tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-14 03:36:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
229037 commits 208 branches 129 tags 14 GiB
Commit graph

4 commits

Author SHA1 Message Date
Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" 
In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
 2020-02-05 19:41:25 +01:00
Frederik Rietdijk 0be87c7979 Revert "Merge master into staging-next" 
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048.

This reverts commit ac241fb7a5, reversing
changes made to 76a439239e.
 2020-02-05 19:18:35 +01:00
Leonhard Markert 42a2668eb0 lorri: unstable-2020-01-09 -> 1.0 2020-02-05 12:12:02 +01:00
Leonhard Markert ceccff3439 lorri: init at version unstable-2019-10-30 
Includes user service (nixos/modules/services/development/lorri) that
starts on demand.
 2019-11-14 16:06:27 +01:00