diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
| commit | d2e147bedf251976ed99b94b6c905d6761f7a892 (patch) | |
| tree | 9e0c62d61698916fd4627ed98d3d880c8fc0ab2e /pkgs/tools/package-management/nix | |
| parent | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (diff) | |
| parent | c464dc811babfe316ed4ab7bbc12351122e69dd7 (diff) | |
| download | nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.gz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.bz2 nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.lz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.xz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.zst nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master
Diffstat (limited to 'pkgs/tools/package-management/nix')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e60cf580426..cd1f6062cfb 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -42,6 +42,8 @@ common = [ "out" "dev" ] ++ lib.optionals enableDocumentation [ "man" "doc" ]; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] @@ -218,10 +220,10 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.14"; + version = "2.3.15"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; + sha256 = "sha256-N+MxClX94eUOfUMh0puRgNHp16+cjSEdtqZn5u5OtBA="; }; boehmgc = boehmgc_nix; |