JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-12 00:02:11 +00:00 committed by GitHub
commit 8ae986f7ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/science/math/singular/default.nix
View File

@ -4,6 +4,7 @@
, buildPackages
, sharutils
, file
, getconf
, flint
, ntl
, cddlib
@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
latex2html
texinfo4
texlive.combined.scheme-small
];
] ++ lib.optionals stdenv.isDarwin [ getconf ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
preAutoreconf = ''

4
pkgs/misc/cliscord/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, openssl, pkg-config, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, openssl, pkg-config, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "cliscord";
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-hzZozgOkw8kFppuHiX9TQxHhxKRv8utWWbhEOIzKDLo=";
};
buildInputs = [ openssl ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];

5
pkgs/tools/filesystems/garage/default.nix
View File

@ -1,4 +1,5 @@
{ lib, rustPlatform, fetchFromGitea, protobuf, testers, garage }:
{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }:
rustPlatform.buildRustPackage rec {
pname = "garage";
version = "0.7.0";
@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ protobuf ];
buildInputs = lib.optional stdenv.isDarwin Security;
passthru = {
tests.version = testers.testVersion { package = garage; };
};

8
pkgs/top-level/all-packages.nix
View File

@ -6079,7 +6079,9 @@ with pkgs;
gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
garage = callPackage ../tools/filesystems/garage { };
garage = callPackage ../tools/filesystems/garage {
inherit (darwin.apple_sdk.frameworks) Security;
};
garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
@ -14146,7 +14148,9 @@ with pkgs;
clips = callPackage ../development/interpreters/clips { };
cliscord = callPackage ../misc/cliscord { };
cliscord = callPackage ../misc/cliscord {
inherit (darwin.apple_sdk.frameworks) Security;
};
clisp = callPackage ../development/interpreters/clisp { };
clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };