From fe901d1372cccd2dc04d5187c3366fabacc3f9c9 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:39:14 +0300 Subject: [PATCH 1/7] maintainers: add retrry to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 720824ee66e..1cdb3dd8d1a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -294,6 +294,7 @@ refnil = "Martin Lavoie "; relrod = "Ricky Elrod "; renzo = "Renzo Carbonara "; + retrry = "Tadas BarzdÅžius "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; rnhmjoj = "Michele Guerini Rocco "; From 9450a6826f68b4ba18618bbb25368b95fceeae2f Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:39:44 +0300 Subject: [PATCH 2/7] rustc: 1.7.0 -> 1.8.0 --- pkgs/development/compilers/rustc/default.nix | 16 ++++++++-------- pkgs/development/compilers/rustc/generic.nix | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix index 61346f1b4e2..38d6cb0b6e7 100644 --- a/pkgs/development/compilers/rustc/default.nix +++ b/pkgs/development/compilers/rustc/default.nix @@ -1,11 +1,11 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "1.7.0"; + shortVersion = "1.8.0"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcSha = "05f4v6sfmvkwsv6a7jp9sxsm84s0gdvqyf2wwdi1ilg9k8nxzgd4"; + srcSha = "1s03aymmhhrndq29sv9cs8s4p1sg8qvq8ds6lyp6s4ny8nyvdpzy"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. @@ -15,12 +15,12 @@ callPackage ./generic.nix { for the tagged release and not a snapshot in the current HEAD. */ - snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2"; - snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4"; - snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1"; - snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7"; - snapshotDate = "2015-12-18"; - snapshotRev = "3391630"; + snapshotHashLinux686 = "5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7"; + snapshotHashLinux64 = "d29b7607d13d64078b6324aec82926fb493f59ba"; + snapshotHashDarwin686 = "4c8e42dd649e247f3576bf9dfa273327b4907f9c"; + snapshotHashDarwin64 = "411a41363f922d1d93fa62ff2fedf5c35e9cccb2"; + snapshotDate = "2016-02-17"; + snapshotRev = "4d3eebf"; patches = [ ./patches/remove-uneeded-git.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 3f640076947..976c1b932b5 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -62,7 +62,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -164,7 +164,8 @@ with stdenv.lib; stdenv.mkDerivation { buildInputs = [ ncurses ] ++ optional (!forceBundledLLVM) llvmShared; - enableParallelBuilding = false; # missing files during linking, occasionally + # https://github.com/rust-lang/rust/issues/30181 + # enableParallelBuilding = false; # missing files during linking, occasionally outputs = [ "out" "doc" ]; setOutputFlags = false; From 0649edd4321181f9314dadd23db812615e936d55 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:40:59 +0300 Subject: [PATCH 3/7] Heatseeker: 1.3.0 -> 1.4.0 --- pkgs/tools/misc/heatseeker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 0d85554c347..9183f1290ea 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -4,17 +4,17 @@ with rustPlatform; buildRustPackage rec { name = "heatseeker-${version}"; - version = "1.3.0"; + version = "1.4.0"; - depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh"; + depsSha256 = "1acimdkl6ra9jlyiydzzd6ccdygr5is2xf9gw8i45xzh0xnsq226"; src = fetchFromGitHub { owner = "rschmitt"; repo = "heatseeker"; rev = "v${version}"; - sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl"; + sha256 = "1v2p6l4bdmvn9jggb12p0j5ajjvnbcdjsiavlcqiijz2w8wcdgs8"; }; - + # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of TRAVIS= "true"; From 94280ecf903d26c4cf1f8205ca0cc47b0d1cce38 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:41:37 +0300 Subject: [PATCH 4/7] exa: 2016-04-11 -> 2016-04-20 --- pkgs/tools/misc/exa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 4c20719fc51..39ba9bb2e50 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "exa-${version}"; - version = "2016-04-11"; + version = "2016-04-20"; depsSha256 = "1rpynsni2r3gim10xc1qkj51wpbzafwsr99y61zh41v4vh047g1k"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; - rev = "9b87ef1da2231acef985bb08f7bd4a557167b652"; - sha256 = "1f71bqkpc6bf9jg1zxy21rzbyhzghwfmgbyyyb81ggxcri0kajwi"; + rev = "110a1c716bfc4a7f74f74b3c4f0a881c773fcd06"; + sha256 = "136yxi85m50vwmqinr1wnd0h29n5yjykqqqk9ibbcmmhx8sqhjzf"; }; nativeBuildInputs = [ cmake ]; From 7d661a4ab40a6296322bb7eced188a6d74dc6dc1 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:42:37 +0300 Subject: [PATCH 5/7] cargo: 0.8.0 -> 0.9.0. Enable Darwin --- .../tools/build-managers/cargo/common.nix | 4 ++-- .../tools/build-managers/cargo/default.nix | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 110956ebf85..64966479319 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -31,8 +31,8 @@ meta = with stdenv.lib; { homepage = http://crates.io; description = "Downloads your Rust project's dependencies and builds your project"; - maintainers = with maintainers; [ wizeman ]; + maintainers = with maintainers; [ wizeman retrry ]; license = [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index e0094b4350a..c3e782a12ea 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl +{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib, makeWrapper }: with rustPlatform; with ((import ./common.nix) { inherit stdenv rustc; - version = "0.8.0"; + version = "0.9.0"; }); buildRustPackage rec { @@ -15,10 +15,10 @@ buildRustPackage rec { src = fetchgit { url = "git://github.com/rust-lang/cargo"; rev = "refs/tags/${version}"; - sha256 = "02z0b6hpygjjfbskg22ggrhdv2nasrgf8x1fd8y0qzg4krx2czlh"; + sha256 = "0d3n2jdhaz06yhilvmw3m2avxv501da1hdhljc9mwkz3l5bkv2jv"; }; - depsSha256 = "1gwc5ygs3h8jxs506xmbj1xzaqpb3kmg3pkxg9j9yqy616jw6rcn"; + depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg"; buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]; @@ -28,8 +28,15 @@ buildRustPackage rec { buildPhase = "make"; - # Disable check phase as there are lots of failures (some probably due to - # trying to access the network). + checkPhase = '' + # Export SSL_CERT_FILE as without it one test fails with SSL verification error + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + # Disable cross compilation tests + export CFG_DISABLE_CROSS_TESTS=1 + cargo test + ''; + + # Disable check phase as there are failures (author_prefers_cargo test fails) doCheck = false; installPhase = '' From 357a251bfb2449ee9d6c9b18b17d86fef7d4767c Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 12:43:00 +0300 Subject: [PATCH 6/7] rustfmt: 2016-03-22 -> 0.4.0 --- pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 55e721306ce..0fad7290df3 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "2016-03-22"; + version = "0.4"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "ca757183fedf8e89286372b91ca074c11d99c4f4"; - sha256 = "0ngg5m002hwwmsqy9wr50dj3l3zgwk39701wzszm3nrhz6x13dmj"; + rev = "19768da5c97c108a05e6f545b73ba4b76d1b1788"; + sha256 = "0f2m0gvlqlybcjl2xqwxlp5hjkhd30kx25dq56k5x0r3808ijksg"; }; - depsSha256 = "0mg4z197iiwjlgqs5izacld25cr11qi3bcrqq204f0jzrnj3y8ag"; + depsSha256 = "1lbcpvp7xhyl96w7jfd18w6py60nwllr93jna5j33zvnip61cpf5"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; From a2973df0334933aca215ceedf54e2642871a9a9e Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 20 Apr 2016 15:08:12 +0300 Subject: [PATCH 7/7] pijul: use stable rustPlatform --- pkgs/applications/version-management/pijul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 399e4cf3024..66dd63956d6 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchdarcs, rustUnstable, openssl, libssh }: +{ stdenv, fetchdarcs, rustPlatform, openssl, libssh }: -with rustUnstable; +with rustPlatform; buildRustPackage rec { name = "pijul-${version}";