From c41675bce0ce3eb4d79180c804892e8e3c268e55 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 12 May 2018 01:06:47 -0400 Subject: [PATCH 01/83] GHCJS 8.2 --- .../compilers/ghcjs-ng/8.2/dep-overrides.nix | 6 + .../compilers/ghcjs-ng/8.2/git.json | 6 + .../compilers/ghcjs-ng/8.2/stage0.nix | 168 ++++++++++++++++++ pkgs/development/compilers/ghcjs-ng/README.md | 20 +++ .../compilers/ghcjs-ng/common-overrides.nix | 8 + .../ghcjs-ng/configured-ghcjs-src.nix | 44 +++++ .../compilers/ghcjs-ng/default.nix | 77 ++++++++ .../compilers/ghcjs-ng/mk-stage0.nix | 25 +++ pkgs/top-level/haskell-packages.nix | 28 ++- 9 files changed, 377 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/git.json create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/README.md create mode 100644 pkgs/development/compilers/ghcjs-ng/common-overrides.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/default.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/mk-stage0.nix diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix new file mode 100644 index 00000000000..72066ee1701 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix @@ -0,0 +1,6 @@ +{ haskellLib }: + +let inherit (haskellLib) dontHaddock; +in self: super: { + ghcjs = dontHaddock super.ghcjs; +} diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/git.json b/pkgs/development/compilers/ghcjs-ng/8.2/git.json new file mode 100644 index 00000000000..efe7794a103 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.2/git.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/ghcjs/ghcjs", + "rev": "0cff73c3ee13b464adba90f308b77751c75b9f26", + "sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv", + "fetchSubmodules": true +} diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix new file mode 100644 index 00000000000..0680ff156e1 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix @@ -0,0 +1,168 @@ +{ callPackage, configuredSrc }: + +{ + + ghcjs = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring + , base64-bytestring, binary, bytestring, Cabal, containers + , cryptohash, data-default, deepseq, directory, executable-path + , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs + , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts + , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl + , network, optparse-applicative, parallel, parsec, process, random + , regex-posix, safe, shelly, split, stdenv, stringsearch, syb + , system-fileio, system-filepath, tar, template-haskell + , template-haskell-ghcjs, terminfo, test-framework + , test-framework-hunit, text, time, transformers + , transformers-compat, unix, unix-compat, unordered-containers + , vector, wai, wai-app-static, wai-extra, wai-websockets, warp + , webdriver, websockets, wl-pprint-text, yaml + }: + mkDerivation { + pname = "ghcjs"; + version = "8.2.0.1"; + src = configuredSrc + /.; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + aeson array attoparsec base base16-bytestring base64-bytestring + binary bytestring Cabal containers cryptohash data-default deepseq + directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs + ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl + optparse-applicative parallel parsec process regex-posix safe split + stringsearch syb template-haskell template-haskell-ghcjs text time + transformers unordered-containers vector wl-pprint-text yaml + ]; + executableHaskellDepends = [ + aeson base binary bytestring Cabal containers directory + executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs + lens mtl optparse-applicative process shelly system-fileio + system-filepath tar terminfo text time transformers + transformers-compat unix unix-compat unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default deepseq directory http-types + HUnit lens lifted-base network optparse-applicative process random + shelly system-fileio system-filepath test-framework + test-framework-hunit text time transformers unordered-containers + wai wai-app-static wai-extra wai-websockets warp webdriver + websockets yaml + ]; + description = "Haskell to JavaScript compiler"; + license = stdenv.lib.licenses.mit; + }) {}; + + ghc-api-ghcjs = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs + , hoopl, hpc, process, stdenv, template-haskell-ghcjs, terminfo + , time, transformers, unix + }: + mkDerivation { + pname = "ghc-api-ghcjs"; + version = "8.2.2"; + src = configuredSrc + /lib/ghc-api-ghcjs; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-boot ghc-boot-th ghci-ghcjs hoopl hpc process + template-haskell-ghcjs terminfo time transformers unix + ]; + homepage = "http://www.haskell.org/ghc/"; + description = "The GHC API (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + ghci-ghcjs = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv + , template-haskell-ghcjs, transformers, unix + }: + mkDerivation { + pname = "ghci-ghcjs"; + version = "8.2.2"; + src = configuredSrc + /lib/ghci-ghcjs; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq filepath ghc-boot + ghc-boot-th template-haskell-ghcjs transformers unix + ]; + description = "The library supporting GHC's interactive interpreter (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + ghcjs-th = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc-prim + , ghci-ghcjs, stdenv, template-haskell-ghcjs + }: + mkDerivation { + pname = "ghcjs-th"; + version = "0.1.0.0"; + src = configuredSrc + /lib/ghcjs-th; + libraryHaskellDepends = [ + base binary bytestring containers ghc-prim ghci-ghcjs + template-haskell-ghcjs + ]; + homepage = "http://github.com/ghcjs"; + license = stdenv.lib.licenses.mit; + }) {}; + + haddock-api-ghcjs = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq + , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths + , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv + , transformers, xhtml + }: + mkDerivation { + pname = "haddock-api-ghcjs"; + version = "2.18.1"; + src = configuredSrc + /lib/haddock-api-ghcjs; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers + xhtml + ]; + testHaskellDepends = [ + base containers ghc-api-ghcjs hspec QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + haddock-library-ghcjs = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , hspec-discover, QuickCheck, stdenv, transformers + }: + mkDerivation { + pname = "haddock-library-ghcjs"; + version = "1.4.4"; + src = configuredSrc + /lib/haddock-library-ghcjs; + libraryHaskellDepends = [ base bytestring deepseq transformers ]; + testHaskellDepends = [ + base base-compat bytestring deepseq hspec QuickCheck transformers + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + template-haskell-ghcjs = callPackage + ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }: + mkDerivation { + pname = "template-haskell-ghcjs"; + version = "2.12.0.0"; + src = configuredSrc + /lib/template-haskell-ghcjs; + libraryHaskellDepends = [ base ghc-boot-th pretty ]; + description = "Support library for Template Haskell (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + +} diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md new file mode 100644 index 00000000000..3e1598c83b0 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/README.md @@ -0,0 +1,20 @@ +New build system for GHCJS 8.2 +--- + +`ghcjs-8.2` reworked the build system, and now comes with its own +small package set of dependencies. This involves autogenerating +several sources and cabal files, based on a GHC +checkout. `callCabal2nix` is off limits, since we don't like "import +from derivation" in nixpkgs. So there is a derivation that builds the +nix expression that should be checked in whenever GHCJS is updated. + +Updating +--- + +``` +$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \ + | jq '{ url, rev, fetchSubmodules, sha256 }' \ + > 8.2/git.json +$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix +``` + diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix new file mode 100644 index 00000000000..172a48a5a65 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -0,0 +1,8 @@ +{ haskellLib, alex, happy }: + +let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; +in self: super: { + ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; + ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"; + haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; +} diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix new file mode 100644 index 00000000000..b9435b31157 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix @@ -0,0 +1,44 @@ +{ perl +, autoconf +, automake +, python3 +, gcc +, cabal-install +, gmp +, runCommand + +, ghc +, happy +, alex + +, ghcjsSrc +}: + +runCommand "configured-ghcjs-src" { + buildInputs = [ + perl + autoconf + automake + python3 + ghc + happy + alex + cabal-install + ]; + inherit ghcjsSrc; +} '' + export HOME=$(pwd) + cp -r "$ghcjsSrc" "$out" + chmod -R +w "$out" + cd "$out" + + # TODO: Find a better way to avoid impure version numbers + sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac + + # TODO: How to actually fix this? + # Seems to work fine and produce the right files. + touch ghc/includes/ghcautoconf.h + + patchShebangs . + ./utils/makePackages.sh copy +'' diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix new file mode 100644 index 00000000000..c2fb6a03c6b --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, callPackage +, fetchgit +, ghcjsSrcJson ? null +, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson)) +, bootPkgs +, alex +, happy +, stage0 +, haskellLib +, cabal-install +, nodejs +, makeWrapper +, xorg +, gmp +, lib +, ghcjsDepOverrides ? (_:_:{}) +}: + +let + passthru = { + configuredSrc = callPackage ./configured-ghcjs-src.nix { + inherit ghcjsSrc alex happy; + inherit (bootPkgs) ghc; + }; + genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; }; + bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [ + (self: _: import stage0 { + inherit (passthru) configuredSrc; + inherit (self) callPackage; + }) + + (callPackage ./common-overrides.nix { inherit haskellLib alex happy; }) + ghcjsDepOverrides + ]); + + targetPrefix = ""; + inherit (passthru.bootPkgs.ghcjs) version; + isGhcjs = true; + + # Relics of the old GHCJS build system + stage1Packages = []; + mkStage2 = _: {}; + }; + + libexec = + if builtins.compareVersions passthru.bootPkgs.ghcjs.version "8.3" <= 0 + then "${passthru.bootPkgs.ghcjs}/bin" + else "${passthru.bootPkgs.ghcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${passthru.bootPkgs.ghcjs.name}"; + +in stdenv.mkDerivation { + name = "ghcjs"; + src = passthru.configuredSrc; + nativeBuildInputs = [passthru.bootPkgs.ghcjs passthru.bootPkgs.ghc cabal-install nodejs makeWrapper xorg.lndir gmp]; + phases = ["unpackPhase" "buildPhase"]; + buildPhase = '' + export HOME=$TMP + cd lib/boot + + mkdir -p $out/bin + mkdir -p $out/libexec + lndir ${libexec} $out/bin + + wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec" + wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec" + wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d" + + env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j $NIX_BUILD_CORES --with-ghcjs-bin $out/bin + ''; + + enableParallelBuilding = true; + + inherit passthru; + + meta.platforms = passthru.bootPkgs.ghc.meta.platforms; + } + diff --git a/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix b/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix new file mode 100644 index 00000000000..f45ebb4511d --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix @@ -0,0 +1,25 @@ +{ configuredSrc +, runCommand +, cabal2nix +, yq +}: + +runCommand "stage0.nix" { + buildInputs = [cabal2nix yq]; +} '' + ( + printf '{ callPackage, configuredSrc }:\n\n{\n\n' + yq '.packages | .[]' ${configuredSrc}/stack.yaml -r | sed 's|^\.$|./.|' | sed 's|^\.||' | while read f; do + printf ' %s = callPackage\n' \ + "$(find ${configuredSrc}/$f -name "*.cabal" -maxdepth 1 \ + | xargs basename \ + | sed 's/.cabal$//')" + printf '(%s) {};' \ + "$(cabal2nix ${configuredSrc}/$f \ + | sed 's|${configuredSrc}/|configuredSrc + |g')" \ + | sed 's/^/ /' + printf '\n\n' + done + printf '}\n' + ) > $out +'' diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8a395fbec18..837f8eb794d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -10,7 +10,10 @@ let "ghc821Binary" "ghcCross" "ghcjs" - "ghcjsHEAD" + "ghcjs710" + "ghcjs80" + "ghcjs82" + "ghcjs84" "integer-simple" ]; @@ -76,14 +79,22 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { + ghcjs = compiler.ghcjs82; + ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; }; - ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { bootPkgs = packages.ghc802; inherit (pkgs) cabal-install; }; + ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec { + bootPkgs = packages.ghc822; + inherit (bootPkgs) alex happy; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; + ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {}; + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -139,18 +150,25 @@ in rec { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = callPackage ../development/haskell-modules rec { + ghcjs = packages.ghcjs82; + ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackage ../development/haskell-modules rec { + ghcjs80 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjs82 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs82; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. From 64df9b6b899fc734577f9b832f17ba3286db1634 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 12 May 2018 17:11:41 -0400 Subject: [PATCH 02/83] GHCJS 8.4 --- .../compilers/ghcjs-ng/8.4/dep-overrides.nix | 7 + .../compilers/ghcjs-ng/8.4/git.json | 6 + .../compilers/ghcjs-ng/8.4/stage0.nix | 175 ++++++++++++++++++ .../configuration-ghc-8.4.x.nix | 5 +- pkgs/top-level/haskell-packages.nix | 13 ++ 5 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/git.json create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix new file mode 100644 index 00000000000..2d0ed55c6cd --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix @@ -0,0 +1,7 @@ +{ haskellLib }: + +let inherit (haskellLib) dontCheck doJailbreak; +in self: super: { + haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs; + haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs; +} diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json new file mode 100644 index 00000000000..2d4a7a42667 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/ghcjs/ghcjs", + "rev": "c494a598d1e5b6d70ddcb97177dc4b6cc71f5bd0", + "sha256": "1gpn1y3m2gk2x4anfh11p4cp49blabj761wicawvkw0w9bfhcfhn", + "fetchSubmodules": true +} diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix new file mode 100644 index 00000000000..051b0a19b5b --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix @@ -0,0 +1,175 @@ +{ callPackage, configuredSrc }: + +{ + + ghcjs = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring + , base64-bytestring, binary, bytestring, Cabal, containers + , cryptohash, data-default, deepseq, directory, executable-path + , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs + , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts + , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl + , network, optparse-applicative, parallel, parsec, process, random + , regex-posix, safe, shelly, split, stdenv, stringsearch, syb + , system-fileio, system-filepath, tar, template-haskell + , template-haskell-ghcjs, terminfo, test-framework + , test-framework-hunit, text, time, transformers + , transformers-compat, unix, unix-compat, unordered-containers + , vector, wai, wai-app-static, wai-extra, wai-websockets, warp + , webdriver, websockets, wl-pprint-text, yaml + }: + mkDerivation { + pname = "ghcjs"; + version = "8.4.0.1"; + src = configuredSrc + /.; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + aeson array attoparsec base base16-bytestring base64-bytestring + binary bytestring Cabal containers cryptohash data-default deepseq + directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs + ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl + optparse-applicative parallel parsec process regex-posix safe split + stringsearch syb template-haskell template-haskell-ghcjs text time + transformers unordered-containers vector wl-pprint-text yaml + ]; + executableHaskellDepends = [ + aeson base binary bytestring Cabal containers directory + executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs + lens mtl optparse-applicative process shelly system-fileio + system-filepath tar terminfo text time transformers + transformers-compat unix unix-compat unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default deepseq directory http-types + HUnit lens lifted-base network optparse-applicative process random + shelly system-fileio system-filepath test-framework + test-framework-hunit text time transformers unordered-containers + wai wai-app-static wai-extra wai-websockets warp webdriver + websockets yaml + ]; + description = "Haskell to JavaScript compiler"; + license = stdenv.lib.licenses.mit; + }) {}; + + ghc-api-ghcjs = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs + , hpc, process, stdenv, template-haskell-ghcjs, terminfo, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-api-ghcjs"; + version = "8.4.0"; + src = configuredSrc + /lib/ghc-api-ghcjs; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-boot ghc-boot-th ghci-ghcjs hpc process template-haskell-ghcjs + terminfo time transformers unix + ]; + homepage = "http://www.haskell.org/ghc/"; + description = "The GHC API (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + ghci-ghcjs = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv + , template-haskell-ghcjs, transformers, unix + }: + mkDerivation { + pname = "ghci-ghcjs"; + version = "8.4.0"; + src = configuredSrc + /lib/ghci-ghcjs; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq filepath ghc-boot + ghc-boot-th template-haskell-ghcjs transformers unix + ]; + description = "The library supporting GHC's interactive interpreter (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + ghcjs-th = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc-prim + , ghci-ghcjs, stdenv, template-haskell-ghcjs + }: + mkDerivation { + pname = "ghcjs-th"; + version = "0.1.0.0"; + src = configuredSrc + /lib/ghcjs-th; + libraryHaskellDepends = [ + base binary bytestring containers ghc-prim ghci-ghcjs + template-haskell-ghcjs + ]; + homepage = "http://github.com/ghcjs"; + license = stdenv.lib.licenses.mit; + }) {}; + + haddock-api-ghcjs = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq + , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths + , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv + , transformers, xhtml + }: + mkDerivation { + pname = "haddock-api-ghcjs"; + version = "2.20.0"; + src = configuredSrc + /lib/haddock-api-ghcjs; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers + xhtml + ]; + testHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec + QuickCheck transformers xhtml + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + haddock-library-ghcjs = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, deepseq + , directory, filepath, haddock-library, hspec, hspec-discover + , optparse-applicative, QuickCheck, stdenv, transformers, tree-diff + }: + mkDerivation { + pname = "haddock-library-ghcjs"; + version = "1.6.0"; + src = configuredSrc + /lib/haddock-library-ghcjs; + libraryHaskellDepends = [ + base bytestring containers deepseq transformers + ]; + testHaskellDepends = [ + base base-compat bytestring containers deepseq directory filepath + haddock-library hspec optparse-applicative QuickCheck transformers + tree-diff + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + template-haskell-ghcjs = callPackage + ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }: + mkDerivation { + pname = "template-haskell-ghcjs"; + version = "2.13.0.0"; + src = configuredSrc + /lib/template-haskell-ghcjs; + libraryHaskellDepends = [ base ghc-boot-th pretty ]; + description = "Support library for Template Haskell (customized for GHCJS)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 70624d1ed6a..12fd5974830 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -105,6 +105,9 @@ self: super: { ## hspec-discover ==2.4.8 hspec-discover = super.hspec-discover_2_5_0; + # https://github.com/jcristovao/enclosed-exceptions/issues/12 + enclosed-exceptions = dontCheck super.enclosed-exceptions; + ## On Hackage: ## Upstreamed, awaiting a Hackage release @@ -450,7 +453,7 @@ self: super: { matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; - wl-pprint-text = self.wl-pprint-text_1_1_1_1; + wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_1; # https://github.com/xmonad/xmonad/issues/155 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 837f8eb794d..c00bce430c3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -95,6 +95,13 @@ in rec { stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {}; }; + ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { + bootPkgs = packages.ghc842; + inherit (bootPkgs) alex happy; + ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; + stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; + ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -169,6 +176,12 @@ in rec { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjs84 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs84; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. From f252c72669399b95827e000bbaa535510b952785 Mon Sep 17 00:00:00 2001 From: Judson Date: Sun, 13 May 2018 14:19:35 -0700 Subject: [PATCH 03/83] hiro: init at 0.1.4 --- .../python-modules/hiro/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/development/python-modules/hiro/default.nix diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix new file mode 100644 index 00000000000..0289c008e7e --- /dev/null +++ b/pkgs/development/python-modules/hiro/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, mock }: +buildPythonPackage rec { + pname = "hiro"; + version = "0.1.4"; + src = fetchPypi { + inherit pname version; + + sha256 = "1340lhg7k522bqpz5iakl51qb47mjw804mfwwzm77i7qcm5cwiz8"; + }; + + propagatedBuildInputs = [ six mock ]; + + meta = with stdenv.lib; { + description = "Time manipulation utilities for Python"; + homepage = http://hiro.readthedocs.io/en/latest/; + license = licenses.mit; + maintainers = with maintainers; [ nyarly ]; + }; +} From 42d0ce8a28c63058004e38d0fb9a1dee4c0d00bc Mon Sep 17 00:00:00 2001 From: Judson Date: Sun, 13 May 2018 14:20:59 -0700 Subject: [PATCH 04/83] keyrings.alt: init at 2.3 --- .../python-modules/keyrings-alt/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/keyrings-alt/default.nix diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix new file mode 100644 index 00000000000..140d4297cda --- /dev/null +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, six +, pytest, unittest2, mock, keyring +}: + +buildPythonPackage rec { + pname = "keyrings.alt"; + version = "2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d"; + }; + propagatedBuildInputs = [ six ]; + + # Fails with "ImportError: cannot import name mock" + doCheck = false; + checkInputs = [ pytest unittest2 mock keyring ]; + + meta = with stdenv.lib; { + license = licenses.mit; + description = "Alternate keyring implementations"; + homepage = https://github.com/jaraco/keyrings.alt; + maintainers = with maintainers; [ nyarly ]; + }; +} From 51f4a46af29c4dc47659e687799146a2ac6c04af Mon Sep 17 00:00:00 2001 From: Judson Date: Sun, 13 May 2018 14:35:42 -0700 Subject: [PATCH 05/83] jira_cli: init at 2.2 --- pkgs/development/tools/jira_cli/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 3 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/jira_cli/default.nix diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix new file mode 100644 index 00000000000..37b76c50e90 --- /dev/null +++ b/pkgs/development/tools/jira_cli/default.nix @@ -0,0 +1,32 @@ +{ stdenv, libffi, openssl, pythonPackages }: +let + inherit (pythonPackages) fetchPypi buildPythonApplication vcrpy mock hiro; +in + buildPythonApplication rec { + pname = "jira-cli"; + version = "2.2"; + src = fetchPypi { + inherit pname version; + sha256 = "314118d5d851394ebf910122fd7ce871f63581393968c71456441eb56be3b112"; + }; + + postPatch = '' + substituteInPlace requirements/main.txt --replace "argparse" "" + ''; + + # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this. + doCheck = false; + checkInputs = with pythonPackages; [ vcrpy mock hiro ]; + buildInputs = [ libffi openssl ]; + propagatedBuildInputs = with pythonPackages; [ + argparse ordereddict requests six suds-jurko termcolor keyring + jira keyrings-alt + ]; + + meta = with stdenv.lib; { + description = "A command line interface to Jira"; + homepage = http://github.com/alisaifee/jira-cli; + maintainers = with maintainers; [ nyarly ]; + license = licenses.mit; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a386721feb..702dfd5d473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3150,6 +3150,8 @@ with pkgs; jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jira-cli = callPackage ../development/tools/jira_cli { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; jmespath = callPackage ../development/tools/jmespath { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9033c3d825..15737f335c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2994,6 +2994,8 @@ in { }; + hiro = callPackage ../development/python-modules/hiro {}; + hglib = callPackage ../development/python-modules/hglib {}; humanize = buildPythonPackage rec { @@ -5070,6 +5072,7 @@ in { }; }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt {}; SPARQLWrapper = buildPythonPackage rec { name = "SPARQLWrapper-${version}"; From 9d5b6b89f061cb416c19f4c49f04117d315328be Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 14 May 2018 12:50:20 -0500 Subject: [PATCH 06/83] kubernetes: 1.9.1 -> 1.9.7 --- .../networking/cluster/kubernetes/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 1a7ba3cf93d..e1023afc7ab 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.9.1"; + version = "1.9.7"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; + sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh"; }; # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373 @@ -30,21 +30,6 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; - patches = [ - # patch is from https://github.com/kubernetes/kubernetes/pull/58207 - (fetchpatch { - url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; - sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; - }) - (fetchpatch { - # https://github.com/kubernetes/kubernetes/pull/60978 - # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and - # non-critical failures on prior versions. - url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch"; - sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p"; - }) - ]; - postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" From 9f79ac6f3bbbdee1ea006c292a867184f3985c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 15 May 2018 16:58:37 +0200 Subject: [PATCH 07/83] androidndk: Drop 32bit support --- pkgs/development/mobile/androidenv/androidndk.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 2fe4005532d..a9908d67f1d 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -6,16 +6,10 @@ stdenv.mkDerivation rec { name = "android-ndk-r10e"; - src = if stdenv.system == "i686-linux" - then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin"; - sha256 = "1xbxra5v3bm6cmxyx8yyya5r93jh5m064aibgwd396xdm8jpvc4j"; - } - else if stdenv.system == "x86_64-linux" then fetchurl { + src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin"; sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h"; - } - else throw "platform ${stdenv.system} not supported!"; + } else throw "platform ${stdenv.system} not supported!"; phases = "buildPhase"; From 1d1407a6f4708455a1e85854e4e473796bf1f1f7 Mon Sep 17 00:00:00 2001 From: dbohdan Date: Tue, 15 May 2018 22:50:45 +0300 Subject: [PATCH 08/83] tcl2048: 0.3.1 -> 0.4.0 --- pkgs/games/tcl2048/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index d1517a2ec61..48fa0a3b518 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tcl, tcllib }: stdenv.mkDerivation { - name = "tcl2048-0.3.1"; + name = "tcl2048-0.4.0"; src = fetchurl { - url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.3.1/2048.tcl; - sha256 = "44e325328784c4e91cecc0a9cc00e32d733da713adf2fad1c081542f38af3361"; + url = https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl; + sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e"; }; phases = "installPhase"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/dbohdan/2048-tcl; + homepage = https://github.com/dbohdan/2048.tcl; description = "The game of 2048 implemented in Tcl"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; From 302ed5422d8132a33e88f4dbf032006f33cf908d Mon Sep 17 00:00:00 2001 From: dbohdan Date: Tue, 15 May 2018 23:10:39 +0300 Subject: [PATCH 09/83] maintainers: Update my contact info --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a2db508d4d2..8b546d58ac6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -989,9 +989,9 @@ name = "Davor Babic"; }; dbohdan = { - email = "danyil.bohdan@gmail.com"; + email = "dbohdan@dbohdan.com"; github = "dbohdan"; - name = "Danyil Bohdan"; + name = "D. Bohdan"; }; dbrock = { email = "daniel@brockman.se"; From d86edd5161c28f59291c23594de5e9002a1a03b6 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 16 May 2018 03:09:22 -0400 Subject: [PATCH 10/83] Dont haddock ghcjs in either version --- pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix | 6 ------ pkgs/development/compilers/ghcjs-ng/common-overrides.nix | 2 +- pkgs/top-level/haskell-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix deleted file mode 100644 index 72066ee1701..00000000000 --- a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ haskellLib }: - -let inherit (haskellLib) dontHaddock; -in self: super: { - ghcjs = dontHaddock super.ghcjs; -} diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index 172a48a5a65..a88e2c48d03 100644 --- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -3,6 +3,6 @@ let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; in self: super: { ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; - ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"; + ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c00bce430c3..2e6bd5ebb85 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -93,7 +93,6 @@ in rec { inherit (bootPkgs) alex happy; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; - ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {}; }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { bootPkgs = packages.ghc842; From 0f850499615ff2327bf5fd16b85b3c75d56edac7 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 16 May 2018 03:09:40 -0400 Subject: [PATCH 11/83] bump ghcjs 8.4 --- pkgs/development/compilers/ghcjs-ng/8.4/git.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json index 2d4a7a42667..49ff19529c6 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json +++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json @@ -1,6 +1,6 @@ { "url": "https://github.com/ghcjs/ghcjs", - "rev": "c494a598d1e5b6d70ddcb97177dc4b6cc71f5bd0", - "sha256": "1gpn1y3m2gk2x4anfh11p4cp49blabj761wicawvkw0w9bfhcfhn", + "rev": "6770fa38621f55b7a947fc11c69f81b8ce8502cf", + "sha256": "0c0x0yylx14mrvzmbvkw6zbprriizk73hvz8iija8i8hwpff79vm", "fetchSubmodules": true } From 9326126fdd73ef910441553a815fe300bbfe4d37 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 16 May 2018 03:09:54 -0400 Subject: [PATCH 12/83] Add gcc to configured-ghcjs-src for macos --- pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix index b9435b31157..e8c24b21134 100644 --- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix +++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix @@ -20,6 +20,7 @@ runCommand "configured-ghcjs-src" { autoconf automake python3 + gcc ghc happy alex From 2a32834ad9ff1d44efdf3a24a3182ddc8eeea2ed Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 16 May 2018 03:10:52 -0400 Subject: [PATCH 13/83] Factor out bootGhcjs for justStaticExecutables sake --- .../compilers/ghcjs-ng/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index c2fb6a03c6b..71bab1a4e66 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -35,7 +35,7 @@ let ]); targetPrefix = ""; - inherit (passthru.bootPkgs.ghcjs) version; + inherit (bootGhcjs) version; isGhcjs = true; # Relics of the old GHCJS build system @@ -43,15 +43,24 @@ let mkStage2 = _: {}; }; + bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs; libexec = - if builtins.compareVersions passthru.bootPkgs.ghcjs.version "8.3" <= 0 - then "${passthru.bootPkgs.ghcjs}/bin" - else "${passthru.bootPkgs.ghcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${passthru.bootPkgs.ghcjs.name}"; + if builtins.compareVersions bootGhcjs.version "8.3" <= 0 + then "${bootGhcjs}/bin" + else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}"; in stdenv.mkDerivation { name = "ghcjs"; src = passthru.configuredSrc; - nativeBuildInputs = [passthru.bootPkgs.ghcjs passthru.bootPkgs.ghc cabal-install nodejs makeWrapper xorg.lndir gmp]; + nativeBuildInputs = [ + bootGhcjs + passthru.bootPkgs.ghc + cabal-install + nodejs + makeWrapper + xorg.lndir + gmp + ]; phases = ["unpackPhase" "buildPhase"]; buildPhase = '' export HOME=$TMP @@ -61,7 +70,7 @@ in stdenv.mkDerivation { mkdir -p $out/libexec lndir ${libexec} $out/bin - wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec" + wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec -dcore-lint" wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec" wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d" From 00c4ba1ea0111f50e188cce7ddc3f5fc8dc58be3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 16 May 2018 21:10:34 +0200 Subject: [PATCH 14/83] pacvim: init at 2018-05-16 --- pkgs/games/pacvim/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/games/pacvim/default.nix diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix new file mode 100644 index 00000000000..59e7c874d14 --- /dev/null +++ b/pkgs/games/pacvim/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + name = "pacvim-${version}"; + version = "2018-05-16"; + src = fetchFromGitHub { + owner = "jmoon018"; + repo = "PacVim"; + rev = "ca7c8833c22c5fe97974ba5247ef1fcc00cedb8e"; + sha256 = "1kq6j7xmsl5qfl1246lyglkb2rs9mnb2rhsdrp18965dpbj2mhx2"; + }; + + buildInputs = [ ncurses ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jmoon018/PacVim"; + description = "PacVim is a game that teaches you vim commands."; + maintainers = with maintainers; [ infinisil ]; + license = licenses.lgpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1129a984d27..0f8db2101a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19340,6 +19340,8 @@ with pkgs; orthorobot = callPackage ../games/orthorobot { love = love_0_7; }; + pacvim = callPackage ../games/pacvim { }; + performous = callPackage ../games/performous { }; pingus = callPackage ../games/pingus {}; From c8996506e136cc8cbe4131d2514b801ddca1a3b1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 May 2018 14:06:07 -0500 Subject: [PATCH 15/83] dyncall: install cmake modules, man pages, use upstream's preferred URL --- .../development/libraries/dyncall/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index b60f61299f3..704f5c51c9c 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -10,12 +10,26 @@ stdenv.mkDerivation rec { sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2"; }; - doCheck = true; - checkTarget = "run-tests"; + # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) + doCheck = false; + + # install bits not automatically installed + postInstall = '' + # install cmake modules to make using dyncall easier + # This is essentially what -DINSTALL_CMAKE_MODULES=ON if using cmake build + # We don't use the cmake-based build since it installs different set of headers + # (mostly fewer headers, but installs dyncall_alloc_wx.h "instead" dyncall_alloc.h) + # and we'd have to patch the cmake module installation to not use CMAKE_ROOT anyway :). + install -D -t $out/lib/cmake ./buildsys/cmake/Modules/Find*.cmake + + # manpages are nice, install them + # doing this is in the project's "ToDo", so check this when updating! + install -D -t $out/share/man/man3 ./*/*.3 + ''; meta = with stdenv.lib; { description = "Highly dynamic multi-platform foreign function call interface library"; - homepage = http://dyncall.org; + homepage = http://www.dyncall.org; license = licenses.isc; maintainers = with maintainers; [ dtzWill ]; }; From 3518211d63eb9040483652c8ceed22b420f2d0b1 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 16 May 2018 23:10:58 +0200 Subject: [PATCH 16/83] minio: 2018-03-30T00-38-44Z -> 2018-05-11T00-29-24Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 786a188bbfd..7f590461d9d 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-03-30T00-38-44Z"; + version = "2018-05-11T00-29-24Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80"; + sha256 = "01jw1djfs0jbhsx9pmx3kj31mfhrw45lr1i4lwkmh8k7fxn8w13x"; }; goPackagePath = "github.com/minio/minio"; From 277806e0d143abcfc18cd3a9543dd43cdd3d0e2b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 16 May 2018 23:11:26 +0200 Subject: [PATCH 17/83] minio-client: 2018-03-25T01-22-22Z -> 2018-04-28T00-08-20Z --- pkgs/tools/networking/minio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index bfe7dfc2dc0..c1b2b18b3f4 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-client-${version}"; - version = "2018-03-25T01-22-22Z"; + version = "2018-04-28T00-08-20Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1x71va37jaqsi99d0i0mccybrs9kjgmpfsm0dchmc58mmhyagh3k"; + sha256 = "03c9ahphkpsy6z9i9z50jcsgj5ba6gba2sw2nz22b1ynqiz3ds37"; }; goPackagePath = "github.com/minio/mc"; From 247a501eb06ef466e366f43fabb0627ece90a640 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 17 May 2018 00:43:59 +0300 Subject: [PATCH 18/83] avocode: 2.26.0 -> 2.26.1 (#40601) --- pkgs/applications/graphics/avocode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 7bcbc8f2e40..c1e2da20e54 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "2.26.0"; + version = "2.26.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "11d3nlshyzh5aqf5vsvnjwhr9qn8a2kd848x0ylv91y9p9njgsl5"; + sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode - patchelf --set-rpath ${libPath}:$out/ $file + patchelf --set-rpath ${libPath}:$out/ $file done ''; From 13ceaf66aaba8412eecd6e0e8c54ab1712729d24 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 17 May 2018 00:05:53 +0200 Subject: [PATCH 19/83] prometheus: correctly set version information (#40617) The way prometheus expects the version to be set is not what was currently set. --- pkgs/servers/monitoring/prometheus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 3287bc6f258..b71d9b8e58b 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -19,7 +19,7 @@ let doCheck = true; - buildFlagsArray = let t = "${goPackagePath}/version"; in '' + buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} -X ${t}.Revision=unknown From e3b3eac630b686dac89895eab6a4d9245362d5f4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 May 2018 00:13:19 +0200 Subject: [PATCH 20/83] dunst: add wrapper to find librsvg (#40050) --- pkgs/applications/misc/dunst/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 75640b2c54e..1a809307cc1 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514"; }; - nativeBuildInputs = [ perl pkgconfig which systemd ]; + nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" ]; + postInstall = '' + wrapProgram $out/bin/dunst \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + meta = with stdenv.lib; { description = "Lightweight and customizable notification daemon"; homepage = https://dunst-project.org/; From 570b1e52c68cf7e3e70dd653c38648af1eeb353d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 17 May 2018 02:04:42 +0300 Subject: [PATCH 21/83] top-level: build winePackages on Hydra --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7059212f4..76ef39d5c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21209,7 +21209,7 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = rec { + winePackages = recurseIntoAttrs rec { minimal = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; wineBuild = config.wine.build or "wine32"; From 1b2b126f82b5b8796ac90a22939cbe1449647a1b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 17 May 2018 02:29:26 +0300 Subject: [PATCH 22/83] winePackages: move to pkgs/top-level/wine-packages.nix --- pkgs/top-level/all-packages.nix | 49 +------------------------------ pkgs/top-level/wine-packages.nix | 50 ++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 48 deletions(-) create mode 100644 pkgs/top-level/wine-packages.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ef39d5c6e..e7b3c1d3908 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21209,54 +21209,7 @@ with pkgs; pythonPackages = python3Packages; }; - winePackages = recurseIntoAttrs rec { - minimal = callPackage ../misc/emulators/wine { - wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; - }; - - base = minimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; - gettextSupport = true; - fontconfigSupport = true; - alsaSupport = true; - openglSupport = true; - vulkanSupport = stdenv.isLinux; - tlsSupport = true; - cupsSupport = true; - dbusSupport = true; - cairoSupport = true; - cursesSupport = true; - saneSupport = true; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - udevSupport = true; - xineramaSupport = true; - xmlSupport = true; - }; - - full = base.override { - gtkSupport = true; - gstreamerSupport = true; - colorManagementSupport = true; - mpg123Support = true; - openalSupport = true; - openclSupport = true; - odbcSupport = true; - netapiSupport = true; - vaSupport = true; - pcapSupport = true; - v4lSupport = true; - gsmSupport = true; - gphoto2Support = true; - ldapSupport = true; - }; - - stable = base.override { wineRelease = "stable"; }; - unstable = base.override { wineRelease = "unstable"; }; - staging = base.override { wineRelease = "staging"; }; - }; + winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { }); wine = winePackages.full; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix new file mode 100644 index 00000000000..109f0136255 --- /dev/null +++ b/pkgs/top-level/wine-packages.nix @@ -0,0 +1,50 @@ +{ stdenv, config, callPackage }: + +rec { + minimal = callPackage ../misc/emulators/wine { + wineRelease = config.wine.release or "stable"; + wineBuild = config.wine.build or "wine32"; + }; + + base = minimal.override { + pngSupport = true; + jpegSupport = true; + tiffSupport = true; + gettextSupport = true; + fontconfigSupport = true; + alsaSupport = true; + openglSupport = true; + vulkanSupport = stdenv.isLinux; + tlsSupport = true; + cupsSupport = true; + dbusSupport = true; + cairoSupport = true; + cursesSupport = true; + saneSupport = true; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + udevSupport = true; + xineramaSupport = true; + xmlSupport = true; + }; + + full = base.override { + gtkSupport = true; + gstreamerSupport = true; + colorManagementSupport = true; + mpg123Support = true; + openalSupport = true; + openclSupport = true; + odbcSupport = true; + netapiSupport = true; + vaSupport = true; + pcapSupport = true; + v4lSupport = true; + gsmSupport = true; + gphoto2Support = true; + ldapSupport = true; + }; + + stable = base.override { wineRelease = "stable"; }; + unstable = base.override { wineRelease = "unstable"; }; + staging = base.override { wineRelease = "staging"; }; +} From b577dc3bd0d989408a6d71b74b5792722c92b6da Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 May 2018 21:56:19 -0400 Subject: [PATCH 23/83] linux-copperhead: 4.14.39.a -> 4.14.41.a --- pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix index a1c93e56590..8054ba0be6a 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.39"; + version = "4.14.41"; revision = "a"; - sha256 = "19nx537a8kbbyp5d67anrqfw8i8hliw3yb1gyrf70isl3fqifjaa"; + sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 1006c8c8d29cc70f9ed0c168449a92e3dc5fe69b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 May 2018 21:56:50 -0400 Subject: [PATCH 24/83] linux-copperhead: 4.16.7.a -> 4.16.9.a --- pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix index 9d4b729060a..5c65f2064b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.16.7"; + version = "4.16.9"; revision = "a"; - sha256 = "1kdy3sqrn161hm5avhk3nd75p07a21ja0rzar3ybibh1bl2mc6zq"; + sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From c65686c7f9aa3a8540ae21215d9ee130e3c3b5df Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 May 2018 22:13:43 -0400 Subject: [PATCH 25/83] kafka: 1.0.0 -> 1.0.1 --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 152e6045574..10e9489833e 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -19,9 +19,9 @@ let sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7"; }; "1.0" = { - kafkaVersion = "1.0.0"; + kafkaVersion = "1.0.1"; scalaVersion = "2.12"; - sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm"; + sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m"; }; }; in From fe2deeb4584e7da1d7018d74ec659fa6a0357e45 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 May 2018 22:26:40 -0400 Subject: [PATCH 26/83] kafka: Add 1.1 --- nixos/tests/kafka.nix | 1 + pkgs/servers/apache-kafka/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 6209b4b8e2b..e48b25d67df 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -65,4 +65,5 @@ in with pkgs; { kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10; kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11; kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0; + kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 10e9489833e..fe67bdd0282 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -23,6 +23,11 @@ let scalaVersion = "2.12"; sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m"; }; + "1.1" = { + kafkaVersion = "1.1.0"; + scalaVersion = "2.12"; + sha256 = "04idhsr6pbkb0xkx38faxv2pn5nkjcflz6wl4s3ka82h1fbq74j9"; + }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7059212f4..681f490bf01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7564,11 +7564,12 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; - apacheKafka = apacheKafka_1_0; + apacheKafka = apacheKafka_1_1; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; + apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; kt = callPackage ../tools/misc/kt {}; From b8966f5d87d0cd3623bd67a050c6e16c16fe1964 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 May 2018 22:45:17 -0700 Subject: [PATCH 27/83] xpra: 2.2.6 -> 2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xpra/versions. These checks were done: - built on NixOS - /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra passed the binary check. - Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_Xdummy had a zero exit code or showed the expected version - /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_udev_product_version passed the binary check. - Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_browser-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_browser had a zero exit code or showed the expected version - /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_launcher-wrapped passed the binary check. - /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_launcher passed the binary check. - Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_signal_listener-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_signal_listener had a zero exit code or showed the expected version - /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/..xpra-wrapped-wrapped passed the binary check. - /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra-wrapped passed the binary check. - 6 of 11 passed binary check by having a zero exit code. - 0 of 11 passed binary check by having the new version present in output. - found 2.3 with grep in /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3 - directory tree listing: https://gist.github.com/9e03a45b8255a45b7df6fbcf24b6f408 - du listing: https://gist.github.com/a48b995e2d458e3b9da00ae42675dbe6 --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 9bc13b3260d..f8174a03cac 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.2.6"; + version = "2.3"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz"; + sha256 = "0kq0ambpy8r7m3wxdp79cgxgnl9yfmr19lv88f617gnv0sp0aarp"; }; nativeBuildInputs = [ pkgconfig ]; From deb8d43e297f14512f3f032cf1de4337c7ebc1b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 May 2018 22:46:12 -0700 Subject: [PATCH 28/83] you-get: 0.4.1060 -> 0.4.1077 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/you-get/versions. These checks were done: - built on NixOS - /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077/bin/.you-get-wrapped passed the binary check. - /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077/bin/you-get passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.4.1077 with grep in /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077 - directory tree listing: https://gist.github.com/7dc27079ec72816d18224787520a534c - du listing: https://gist.github.com/ebb4a641370380db9496be5dadc3d499 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index f0a8eda0028..bfce454473a 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1060"; + version = "0.4.1077"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1c4drn6khqrjvyzzsiaracnpcvahbiya6v5p18h2lyl7xia8gk51"; + sha256 = "1qf4n1zgbr533a0qbxp8548f25jwqdwfl42gi5dyfhm4f1y1jk1a"; }; meta = with stdenv.lib; { From dd51a4a19e823b9828d93e8fdcb4a48648f0508e Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Fri, 11 May 2018 17:32:18 +0100 Subject: [PATCH 29/83] add psyanticy as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6b9d2a16c53..c49561da51b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3021,6 +3021,11 @@ email = "philipp@xndr.de"; name = "Philipp Steinpaß"; }; + psyanticy = { + email = "iuns@outlook.fr"; + github = "Assassinkin"; + name = "Psyanticy"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; From 1ec3c94a21de18c28839ea3b25d8b8aaef0deb41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 May 2018 23:31:23 -0700 Subject: [PATCH 30/83] python36Packages.uranium: 3.2.1 -> 3.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uranium/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 3.3.0 with grep in /nix/store/s5bmfykrkc953i0qhfkmwj6fj1yv3i56-uranium-3.3.0 - directory tree listing: https://gist.github.com/0c76704986608d25a9223af819e0a259 - du listing: https://gist.github.com/242655ce87890bfe9b511e44306303de --- pkgs/development/python-modules/uranium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 774799f3b4d..0917c5ab6ee 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.3.0"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz"; + sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb"; }; buildInputs = [ python gettext ]; From 8ea265279e65fb83149691e5cdeec70f1e81c706 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Thu, 17 May 2018 15:22:31 +0800 Subject: [PATCH 31/83] Allow YAML on other platforms as well. --- pkgs/development/libraries/libyaml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index e441d1e6b61..20053190e3b 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; }; } From 2329df494cf000cf9328b23fea138841a2de1832 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 01:18:07 -0700 Subject: [PATCH 32/83] spidermonkey_52: 52.7.4 -> 52.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spidermonkey/versions. These checks were done: - built on NixOS - /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0/bin/js52 passed the binary check. - /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0/bin/js52-config passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 52.8.0 with grep in /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0 - directory tree listing: https://gist.github.com/1ec4dfe6196b463eb8174ab1aa82023d - du listing: https://gist.github.com/a7355483d743c1a8d6fb1271ee57a5c0 --- pkgs/development/interpreters/spidermonkey/52.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 35dcff95029..4657a51e48f 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: let - version = "52.7.4"; + version = "52.8.0"; in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz"; + sha256 = "11v2wwgrb92z08dv9cvk5x2dj3xj25qxzbjqjgiq6mz91bzd9gms"; }; buildInputs = [ readline icu zlib nspr ]; From fd95438c6123a36ad21f500cecfa84ba5e26cab0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 May 2018 22:36:53 -0700 Subject: [PATCH 33/83] xqilla: 2.3.3 -> 2.3.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xqilla/versions. These checks were done: - built on NixOS - /nix/store/q0djr7z4ixv0mx02crj7ifqapgm54crr-xqilla-2.3.4/bin/xqilla passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.3.4 with grep in /nix/store/q0djr7z4ixv0mx02crj7ifqapgm54crr-xqilla-2.3.4 - directory tree listing: https://gist.github.com/70c99ca62187f093025b5404d2a4a6da - du listing: https://gist.github.com/38a73f127b9835b2a8c187242de78a1d --- pkgs/development/tools/xqilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index 77bf313e83d..c163c4cbcf6 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xqilla-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "mirror://sourceforge/xqilla/XQilla-${version}.tar.gz"; - sha256 = "1mjgcyar3qyizpnb0h9lxaj6p9yq4vj09qd8qan1bwv6z6sbjxlg"; + sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd"; }; configureFlags = [ "--with-xerces=${xercesc}" ]; From 2f6c9947fe5d5ac1d1832337267eb735a7832161 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 17 May 2018 05:26:48 -0400 Subject: [PATCH 34/83] Add pkgconfig to ghcjs boot --- pkgs/development/compilers/ghcjs-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 71bab1a4e66..03bdf022ecd 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -13,6 +13,7 @@ , makeWrapper , xorg , gmp +, pkgconfig , lib , ghcjsDepOverrides ? (_:_:{}) }: @@ -60,6 +61,7 @@ in stdenv.mkDerivation { makeWrapper xorg.lndir gmp + pkgconfig ]; phases = ["unpackPhase" "buildPhase"]; buildPhase = '' From 9c6e63ffdac0579b118e3bef5b436fbefb0e0978 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 17 May 2018 05:27:03 -0400 Subject: [PATCH 35/83] Expose bootGhcjs for convenience's sake --- pkgs/development/compilers/ghcjs-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 03bdf022ecd..a5d0c46e78e 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -36,6 +36,7 @@ let ]); targetPrefix = ""; + inherit bootGhcjs; inherit (bootGhcjs) version; isGhcjs = true; From 7b405d35648ac198c1329063d6e3bc820356482c Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 17 May 2018 05:27:19 -0400 Subject: [PATCH 36/83] Remove -dcore-lint from GHCJS wrapper --- pkgs/development/compilers/ghcjs-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index a5d0c46e78e..785f5b878f7 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { mkdir -p $out/libexec lndir ${libexec} $out/bin - wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec -dcore-lint" + wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec" wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec" wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d" From 4eb49533cbbab3994b0819de966501d994e8b688 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 17 May 2018 05:27:38 -0400 Subject: [PATCH 37/83] Work around GHCJS bug with ghcjs-boot -j1 --- pkgs/development/compilers/ghcjs-ng/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 785f5b878f7..035687a64f3 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -77,10 +77,12 @@ in stdenv.mkDerivation { wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec" wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d" - env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j $NIX_BUILD_CORES --with-ghcjs-bin $out/bin + env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin ''; - enableParallelBuilding = true; + # We hard code -j1 as a temporary workaround for + # https://github.com/ghcjs/ghcjs/issues/654 + # enableParallelBuilding = true; inherit passthru; From 2dd3789d47da95988cea74ff213a7e990c9e3a79 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 17 May 2018 05:35:00 -0400 Subject: [PATCH 38/83] Bump GHCJS 8.4 --- pkgs/development/compilers/ghcjs-ng/8.4/git.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json index 49ff19529c6..b27c75bfe71 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json +++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json @@ -1,6 +1,6 @@ { "url": "https://github.com/ghcjs/ghcjs", - "rev": "6770fa38621f55b7a947fc11c69f81b8ce8502cf", - "sha256": "0c0x0yylx14mrvzmbvkw6zbprriizk73hvz8iija8i8hwpff79vm", + "rev": "d20da90a4819faad1c6309a06363b34edac0374c", + "sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr", "fetchSubmodules": true } From 3bec610cf33d6f754ea362cd982e66a788784f8f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 02:53:14 -0700 Subject: [PATCH 39/83] opensc: 0.17.0 -> 0.18.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opensc/versions. These checks were done: - built on NixOS - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-tool passed the binary check. - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-explorer had a zero exit code or showed the expected version - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-notify passed the binary check. - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-tool had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-crypt had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs11-tool had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/cardos-tool had a zero exit code or showed the expected version - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/eidenv passed the binary check. - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/openpgp-tool passed the binary check. - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/iasecc-tool had a zero exit code or showed the expected version - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/egk-tool passed the binary check. - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-asn1 passed the binary check. - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/cryptoflex-tool had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-init had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/netkey-tool had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/piv-tool had a zero exit code or showed the expected version - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/westcos-tool passed the binary check. - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/sc-hsm-tool passed the binary check. - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/dnie-tool had a zero exit code or showed the expected version - /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/gids-tool passed the binary check. - Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/npa-tool had a zero exit code or showed the expected version - 9 of 21 passed binary check by having a zero exit code. - 3 of 21 passed binary check by having the new version present in output. - found 0.18.0 with grep in /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0 - directory tree listing: https://gist.github.com/1276953ac55af68ec597ce6744192684 - du listing: https://gist.github.com/b02c245b9a13433013450fc258e41a01 --- pkgs/tools/security/opensc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index e727180fa3f..819c01a0893 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensc-${version}"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "1mgcf698zhpqzamd52547scdws7mhdva377kc3chpr455n0mw8g0"; + sha256 = "1shwx1rkmnygk2dp0q8pbvnxcg96bn570vch9yq34gs42ryskihf"; }; nativeBuildInputs = [ pkgconfig ]; From fb7340d3e546c1272c69a6408d205dedce89e05b Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Fri, 11 May 2018 15:14:15 +0100 Subject: [PATCH 40/83] pythonPackages.mail-parser: init at 3.3.1 --- .../python-modules/mail-parser/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/mail-parser/default.nix diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix new file mode 100644 index 00000000000..e05dc3f2861 --- /dev/null +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -0,0 +1,41 @@ +{ lib, buildPythonPackage, python, pythonOlder, glibcLocales, fetchFromGitHub, ipaddress, six, simplejson }: + +buildPythonPackage rec { + pname = "mail-parser"; + version = "3.3.1"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "SpamScope"; + repo = pname; + rev = "v${version}"; + sha256 = "1b1v61zwgdx2xjzds3hp6bv53yq424hhlrhf445n4faj1l0c4lkg"; + }; + + LC_ALL = "en_US.utf-8"; + + # ipaddress is part of the standard library of Python 3.3+ + prePatch = lib.optionalString (!pythonOlder "3.3") '' + substituteInPlace requirements.txt \ + --replace "ipaddress" "" + ''; + + nativeBuildInputs = [ glibcLocales ]; + propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress; + + # Taken from .travis.yml + checkPhase = '' + ${python.interpreter} tests/test_main.py + ${python.interpreter} -m mailparser -v + ${python.interpreter} -m mailparser -h + ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j + cat tests/mails/mail_malformed_3 | ${python.interpreter} -m mailparser -k -j + ''; + + meta = with lib; { + description = "A mail parser for python 2 and 3"; + homepage = https://github.com/SpamScope/mail-parser; + license = licenses.asl20; + maintainers = with maintainers; [ psyanticy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7868f7d7ff0..61c0eac4c6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -277,6 +277,8 @@ in { logster = callPackage ../development/python-modules/logster { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; From de49ba6c3f17574104d11c817ca3a60649a57cfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 03:57:50 -0700 Subject: [PATCH 41/83] nauty: 26r7 -> 26r10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nauty/versions. These checks were done: - built on NixOS - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dreadnaut passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/copyg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/listg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/labelg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dretog passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/amtog passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/geng passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/complg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/showg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/NRswitchg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/biplabg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/addedgeg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/deledgeg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/countg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/pickg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genrang passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/newedgeg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/catg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genbg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/directg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/gentreeg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genquarticg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/ranlabg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/multig passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/planarg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/gentourng passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/linegraphg passed the binary check. - Warning: no invocation of /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/watercluster2 had a zero exit code or showed the expected version - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dretodot passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/subdivideg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/vcolg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/delptg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/cubhamg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/twohamg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/hamheuristic passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/converseg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genspecialg passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genbgL passed the binary check. - /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/shortg passed the binary check. - Warning: no invocation of /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/configure had a zero exit code or showed the expected version - 38 of 40 passed binary check by having a zero exit code. - 0 of 40 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/3bca602211d416ba58097f4f8880b6d0 - du listing: https://gist.github.com/4ac19efe14e18aae8fece0ec1a500bf1 --- pkgs/applications/science/math/nauty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 36ac84ece25..d7b4707420b 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { name = "nauty-${version}"; - version = "26r7"; + version = "26r10"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; - sha256 = "1indcc1im7s5x89x0xn4699izw1wwars1aanpmf8jibnw66n9dcp"; + sha256 = "16pdklh066z6mx424wkisr88fz9divn2caj7ggs03wy3y848spq6"; }; buildInputs = []; installPhase = '' From c056694d74fe99c6a0657528fac73645680e0df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 15 May 2018 17:45:48 +0200 Subject: [PATCH 42/83] androidndk: Adds versions 17 and 16b --- .../mobile/androidenv/androidndk.nix | 52 +++++--- .../development/mobile/androidenv/default.nix | 26 +++- ...h => make-standalone-toolchain_r10e.patch} | 0 .../make_standalone_toolchain.py_16b.patch | 119 ++++++++++++++++++ .../make_standalone_toolchain.py_17.patch | 119 ++++++++++++++++++ 5 files changed, 296 insertions(+), 20 deletions(-) rename pkgs/development/mobile/androidenv/{make-standalone-toolchain.patch => make-standalone-toolchain_r10e.patch} (100%) create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index a9908d67f1d..d0bfe6c8100 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, zlib, ncurses, p7zip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools +, platformTools, python3, version, sha256 }: stdenv.mkDerivation rec { - name = "android-ndk-r10e"; + name = "android-ndk-r${version}"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin"; - sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h"; + url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip"; + inherit sha256; } else throw "platform ${stdenv.system} not supported!"; phases = "buildPhase"; @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused - jdk - which + jdk python3 which ]) + ":${platformTools}/platform-tools"; in '' set -x @@ -38,9 +37,22 @@ stdenv.mkDerivation rec { # so that it doesn't fail because of read-only permissions set cd - - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain.patch } + ${if (version == "10e") then + '' + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } + '' + else + '' + patchShebangs ${pkg_path}/build/tools/make-standalone-toolchain.sh + + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") } + wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + } cd ${pkg_path} find $out \( \ @@ -49,29 +61,31 @@ stdenv.mkDerivation rec { \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ --set-rpath ${stdenv.lib.makeLibraryPath [ zlib.out ncurses ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ndk-gdb ndk-gdb-py + for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} do sed -i -e ${sed_script_1} $i done - sed -i -e ${sed_script_2} ndk-which - # a bash script - patchShebangs ndk-which + ${lib.optionalString (version == "10e") '' + sed -i -e ${sed_script_2} ndk-which + # a bash script + patchShebangs ndk-which + ''} # wrap - for i in ndk-build ndk-gdb ndk-gdb-py ndk-which + for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} do wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" done # make some executables available in PATH mkdir -pv ${bin_path} for i in \ - ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which + ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} do ln -sf ${pkg_path}/$i ${bin_path}/$i done ''; - meta = { - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; + meta = { + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + }; } diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index b77cc68fa0e..d122ffe241e 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -215,13 +215,37 @@ rec { useInstantApps = true; }; + androidndk_10e = import ./androidndk.nix { + inherit (buildPackages) + p7zip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib python3 + coreutils file findutils gawk gnugrep gnused jdk which; + inherit platformTools; + version = "10e"; + sha256 = "032j3sgk93bjbkny84i17ph61dhjmsax9ddqng1zbi2p7dgl0pzf"; + }; + + androidndk_16b = import ./androidndk.nix { + inherit (buildPackages) + p7zip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib python3 + coreutils file findutils gawk gnugrep gnused jdk which; + inherit platformTools; + version = "16b"; + sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw"; + }; + androidndk = import ./androidndk.nix { inherit (buildPackages) p7zip makeWrapper; inherit (pkgs) - stdenv fetchurl zlib ncurses lib + stdenv fetchurl zlib ncurses lib python3 coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; + version = "17"; + sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds"; }; androidndk_r8e = import ./androidndk_r8e.nix { diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch similarity index 100% rename from pkgs/development/mobile/androidenv/make-standalone-toolchain.patch rename to pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch new file mode 100644 index 00000000000..70b1f7e7f4a --- /dev/null +++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch @@ -0,0 +1,119 @@ +diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py +index a6ae8448..2739912e 100755 +--- a/build/tools/make_standalone_toolchain.py ++++ b/build/tools/make_standalone_toolchain.py +@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + sysroot_path, stl, host_tag): + """Create a standalone toolchain.""" + copy_directory_contents(gcc_path, install_path) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_directory_contents(clang_path, install_path) ++ os.system('chmod -R +w "{}"'.format(install_path)) + triple = get_triple(arch) + make_clang_scripts( + install_path, triple, api, host_tag.startswith('windows')) +@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + sysroot = os.path.join(NDK_DIR, 'sysroot') + install_sysroot = os.path.join(install_path, 'sysroot') + shutil.copytree(sysroot, install_sysroot) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + arch_headers = os.path.join(sysroot, 'usr/include', triple) + copy_directory_contents( + arch_headers, os.path.join(install_sysroot, 'usr/include')) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + lib_path = os.path.join(sysroot_path, 'usr/lib') + lib_install = os.path.join(install_sysroot, 'usr/lib') + if os.path.exists(lib_path): + shutil.copytree(lib_path, lib_install) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + lib64_path = os.path.join(sysroot_path, 'usr/lib64') + lib64_install = os.path.join(install_sysroot, 'usr/lib64') + if os.path.exists(lib64_path): + shutil.copytree(lib64_path, lib64_install) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) + copy_directory_contents(prebuilt_path, install_path) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) + dirs = os.listdir(toolchain_lib_dir) +@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + if stl == 'gnustl': + gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9') + shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + for abi in get_abis(arch): + copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple, + abi) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_gnustl_libs(gnustl_dir, install_path, triple, abi) ++ os.system('chmod -R +w "{}"'.format(install_path)) + if arch == 'arm': + copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, + triple, abi, thumb=True) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_gnustl_libs(gnustl_dir, install_path, triple, abi, + thumb=True) ++ os.system('chmod -R +w "{}"'.format(install_path)) + elif stl == 'libc++': + libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++') + libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') + support_dir = os.path.join(NDK_DIR, 'sources/android/support') + copy_directory_contents(os.path.join(libcxx_dir, 'include'), + cxx_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_directory_contents(os.path.join(support_dir, 'include'), + support_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + # I have no idea why we need this, but the old one does it too. + copy_directory_contents( + os.path.join(libcxxabi_dir, 'include'), + os.path.join(install_path, 'include/llvm-libc++abi/include')) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + headers = [ + 'cxxabi.h', +@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + dest_libdir = get_dest_libdir(install_path, triple, abi) + include_libunwind = arch == 'arm' + copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind) ++ os.system('chmod -R +w "{}"'.format(install_path)) + if arch == 'arm': + thumb_libdir = os.path.join(dest_libdir, 'thumb') + copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind) ++ os.system('chmod -R +w "{}"'.format(install_path)) + elif stl == 'stlport': + stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport') + gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++') + + copy_directory_contents( + os.path.join(stlport_dir, 'stlport'), cxx_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + # Same as for libc++. Not sure why we have this extra directory, but + # keep the cruft for diff. + copy_directory_contents( + os.path.join(gabixx_dir, 'include'), + os.path.join(install_path, 'include/gabi++/include')) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + headers = [ + 'cxxabi.h', +@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + + for abi in get_abis(arch): + copy_stlport_libs(stlport_dir, install_path, triple, abi) ++ os.system('chmod -R +w "{}"'.format(install_path)) + if arch == 'arm': + copy_stlport_libs(stlport_dir, install_path, triple, abi, + thumb=True) ++ os.system('chmod -R +w "{}"'.format(install_path)) + else: + raise ValueError(stl) + diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch new file mode 100644 index 00000000000..88ce69be3e8 --- /dev/null +++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch @@ -0,0 +1,119 @@ +diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py +index daba3351..424b7fef 100755 +--- a/build/tools/make_standalone_toolchain.py ++++ b/build/tools/make_standalone_toolchain.py +@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + platforms_path, stl, host_tag): + """Create a standalone toolchain.""" + copy_directory_contents(gcc_path, install_path) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_directory_contents(clang_path, install_path) ++ os.system('chmod -R +w "{}"'.format(install_path)) + triple = get_triple(arch) + make_clang_scripts( + install_path, triple, api, host_tag.startswith('windows')) +@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + install_headers = os.path.join(install_sysroot, 'usr/include') + os.makedirs(os.path.dirname(install_headers)) + shutil.copytree(headers, install_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + arch_headers = os.path.join(sysroot, 'usr/include', triple) + copy_directory_contents(arch_headers, os.path.join(install_headers)) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + for lib_suffix in ('', '64'): + lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix)) +@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + install_sysroot, 'usr/lib{}'.format(lib_suffix)) + if os.path.exists(lib_path): + shutil.copytree(lib_path, lib_install) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + static_lib_path = os.path.join(sysroot, 'usr/lib', triple) + static_lib_install = os.path.join(install_sysroot, 'usr/lib') + if arch == 'x86_64': + static_lib_install += '64' + copy_directory_contents(static_lib_path, static_lib_install) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) + copy_directory_contents(prebuilt_path, install_path) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + gdbserver_path = os.path.join( + NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') + gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') + shutil.copytree(gdbserver_path, gdbserver_install) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) + dirs = os.listdir(toolchain_lib_dir) +@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + for abi in get_abis(arch): + copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple, + abi) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_gnustl_libs(gnustl_dir, install_path, triple, abi) ++ os.system('chmod -R +w "{}"'.format(install_path)) + if arch == 'arm': + copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, + triple, abi, thumb=True) ++ os.system('chmod -R +w "{}"'.format(install_path)) + copy_gnustl_libs(gnustl_dir, install_path, triple, abi, + thumb=True) ++ os.system('chmod -R +w "{}"'.format(install_path)) + elif stl == 'libc++': + libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++') + libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') + copy_directory_contents(os.path.join(libcxx_dir, 'include'), + cxx_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + if api < 21: + support_dir = os.path.join(NDK_DIR, 'sources/android/support') + copy_directory_contents(os.path.join(support_dir, 'include'), + support_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + # I have no idea why we need this, but the old one does it too. + copy_directory_contents( + os.path.join(libcxxabi_dir, 'include'), + os.path.join(install_path, 'include/llvm-libc++abi/include')) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + headers = [ + 'cxxabi.h', +@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + src_libdir = get_src_libdir(libcxx_dir, abi) + dest_libdir = get_dest_libdir(install_path, triple, abi) + copy_libcxx_libs(src_libdir, dest_libdir, abi, api) ++ os.system('chmod -R +w "{}"'.format(install_path)) + if arch == 'arm': + thumb_libdir = os.path.join(dest_libdir, 'thumb') + copy_libcxx_libs(src_libdir, thumb_libdir, abi, api) ++ os.system('chmod -R +w "{}"'.format(install_path)) + elif stl == 'stlport': + stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport') + gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++') + + copy_directory_contents( + os.path.join(stlport_dir, 'stlport'), cxx_headers) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + # Same as for libc++. Not sure why we have this extra directory, but + # keep the cruft for diff. + copy_directory_contents( + os.path.join(gabixx_dir, 'include'), + os.path.join(install_path, 'include/gabi++/include')) ++ os.system('chmod -R +w "{}"'.format(install_path)) + + headers = [ + 'cxxabi.h', +@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, + if arch == 'arm': + copy_stlport_libs(stlport_dir, install_path, triple, abi, + thumb=True) ++ os.system('chmod -R +w "{}"'.format(install_path)) + else: + raise ValueError(stl) + From ec9bb1bb34f1743c0c533b76cd24ec5f69a15907 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 17 May 2018 13:18:07 +0200 Subject: [PATCH 43/83] grafana: 5.1.2 -> 5.1.3 (#40621) --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f9fb4efa04b..646401ce02f 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.2"; + version = "5.1.3"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0iw0mr6m99z6vy9mz9fdhmn4fxi359n3ns71bm5a71np8lf4qs36"; + sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "18bqmvyfjkvkrdbxa989aa6c7ri3b4wdb7ai543hiaz00s9mnpzm"; + sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From 1d424ba1699a0b955a974ec316f770004eb0f004 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 17 May 2018 07:33:27 -0400 Subject: [PATCH 44/83] hack-font: 3.002 -> 3.003 (#40627) --- pkgs/data/fonts/hack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index eb794326539..e77fcc3c3a3 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "3.002"; + version = "3.003"; in fetchzip rec { name = "hack-font-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack ''; - sha256 = "11f3hl4nvxq6pvsmwr1c1r5wrxhrp7ixr5bshrz2dmqn7l8bxa63"; + sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s"; meta = with stdenv.lib; { description = "A typeface designed for source code"; From 596645d5d265e9a20a041714ee19585a81e1d9c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 04:46:07 -0700 Subject: [PATCH 45/83] libu2f-host: 1.1.5 -> 1.1.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libu2f-host/versions. These checks were done: - built on NixOS - /nix/store/8jbzdkhk2krc8yc37c9bcxsbmam5csaa-libu2f-host-1.1.6/bin/u2f-host passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.1.6 with grep in /nix/store/8jbzdkhk2krc8yc37c9bcxsbmam5csaa-libu2f-host-1.1.6 - directory tree listing: https://gist.github.com/bc0958f894bcdad9565006be8be45096 - du listing: https://gist.github.com/e9a255d64be0442f7d14fca45cbcb6f0 --- pkgs/development/libraries/libu2f-host/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 2def14b1c10..675ca1cd220 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.5"; + name = "libu2f-host-1.1.6"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk"; + sha256 = "19xxwwqfzg3njfpxvhlyxd05wjwsdw3m4lpn7gk31cna6agbp82d"; }; nativeBuildInputs = [ pkgconfig ]; From ea7404dcd743c06e815263ccc64d3fa9904bfe4e Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Wed, 16 May 2018 22:32:31 +0200 Subject: [PATCH 46/83] ries: init at 2018-04-11 --- .../science/math/ries/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/science/math/ries/default.nix diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix new file mode 100644 index 00000000000..4b237a01a3e --- /dev/null +++ b/pkgs/applications/science/math/ries/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip }: +stdenv.mkDerivation { + name = "ries-2018-04-11"; + + # upstream does not provide a stable link + src = fetchzip { + url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip"; + sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://mrob.com/pub/ries/; + description = "Tool to produce a list of equations that approximately solve to a given number"; + platforms = platforms.all; + maintainers = with maintainers; [ symphorien ]; + license = licenses.gpl3Plus; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d827d7e16d..29d348511d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17244,6 +17244,8 @@ with pkgs; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; + ries = callPackage ../applications/science/math/ries { }; + ripser = callPackage ../applications/science/math/ripser { }; rkt = callPackage ../applications/virtualization/rkt { }; From dd2b5b9400f7181c4babc4e7366eee846b2f74ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 May 2018 15:21:14 +0200 Subject: [PATCH 47/83] multi-ghc-travis: update to latest git version from May 16th --- pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 454bb5d5881..2ba1d64675a 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "105005cde6bde903e477e5b9724d02bdea06bae4"; - sha256 = "1l76782aa29mi88a2brvkyi6k0v33rpihxlskx99mak06bjrmnhh"; + rev = "b65ea5b35c59d1e7d0f89ff4e21840dc0e2ec3a0"; + sha256 = "0qgsll772x24nnkarj30mplmvvwzz5vn5aadn5xzkcn77g5jiqmg"; }; isLibrary = true; isExecutable = true; From 24f61ca48e02620a6590d66e74ee07cf5cc0e9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 May 2018 17:06:33 +0200 Subject: [PATCH 48/83] knot-dns: 2.6.6 -> 2.6.7 https://lists.nic.cz/pipermail/knot-dns-users/2018-May/001356.html Some of the fixed bugs could be exploited to crash knot-resolver if running in --verbose mode. --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 88fa07009f8..5fe7a8608c5 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci"; + sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243"; }; outputs = [ "bin" "out" "dev" ]; From 0b4b3e648c263084bfa58cc144d1fca630bf067c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 17 May 2018 10:06:56 -0500 Subject: [PATCH 49/83] perlPackages.AppSt: 1.1.2 -> 1.1.4 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a23eff2e7f..4d06204ad39 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -365,10 +365,10 @@ let self = _self // overrides; _self = with self; { }; AppSt = buildPerlPackage rec { - name = "App-St-1.1.2"; + name = "App-St-1.1.4"; src = fetchurl { - url = https://github.com/nferraz/st/archive/v1.1.2.tar.gz; - sha256 = "1j1iwcxl16m4x5kl1vcv0linb93r55ndh3jm0w6qf459jl4x38s6"; + url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz; + sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0"; }; postInstall = '' From a5c9b87d78cc08354e5a3375a8acc4154d75f6b1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 17 May 2018 10:10:58 -0500 Subject: [PATCH 50/83] App::St: no need for fixup anymore FWIW the fixup is the update 1.1.2 -> 1.1.4 is reverted. --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d06204ad39..8956f980668 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -372,7 +372,6 @@ let self = _self // overrides; _self = with self; { }; postInstall = '' - sed -e "1 s|\(.*\)|\1 -I $out/lib/perl5/site_perl|" -i $out/bin/st ($out/bin/st --help || true) | grep Usage ''; meta = { From 832a8ca087b748db7be7969581e0e10ae1eb486c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 17 May 2018 17:22:27 +0200 Subject: [PATCH 51/83] androidndk: Fix usage as crossSystem --- lib/systems/examples.nix | 2 +- .../mobile/androidenv/androidndk-pkgs.nix | 21 +++++++++++++------ .../mobile/androidenv/androidndk.nix | 1 + .../development/mobile/androidenv/default.nix | 15 +++++++++++++ pkgs/stdenv/cross/default.nix | 4 +++- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9c43d9b1bbc..4c7dd991791 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -45,7 +45,7 @@ rec { aarch64-android-prebuilt = rec { config = "aarch64-unknown-linux-android"; - sdkVer = "21"; + sdkVer = "24"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 663a1f1ee8f..1323466ea86 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -98,10 +98,19 @@ rec { # We use androidndk from the previous stage, else we waste time or get cycles # cross-compiling packages to wrap incorrectly wrap binaries we don't include # anyways. - libraries = { - name = "bionic-prebuilt"; - type = "derivation"; - outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/"; - drvPath = throw "fake derivation, build ${buildAndroidndk} to use"; - }; + libraries = + let + includePath = if buildAndroidndk.version == "10e" then + "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/include/" + else + "${buildAndroidndk}/libexec/${buildAndroidndk.name}/sysroot/usr/include"; + libPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/"; + in + runCommand "bionic-prebuilt" {} '' + mkdir -p $out + cp -r ${includePath} $out/include + chmod +w $out/include + ${lib.optionalString (lib.versionOlder buildAndroidndk.version "10e") "ln -s $out/include/${targetInfo.triple}/asm $out/include/asm"} + ln -s ${libPath} $out/lib + ''; } diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index d0bfe6c8100..78e278be237 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { name = "android-ndk-r${version}"; + inherit version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index d122ffe241e..3978ae1aeb7 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -281,4 +281,19 @@ rec { inherit androidndk; targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; }; + + androidndkPkgs_10e = import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + lib hostPlatform targetPlatform + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e; + androidndk = androidndk_10e; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e; + }; } diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 973be983186..41b5fd99504 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,7 +41,9 @@ in lib.init bootStages ++ [ targetPlatform = crossSystem; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if crossSystem.useAndroidPrebuilt + else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) + then buildPackages.androidenv.androidndkPkgs_10e.gcc + else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit) then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; }; From e5861b8e0da8b13fceab9e841359f51da66664c2 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 17 May 2018 10:27:08 -0500 Subject: [PATCH 52/83] tigervnc: add makeWrapper to nativeBuildInputs Fixes #40654 --- pkgs/tools/admin/tigervnc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3818f361cb5..69f6e056b73 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -5,7 +5,8 @@ , cmake, gettext, libtool , glproto, libGLU , gnutls, pam, nettle -, xterm, openssh }: +, xterm, openssh +, makeWrapper}: with stdenv.lib; @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { glproto libGLU ] ++ xorgserver.buildInputs; - nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ] + nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ] ++ xorg.xorgserver.nativeBuildInputs; propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; From 276f2897cb567593ae7f071d13bdeec5fad61240 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 17 May 2018 17:35:01 +0200 Subject: [PATCH 53/83] oracle-instantclient: move rpmextract and patchelf to nativeBuildInputs --- pkgs/development/libraries/oracle-instantclient/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 1c629c13779..5affd14708b 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -34,9 +34,11 @@ in stdenv.mkDerivation rec { srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552"); srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1"); - buildInputs = [ glibc patchelf rpmextract ] ++ + buildInputs = [ glibc ] ++ optional odbcSupport unixODBC; + nativeBuildInputs = [ rpmextract patchelf ]; + buildCommand = '' mkdir -p "${name}" cd "${name}" From 0f4269bf48458bcc9ec089364e9dd234585f7667 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 17 May 2018 17:37:08 +0200 Subject: [PATCH 54/83] oracle-instantclient: remove unused arguments --- pkgs/development/libraries/oracle-instantclient/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 5affd14708b..9abb3e5f9e0 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,6 +1,4 @@ -{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio -, odbcSupport ? false, unixODBC -}: +{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }: assert odbcSupport -> unixODBC != null; From ccb4558a91f6466eb2aee4caeb8cb6dd42b8a082 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 17 May 2018 17:38:06 +0200 Subject: [PATCH 55/83] oracle-instantclient: prefix LD_LIBRARY_PATH --- pkgs/development/libraries/oracle-instantclient/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 9abb3e5f9e0..edb07800d98 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }: +{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }: assert odbcSupport -> unixODBC != null; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glibc ] ++ optional odbcSupport unixODBC; - nativeBuildInputs = [ rpmextract patchelf ]; + nativeBuildInputs = [ rpmextract patchelf makeWrapper ]; buildCommand = '' mkdir -p "${name}" @@ -70,6 +70,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ $exe + wrapProgram $exe --prefix LD_LIBRARY_PATH ":" $out/lib done ''; From 7824c60a439810bc068db5d67756161ac62527fa Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 17 May 2018 17:38:32 +0200 Subject: [PATCH 56/83] oracle-instantclient: patchelf and wrap adrci and genezi, too --- pkgs/development/libraries/oracle-instantclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index edb07800d98..6ed3e584fa3 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { $lib done - for exe in $out/bin/sqlplus; do + for exe in $out/bin/{adrci,genezi,sqlplus}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ $exe From a88354d99f8298a45a2e5e3632fb793a83f2b940 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 17 May 2018 18:40:48 +0200 Subject: [PATCH 57/83] pythonPackages.cx_oracle: 6.2.1 -> 6.3.1 --- pkgs/development/python-modules/cx_oracle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index f2e10caad72..637518b1969 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "6.2.1"; + version = "6.3.1"; buildInputs = [ oracle-instantclient @@ -10,10 +10,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9"; + sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7"; }; - # Check need an Oracle database to run + # Check need an Oracle database to run doCheck = false; meta = with stdenv.lib; { From d7ac3818d3addea49eceebe175222b8357e32138 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 06:22:02 -0700 Subject: [PATCH 58/83] gpsprune: 18.6 -> 19 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpsprune/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/akzrr13fzbw4ympkxcjp4v434hbfw6nb-gpsprune-19/bin/gpsprune had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 19 with grep in /nix/store/akzrr13fzbw4ympkxcjp4v434hbfw6nb-gpsprune-19 - directory tree listing: https://gist.github.com/093deda67a3697cfb7ceb5e487494b74 - du listing: https://gist.github.com/c4d02de001bcd6a66916da90695ae515 --- pkgs/applications/misc/gpsprune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index a51ec8c1b04..3c40457062b 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.6"; + version = "19"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q"; + sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; phases = [ "installPhase" ]; From 838bfaa8edf2c1224715eda00f143a5dc363e65a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 May 2018 19:12:17 +0200 Subject: [PATCH 59/83] gpsbabel: remove use of phases Also make use of `makeWrapper`. --- pkgs/applications/misc/gpsprune/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 3c40457062b..b6391d06eb9 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; - phases = [ "installPhase" ]; - + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre8 ]; desktopItem = makeDesktopItem { @@ -23,15 +22,11 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;"; }; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - cat > $out/bin/gpsprune < Date: Thu, 17 May 2018 18:43:25 +0200 Subject: [PATCH 60/83] pythonPackages.cx_oracle: fix dlopen previously, $ORACLE_HOME had to be set for each python script using this library. We now patch odpi to load libclntsh.so from oracle-instantclient if $ORACLE_HOME was not provided. --- ...-dpiOci.c-nixify-libclntsh.so-dlopen.patch | 27 +++++++++++++++++++ .../python-modules/cx_oracle/default.nix | 6 +++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch diff --git a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch new file mode 100644 index 00000000000..a2de7b24853 --- /dev/null +++ b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch @@ -0,0 +1,27 @@ +From 355b9d812efdfbd041e14b365258b69c81689981 Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Thu, 17 May 2018 18:37:40 +0200 +Subject: [PATCH] odpi/src/dpiOci.c: nixify libclntsh.so dlopen + +--- + odpi/src/dpiOci.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/odpi/src/dpiOci.c b/odpi/src/dpiOci.c +index 76b9867..22c2987 100644 +--- a/odpi/src/dpiOci.c ++++ b/odpi/src/dpiOci.c +@@ -1575,6 +1575,10 @@ static int dpiOci__loadLib(dpiError *error) + } + } + } ++ if(!dpiOciLibHandle) { ++ dpiOciLibHandle = dlopen("@libclntsh@", RTLD_LAZY); ++ } ++ + #endif + + if (!dpiOciLibHandle) { +-- +2.16.3 + diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 637518b1969..c9925fad88d 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7"; }; + patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ]; + + postPatch = '' + substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so"; + ''; + # Check need an Oracle database to run doCheck = false; From bd648f321c2c1e52a4b8d2a7d7183ba076937ac4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 May 2018 20:28:12 +0200 Subject: [PATCH 61/83] nixos/nginx: emphasize that useACMEHost does not create certs It was not entirely clean that `services.nginx.virtualHosts..useACMEHost` does not create certificates, see https://github.com/NixOS/nixpkgs/issues/40593 --- nixos/modules/services/web-servers/nginx/vhost-options.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index f014d817e80..e4494dff37d 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -62,6 +62,7 @@ with lib; This is useful if you have many subdomains and want to avoid hitting the rate limit. Alternately, you can generate a certificate through . + Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using . ''; }; From d9266340e187b0d29f3ea898a9983cb0727a9b1a Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 23 Apr 2018 00:52:01 +0200 Subject: [PATCH 62/83] Adds gerschtli to maintainer-list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2add8fa2c4f..790b72c039e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1483,6 +1483,11 @@ github = "georgewhewell"; name = "George Whewell"; }; + gerschtli = { + email = "tobias.happ@gmx.de"; + github = "Gerschtli"; + name = "Tobias Happ"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; From 93fedb03fe4618c8a5bc51c2d7bf3502e0d80939 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 23 Apr 2018 01:13:19 +0200 Subject: [PATCH 63/83] cargo-release: Init at 0.10.0 --- .../cargo-release/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/package-management/cargo-release/default.nix diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix new file mode 100644 index 00000000000..562f92121d6 --- /dev/null +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "cargo-release-${version}"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "sunng87"; + repo = "cargo-release"; + rev = "${version}"; + sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0"; + }; + + cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5"; + + meta = with stdenv.lib; { + description = ''Cargo subcommand "release": everything about releasing a rust crate''; + homepage = https://github.com/sunng87/cargo-release; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ gerschtli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47719d7ab56..424c15ac715 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6894,6 +6894,7 @@ with pkgs; }); cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-release = callPackage ../tools/package-management/cargo-release { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; From e0fccdcc8d03da8ec306db3ac9710fbe5e135293 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 17 May 2018 11:09:33 -0500 Subject: [PATCH 64/83] rust: add more sys overrides --- pkgs/build-support/rust/default-crate-overrides.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 488fcb94372..c9d2913c4fd 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -3,7 +3,7 @@ libsodium, postgresql, ... }: let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { cargo = attrs: { @@ -19,7 +19,8 @@ in crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; curl-sys = attrs: { - buildInputs = [ pkgconfig curl ]; + buildInputs = [ pkgconfig ]; + propagatedBuiltInputs = [ curl ]; }; libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; @@ -69,4 +70,7 @@ in pq-sys = attr: { buildInputs = [ pkgconfig postgresql ]; }; + security-framework-sys = attr: { + propagatedBuildInputs = [ Security ]; + }; } From 768bd58a4890f00a42d3e5578f37534350fba7a2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 17 May 2018 14:19:36 -0500 Subject: [PATCH 65/83] crate-overrides: curl-sys needs zlib --- pkgs/build-support/rust/default-crate-overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index c9d2913c4fd..971c4d0f5e2 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -19,7 +19,7 @@ in crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; curl-sys = attrs: { - buildInputs = [ pkgconfig ]; + buildInputs = [ pkgconfig zlib ]; propagatedBuiltInputs = [ curl ]; }; libgit2-sys = attrs: { From 9bca8edce0bb70111d8971d558e745068c3f6041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 17 May 2018 20:21:11 +0100 Subject: [PATCH 66/83] python.pkgs.cx_oracle: add missing quote --- pkgs/development/python-modules/cx_oracle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index c9925fad88d..717faf1128f 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ]; postPatch = '' - substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so"; + substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ "${oracle-instantclient}/lib/libclntsh.so"; ''; # Check need an Oracle database to run From 99b4eb99872c46fd10aacdab4162be0f09f817f0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 May 2018 21:38:00 +0200 Subject: [PATCH 67/83] disorderfs: 0.5.2 -> 0.5.3 --- pkgs/tools/filesystems/disorderfs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 0551198cded..0bde9b0b26e 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2"; - sha256 = "0jdadb1ppd5qrnngpjv14az32gwslag2wwv1k8rs29iqlfy38cjf"; + url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; + sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; buildInputs = [ fuse attr ]; + sourceRoot = "."; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { From 85cc1364adfed5c439c6dea6f1563af2220c276a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 12:40:38 -0700 Subject: [PATCH 68/83] babl: 0.1.46 -> 0.1.48 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/babl/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.1.48 with grep in /nix/store/1pffxdly3bs42aqxf9zzmh3kcn304r8i-babl-0.1.48 - directory tree listing: https://gist.github.com/42f46e6f60e3db18a7a54f4ec1c31b80 - du listing: https://gist.github.com/3382dcb9c594fd5e06a9432be1c8d80b --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 285f4dea802..ac9056d1e03 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.46"; + name = "babl-0.1.48"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv"; + sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy"; }; doCheck = true; From 7e29dcf3ccc91a2bb0209dd76d02911a5284f240 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 12:49:56 -0700 Subject: [PATCH 69/83] babeld: 1.8.1 -> 1.8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/babeld/versions. These checks were done: - built on NixOS - /nix/store/7vd417z6awqq3wyqjg3wzyq3868qfh5f-babeld-1.8.2/bin/babeld passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.8.2 with grep in /nix/store/7vd417z6awqq3wyqjg3wzyq3868qfh5f-babeld-1.8.2 - directory tree listing: https://gist.github.com/560ddce597cdbadf44146673690eeba5 - du listing: https://gist.github.com/b9dcee589270b1bf6e38fcdac5771b9c --- pkgs/tools/networking/babeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 801863fb95a..9c8f8d31c0c 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.1"; + name = "babeld-1.8.2"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1gq6q1zly40ngs9wl3qa3yjvyb6zbqck82fp3n6w2bi9ymrrq94w"; + sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87"; }; preBuild = '' From 0f7eaddc5032b5b2276239dd1150f6a507626c98 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 May 2018 21:42:14 -0500 Subject: [PATCH 70/83] sqlar: init at 2018-01-07 --- pkgs/development/libraries/sqlite/sqlar.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/sqlite/sqlar.nix diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix new file mode 100644 index 00000000000..734d68ca3d4 --- /dev/null +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, fuse, zlib }: + +stdenv.mkDerivation rec { + name = "sqlar-${version}"; + version = "2018-01-07"; + + src = fetchurl { + url = "https://www.sqlite.org/sqlar/tarball/4824e73896/sqlar-src-4824e73896.tar.gz"; + sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9"; + }; + + buildInputs = [ fuse zlib ]; + + buildFlags = [ "sqlar" "sqlarfs" ]; + + installPhase = '' + install -D -t $out/bin sqlar sqlarfs + ''; + + meta = with stdenv.lib; { + homepage = https://sqlite.org/sqlar; + description = "SQLite Archive utilities"; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47719d7ab56..88a9ad7e14d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11650,6 +11650,8 @@ with pkgs; sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); + sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; From f2849abd7e3ea9ed7d8baf0899331a876261cbfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 13:08:26 -0700 Subject: [PATCH 71/83] openresty: 1.13.6.1 -> 1.13.6.2 (#40648) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openresty/versions. These checks were done: - built on NixOS - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/opm passed the binary check. - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/md2pod.pl passed the binary check. - Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx-xml2pod had a zero exit code or showed the expected version - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/resty passed the binary check. - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc passed the binary check. - Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc-index had a zero exit code or showed the expected version - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/openresty passed the binary check. - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/luajit-openresty passed the binary check. - /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx passed the binary check. - 7 of 9 passed binary check by having a zero exit code. - 2 of 9 passed binary check by having the new version present in output. - found 1.13.6.2 with grep in /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2 - directory tree listing: https://gist.github.com/3d4adc0eb55d63d7e2b269541039384b - du listing: https://gist.github.com/f8dd4bb690e9b8615ede14c9f250f9f7 --- pkgs/servers/http/openresty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 093f5f0e502..252e1a97dfd 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.13.6.1"; + version = "1.13.6.2"; src = fetchurl { url = "http://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i"; + sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; From c521ad3528c00eefc004ab531fbb6fa2c5234a9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 13:14:13 -0700 Subject: [PATCH 72/83] soapyhackrf: 0.3.2 -> 0.3.3 (#40643) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/soapyhackrf/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/2cb235b01daec8f6f3de0f0217e17bda - du listing: https://gist.github.com/4ad265d40e6ea8558f6cccfbfb8d9d35 --- pkgs/applications/misc/soapyhackrf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix index f5543af9c60..2c5dd058ced 100644 --- a/pkgs/applications/misc/soapyhackrf/default.nix +++ b/pkgs/applications/misc/soapyhackrf/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.2"; + version = "0.3.3"; in stdenv.mkDerivation { name = "soapyhackrf-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyHackRF"; rev = "soapy-hackrf-${version}"; - sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p"; + sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 43a28c2083dac448056567f908382f70394d2f6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 13:26:35 -0700 Subject: [PATCH 73/83] prosody: 0.10.0 -> 0.10.1 (#40645) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/prosody/versions. These checks were done: - built on NixOS - /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosody passed the binary check. - Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosodyctl had a zero exit code or showed the expected version - /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosody-wrapped passed the binary check. - Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosodyctl-wrapped had a zero exit code or showed the expected version - 2 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 0.10.1 with grep in /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1 - directory tree listing: https://gist.github.com/e1e8caae1a498d8e07f1c35d990846d3 - du listing: https://gist.github.com/9b3a9c7a8711da781e548e894e848cdc --- pkgs/servers/xmpp/prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 2d0e1a529da..6f092dd80cd 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -25,12 +25,12 @@ let in stdenv.mkDerivation rec { - version = "0.10.0"; + version = "0.10.1"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l"; + sha256 = "1kmmpkkgymg1r8r0k8j83pgmiskg1phl8hmpzjrnvlvsfnrnjplr"; }; communityModules = fetchhg { From 94cb35748e21ef60db030e259ae838bdada876bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 13:44:42 -0700 Subject: [PATCH 74/83] debootstrap: 1.0.97 -> 1.0.98 (#40682) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions. These checks were done: - built on NixOS - /nix/store/m0h3f8pqvj25qgxc3z8qr9dz5id09ak7-debootstrap-1.0.98/bin/debootstrap passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.0.98 with grep in /nix/store/m0h3f8pqvj25qgxc3z8qr9dz5id09ak7-debootstrap-1.0.98 - directory tree listing: https://gist.github.com/f2964467bd7a4c6fb63e26c0c192fdc2 - du listing: https://gist.github.com/987ba3269a198a4eb67c50f8263d192d --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 7b143183bc0..0ed883bf342 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.97"; + version = "1.0.98"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1w2wdiazfykjkwainxfk72rccqsh1l1i90h93phsvayv0gsbxrnk"; + sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8"; }; buildInputs = [ dpkg gettext gawk perl ]; From 00ddd6a8ae9989ada2cb1a70b0c6cfb1022f6b1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 14:08:28 -0700 Subject: [PATCH 75/83] dash: 0.5.10 -> 0.5.10.1 (#40677) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dash/versions. These checks were done: - built on NixOS - /nix/store/xdfhswm4pr989ad5582dphj02nlhd09g-dash-0.5.10.1/bin/dash passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/c7533f80b4151e29fb67f31acbea016b - du listing: https://gist.github.com/455f25b553fefbc281441c80772198d1 --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 5f26801ca6d..c852e1feb33 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.10"; + name = "dash-0.5.10.1"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d"; + sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s"; }; hardeningDisable = [ "format" ]; From 157eb22351f9d0a9d8337b104ddb8bdb5ec4c01e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 14:09:01 -0700 Subject: [PATCH 76/83] debianutils: 4.8.4 -> 4.8.6 (#40678) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debianutils/versions. These checks were done: - built on NixOS - /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/run-parts passed the binary check. - /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/tempfile passed the binary check. - /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/ischroot passed the binary check. - Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/which had a zero exit code or showed the expected version - /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/savelog passed the binary check. - Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/add-shell had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/installkernel had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/remove-shell had a zero exit code or showed the expected version - 4 of 8 passed binary check by having a zero exit code. - 1 of 8 passed binary check by having the new version present in output. - found 4.8.6 with grep in /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6 - directory tree listing: https://gist.github.com/d23555dbc7c71f2c0b98dcd75d09c013 - du listing: https://gist.github.com/58757b8859445f56eba651aa845fe59f --- pkgs/tools/misc/debianutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index d93cc479a80..bec0cbbd2b9 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.4"; + version = "4.8.6"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0"; + sha256 = "0wrz8ak4896f5i8wirijr9hdvc43xzxpg2gjs0snmpys8iqh82fv"; }; meta = { From 3432fa3fd5197f0cd2c723a1f14641e30ccb173d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 17 May 2018 16:16:26 -0500 Subject: [PATCH 77/83] bashplotlib: init at 2017-10-11 (#40685) --- pkgs/tools/misc/bashplotlib/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/bashplotlib/default.nix diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix new file mode 100644 index 00000000000..2757f5f3e21 --- /dev/null +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + pname = "bashplotlib-${version}"; + version = "2017-10-11"; + + src = fetchFromGitHub { + owner = "glamp"; + repo = "bashplotlib"; + rev = "fdc52be2c1fed13753692eced328143ab1db6f3d"; + sha256 = "1ycql6j65zywyav2n3c0x1i5cm9w6glzqc3v0cgdvv1bdg4wi0gf"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/glamp/bashplotlib; + description = "Plotting in the terminal"; + maintainers = with maintainers; [ dtzWill ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d51e6fbe857..698a0c8ed30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -784,6 +784,8 @@ with pkgs; basex = callPackage ../tools/text/xml/basex { }; + bashplotlib = callPackage ../tools/misc/bashplotlib { }; + babeld = callPackage ../tools/networking/babeld { }; badvpn = callPackage ../tools/networking/badvpn {}; From bb898dbc89cbca92850306f35ab8cfcc0f074e60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 14:56:24 -0700 Subject: [PATCH 78/83] pam_u2f: 1.0.6 -> 1.0.7 (#40649) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pam_u2f/versions. These checks were done: - built on NixOS - /nix/store/ny1mv10yj3az2yjn25sla3aybl550rwi-pam_u2f-1.0.7/bin/pamu2fcfg passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.0.7 with grep in /nix/store/ny1mv10yj3az2yjn25sla3aybl550rwi-pam_u2f-1.0.7 - directory tree listing: https://gist.github.com/7da727fb06490bc549a719fda2ada9ab - du listing: https://gist.github.com/a984153d959e953899879d365ffc7852 --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 5cc235c3104..58e3f79d42b 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h"; + sha256 = "1kz7d3vr5dag1d5zq14kcp887p5d0q079dy1sqyl8ndi567asjh3"; }; nativeBuildInputs = [ pkgconfig ]; From f1323634c1083c3594e6a62a7c2ff065e3e9a36d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 15:32:15 -0700 Subject: [PATCH 79/83] armadillo: 8.500.0 -> 8.500.1 (#40700) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/armadillo/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 8.500.1 with grep in /nix/store/fgj0bi559rzmrmzm0y0fyfr75wljlwzz-armadillo-8.500.1 - directory tree listing: https://gist.github.com/6b042c178fafc84e571bb6d2ed67ae65 - du listing: https://gist.github.com/32fd420f41d621a7b6b540cabbcf3f53 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 4c98bbc182c..abf251f97f9 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.500.0"; + version = "8.500.1"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1wdvii5sncq3d8dh272s1n79mpcwzz437lyyfwy7gm7vbks6j77m"; + sha256 = "0bm1g93yr79i74382pq1almakpyf42yipiqkqy742jyzwbxhxr5c"; }; nativeBuildInputs = [ cmake ]; From 81a0a3b39c7812cd6c9d1734f276fe72d33e842a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 16:08:47 -0700 Subject: [PATCH 80/83] ntp: 4.2.8p10 -> 4.2.8p11 (#40661) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ntp/versions. These checks were done: - built on NixOS - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/calc_tickadj passed the binary check. - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntp-wait passed the binary check. - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntptrace passed the binary check. - Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/update-leap had a zero exit code or showed the expected version - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/sntp passed the binary check. - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpd passed the binary check. - Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpdate had a zero exit code or showed the expected version - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpdc passed the binary check. - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpq passed the binary check. - /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntp-keygen passed the binary check. - Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntptime had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/tickadj had a zero exit code or showed the expected version - 8 of 12 passed binary check by having a zero exit code. - 0 of 12 passed binary check by having the new version present in output. - found 4.2.8p11 with grep in /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11 - directory tree listing: https://gist.github.com/643849ae077bac0514537c8aa923dd6d - du listing: https://gist.github.com/1b2abf7cee80b022945ff72be1eb7070 --- pkgs/tools/networking/ntp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 29f8e1ae257..1178f5f0107 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p10"; + name = "ntp-4.2.8p11"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "17xrk7gxrl3hgg0i73n8qm53knyh01lf0f3l1zx9x6r1cip3dlnx"; + sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"; }; # The hardcoded list of allowed system calls for seccomp is From b1b49e114b249a385025ed7acec1766713d8bb68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 16:23:42 -0700 Subject: [PATCH 81/83] usbutils: 009 -> 010 (#40635) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/usbutils/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/lsusb.py had a zero exit code or showed the expected version - /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/usbhid-dump passed the binary check. - /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/lsusb passed the binary check. - /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/usb-devices passed the binary check. - 3 of 4 passed binary check by having a zero exit code. - 1 of 4 passed binary check by having the new version present in output. - found 010 with grep in /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010 - directory tree listing: https://gist.github.com/ea1dc2aa0de1416d4359481ce7edb85e - du listing: https://gist.github.com/f46f6ac9b995df459105446dc2761e28 --- pkgs/os-specific/linux/usbutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 31e4a3dd26f..adb2a0ee2fb 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1, hwdata }: stdenv.mkDerivation rec { - name = "usbutils-009"; + name = "usbutils-010"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "0q3iavmak2bs9xw486w4xfbjl0hbzii93ssgpr95mxmm9kjz1gwb"; + sha256 = "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1"; }; nativeBuildInputs = [ pkgconfig ]; From 285a90b714bfee4004ffa84c83f15bebc36df0b9 Mon Sep 17 00:00:00 2001 From: Roland Koebler Date: Fri, 18 May 2018 01:35:31 +0200 Subject: [PATCH 82/83] lighttpd: add option to enable WebDAV (#40623) --- pkgs/servers/http/lighttpd/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7bf1b1ffa64..31b3449d5f6 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -2,11 +2,14 @@ , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, mysql ? null , enableLdap ? false, openldap ? null +, enableWebDAV ? true, sqlite ? null, libuuid ? null }: assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; assert enableLdap -> openldap != null; +assert enableWebDAV -> sqlite != null; +assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { name = "lighttpd-1.4.49"; @@ -20,12 +23,16 @@ stdenv.mkDerivation rec { buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMysql mysql.connector-c - ++ stdenv.lib.optional enableLdap openldap; + ++ stdenv.lib.optional enableLdap openldap + ++ stdenv.lib.optional enableWebDAV sqlite + ++ stdenv.lib.optional enableWebDAV libuuid; configureFlags = [ "--with-openssl" ] ++ stdenv.lib.optional enableMagnet "--with-lua" ++ stdenv.lib.optional enableMysql "--with-mysql" - ++ stdenv.lib.optional enableLdap "--with-ldap"; + ++ stdenv.lib.optional enableLdap "--with-ldap" + ++ stdenv.lib.optional enableWebDAV "--with-webdav-props" + ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks"; preConfigure = '' sed -i "s:/usr/bin/file:${file}/bin/file:g" configure From 3a5fcbbd911b0ee2a82903bacb06e4c508d7c1b3 Mon Sep 17 00:00:00 2001 From: Herdiansyah Date: Fri, 18 May 2018 06:41:03 +0700 Subject: [PATCH 83/83] neofetch: 3.4.0 -> 4.0.0 (#40651) --- pkgs/tools/misc/neofetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 097eb2408f8..cece77b8d3e 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.4.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx"; + sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn"; }; dontBuild = true;