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

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát
2016-12-30 22:40:41 +01:00
parent dd2fc990f0 ee3fb421b8
commit 20c2b45ee6
10 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libssh2/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurlBoot, openssl, zlib, windows}:
stdenv.mkDerivation rec {
name = "libssh2-1.7.0";
name = "libssh2-1.8.0";
src = fetchurlBoot {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr";
};
outputs = [ "out" "dev" "devdoc" ];

9
pkgs/development/libraries/ncurses/default.nix
View File

@@ -91,6 +91,12 @@ stdenv.mkDerivation rec {
if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
if [ "ncurses" = "$library" ]
then
# make libtinfo symlinks
ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
fi
fi
done
for statictype in a dll.a la; do
@@ -102,9 +108,6 @@ stdenv.mkDerivation rec {
done
done
# create libtinfo symlink
ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
# move some utilities to $bin
# these programs are used at runtime and don't really belong in $dev
moveToOutput "bin/clear" "$out"