nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45643 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2018-08-27 08:21:31 +02:00 committed by GitHub
commit 87e44b0357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -11,15 +11,18 @@ assertExecutable() {
# makeWrapper EXECUTABLE ARGS
# ARGS:
# --argv0 NAME : set name of executed process to NAME
# (otherwise it’s called …-wrapped)
# --set VAR VAL : add VAR with value VAL to the executable’s environment
# --unset VAR : remove VAR from the environment
# --run COMMAND : run command before the executable
# The command can push extra flags to a magic list variable
# extraFlagsArray, which are then added to the invocation
# of the executable
# --add-flags FLAGS : add FLAGS to invocation of executable
# --argv0 NAME : set name of executed process to NAME
# (otherwise it’s called …-wrapped)
# --set VAR VAL : add VAR with value VAL to the executable’s
# environment
# --set-default VAR VAL : like --set, but only adds VAR if not already set in
# the environment
# --unset VAR : remove VAR from the environment
# --run COMMAND : run command before the executable
# The command can push extra flags to a magic list
# variable extraFlagsArray, which are then added to
# the invocation of the executable
# --add-flags FLAGS : add FLAGS to invocation of executable
# --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP
# --suffix

2
pkgs/development/tools/misc/strace/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";
# fails 1 out of 523 tests with
# "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch"

4
pkgs/os-specific/linux/busybox/default.nix
View File

@ -32,14 +32,14 @@ let
in
stdenv.mkDerivation rec {
name = "busybox-1.29.1";
name = "busybox-1.29.2";
# Note to whoever is updating busybox: please verify that:
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
# still builds after the update.
src = fetchurl {
url = "https://busybox.net/downloads/${name}.tar.bz2";
sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw";
sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7";
};
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];

4
pkgs/tools/security/sudo/default.nix
View File

@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
name = "sudo-1.8.23";
name = "sudo-1.8.24";
src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq";
sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l";
};
prePatch = ''

5
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -95,12 +95,13 @@ core = stdenv.mkDerivation rec {
configureFlags = common.configureFlags
++ [ "--without-x" ] # disable xdvik and xpdfopen
++ map (what: "--disable-${what}") [
++ map (what: "--disable-${what}") ([
"dvisvgm" "dvipng" # ghostscript dependency
"luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more
"xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
]
] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure
;
enableParallelBuilding = true;