1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
nixpkgs/nixos
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
..
doc Merge remote-tracking branch 'origin/master' into staging-next 2021-05-16 18:27:14 -07:00
lib nixos/testing-python.nix: Move makeWrapper to nativeBuildInputs 2021-05-09 03:04:03 +02:00
maintainers amazonImage: make statically sized again 2021-05-01 02:19:42 +00:00
modules Merge remote-tracking branch 'origin/master' into staging-next 2021-05-18 08:57:16 -07:00
tests Merge pull request #123381 from primeos/nixos-tests-cagebreak 2021-05-18 16:01:37 +02:00
COPYING
default.nix nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems 2021-01-08 19:36:10 +01:00
README
release-combined.nix nixos/release-combined: fix a test name 2021-05-17 22:52:28 +02:00
release-small.nix
release.nix Merge pull request #121834 from samueldr/feature/raspberrypi4-image-cleanup 2021-05-10 14:05:02 -04:00

*** NixOS ***

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