Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15e6801eb3bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b60a6af8eda5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 22, 2021

  1. nix: add Security to build inputs. 

    For some reason, this is required to build nix on Big Sur, even though
it's not needed on earlier macOS versions.
    @dhess
    dhess committed Jan 22, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dhess Drew Hess
    GPG key ID: 4DC0BBFBE3FEF428
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9088862 View commit details

  2. Merge pull request #110493 from hackworthltd/nix-big-sur 

    nix: add Security to build inputs.
    @edolstra
    edolstra authored Jan 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b60a6af View commit details
Showing with 3 additions and 0 deletions.
  1. +2 −0 pkgs/tools/package-management/nix/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
2 changes: 2 additions & 0 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, stateDir ? "/nix/var"
, confDir ? "/etc"
, boehmgc
, Security
}:

let
@@ -52,6 +53,7 @@ common =
[ curl openssl sqlite xz bzip2 nlohmann_json
brotli boost editline
]
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock ]
++ lib.optional withLibseccomp libseccomp
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -28574,6 +28574,7 @@ in
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; };
inherit (darwin.apple_sdk.frameworks) Security;
})
nix
nixStable