Re: [Nix-dev] Git branches to track nix channels
Hi Arseniy, On Tue, May 19 2015, Arseniy Seroka wrote: We have this. Read about it in a making patches section [1] [1] https://github.com/jagajaga/nixpkgs/blob/addition/contributing/CONTRIBUTING.md what's the status of that document? We also have: https://nixos.org/wiki/Contributing Is your page adding information on top of the wiki page? If yes, could you adjust it to make use of the nixpkgs-channels repo? Do you see a need for a CONTRIBUTING.md in nixpkgs (instead of the wiki page)? What do you think about a link from README.md to the Contributing wiki page? I'm a fan of having things in one place and would welcome a CONTRIBUTING.md instead of the wiki page. regards Florian On 19 May 2015 12:15:00 Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 -- ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 signature.asc 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] Git branches to track nix channels
On Tue, May 19 2015, Peter Simons wrote: Hi Florian, What is the reasoning to have these in a separate repository? We don't want notification e-mails sent out every time the channel updates, which would happen if these branches were pushed to the main repository. Thx - I added information to the nixpkgs README.md. -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 signature.asc 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] Git branches to track nix channels
github shows CONTRIBUTING.md when you open an issue/PR, that's the main reason I'd like to see it as an entry point to contributing to Nix family. The wiki page and nixos.org is something ~1% of contributing users will ever read. On Fri, May 22, 2015 at 11:04 AM, Florian Friesdorf f...@chaoflow.net wrote: Hi Arseniy, On Tue, May 19 2015, Arseniy Seroka wrote: We have this. Read about it in a making patches section [1] [1] https://github.com/jagajaga/nixpkgs/blob/addition/contributing/CONTRIBUTING.md what's the status of that document? We also have: https://nixos.org/wiki/Contributing Is your page adding information on top of the wiki page? If yes, could you adjust it to make use of the nixpkgs-channels repo? Do you see a need for a CONTRIBUTING.md in nixpkgs (instead of the wiki page)? What do you think about a link from README.md to the Contributing wiki page? I'm a fan of having things in one place and would welcome a CONTRIBUTING.md instead of the wiki page. regards Florian On 19 May 2015 12:15:00 Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 -- ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
There is also a thread mentioning contribution from march: Some bug tracker experience and RFC on improvements On Fri, May 22 2015, Florian Friesdorf wrote: Hi Arseniy, On Tue, May 19 2015, Arseniy Seroka wrote: We have this. Read about it in a making patches section [1] [1] https://github.com/jagajaga/nixpkgs/blob/addition/contributing/CONTRIBUTING.md what's the status of that document? We also have: https://nixos.org/wiki/Contributing Is your page adding information on top of the wiki page? If yes, could you adjust it to make use of the nixpkgs-channels repo? Do you see a need for a CONTRIBUTING.md in nixpkgs (instead of the wiki page)? What do you think about a link from README.md to the Contributing wiki page? I'm a fan of having things in one place and would welcome a CONTRIBUTING.md instead of the wiki page. regards Florian On 19 May 2015 12:15:00 Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 -- ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 signature.asc 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] Git branches to track nix channels
Hi, On 20/05/15 22:23, Nicolas Pierron wrote: I did that a while ago, and somebody removed them, because of the potential noise that such branches can caused. Then I pushed the script that I made to keep track of the channel versions. You can use this script in your nixpkgs working directory, run $ $(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh I think it's preferrable to use standard Git mechanisms (since it doesn't involve trying to parse http://nixos.org/channels/): $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git And then you can rebase your local branch on top of (say) the current nixos-14.12: $ git remote update channels $ git rebase channels/nixos-14.12 -- Eelco Dolstra | LogicBlox, Inc. | http://nixos.org/~eelco/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
On 05/19/2015 07:36 PM, Matthias Beyer wrote: On 19-05-2015 12:08:30, Vladimír Čunát wrote: I'm uncertain if there might be some performance implications [...] From a git point of view, there won't be any performance implications besides that the tags get fetched on `git fetch` - which is wanted behaviour I guess. What I meant: in most git commands one can specify a refname, so any tag is accepted there as well. Therefore, the tags probably have to be searched very often (see man gitrevision for details). I think the implementation does no clever thing about the tag/branch names - it just passes through all, which could become slower in time, if we had many thousands of them. But anyway, IMO it will take some time before it gets noticeable. I often check out all the pull request branches, so I have thousands refs already, without noticing any problems. $ wc -l .git/info/refs du -h .git/info/refs 6701 .git/info/refs 420K .git/info/refs $ find .git/refs/ | wc -l 587 Vladimir 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] Git branches to track nix channels
Hi, I did that a while ago, and somebody removed them, because of the potential noise that such branches can caused. Then I pushed the script that I made to keep track of the channel versions. You can use this script in your nixpkgs working directory, run $ $(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh Then you can make an alias in your .git/config: [alias] fetch-channels = !sh -c \$(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh\ which means that you can also do, from anywhere inside your working directory. $ git fetch-channels This will pull all the channel branches from nixos.org, and also look for the channels that are corresponding to nixos-version, and any channel that you have in ~/.nix-defexpr . On Tue, May 19, 2015 at 9:56 AM, Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Nicolas Pierron http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
I've wrote that and nobody mentioned :( 2015-05-20 23:23 GMT+03:00 Nicolas Pierron nicolas.b.pier...@gmail.com: Hi, I did that a while ago, and somebody removed them, because of the potential noise that such branches can caused. Then I pushed the script that I made to keep track of the channel versions. You can use this script in your nixpkgs working directory, run $ $(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh Then you can make an alias in your .git/config: [alias] fetch-channels = !sh -c \$(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh\ which means that you can also do, from anywhere inside your working directory. $ git fetch-channels This will pull all the channel branches from nixos.org, and also look for the channels that are corresponding to nixos-version, and any channel that you have in ~/.nix-defexpr . On Tue, May 19, 2015 at 9:56 AM, Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Nicolas Pierron http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Sincerely, Arseniy Seroka ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
On 20/05/2015 14:44, Vladimír Čunát wrote: On 05/19/2015 07:36 PM, Matthias Beyer wrote: On 19-05-2015 12:08:30, Vladimír Čunát wrote: I'm uncertain if there might be some performance implications [...] From a git point of view, there won't be any performance implications besides that the tags get fetched on `git fetch` - which is wanted behaviour I guess. What I meant: in most git commands one can specify a refname, so any tag is accepted there as well. Therefore, the tags probably have to be searched very often (see man gitrevision for details). I think the implementation does no clever thing about the tag/branch names - it just passes through all, which could become slower in time, if we had many thousands of them. That I/O for getting all refs can indeed become very noticeable if the local git repository is not in the FS cache, also somewhat depending on the file system that's used. But there is already a solution for that: git pack-refs stores the refs (tags only, by default) in a single file, rather than as a separate file for each ref. Separate files will still be created as refs get updated, but only for those refs that get updated. git pack-refs is by default automatically run by git gc, and git gc is by default automatically run after most operations, if enough git objects have been created. So for most users, as long as you make sure to use tags and not some custom ref naming scheme, nothing special needs to be done. Cheers, Harald van Dijk But anyway, IMO it will take some time before it gets noticeable. I often check out all the pull request branches, so I have thousands refs already, without noticing any problems. $ wc -l .git/info/refs du -h .git/info/refs 6701 .git/info/refs 420K .git/info/refs $ find .git/refs/ | wc -l 587 Vladimir ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
What is the reasoning to have these in a separate repository? What do you think about adding tags like I proposed? On Tue, May 19 2015, Domen Kožar wrote: We have https://github.com/NixOS/nixpkgs-channels that has branches that track latest channel updates On Tue, May 19, 2015 at 9:56 AM, Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 signature.asc 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] Git branches to track nix channels
Hi Florian, What is the reasoning to have these in a separate repository? We don't want notification e-mails sent out every time the channel updates, which would happen if these branches were pushed to the main repository. Best regards, Peter ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
We have https://github.com/NixOS/nixpkgs-channels that has branches that track latest channel updates On Tue, May 19, 2015 at 9:56 AM, Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
We have this. Read about it in a making patches section [1] [1] https://github.com/jagajaga/nixpkgs/blob/addition/contributing/CONTRIBUTING.md Sincerely, Arseniy Seroka On 19 May 2015 12:15:00 Florian Friesdorf f...@chaoflow.net wrote: Hi, nix channels are series of snapshots of nixpkgs that were succesfully build by hydra and we subscribe and update them via nix-channel - for users of nixpkgs this is great! As maintainers of nixpkgs and users who keep custom patches, we also have one or more local checkouts of git://github.com/NixOS/nixpkgs.git. It would be great if channel information would be available via git as well: - one branch per channel, git reset --hard to the latest successfully build nixpkgs in this channel - tags (channel-name-datetime) for each successful channel build. This would enable us to base local customizations of nixpkgs on-top of successful hydra builds and therefore getting as much binary package support as possible, and would remove the need to additionally maintain channels with nix-channel. What do you think? cheers florian -- Florian Friesdorf f...@chaoflow.net GPG FPR: 7A13 5EEE 1421 9FC2 108D BAAF 38F8 99A3 0C45 F083 -- ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Git branches to track nix channels
On 05/19/2015 11:22 AM, Florian Friesdorf wrote: What do you think about adding tags like I proposed? Listing the tags will quickly become unwieldy, but for a persistent reference it will be more readable to have channel-date than some random hash (or maybe channel/date or something). It might be also nice for things like git describe. Maybe there's a better way to achieve those, I don't know. I'm uncertain if there might be some performance implications when working on a repo with too many tags, but as this won't be in the main repo, we can easily chance it. Vladimir 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] Git branches to track nix channels
On 19-05-2015 12:08:30, Vladimír Čunát wrote: I'm uncertain if there might be some performance implications when working on a repo with too many tags, but as this won't be in the main repo, we can easily chance it. From a git point of view, there won't be any performance implications besides that the tags get fetched on `git fetch` - which is wanted behaviour I guess. doing a `git tag` could become a bit slower... But I don't think that's much of a problem (just did a `git tag` on the kernel sources, which has 417 tags for me atm: real0m0.015s user0m0.003s sys 0m0.011s so I guess nobody cares. (Well, `git tag` is simply file-read and nothing more...) -- Mit freundlichen Grüßen, Kind regards, Matthias Beyer Proudly sent with mutt. Happily signed with gnupg. pgpmagQrmc6kP.pgp Description: PGP signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
