diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:49 -0700 |
| commit | 773b4deb7c5c6300f23f2ec2db4751e40f6520fa (patch) | |
| tree | 45e1caaa95b76b129efe46e8c048be03c91f3baf /pkgs/tools | |
| parent | 316a09377d12b29764b5daf51e0df8986a5fe175 (diff) | |
| parent | a6f6c0eeeb45ad122022366724e396955f0f775b (diff) | |
| download | nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.gz nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.bz2 nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.lz nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.xz nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.zst nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.zip | |
Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for all packages.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/quirc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index cab02f6573d1..d84989d4372b 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; preInstall = '' mkdir -p "$out"/{bin,lib,include} - find . -maxdepth 1 -type f -perm +111 -exec cp '{}' "$out"/bin ';' + find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';' ''; makeFlags = "PREFIX=$(out)"; meta = { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 6901c74cc48a..f9f638ec8136 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -16,11 +16,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.43.0"; + name = "curl-7.44.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1ycdhp47v8z6y64s7ihi5jl28dzc5w8wqn0wrhy4hc152ahm99ms"; + sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains |