jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c05cc615f2
nixpkgs/nixos/modules/system
History
Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" 
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a570d6cf81d229ad22a8889602639160 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 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master.

This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
2020-02-05 19:41:25 +01:00
..
activation Revert "add config.environment.ld-linux" 2020-02-02 15:29:49 +01:00
boot Revert "Revert "Merge master into staging-next"" 2020-02-05 19:41:25 +01:00
etc Revert "Merge pull request #54980 from danbst/etc-relative" (#56507) 2019-02-28 07:48:40 +02:00