diff options
52 files changed, 505 insertions, 197 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index f85c74ab88e3a..21642ca0bdc1e 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -71,7 +71,7 @@ rec { + (if pathExists suffixFile then fileContents suffixFile else "pre-git"); # Whether we're being called by nix-shell. - inNixShell = builtins.getEnv "IN_NIX_SHELL" == "1"; + inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; # Return minimum/maximum of two numbers. min = x: y: if x < y then x else y; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 483527c8fa8cd..0cd5c1997518e 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.34.146.g28f9eda2-19"; + version = "1.0.36.120.g536a862f-20"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1pks9b83aj6y3c3jlmll0rs05yk15r49v0v4amm950z68v182a5g"; + sha256 = "03r4hz4x4f3zmp6dsv1n72y5q01d7mfqvaaxqvd587a5561gahf0"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix new file mode 100644 index 0000000000000..35b66299c06d1 --- /dev/null +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }: + +stdenv.mkDerivation { + name = "fehlstart-9f4342d7"; + + src = fetchFromGitLab { + owner = "fehlstart"; + repo = "fehlstart"; + rev = "9f4342d75ec5e2a46c13c99c34894bc275798441"; + sha256 = "1rfzh7w6n2s9waprv7m1bhvqrk36a77ada7w655pqiwkhdj5q95i"; + }; + + patches = [ ./use-nix-profiles.patch ]; + buildInputs = [ pkgconfig gtk2 keybinder ]; + + preConfigure = '' + export PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "Small desktop application launcher with reasonable memory footprint"; + homepage = https://gitlab.com/fehlstart/fehlstart; + licence = licenses.gpl3; + maintainers = [ maintainers.mounium ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/pkgs/applications/misc/fehlstart/use-nix-profiles.patch new file mode 100644 index 0000000000000..0c06e53f98148 --- /dev/null +++ b/pkgs/applications/misc/fehlstart/use-nix-profiles.patch @@ -0,0 +1,21 @@ +--- fehlstart-9f4342d75ec5e2a46c13c99c34894bc275798441-src/fehlstart.c 1970-01-01 01:00:01.000000000 +0100 ++++ fehlstart.c 2016-08-10 12:21:11.231638418 +0200 +@@ -779,8 +779,15 @@ + read_settings(setting_file, &settings); + update_commands(); + g_hash_table_foreach(action_map, update_launcher, NULL); +- add_launchers(STR_S(APPLICATIONS_DIR_0)); +- add_launchers(STR_S(APPLICATIONS_DIR_1)); +- add_launchers(STR_S(USER_APPLICATIONS_DIR)); ++ const char* nixprofiles = getenv("NIX_PROFILES"); ++ if(nixprofiles != NULL) { ++ const char* pch = strtok(nixprofiles, " "); ++ while (pch != NULL) ++ { ++ String nix_dir = str_concat((String) { pch, strlen(pch), false },STR_S("/share/applications")); ++ add_launchers(nix_dir); ++ pch = strtok(NULL, " "); ++ } ++ } + return NULL; + } diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 4bf6e36f1d261..4050f8bf58947 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -24,7 +24,7 @@ assert stdenv.isLinux; let - version = "4.2.9"; + version = "4.2.10"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -57,7 +57,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624"; + sha256 = "0ws94hgxajaww450q8ivrp28ypv39mashs29ak41faxf29cr097m"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 5864a07fde728..e67c141f35828 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; installPhase = '' - mkdir -p $out/{bin,share} - cp -rv doc/man $out/share/ + mkdir -p $out/{bin,share/man/man1} + cp -rv doc/man/*.1 $out/share/man/man1 cp src/timew $out/bin/ ''; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index eaa60084b6d0d..bc170cfdafdce 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -47,7 +47,6 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { configureFlags = [ "--enable-application=browser" - "--disable-javaxpcom" "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" @@ -64,11 +63,9 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { #"--enable-system-cairo" "--enable-startup-notification" "--enable-content-sandbox" # available since 26.0, but not much info available - "--disable-content-sandbox-reporter" # keeping disabled for now "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" "--disable-updater" "--enable-jemalloc" "--disable-gconf" @@ -135,8 +132,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "47.0.1"; - sha512 = "f79c53b9acf0d96917aa11e57092a4e540ce694471123ef8e616e15864195fab7b37235ebd37367e4d0cc8e594a881a30c973075cc97346ef6f88d92944c0312"; + version = "48.0"; + sha512 = "51bbb1954920b4d0e49e2834939748e596ed27c09a45adeea2be2cfbd32898dae41f13db17318e9699fa96c41fb50fba9966df1f88deeadc0ae3bdd679bd79c5"; }; firefox-esr-unwrapped = common { diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index acc0ddd43d368..e4a732ba66d8b 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid }: stdenv.mkDerivation rec { - version = "0.4.19"; + version = "0.4.20"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "1ldh3sc4n19vsjfc1f3kbrin7djb1z6y1rkisc5f6zjx4bd6535v"; + sha256 = "0m8afbfdc9a57cy94ny7g6jv2ndfmrvkx0lgk64i8w870958gkwb"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index da10e89855aed..0cda65b32c306 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - version = "2.7.5"; + version = "2.7.6"; name = "pari-${version}"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11"; + sha256 = "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr"; }; buildInputs = [gmp readline]; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index bf6eabef909e6..40d23cc7e8a46 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, wxGTK, perl, python, zlib}: +{stdenv, fetchurl, wxGTK, perl, python, zlib, mesa, libX11}: let s = # Generated upstream information rec { baseName="golly"; - version="2.7"; + version="2.8"; name="${baseName}-${version}"; - hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f"; - url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz"; - sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f"; + hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; + sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; }; buildInputs = [ - wxGTK perl python zlib + wxGTK perl python zlib mesa libX11 ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream index 57881e5de3554..24032de566848 100644 --- a/pkgs/applications/science/misc/golly/default.upstream +++ b/pkgs/applications/science/misc/golly/default.upstream @@ -1,4 +1,4 @@ url http://sourceforge.net/projects/golly/files/golly/ version_link '[-][0-9.]+/$' -SF_version_tarball +SF_version_tarball 'src' SF_redirect diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 39eb0586f7b23..09c36835dad60 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -3,7 +3,7 @@ , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , metacity , libstartup_notification, libpthreadstubs, libxcb, intltool -, ORBit2, libXau +, ORBit2, libXau, libICE, libSM , dbus, dbus_glib, librsvg, mesa , libXdmcp, libnotify, python , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus @@ -15,18 +15,18 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.12.2"; + version="0.9.13.0"; name="${baseName}-${version}"; - hash="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9"; - url="https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2"; - sha256="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9"; + hash="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; + url="https://launchpad.net/compiz/0.9.13/0.9.13.0/+download/compiz-0.9.13.0.tar.bz2"; + sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification metacity libpthreadstubs libxcb intltool - ORBit2 libXau + ORBit2 libXau libICE libSM dbus dbus_glib librsvg mesa libXdmcp libnotify python hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh index b66001073f270..fe439c5d11e39 100644 --- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh +++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh @@ -9,7 +9,7 @@ SF_version_dir () { } SF_version_tarball () { - version_link '[.]tar[.].*/download$' + version_link "${1:-[.]tar[.]}.*/download\$" } GH_latest () { diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index be6f1a5402d63..fa2b3d31d75b2 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "17sfhg3xfnakk666wlsbhxp4vbn19hlywf5cn1zfcd4zqkcyx30h"; + sha256 = "1plakydixx0xrp0z3n8ahnwg66psn31791dh56yl4ry41phq0axm"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index 4b4ee89f981b6..130b3311cc58e 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -3,13 +3,15 @@ rec { rustc = callPackage ./rustc.nix { - shortVersion = "beta-1.10.0"; + shortVersion = "beta-1.11.0"; forceBundledLLVM = false; + needsCmake = true; configureFlags = [ "--release-channel=beta" ]; - srcRev = "d18e321abeecc69e4d1bf9cafba4fba53ddf267d"; - srcSha = "1ck8mbjrq0bzq5xzwgaqdilakwm2ab0xpzqibjycds62ad4yw774"; - patches = [ ./patches/disable-lockfile-check.patch ] - ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + srcRev = "9333c420da0da6291740c313d5af3d620b55b8bc"; + srcSha = "05z6i4s5jjw3c5ypap6kzxk81bg4dib47h51znvsvcvr0svsnkgs"; + patches = [ + ./patches/disable-lockfile-check.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; inherit targetToolchains; @@ -17,10 +19,15 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.10.0"; - srcRev = "refs/tags/${version}"; - srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2"; - depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b"; + # TODO: We're temporarily tracking master here as Darwin needs the + # `http.cainfo` option from .cargo/config which isn't released + # yet. + + version = "beta-2016-07-25"; + srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; + srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; + depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc"; + inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index bfc82c4317d73..1ced865fc909a 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, makeWrapper, cacert, zlib }: let + inherit (stdenv.lib) optionalString; + platform = if stdenv.system == "i686-linux" then "i686-unknown-linux-gnu" @@ -24,6 +26,8 @@ let then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6" else throw "missing boostrap hash for platform ${stdenv.system}"; + needsPatchelf = stdenv.isLinux; + src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; sha256 = bootstrapHash; @@ -46,9 +50,11 @@ rec { ./install.sh --prefix=$out \ --components=rustc,rust-std-${platform},rust-docs - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustc" + ${optionalString needsPatchelf '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustc" + ''} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads @@ -71,9 +77,11 @@ rec { ./install.sh --prefix=$out \ --components=cargo - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" + ${optionalString needsPatchelf '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} wrapProgram "$out/bin/cargo" \ --suffix PATH : "${rustc}/bin" diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index fc4bf732cf6bf..537764ebca2b4 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,7 @@ { stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc -, version, srcRev, srcSha, depsSha256 }: +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, version, srcRev, srcSha, depsSha256 +, patches ? []}: rustPlatform.buildRustPackage rec { name = "cargo-${version}"; @@ -13,11 +14,14 @@ rustPlatform.buildRustPackage rec { }; inherit depsSha256; + inherit patches; passthru.rustc = rustc; - buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper libgit2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + + LIBGIT2_SYS_USE_PKG_CONFIG=1; configurePhase = '' ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo @@ -37,9 +41,14 @@ rustPlatform.buildRustPackage rec { "$out/lib/rustlib/uninstall.sh" \ "$out/lib/rustlib/manifest-cargo" + # NOTE: We override the `http.cainfo` option usually specified in + # `.cargo/config`. This is an issue when users want to specify + # their own certificate chain as environment variables take + # precedence wrapProgram "$out/bin/cargo" \ --suffix PATH : "${rustc}/bin" \ - --run "export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" \ + --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''} ''; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index adabdd71a1dd1..bfab4453a349c 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -23,10 +23,15 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.11.0"; - srcRev = "refs/tags/${version}"; - srcSha = "0ic2093bmwiw6vl2l9yhip87ni6dbz7dhrizy9wdx61229k16hc4"; - depsSha256 = "0690sgn6fcay7sazlmrbbn4jbhnvmznrpz5z3rvkbaifkjrg4w6d"; + # TODO: We're temporarily tracking master here as Darwin needs the + # `http.cainfo` option from .cargo/config which isn't released + # yet. + + version = "master-2016-07-25"; + srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; + srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; + depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/head.nix index bbfe5c9a1529c..3406fdb317fa2 100644 --- a/pkgs/development/compilers/rust/head.nix +++ b/pkgs/development/compilers/rust/head.nix @@ -3,13 +3,18 @@ rec { rustc = callPackage ./rustc.nix { - shortVersion = "master-1.11.0"; + shortVersion = "master-1.12.0"; forceBundledLLVM = false; - srcRev = "298730e7032cd55809423773da397cd5c7d827d4"; - srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1"; - patches = [ ./patches/disable-lockfile-check.patch - ./patches/use-rustc-1.9.0.patch ] - ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + needsCmake = true; + configureFlags = [ "--release-channel=nightly" ]; + srcRev = "d9a911d236cbecb47775276ba51a5f9111bdbc9c"; + srcSha = "07wybqvnw99fljmcy33vb9iwirmp10cwy47n008p396s7pb852hv"; + patches = [ + ./patches/disable-lockfile-check.patch + # Drop this patch after + # https://github.com/rust-lang/rust/pull/35140 gets merged + ./patches/tcp-stress-test-run-a-smaller-number-of-threads.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; inherit targetToolchains; @@ -17,10 +22,11 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "2016.06.07"; - srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28"; - srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f"; - depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f"; + version = "master-2016-07-25"; + srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; + srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; + depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch b/pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch new file mode 100644 index 0000000000000..1b1d62160f654 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch @@ -0,0 +1,44 @@ +From b6202b5d602ca8216febe8ce9078581faa32955e Mon Sep 17 00:00:00 2001 +From: Moritz Ulrich <moritz@tarn-vedra.de> +Date: Sat, 30 Jul 2016 09:01:13 +0200 +Subject: [PATCH] tcp-stress-test: Run a smaller number of threads. + +--- + src/test/run-pass/tcp-stress.rs | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs +index dfc8649..df8cdc9 100644 +--- a/src/test/run-pass/tcp-stress.rs ++++ b/src/test/run-pass/tcp-stress.rs +@@ -21,6 +21,8 @@ use std::sync::mpsc::channel; + use std::time::Duration; + use std::thread::{self, Builder}; + ++const TARGET_CNT: usize = 256; ++ + fn main() { + // This test has a chance to time out, try to not let it time out + thread::spawn(move|| -> () { +@@ -42,8 +44,9 @@ fn main() { + }); + + let (tx, rx) = channel(); ++ + let mut spawned_cnt = 0; +- for _ in 0..1000 { ++ for _ in 0..TARGET_CNT { + let tx = tx.clone(); + let res = Builder::new().stack_size(64 * 1024).spawn(move|| { + match TcpStream::connect(addr) { +@@ -66,6 +69,6 @@ fn main() { + for _ in 0..spawned_cnt { + rx.recv().unwrap(); + } +- assert_eq!(spawned_cnt, 1000); ++ assert_eq!(spawned_cnt, TARGET_CNT); + process::exit(0); + } +-- +2.9.1 + diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b1b33d57bb250..85e842176f47f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps -, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git +, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl , isRelease ? false +, needsCmake ? false , shortVersion , forceBundledLLVM ? false , srcSha, srcRev @@ -13,26 +14,28 @@ } @ args: let - version = if isRelease then - "${shortVersion}" - else - "${shortVersion}-g${builtins.substring 0 7 srcRev}"; + inherit (stdenv.lib) optional optionalString; - name = "rustc-${version}"; + version = if isRelease then + "${shortVersion}" + else + "${shortVersion}-g${builtins.substring 0 7 srcRev}"; - procps = if stdenv.isDarwin then darwin.ps else args.procps; + name = "rustc-${version}"; - llvmShared = llvm.override { enableSharedLibraries = true; }; + procps = if stdenv.isDarwin then darwin.ps else args.procps; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); + llvmShared = llvm.override { enableSharedLibraries = true; }; - 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 retrry ]; - license = [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux ++ platforms.darwin; - }; + target = builtins.replaceStrings [" "] [","] (builtins.toString targets); + + 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 retrry ]; + license = [ licenses.mit licenses.asl20 ]; + platforms = platforms.linux ++ platforms.darwin; + }; in stdenv.mkDerivation { @@ -42,7 +45,7 @@ stdenv.mkDerivation { __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; src = fetchgit { url = https://github.com/rust-lang/rust; @@ -55,11 +58,12 @@ stdenv.mkDerivation { ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] - ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang" - ++ stdenv.lib.optional (targets != []) "--target=${target}" - ++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; + ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" + ++ optional (targets != []) "--target=${target}" + ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; patches = patches ++ targetPatches; + passthru.target = target; postPatch = '' @@ -73,7 +77,7 @@ stdenv.mkDerivation { --replace "\$\$(subst /,//," "\$\$(subst /,/," # Fix dynamic linking against llvm - ${stdenv.lib.optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} + ${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -84,6 +88,9 @@ stdenv.mkDerivation { #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ + # Disable fragile linker-output-non-utf8 test + rm -vr src/test/run-make/linker-output-non-utf8/ + # Useful debugging parameter #export VERBOSE=1 ''; @@ -94,10 +101,17 @@ stdenv.mkDerivation { configureFlagsArray+=("--infodir=$out/share/info") ''; + # New -beta and -unstable unfortunately need cmake for compiling + # llvm-rt but don't use it for the normal build. This disables cmake + # in Nix. + dontUseCmakeConfigure = needsCmake; + # ps is needed for one of the test cases - nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ]; + nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ] + ++ stdenv.lib.optional needsCmake [ cmake curl ]; + buildInputs = [ ncurses ] ++ targetToolchains - ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared; + ++ optional (!forceBundledLLVM) llvmShared; # https://github.com/rust-lang/rust/issues/30181 # enableParallelBuilding = false; # missing files during linking, occasionally @@ -105,8 +119,12 @@ stdenv.mkDerivation { outputs = [ "out" "doc" ]; setOutputFlags = false; - preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; + preCheck = '' + export TZDIR=${tzdata}/share/zoneinfo + ${optionalString stdenv.isDarwin "export TMPDIR=/tmp"} + ''; + # Disable doCheck on Darwin to work around upstream issue doCheck = true; dontSetConfigureCross = true; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 296f81d271d9c..35467080e831f 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0fjdqnb2rsm2vi9794ywp27jr239ddvzc4xfr0dk49jd4v7p2kc5"; + sha256 = "0jfhrzsydgxzx0g90bl3fjys0i5biah76lkxjgh16l7h7577y8rh"; }; patchPhase = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 690153a277927..5faceef857330 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -973,4 +973,21 @@ self: super: { # us when we patch the cabal file (Link options will be recored in the ghc package registry). GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; + # https://github.com/gwern/mueval/issues/14 + mueval = overrideCabal super.mueval (drv: { + revision = null; + editedCabalFile = null; + patches = [(pkgs.fetchpatch { + url = "https://github.com/gwern/mueval/commit/866f895e0b671bcaa232b46ed93dd7d47a4b32b2.patch"; + sha256 = "16pb9nfr52hwidxv0f7j4yg8yd86959kzbcw9lmnzpvgdy5qyvkg"; + })]; + }); + + # remove if a version > 0.1.0.1 ever gets released + stunclient = overrideCabal super.stunclient (drv: { + postPatch = (drv.postPatch or "") + '' + substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" "" + ''; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ffa3405d6eb88..2328e9f34cc9b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -107,6 +107,7 @@ package-maintainers: - shakespeare abbradar: - Agda + - lambdabot dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2212,7 +2213,6 @@ dont-distribute-packages: hinotify-bytestring: [ x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux ] hint-server: [ i686-linux, x86_64-darwin, x86_64-linux ] - hint: [ i686-linux, x86_64-darwin, x86_64-linux ] hinvaders: [ i686-linux, x86_64-darwin, x86_64-linux ] hinze-streams: [ i686-linux, x86_64-darwin, x86_64-linux ] hip: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2797,15 +2797,6 @@ dont-distribute-packages: lambda-devs: [ i686-linux, x86_64-darwin, x86_64-linux ] lambda-toolbox: [ i686-linux, x86_64-linux ] lambdaBase: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-core: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-haskell-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-irc-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-misc-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-novelty-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-reference-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-social-plugins: [ i686-linux, x86_64-darwin, x86_64-linux ] - lambdabot-utils: [ i686-linux, x86_64-linux ] - lambdabot: [ i686-linux, x86_64-darwin, x86_64-linux ] LambdaCalculator: [ i686-linux, x86_64-linux ] lambdacat: [ i686-linux, x86_64-linux ] lambdacms-core: [ i686-linux, x86_64-linux ] diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 84b474b08cb04..16042091a47a0 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.31.0"; + version = "2.31.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "03a0gmz95di62552dv873iwwy1ym96kpyrc0s708assjlslr9716"; + sha256 = "00z0x2w1dnfd2h8xvmq3qy2n8gqxyi9gxwnsz0q420by8vnrljmh"; }; buildInputs = [ unzip diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 3a3acbf67b9db..6e8a8cd8d7fe2 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "12"; - sha256 = "09xcbrs48c9sgy6cj37qbc69gi6wlkjd6r3fi4zr8xwmj5wkmz5g"; + revision = "13"; + sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13"; extraConfigureFlags = "--with-gnump"; }) diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index d952b50aeb8e5..4e004da32175c 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "29"; - sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176"; + revision = "30"; + sha256 = "09d1cvg6dnfi225wipc1fw691bq7xxdcmgkq8smldc5kivf3mbwd"; openssl = null; postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp"; }) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 7aaac299b0e3e..0a0c5858917f9 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { version = "0.24.1"; @@ -10,10 +10,20 @@ stdenv.mkDerivation (rec { sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd"; }; + # TODO: `cargo` (rust's package manager) surfaced a serious bug in + # libgit2 when the `Security.framework` transport is used on Darwin. + # The upstream issue is tracked at + # https://github.com/libgit2/libgit2/issues/3885 - feel free to + # remove this patch as soon as it's resolved (i.E. when cargo is + # working fine without this patch) + patches = stdenv.lib.optionals stdenv.isDarwin [ + ./disable-security.framework.patch + ]; + cmakeFlags = "-DTHREADSAFE=ON"; nativeBuildInputs = [ cmake python pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser ]; + buildInputs = [ zlib libssh2 openssl http-parser curl ]; meta = { description = "The Git linkable library"; diff --git a/pkgs/development/libraries/git2/disable-security.framework.patch b/pkgs/development/libraries/git2/disable-security.framework.patch new file mode 100644 index 0000000000000..ce6a008b1c4c3 --- /dev/null +++ b/pkgs/development/libraries/git2/disable-security.framework.patch @@ -0,0 +1,58 @@ +From fbc2ea65406236a740b8734dd41dc5ddbc24f8c9 Mon Sep 17 00:00:00 2001 +From: mulrich <mulrich@entwicklerheld.local> +Date: Mon, 8 Aug 2016 15:36:07 +0200 +Subject: [PATCH] disable security.framework + +--- + CMakeLists.txt | 7 +++---- + src/curl_stream.c | 9 ++++++++- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 93a9e47..331e148 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,8 @@ ENDIF() + + IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + SET( USE_ICONV ON ) +- FIND_PACKAGE(Security) ++ # FIND_PACKAGE(Security) ++ SET(SECURITY_FOUND "NO") + FIND_PACKAGE(CoreFoundation REQUIRED) + ENDIF() + +@@ -87,9 +88,7 @@ IF(MSVC) + OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF) + ENDIF() + +-IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- OPTION( USE_OPENSSL "Link with and use openssl library" ON ) +-ENDIF() ++OPTION( USE_OPENSSL "Link with and use openssl library" ON ) + + CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h" + HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C) +diff --git a/src/curl_stream.c b/src/curl_stream.c +index 98de187..a8a9f4c 100644 +--- a/src/curl_stream.c ++++ b/src/curl_stream.c +@@ -309,7 +309,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port) + curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1); + curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY); + +- /* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */ ++ const char* cainfo = getenv("SSL_CERT_FILE"); ++ if(cainfo != NULL) { ++ curl_easy_setopt(handle, CURLOPT_CAINFO, cainfo); ++ } ++ ++ /* ++ curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); ++ */ + + st->parent.version = GIT_STREAM_VERSION; + st->parent.encrypted = 0; /* we don't encrypt ourselves */ +-- +2.3.8 (Apple Git-58) + diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix new file mode 100644 index 0000000000000..a7dd47aaeb4f1 --- /dev/null +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }: + +stdenv.mkDerivation rec { + name = "globalplatform-${version}"; + version = "6.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; + }; + + buildInputs = [ zlib pkgconfig openssl pcsclite ]; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + description = "Library for interacting with smart card devices"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix new file mode 100644 index 0000000000000..f147305220c77 --- /dev/null +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }: + +stdenv.mkDerivation rec { + name = "gppcscconnectionplugin-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; + }; + + buildInputs = [ pkgconfig globalplatform openssl pcsclite ]; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + description = "GlobalPlatform pcsc connection plugin"; + license = [ licenses.lgpl3 licenses.gpl3 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index bdc112aecf6a1..008494818e54b 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.24"; + version = "3.26"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_24_RTM/src/${name}.tar.gz"; - sha256 = "1v8rqia1w9p7i8p8vm1jw22s8rgpkjmnrv1xnxrs9k4i5x4l221g"; + url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz"; + sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index b2d5b93d9f784..746cc747d72d0 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation { ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; - buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; + buildInputs = [ pkgconfig makeWrapper qt4 lndir ]; - propagatedBuildInputs = [ pythonPackages.sip_4_16 ]; + propagatedBuildInputs = [ pythonPackages.sip_4_16 python ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 7ec89ffd7eeca..69fb6e266ea5a 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { }; buildInputs = [ - python pkgconfig makeWrapper lndir + pkgconfig makeWrapper lndir qtbase qtsvg qtwebkit qmakeHook ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip python ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix new file mode 100644 index 0000000000000..a4ed3a44f3509 --- /dev/null +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }: + +stdenv.mkDerivation rec { + name = "gpshell-${version}"; + version = "1.4.4"; + + src = fetchurl { + url = "mirror://sourceforge/globalplatform/gpshell-${version}.tar.gz"; + sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; + }; + + buildInputs = [ pkgconfig globalplatform pcsclite ]; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + description = "Smartcard management application"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 02ab4c06a50a2..2884b23049ab4 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { # mv effect-*/effect $out/pkgs/effect mv requests-*/requests $out/pkgs/ - if [ "$IN_NIX_SHELL" != "1" ]; then + if [ -z "$IN_NIX_SHELL" ]; then if [ -e git-export ]; then mv git-export/src/pypi2nix $out/pkgs/pypi2nix else diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 8d57b48481ec4..46d3873659ffb 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="xboard"; - version="4.9.0"; + version="4.9.1"; name="${baseName}-${version}"; - hash="1av6r3s5vyclwf3c9i1pkr2442ryrf4ixhhf2i44a4j1xyhlp5jb"; - url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.0.tar.gz"; - sha256="1av6r3s5vyclwf3c9i1pkr2442ryrf4ixhhf2i44a4j1xyhlp5jb"; + hash="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib"; + url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz"; + sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib"; }; buildInputs = [ libX11 xproto libXt libXaw libSM libICE libXmu diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index e9fcf5d8c4d3e..8ab4da2da8cf9 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.1.5"; + version = "3.2"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "0akg9gcc3c2p56xbhlvbybqavcprly5q0bvk655zwl6d62j8an7p"; + sha256 = "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq"; }; buildInputs = [ glib pkgconfig gperf utillinux diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index dac0eb0d0f509..ce2f860efc881 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,10 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.40"; + version="0.9.42-rc1"; name="${baseName}-${version}"; - hash="1vr0z694wibjkcpmyg7lz68r53z857c8hsb02cqxi4lfkkcmzgh2"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.40-rc1.tar.bz2"; - sha256="1vr0z694wibjkcpmyg7lz68r53z857c8hsb02cqxi4lfkkcmzgh2"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42~rc1.tar.bz2"; + sha256="11br6xp86bxs1ic2x683hbvg1hk8v2wp8cw6blj0zz3cdl0pcjqf"; }; buildInputs = [ which @@ -18,6 +17,7 @@ stdenv.mkDerivation { inherit buildInputs; src = fetchurl { inherit (s) url sha256; + name = "${s.name}.tar.bz2"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch b/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch deleted file mode 100644 index 7f94669a9f458..0000000000000 --- a/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch +++ /dev/null @@ -1,20 +0,0 @@ -Signed-off-by: Tyler Hicks <tyhicks@xxxxxxxxxxxxx> -Tested-by: Tyler Hicks <tyhicks@xxxxxxxxxxxxx> # 4.4.y, 3.18.y -Cc: <stable@xxxxxxxxxxxxxxx> # 4.5- ---- - fs/ecryptfs/kthread.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c -index e818f5a..b9faeab 100644 ---- a/fs/ecryptfs/kthread.c -+++ b/fs/ecryptfs/kthread.c -@@ -171,7 +171,7 @@ int ecryptfs_privileged_open(struct file **lower_file, - goto out; - } - have_file: -- if ((*lower_file)->f_op->mmap == NULL) { -+ if ((*lower_file)->f_op->mmap == NULL && !d_is_dir(lower_dentry)) { - fput(*lower_file); - *lower_file = NULL; - rc = -EMEDIUMTYPE; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 4dd3444d524e8..56ab62e95e53f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.16"; + version = "4.4.17"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18v4n7yypl4c8k69zrnf9g09pilh47y0ciy3mwbksz2kmw4yq573"; + sha256 = "10ags1n345irx1bi3fyal326b3m5myndz19v0klbvxhd3i3m350m"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 375f0e3b0b426..56963d89efaa2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -148,8 +148,4 @@ rec { sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy"; }; }; - ecryptfs_fix_mmap_bug = - { name = "ecryptfs_fix_mmap_bug"; - patch = ./ecryptfs-fix-mmap-bug.patch; - }; } diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 6e4c49abc5bad..3991e2b99d5e6 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.11.2"; - sha256 = "02khwad28ar2jjdfssysx262bgwgirm9967gnfhw9ga7wvipncm0"; + version = "1.11.3"; + sha256 = "042689m88bjhf7gsly4kl4gjyqdabcnizshxvdlp14gkz507yrja"; }) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 3defa6ab12380..9da5332ce6766 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.7.11"; + version="3.8.1"; name="${baseName}-${version}"; - hash="083dzpz6mafmf4rd55pak5q7x8509y4ggsckcb6i0gmkhzlbf1xd"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.11/glusterfs-3.7.11.tar.gz"; - sha256="083dzpz6mafmf4rd55pak5q7x8509y4ggsckcb6i0gmkhzlbf1xd"; + hash="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.1/glusterfs-3.8.1.tar.gz"; + sha256="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index aa1fa8f3c6c95..b651caf5a5e71 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchgit } : +{ stdenv, fetchFromGitHub } : -let - rev = "61ce53be996189e1c325916e45a7dc0aa89660e3"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + pname = "fasd"; + name = "${pname}-unstable-2016-08-11"; - name = "fasd-git-2015-03-29"; - - src = fetchgit { - url = "https://github.com/clvv/fasd.git"; - inherit rev; - sha256 = "1fd36ff065ae73de2d6b1bae2131c18c8c4dea98ca63d96b0396e8b291072b5e"; + src = fetchFromGitHub { + owner = "clvv"; + repo = "${pname}"; + rev = "90b531a5daaa545c74c7d98974b54cbdb92659fc"; + sha256 = "0i22qmhq3indpvwbxz7c472rdyp8grag55x7iyjz8gmyn8gxjc11"; }; installPhase = '' @@ -18,9 +16,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/clvv/fasd"; + homepage = "https://github.com/clvv/${pname}"; description = "Quick command-line access to files and directories for POSIX shells"; - license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE + license = stdenv.lib.licenses.mit; longDescription = '' Fasd is a command-line productivity booster. diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 64a71846c4bcc..a87d199d9bd4f 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "ised-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "mirror://sourceforge/project/ised/${name}.tar.bz2"; - sha256 = "08wzgmyvlhfaxa0m2b6pw2mn03k1a87pzbzxm0x9z84gci9w2g4h"; + sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb"; }; meta = { diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 3eb0e9d2a90a3..6f280257692c6 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication }: buildPythonApplication rec { - version = "4.49.0"; + version = "4.50.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "1m0yzxd05fklwbmjj1n2q4sx397c1j5qi9a0r5fv3h8pplz4lv0w"; + sha256 = "1hcb5079mkcx3gglfycrhglrgg4jsa499br50yjrh9sal6wpgg7w"; }; doCheck = false; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index a06754cb58d21..3130e65984acb 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,29 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: +{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql +, withGUI ? false, makeWrapper, pkgconfig, gtk2 }: -with stdenv.lib; +let + makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs); -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "thc-hydra-${version}"; - version = "7.5"; + version = "8.2"; src = fetchurl { url = "http://www.thc.org/releases/hydra-${version}.tar.gz"; - sha256 = "1dhavbn2mcm6c2c1qw29ipbpmczax3vhhlxzwn49c8cq471yg4vj"; + sha256 = "1i2a5glmrxdjr80gfppx6wgakflcpj3ksgng212fjzhxr9m4k24y"; }; preConfigure = '' - substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92.lib}/lib" - substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include" + substituteInPlace configure \ + --replace "\$LIBDIRS" "${makeDirs "lib" "lib" buildInputs}" \ + --replace "\$INCDIRS" "${makeDirs "dev" "include" buildInputs}" \ + --replace "/usr/include/math.h" "${stdenv.glibc.dev}/include/math.h" \ + --replace "libcurses.so" "libncurses.so" \ + --replace "-lcurses" "-lncurses" ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libidn ncurses pcre libssh ]; + nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; + buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ] + ++ lib.optional withGUI gtk2; - meta = { + postInstall = lib.optionalString withGUI '' + wrapProgram $out/bin/xhydra \ + --add-flags --hydra-path --add-flags "$out/bin/hydra" + ''; + + meta = with stdenv.lib; { description = "A very fast network logon cracker which support many different services"; license = licenses.agpl3; homepage = https://www.thc.org/thc-hydra/; maintainers = with maintainers; [offline]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 44e249102965f..76f640711a88e 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.3"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0xgfwk6lxwwzq8pbyxjl5xxpybs9p4qwgb7q0ykf048xwxha4kvk"; + sha256 = "0s4q7imc4r3g9lkd92bnvw70679q83b0irrlw895i5nc05dj4djx"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix new file mode 100644 index 0000000000000..c7a686201b0d1 --- /dev/null +++ b/pkgs/tools/text/par/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, fetchpatch}: + +stdenv.mkDerivation { + name = "par-1.52"; + + src = fetchurl { + url = http://www.nicemice.net/par/Par152.tar.gz; + sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082"; + }; + + patches = [ + # A patch by Jérôme Pouiller that adds support for multibyte + # charsets (like UTF-8), plus Debian packaging. + (fetchpatch { + url = "http://sysmic.org/dl/par/par-1.52-i18n.4.patch"; + sha256 = "0alw44lf511jmr38jnh4j0mpp7vclgy0grkxzqf7q158vzdb6g23"; + }) + ]; + + buildPhase = ''make -f protoMakefile''; + + installPhase = '' + mkdir -p $out/bin + cp par $out/bin + + mkdir -p $out/share/man/man1 + cp par.1 $out/share/man/man1 + ''; + + + meta = { + homepage = http://www.nicemice.net/par/; + description = "Paragraph reflow for email"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae0a86dcab586..3f40615e5d203 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4223,6 +4223,8 @@ in zimwriterfs = callPackage ../tools/text/zimwriterfs { }; + par = callPackage ../tools/text/par { }; + zip = callPackage ../tools/archivers/zip { }; zkfuse = callPackage ../tools/filesystems/zkfuse { }; @@ -5481,7 +5483,9 @@ in rust = rustStable; rustStable = callPackage ../development/compilers/rust {}; rustBeta = lowPrio (callPackage ../development/compilers/rust/beta.nix {}); - rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {}); + rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix { + rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); + }); cargo = rust.cargo; rustc = rust.rustc; @@ -7386,6 +7390,10 @@ in glm = callPackage ../development/libraries/glm { }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; + globalplatform = callPackage ../development/libraries/globalplatform { }; + gppcscconnectionplugin = + callPackage ../development/libraries/globalplatform/gppcscconnectionplugin.nix { }; + glog = callPackage ../development/libraries/glog { }; gloox = callPackage ../development/libraries/gloox { }; @@ -7506,6 +7514,8 @@ in gpgstats = callPackage ../tools/security/gpgstats { }; + gpshell = callPackage ../development/tools/misc/gpshell { }; + grantlee = callPackage ../development/libraries/grantlee { }; gsasl = callPackage ../development/libraries/gsasl { }; @@ -8790,9 +8800,7 @@ in texinfo = texinfo4; }; - mueval = callPackage ../development/tools/haskell/mueval { - haskellPackages = haskell.packages.lts; - }; + mueval = callPackage ../development/tools/haskell/mueval { }; muparser = callPackage ../development/libraries/muparser { }; @@ -9237,7 +9245,6 @@ in lambdabot = callPackage ../development/tools/haskell/lambdabot { haskell-lib = haskell.lib; - haskellPackages = haskell.packages.lts; }; leksah = callPackage ../development/tools/haskell/leksah { @@ -11123,7 +11130,6 @@ in linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.ecryptfs_fix_mmap_bug ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -12998,6 +13004,8 @@ in fbreader = callPackage ../applications/misc/fbreader { }; + fehlstart = callPackage ../applications/misc/fehlstart { }; + fetchmail = callPackage ../applications/misc/fetchmail { }; flacon = callPackage ../applications/audio/flacon { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a96c420fe150b..c889db26bc544 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25940,7 +25940,7 @@ in modules // { postPatch = '' libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py + sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py ''; # No tests included |