JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
475c652f7a
nixpkgs/nixos
History
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
..
doc sqldeveloper: {17.4.1.054.0712,18.2.0.183.1748} -> 19.4.0.354.1759 2020-02-04 13:51:52 +01:00
lib Merge pull request #59855 from volth/qemu-cpu-passthru 2020-02-01 22:59:37 -05:00
maintainers maintainers/create-azure.sh: run from anywhere 2020-01-09 20:54:28 +00:00
modules Revert "Revert "Merge master into staging-next"" 2020-02-05 19:41:25 +01:00
tests Revert "Revert "Merge master into staging-next"" 2020-02-05 19:41:25 +01:00
COPYING
default.nix
README
release-combined.nix nixos/release: rename iso_graphical to iso_plasma5 2020-01-27 16:34:37 -05:00
release-small.nix nixos/containers-ip: Test both ipv4 and ipv6 in the same script 2019-11-27 09:13:02 +01:00
release.nix nixos/release: rename iso_graphical to iso_plasma5 2020-01-27 16:34:37 -05:00

README 

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.