diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-13 09:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 09:47:49 +0200 |
| commit | 35ce480d69778867c1de820188879bbad6bc2f75 (patch) | |
| tree | 46e7ec52b6ade87bb750b134aa9cd807efa34b13 /pkgs/development | |
| parent | 20c4986c4dd9b014991c619498ae6ef09aa5d0aa (diff) | |
| parent | eeaf3a131fbe8611d59592ae2e215131b23c70e5 (diff) | |
| download | nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.tar nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.tar.gz nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.tar.bz2 nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.tar.lz nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.tar.xz nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.tar.zst nixpkgs-35ce480d69778867c1de820188879bbad6bc2f75.zip | |
Merge pull request #47964 from NixOS/staging-next
Merge staging-next into master
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/p11-kit/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/parsing/bison/3.x.nix | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4131e5f7a27..1ab0718e796 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { postFixup = '' # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1i#line 1 "{}"' -i '{}' \; + -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a ''; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index db46412ceb5..7c0664533b8 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -10,14 +10,14 @@ assert glSupport -> libGL != null; let - version = "1.15.12"; + version = "1.15.14"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; - sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; + sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e0e0b59a9a9..b4bdd200211 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.13"; + version = "0.23.14"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6"; + sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 469e64acff0..d75a7e0ee3d 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.0.5"; + name = "bison-3.1"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd"; + sha256 = "0ip9krjf0lw57pk3wfbxgjhif1i18hm3vh35d1ifrvhnafskdjx7"; }; patches = []; # remove on another rebuild |