Re: [Nix-dev] svn-revision empty / nixos channel as branch?
On 01/22/2013 10:17 PM, Florian Friesdorf wrote: Am I correct, that the channel would be trunk-combined? http://hydra.nixos.org/jobset/nixos/trunk-combined That depends on your use case. I have only services in nixos and so I rebuild it very rarely. However, I quite often build or update something from nixpkgs. That's why I only used the nixpkgs, moreover the additional things in nixos IMHO aren't usually very build-time intensive. nixpkgs is independent of nixos, nixos needs nixpkgs. % du -sh dev/nixos/nixos 17M dev/nixos/nixos % du -sh dev/nixos/nixpkgs 152Mdev/nixos/nixpkgs I think the size at least is not an argument for separate repositories. Yes, I see this the same way. Having separate repositories, it would be great to register the revision of nixpkgs being used for nixos. Registering nixpkgs as a submodule for nixos would achieve exactly that. However, there would be quite some commits just for upgrading the submodule - I'm not sure how useful that is. The main dependency I see is when the service-package gets updated in synchronously one needs to update the nixos service definition. These two changes should IMHO be somehow seen as interdependent, probably in one commit, but there may be other solutions. On the other hand for hydra to publish what versions have been successfully built together is definitely useful, but she does that already. Yes, and one can often judge from the time stamps... now when rebuilding nixos I always fetch both repos at once to minimize these risks (so I don't see this as a critical problem, just a minor enhancement). The hydra channel could be a git repository with two submodules (nixpkgs, nixos) and hydra updates these in the master branch for every attempted combined build. For every successful combined build it moves the tested branch forward. That could be a nicer way to automatically find out which versions were built together (although we already have it now, in a less efficient way). Vlada smime.p7s Description: S/MIME Cryptographic Signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] svn-revision empty / nixos channel as branch?
revisions are back: /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/svn-revision nixos revision: 64ffca1 nixpkgs revision: 8eef699 Vladimír Čunát vcu...@gmail.com writes: On 01/21/2013 05:12 AM, Florian Friesdorf wrote: I'm using the file to maintain branches channel-nixos of nixos and nixpkgs, so I can develop new features based on a supposedly more stable base. Oh, I'm using parts of those scripts as well. I was thinking of parsing http://hydra.nixos.org/jobset/nixpkgs/trunk instead (which would be more bandwidth-efficient), but your solution was easier. Also a nice idea! Am I correct, that the channel would be trunk-combined? http://hydra.nixos.org/jobset/nixos/trunk-combined Now as the channel only consists of nix expressions, no Manifest files anymore, wouldn't it be sane to maintain it as a repository? One repo with nixos and nixpkgs as submodules? Or probably better: nixpkgs as submodule of nixos? It might be useful to be able to have one commit change both nixos and nixpkgs. Dependencies between the repos aren't too frequent, but still I think they should be seen somehow. nixpkgs is independent of nixos, nixos needs nixpkgs. % du -sh dev/nixos/nixos 17M dev/nixos/nixos % du -sh dev/nixos/nixpkgs 152Mdev/nixos/nixpkgs I think the size at least is not an argument for separate repositories. Having separate repositories, it would be great to register the revision of nixpkgs being used for nixos. Registering nixpkgs as a submodule for nixos would achieve exactly that. However, there would be quite some commits just for upgrading the submodule - I'm not sure how useful that is. On the other hand for hydra to publish what versions have been successfully built together is definitely useful, but she does that already. Having to download 3.5MB for every channel update, while I only miss the information what revisions to use, is as you say not bandwith efficient. The hydra channel could be a git repository with two submodules (nixpkgs, nixos) and hydra updates these in the master branch for every attempted combined build. For every successful combined build it moves the tested branch forward. -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgp8MxfWWYYRD.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] svn-revision empty / nixos channel as branch?
On 01/21/2013 05:12 AM, Florian Friesdorf wrote: I'm using the file to maintain branches channel-nixos of nixos and nixpkgs, so I can develop new features based on a supposedly more stable base. Oh, I'm using parts of those scripts as well. I was thinking of parsing http://hydra.nixos.org/jobset/nixpkgs/trunk instead (which would be more bandwidth-efficient), but your solution was easier. Now as the channel only consists of nix expressions, no Manifest files anymore, wouldn't it be sane to maintain it as a repository? One repo with nixos and nixpkgs as submodules? Or probably better: nixpkgs as submodule of nixos? It might be useful to be able to have one commit change both nixos and nixpkgs. Dependencies between the repos aren't too frequent, but still I think they should be seen somehow. Vlada smime.p7s Description: S/MIME Cryptographic Signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] svn-revision empty / nixos channel as branch?
Quoting Vladimír Čunát (2013-01-21 14:36:27) On 01/21/2013 05:12 AM, Florian Friesdorf wrote: I'm using the file to maintain branches channel-nixos of nixos and nixpkgs, so I can develop new features based on a supposedly more stable base. Oh, I'm using parts of those scripts as well. I was thinking of parsing http://hydra.nixos.org/jobset/nixpkgs/trunk instead (which would be more bandwidth-efficient), but your solution was easier. Now as the channel only consists of nix expressions, no Manifest files anymore, wouldn't it be sane to maintain it as a repository? One repo with nixos and nixpkgs as submodules? Or probably better: nixpkgs as submodule of nixos? It might be useful to be able to have one commit change both nixos and nixpkgs. Dependencies between the repos aren't too frequent, but still I think they should be seen somehow. Vlada maybe git-subtree might be a good candidate for this https://github.com/apenwarr/git-subtree -- Rok Garbas - http://www.garbas.si ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] svn-revision empty / nixos channel as branch?
Hi, so far svn-revision was giving the nixos and nixpkgs SHA forming the channel. With the latest update, this file is empty: % cat /nix/var/nix/profiles/per-user/root/channels-22-link/nixos/nixos/svn-revision 4042_e201da3-ff461b0 % cat /nix/var/nix/profiles/per-user/root/channels-23-link/nixos/nixos/svn-revision I'm using the file to maintain branches channel-nixos of nixos and nixpkgs, so I can develop new features based on a supposedly more stable base. Now as the channel only consists of nix expressions, no Manifest files anymore, wouldn't it be sane to maintain it as a repository? One repo with nixos and nixpkgs as submodules? Or probably better: nixpkgs as submodule of nixos? regards florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 Jabber/XMPP: f...@chaoflow.net IRC: chaoflow on freenode,ircnet,blafasel,OFTC pgp5EbQHqZKrz.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
