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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-25 06:44:40 +00:00 committed by GitHub
commit 873cbb9dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/graphics/krita/default.nix
View File

@ -10,16 +10,13 @@
mkDerivation rec {
pname = "krita";
version = "4.4.1";
version = "4.4.2";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "1bmmfvmawnlihbqkksdrwxfkaip4nfsi97w83fmvkyxl4jk715vr";
sha256 = "121fjdv5phx1aqk21vx9k9vsc5k1w8s86gp6pamy2y31r2ph7r8y";
};
# *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359
enableParallelBuilding = false;
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
buildInputs = [

4
pkgs/applications/science/biology/picard-tools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.24.0";
version = "2.24.1";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-cOkQObzMb222DxjEFxMhiozfRfWR8CwQEsBiFSsnzXs=";
sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8=";
};
nativeBuildInputs = [ makeWrapper ];

15
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -6,6 +6,7 @@
# compiler and the linker just "work".
{ name ? ""
, lib
, stdenvNoCC
, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
@ -15,7 +16,7 @@
, useMacosReexportHack ? false
}:
with stdenvNoCC.lib;
with lib;
assert nativeTools -> !propagateDoc && nativePrefix != "";
assert !nativeTools ->
@ -31,11 +32,11 @@ let
#
# TODO(@Ericson2314) Make unconditional, or optional but always true by
# default.
targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
targetPrefix = lib.optionalString (targetPlatform != hostPlatform)
(targetPlatform.config + "-");
bintoolsVersion = stdenv.lib.getVersion bintools;
bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools);
bintoolsVersion = lib.getVersion bintools;
bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools);
libc_bin = if libc == null then null else getBin libc;
libc_dev = if libc == null then null else getDev libc;
@ -62,7 +63,7 @@ let
else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1"
else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1"
else if targetPlatform.isDarwin then "/usr/lib/dyld"
else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
else null;
expand-response-params =
@ -326,10 +327,10 @@ stdenv.mkDerivation {
let bintools_ = if bintools != null then bintools else {}; in
(if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) //
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
+ " (wrapper script)";
priority = 10;
} // optionalAttrs useMacosReexportHack {
platforms = stdenv.lib.platforms.darwin;
platforms = lib.platforms.darwin;
};
}

17
pkgs/build-support/cc-wrapper/default.nix
View File

@ -6,6 +6,7 @@
# compiler and the linker just "work".
{ name ? ""
, lib
, stdenvNoCC
, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
, gccForLibs ? null
@ -18,7 +19,7 @@
, libcxx ? null
}:
with stdenvNoCC.lib;
with lib;
assert nativeTools -> !propagateDoc && nativePrefix != "";
assert !nativeTools ->
@ -34,11 +35,11 @@ let
#
# TODO(@Ericson2314) Make unconditional, or optional but always true by
# default.
targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
targetPrefix = lib.optionalString (targetPlatform != hostPlatform)
(targetPlatform.config + "-");
ccVersion = stdenv.lib.getVersion cc;
ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc);
ccVersion = lib.getVersion cc;
ccName = lib.removePrefix targetPrefix (lib.getName cc);
libc_bin = if libc == null then null else getBin libc;
libc_dev = if libc == null then null else getDev libc;
@ -247,8 +248,8 @@ stdenv.mkDerivation {
setupHooks = [
../setup-hooks/role.bash
] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh
++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh;
] ++ lib.optional (cc.langC or true) ./setup-hook.sh
++ lib.optional (cc.langFortran or false) ./fortran-hook.sh;
postFixup =
# Ensure flags files exists, as some other programs cat them. (That these
@ -353,7 +354,7 @@ stdenv.mkDerivation {
+ optionalString (libcxx.isLLVM or false) (''
echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
'' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
'' + lib.optionalString stdenv.targetPlatform.isLinux ''
echo "-lc++abi" >> $out/nix-support/libcxx-ldflags
'')
@ -492,7 +493,7 @@ stdenv.mkDerivation {
let cc_ = if cc != null then cc else {}; in
(if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) //
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_
lib.attrByPath ["meta" "description"] "System C compiler" cc_
+ " (wrapper script)";
priority = 10;
};

2
pkgs/build-support/pkg-config-wrapper/default.nix
View File

@ -10,7 +10,7 @@
, extraPackages ? [], extraBuildCommands ? ""
}:
with stdenvNoCC.lib;
with lib;
let
stdenv = stdenvNoCC;

16
pkgs/build-support/release/ant-build.nix
View File

@ -1,5 +1,6 @@
{ src
, pkgs
, lib
, stdenv ? pkgs.stdenv
, name
, antTargets ? []
@ -16,8 +17,7 @@
, ... } @ args:
let
antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
lib = stdenv.lib;
antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
in
stdenv.mkDerivation (
@ -31,7 +31,7 @@ stdenv.mkDerivation (
prePhases =
["antSetupPhase"];
antSetupPhase = with stdenv.lib; ''
antSetupPhase = with lib; ''
if test "$hydraAntLogger" != "" ; then
export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"
fi
@ -46,7 +46,7 @@ stdenv.mkDerivation (
mkdir -p $out/share/java
${ if jars == [] then ''
find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
'' else stdenv.lib.concatMapStrings (j: ''
'' else lib.concatMapStrings (j: ''
cp -v ${j} $out/share/java
'') jars }
@ -65,7 +65,7 @@ stdenv.mkDerivation (
in
''
header "Generating jar wrappers"
'' + (stdenv.lib.concatMapStrings (w: ''
'' + (lib.concatMapStrings (w: ''
mkdir -p $out/bin
cat >> $out/bin/${w.name} <<EOF
@ -85,7 +85,7 @@ stdenv.mkDerivation (
header "Building default ant target"
ant ${antFlags}
closeNest
'' else stdenv.lib.concatMapStrings (t: ''
'' else lib.concatMapStrings (t: ''
header "Building '${t}' target"
ant ${antFlags} ${t}
closeNest
@ -103,12 +103,12 @@ stdenv.mkDerivation (
'';
}
// removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] //
// removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] //
{
name = name + (if src ? version then "-" + src.version else "");
buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;
buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
postHook = ''
mkdir -p $out/nix-support

2
pkgs/build-support/release/debian-build.nix
View File

@ -4,7 +4,7 @@
{ name ? "debian-build"
, lib
, diskImage
, src, stdenv, vmTools, checkinstall
, src, lib, stdenv, vmTools, checkinstall
, fsTranslation ? false
, # Features provided by this package.
debProvides ? []

2
pkgs/build-support/release/default.nix
View File

@ -15,7 +15,7 @@ rec {
} // args);
antBuild = args: import ./ant-build.nix (
{ inherit pkgs;
{ inherit lib pkgs;
} // args);
mvnBuild = args: import ./maven-build.nix (

4
pkgs/development/python-modules/azure-mgmt-compute/default.nix
View File

@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
version = "18.0.0";
version = "18.1.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4";
};
propagatedBuildInputs = [

9
pkgs/stdenv/darwin/default.nix
View File

@ -20,7 +20,7 @@
assert crossSystem == localSystem;
let
inherit (localSystem) system platform;
inherit (localSystem) system;
bootstrapClangVersion = "7.1.0";
@ -80,7 +80,7 @@ in rec {
mkCC = overrides: import ../../build-support/cc-wrapper (
let args = {
inherit shell;
inherit lib shell;
inherit (last) stdenvNoCC;
nativeTools = false;
@ -148,7 +148,7 @@ in rec {
__extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = {
inherit macosVersionMin platform;
inherit macosVersionMin;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
@ -217,6 +217,7 @@ in rec {
binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) {
shell = "${bootstrapTools}/bin/bash";
inherit lib;
inherit (self) stdenvNoCC;
nativeTools = false;
@ -522,7 +523,7 @@ in rec {
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
inherit macosVersionMin platform bootstrapTools;
inherit macosVersionMin bootstrapTools;
};
allowedRequisites = (with pkgs; [

12
pkgs/stdenv/linux/default.nix
View File

@ -42,7 +42,7 @@
assert crossSystem == localSystem;
let
inherit (localSystem) system platform;
inherit (localSystem) system;
commonPreHook =
''
@ -107,15 +107,11 @@ let
bintools = prevStage.binutils;
isGNU = true;
libc = getLibc prevStage;
inherit lib;
inherit (prevStage) coreutils gnugrep;
stdenvNoCC = prevStage.ccWrapperStdenv;
};
extraAttrs = {
# Having the proper 'platform' in all the stdenvs allows getting proper
# linuxHeaders for example.
inherit platform;
};
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
};
@ -171,6 +167,7 @@ in
nativeLibc = false;
buildPackages = { };
libc = getLibc self;
inherit lib;
inherit (self) stdenvNoCC coreutils gnugrep;
bintools = bootstrapTools;
};
@ -317,6 +314,7 @@ in
cc = prevStage.gcc-unwrapped;
bintools = self.binutils;
libc = getLibc self;
inherit lib;
inherit (self) stdenvNoCC coreutils gnugrep;
shell = self.bash + "/bin/bash";
};
@ -369,7 +367,7 @@ in
# TODO: remove this!
inherit (prevStage) glibc;
inherit platform bootstrapTools;
inherit bootstrapTools;
shellPackage = prevStage.bash;
};