diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-22 08:54:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-22 08:54:37 +0100 |
| commit | 246ba46db7bcdc282b59640c61d2610a120d95f7 (patch) | |
| tree | 24709376939642510c6404cc2b261da26c653baf /pkgs/development | |
| parent | 699d715f2426683bc1468eb4630ae1c0ee2af900 (diff) | |
| parent | 94f4857bc507b59d930dba72a9c643878ae854d2 (diff) | |
| download | nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.tar nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.tar.gz nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.tar.bz2 nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.tar.lz nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.tar.xz nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.tar.zst nixlib-246ba46db7bcdc282b59640c61d2610a120d95f7.zip | |
Merge older staging (finished on Hydra)
https://hydra.nixos.org/eval/1427837?filter=&compare=1427817 Fixes #34087.
Diffstat (limited to 'pkgs/development')
6 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 388c24e63364..0147485dd58d 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -40,6 +40,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index f215aadc4d98..aafe30e4c9b3 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -42,6 +42,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 6f84e4b88950..a2ba1fe7f4cb 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -59,6 +59,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 021971a45431..0ee1404484b9 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -60,6 +60,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index fe9f94beed17..e10c5fbb5684 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -10,11 +10,11 @@ (rec { name = "guile-${version}"; - version = "2.2.0"; + version = "2.2.3"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"; + sha256 = "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 060f5ba4934c..ad8c7626661e 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.8"; + version = "1.0.9"; + name = "libnftnl-${version}"; src = fetchurl { - url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6"; + url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; + sha256 = "0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy"; }; nativeBuildInputs = [ pkgconfig ]; |