diff options
Diffstat (limited to 'pkgs/development')
1922 files changed, 13294 insertions, 6559 deletions
diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index 2178226ab9d..827c5137bf8 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.0"; - name = "arduino-mk-${version}"; + pname = "arduino-mk"; src = fetchFromGitHub { owner = "sudar"; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index c48b36e5aba..accedf9a7af 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "abcl"; version = "1.5.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index a3c34bd7e8e..305e0f202bf 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; - rev = "${pname}-${version}"; + rev = "icedtea-web-${version}"; sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; }; diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index e8759ec073b..ed6b2b2ff24 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -7,11 +7,11 @@ let sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f"; }; in stdenv.mkDerivation rec { - name = "apache-flex-sdk-${version}"; + pname = "apache-flex-sdk"; version = "4.16.1"; src = fetchurl { - url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz"; + url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p"; }; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index ad68382c13a..3058e926c3f 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -3,7 +3,7 @@ with builtins; stdenv.mkDerivation rec { - name = "arachne-pnr-${version}"; + pname = "arachne-pnr"; version = "2018.09.09"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index 519992fd8c2..b70fde00e15 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -5,7 +5,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "as31-${version}"; + pname = "as31"; + inherit version; src = fetchurl { name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz"; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index ce754813dda..3cbb7577f34 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "asn1c-${version}"; + pname = "asn1c"; version = "0.9.28"; src = fetchurl { diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index 002f34daa13..f086c36468d 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "ats-${version}"; + pname = "ats"; version = "0.2.12"; src = fetchurl { diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index df61ea2b791..a1e5927e349 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - name = "ats2-${version}"; + pname = "ats2"; version = versionPkg; src = fetchurl { diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 387ae906b88..34d1e64c484 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: stdenv.mkDerivation rec { - name = "avian-${version}"; + pname = "avian"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index bf2272a75c1..6e768e65091 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, gmp }: stdenv.mkDerivation rec { - name = "bigloo-${version}"; + pname = "bigloo"; version = "4.1a-2"; src = fetchurl { diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 52323b3de76..c0e6c4b5004 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = if emscriptenRev == null then "version_${version}" else emscriptenRev; - name = "binaryen-${version}"; + pname = "binaryen"; src = fetchFromGitHub { owner = "WebAssembly"; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 646963eedbc..6fac183125f 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { - name = "ccl-${version}"; + pname = "ccl"; version = "1.11.5"; src = fetchurl { diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9321c8b2de4..12d68f0265c 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "chez-scheme-${version}"; + pname = "chez-scheme"; version = "9.5.2"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index ceeff56330b..34512fc8ef0 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 8; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 74f71181190..5fefce12dbf 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 11; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index a1e29951ddb..664d8492113 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -56,7 +56,6 @@ let }; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clasp"; version = "0.8.99.20181128"; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index e9e97361825..d9f2a588d8f 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "closure-compiler-${version}"; + pname = "closure-compiler"; version = "20190215"; src = fetchurl { diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 9e3184c42eb..3f93ea9e1ba 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -19,7 +19,8 @@ let in stdenv.mkDerivation { - name = "cmucl-binary-${version}"; + pname = "cmucl-binary"; + inherit version; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 237a80280ec..cc8e9f827b7 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { - name = "colm-${version}"; + pname = "colm"; version = "0.13.0.7"; src = fetchurl { - url = "https://www.colm.net/files/colm/${name}.tar.gz"; + url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz"; sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 69e11a48918..940eb851fe6 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -11,7 +11,7 @@ let ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; in stdenv.mkDerivation rec { - name = "compcert-${version}"; + pname = "compcert"; version = "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 8be482e2150..00816fca36b 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "coreclr-${version}"; + pname = "coreclr"; version = "2.0.7"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix new file mode 100644 index 00000000000..8ffa89a11b4 --- /dev/null +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: +{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root + shardsFile ? null + # Specify binaries to build in the form { foo.src = "src/foo.cr"; } + # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } +, crystalBinaries ? {} +, ... +}@args: +let + mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; + + crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { + inherit name; + path = fetchFromGitHub value; + }) (import shardsFile)); + + defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; + +in stdenv.mkDerivation (mkDerivationArgs // { + + configurePhase = args.configurePhase or '' + runHook preConfigure + ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} + runHook postConfigure + ''; + + buildInputs = args.buildInputs or [] ++ [ crystal ]; + + buildPhase = args.buildPhase or '' + runHook preBuild + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' + crystal ${lib.escapeShellArgs ([ + "build" + "-o" bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ attrs.options or defaultOptions)} + '') crystalBinaries)} + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + mkdir -p "$out/bin" + ${lib.concatMapStringsSep "\n" (bin: '' + mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '') (lib.attrNames crystalBinaries)} + runHook postInstall + ''; + + meta = args.meta or {} // { + platforms = args.meta.platforms or crystal.meta.platforms; + }; +}) diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/crystal/crystal2nix.cr index f608102a37b..0610de5cfa4 100644 --- a/pkgs/development/compilers/mint/crystal2nix.cr +++ b/pkgs/development/compilers/crystal/crystal2nix.cr @@ -26,7 +26,7 @@ File.open "shards.nix", "w+" do |file| sha256 = "" args = ["--url", url, "--rev", rev] - Process.run("nix-prefetch-git", args: args) do |x| + Process.run("@nixPrefetchGit@", args: args) do |x| x.error.each_line { |e| puts e } sha256 = PrefetchJSON.from_json(x.output).sha256 end diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix new file mode 100644 index 00000000000..ac69b9b3d96 --- /dev/null +++ b/pkgs/development/compilers/crystal/crystal2nix.nix @@ -0,0 +1,16 @@ +{ lib, crystal, nix-prefetch-git }: +crystal.buildCrystalPackage { + pname = "crystal2nix"; + version = "unstable-2018-07-31"; + + nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; + unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; + + crystalBinaries.crystal2nix.src = "crystal2nix.cr"; + + meta = with lib; { + description = "Utility to convert Crystal's shard.lock files to a Nix file"; + license = licenses.mit; + maintainers = [ maintainers.manveru ]; + }; +} diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 2e823fe1f0f..0c79b3d394f 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: +, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib +, callPackage }: # We need multiple binaries as a given binary isn't always able to build # (even slightly) older or newer versions. @@ -19,11 +20,12 @@ let arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ]; genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { - name = "crystal-binary-${version}"; + pname = "crystal-binary"; + inherit version; src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; @@ -37,7 +39,7 @@ let }; generic = { version, sha256, binary, doCheck ? true }: - stdenv.mkDerivation rec { + let compiler = stdenv.mkDerivation rec { pname = "crystal"; inherit doCheck version; @@ -72,7 +74,7 @@ let buildInputs = [ boehmgc libatomic_ops pcre libevent libyaml - llvm zlib openssl + llvm zlib openssl_1_0_2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -134,6 +136,10 @@ let export PATH=${lib.makeBinPath checkInputs}:$PATH ''; + passthru.buildCrystalPackage = callPackage ./build-package.nix { + crystal = compiler; + }; + meta = with lib; { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; @@ -141,7 +147,7 @@ let maintainers = with maintainers; [ manveru david50407 peterhoeg ]; platforms = builtins.attrNames archs; }; - }; + }; in compiler; in rec { binaryCrystal_0_26 = genericBinary { @@ -199,5 +205,14 @@ in rec { binary = binaryCrystal_0_29; }; - crystal = crystal_0_29; + crystal_0_30 = generic { + version = "0.30.1"; + sha256 = "0fbk784zjflsl3hys5a1xmn8mda8kb2z7ql58wpyfavivswxanbs"; + doCheck = false; # 6 checks are failing now + binary = binaryCrystal_0_29; + }; + + crystal = crystal_0_30; + + crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 5b9e9010ef0..8aab9580232 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -16,7 +16,7 @@ let }: stdenv.mkDerivation rec { - name = "cudatoolkit-${version}"; + pname = "cudatoolkit"; inherit version runPatches; dontPatchELF = true; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 8bae6e2363f..128c245d277 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -11,7 +11,8 @@ let version = "20170519"; in stdenv.mkDerivation { - name = "dale-${version}"; + pname = "dale"; + inherit version; src = fetchFromGitHub { owner = "tomhrr"; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 514075651e1..839ee821d00 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dev86-${version}"; + pname = "dev86"; version = "0.16.21"; src = fetchurl { diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index b3b58e83621..332ded31df6 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "dmd-${version}"; + pname = "dmd"; inherit version; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 4635c6d0a4e..a22862c4292 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -28,11 +28,11 @@ let }; in stdenv.mkDerivation rec { - name = "eli-${version}"; + pname = "eli"; version = "4.8.1"; src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2"; sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; }; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index fbb991d7b5a..c8bef546b6d 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -56,8 +56,9 @@ let */ elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test; elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples; - elm-analyse = elmNodePackages.elm-analyse; - inherit (elmNodePackages) elm-doc-preview elm-upgrade; + # elm-analyse@0.16.4 build is not working + elm-analyse = elmNodePackages."elm-analyse-0.16.3"; + inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref; }; in elmPkgs // { inherit elmPkgs; diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 0e1835c6ffa..1d24df549ea 100755 --- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -4,4 +4,8 @@ set -eu -o pipefail rm -f node-env.nix -node2nix --nodejs-10 -i node-packages.json -o node-packages.nix -c node-composition.nix +node2nix --nodejs-10 \ + -i node-packages.json \ + -o node-packages.nix \ + -c node-composition.nix \ + --no-copy-node-env -e ../../../node-packages/node-env.nix diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index fa0a1482f97..1ffd758ac82 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -5,7 +5,7 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let - nodeEnv = import ./node-env.nix { + nodeEnv = import ../../../node-packages/node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix deleted file mode 100644 index 670556bf271..00000000000 --- a/pkgs/development/compilers/elm/packages/node-env.nix +++ /dev/null @@ -1,540 +0,0 @@ -# This file originates from node2nix - -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: - -let - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <<EOF - #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore - EOF - - chmod +x $out/bin/tar - ''; - - # Function that generates a TGZ file from a NPM project - buildNodeSourceDist = - { name, version, src, ... }: - - stdenv.mkDerivation { - name = "node-tarball-${name}-${version}"; - inherit src; - buildInputs = [ nodejs ]; - buildPhase = '' - export HOME=$TMPDIR - tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) - ''; - installPhase = '' - mkdir -p $out/tarballs - mv $tgzFile $out/tarballs - mkdir -p $out/nix-support - echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${stdenv.lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - if [ "$dontNpmInstall" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node_${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <<EOF - #! ${stdenv.shell} -e - $shellHook - exec ${stdenv.shell} - EOF - chmod +x $out/bin/shell - ''; - - # Provide the dependencies in a development shell through the NODE_PATH environment variable - inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' - export NODE_PATH=$nodeDependencies/lib/node_modules - export PATH="$nodeDependencies/bin:$PATH" - ''; - }; -in -{ - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; -} diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 49edf689694..5ba7e49bfa6 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -2,6 +2,8 @@ "elm-test", "elm-verify-examples", "elm-doc-preview", - "elm-analyse", - "elm-upgrade" + "elm-upgrade", + { "elm-analyse": "0.16.3" }, + "elm-live", + "elm-xref" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index c6cc1cbf247..7605c377057 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -13,22 +13,13 @@ let sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; }; }; - "@sindresorhus/is-0.14.0" = { + "@sindresorhus/is-0.7.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; - }; - }; - "@szmarczak/http-timer-1.1.2" = { - name = "_at_szmarczak_slash_http-timer"; - packageName = "@szmarczak/http-timer"; - version = "1.1.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; + sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; "accepts-1.3.7" = { @@ -40,13 +31,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.10.1" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz"; - sha512 = "w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "ansi-regex-2.1.1" = { @@ -58,13 +49,22 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-4.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; "ansi-styles-3.2.1" = { @@ -85,6 +85,15 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; + "anymatch-3.0.3" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz"; + sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g=="; + }; + }; "arr-diff-4.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -166,13 +175,13 @@ let sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; - "async-limiter-1.0.0" = { + "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "asynckit-0.4.0" = { @@ -238,6 +247,15 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + }; "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -265,6 +283,15 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; + "binary-extensions-2.0.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + }; + }; "bindings-1.5.0" = { name = "bindings"; packageName = "bindings"; @@ -274,13 +301,13 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "binwrap-0.2.1" = { + "binwrap-0.2.2" = { name = "binwrap"; packageName = "binwrap"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.1.tgz"; - sha512 = "kILc2+zMfFEv66/NLfO2GIpmWRPE8hL68fv+o5A94OlN9AIIG4zernpgn9bpPAImb5t4QwFxnqAGSyP1+tGKrA=="; + url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.2.tgz"; + sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; "bluebird-3.5.5" = { @@ -328,6 +355,15 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; "bser-2.1.0" = { name = "bser"; packageName = "bser"; @@ -373,22 +409,22 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; - "cacheable-request-6.1.0" = { + "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "6.1.0"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; }; }; - "camelcase-4.1.0" = { + "camelcase-5.3.1" = { name = "camelcase"; packageName = "camelcase"; - version = "4.1.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "capture-exit-2.0.0" = { @@ -436,6 +472,15 @@ let sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; }; }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; "chalk-2.1.0" = { name = "chalk"; packageName = "chalk"; @@ -454,6 +499,15 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; "chokidar-2.1.2" = { name = "chokidar"; packageName = "chokidar"; @@ -463,6 +517,15 @@ let sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; + "chokidar-3.0.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz"; + sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g=="; + }; + }; "chownr-1.1.2" = { name = "chownr"; packageName = "chownr"; @@ -481,13 +544,22 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "cliui-4.1.0" = { + "cli-color-1.2.0" = { + name = "cli-color"; + packageName = "cli-color"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz"; + sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1"; + }; + }; + "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; - sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "clone-response-1.0.2" = { @@ -499,15 +571,6 @@ let sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; }; }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -544,13 +607,31 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "commander-2.20.0" = { + "commander-2.17.1" = { name = "commander"; packageName = "commander"; - version = "2.20.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; - sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "commander-3.0.0" = { + name = "commander"; + packageName = "commander"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz"; + sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow=="; }; }; "component-emitter-1.3.0" = { @@ -589,6 +670,15 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; + "connect-pushstate-1.1.0" = { + name = "connect-pushstate"; + packageName = "connect-pushstate"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz"; + sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24"; + }; + }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -661,6 +751,15 @@ let sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; + "core-js-3.2.1" = { + name = "core-js"; + packageName = "core-js"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz"; + sha512 = "Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -688,13 +787,13 @@ let sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; }; }; - "cross-spawn-5.1.0" = { + "cross-spawn-5.0.1" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "5.1.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.0.1.tgz"; + sha1 = "a3bbb302db2297cbea3c04edf36941f4613aa399"; }; }; "cross-spawn-6.0.5" = { @@ -706,6 +805,24 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -724,6 +841,15 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -760,13 +886,22 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "defer-to-connect-1.0.2" = { - name = "defer-to-connect"; - packageName = "defer-to-connect"; - version = "1.0.2"; + "default-gateway-2.7.2" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz"; - sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="; + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz"; + sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ=="; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "define-property-0.2.5" = { @@ -859,6 +994,15 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; + "elm-serve-0.4.0" = { + name = "elm-serve"; + packageName = "elm-serve"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz"; + sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw=="; + }; + }; "elm-test-0.19.0-rev6" = { name = "elm-test"; packageName = "elm-test"; @@ -877,6 +1021,15 @@ let sha512 = "O0Z3YsYU9OTb1hTDGORWxi69QjQFEIPfZVq/oc1D5lhL3swduHKY8vdKGuo+WlKVdTas99oNIsgL7yojWdYcsQ=="; }; }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -895,6 +1048,69 @@ let sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; + "es-abstract-1.13.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; + sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + }; + }; + "es-to-primitive-1.2.0" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + }; + }; + "es5-ext-0.10.50" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.50"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; + sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-promisify-6.0.2" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz"; + sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "es6-weak-map-2.0.3" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; + sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; + }; + }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -922,6 +1138,24 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; + "eventemitter3-3.1.2" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; + }; + }; "exec-sh-0.3.2" = { name = "exec-sh"; packageName = "exec-sh"; @@ -931,13 +1165,13 @@ let sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="; }; }; - "execa-0.7.0" = { + "execa-0.10.0" = { name = "execa"; packageName = "execa"; - version = "0.7.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; + sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; }; }; "execa-1.0.0" = { @@ -1084,6 +1318,15 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; "finalhandler-1.1.1" = { name = "finalhandler"; packageName = "finalhandler"; @@ -1129,13 +1372,13 @@ let sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; }; }; - "find-up-2.1.0" = { + "find-up-3.0.0" = { name = "find-up"; packageName = "find-up"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; "firstline-1.2.0" = { @@ -1156,6 +1399,15 @@ let sha1 = "b88673c42009f8821fac2926e99720acee924fae"; }; }; + "follow-redirects-1.8.1" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz"; + sha512 = "micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw=="; + }; + }; "for-in-1.0.2" = { name = "for-in"; packageName = "for-in"; @@ -1210,6 +1462,15 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; "fs-extra-0.30.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -1237,6 +1498,15 @@ let sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; }; }; + "fs-extra-6.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; + }; + }; "fs-minipass-1.2.6" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -1273,13 +1543,31 @@ let sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; - "get-caller-file-1.0.3" = { + "fsevents-2.0.7" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz"; + sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "get-caller-file-2.0.5" = { name = "get-caller-file"; packageName = "get-caller-file"; - version = "1.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; "get-proxy-2.1.0" = { @@ -1309,15 +1597,6 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; - }; - }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -1363,6 +1642,15 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; + "glob-parent-5.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; + sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -1372,22 +1660,31 @@ let sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; - "got-9.6.0" = { + "got-8.3.2" = { name = "got"; packageName = "got"; - version = "9.6.0"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; - sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; + sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; }; }; - "graceful-fs-4.2.0" = { + "graceful-fs-4.2.2" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz"; - sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; "har-schema-2.0.0" = { @@ -1408,6 +1705,24 @@ let sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; "has-flag-2.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -1435,6 +1750,15 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; "has-to-string-tag-x-1.4.1" = { name = "has-to-string-tag-x"; packageName = "has-to-string-tag-x"; @@ -1480,13 +1804,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "http-cache-semantics-4.0.3" = { + "http-cache-semantics-3.8.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.0.3"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; - sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; "http-errors-1.6.2" = { @@ -1516,6 +1840,15 @@ let sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; + "http-proxy-1.17.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; + sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; + }; + }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -1579,13 +1912,31 @@ let sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; + "internal-ip-3.0.1" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz"; + sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; + }; + }; + "into-stream-3.1.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; "ipaddr.js-1.9.0" = { @@ -1597,6 +1948,15 @@ let sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; "is-accessor-descriptor-0.1.6" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -1624,6 +1984,15 @@ let sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; }; }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1633,6 +2002,15 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-callable-1.1.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -1651,6 +2029,15 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -1696,15 +2083,6 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1741,6 +2119,15 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; "is-object-1.0.1" = { name = "is-object"; packageName = "is-object"; @@ -1750,6 +2137,15 @@ let sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; }; }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; "is-plain-object-2.0.4" = { name = "is-plain-object"; packageName = "is-plain-object"; @@ -1759,6 +2155,15 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -1768,6 +2173,15 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; "is-retry-allowed-1.1.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; @@ -1786,6 +2200,15 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; + "is-symbol-1.0.2" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -1939,13 +2362,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "keyv-3.1.0" = { + "keyv-3.0.0" = { name = "keyv"; packageName = "keyv"; - version = "3.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; - sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; + sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; }; }; "kind-of-3.2.2" = { @@ -1993,31 +2416,31 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "latest-version-5.1.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "5.1.0"; + "klaw-2.1.1" = { + name = "klaw"; + packageName = "klaw"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + url = "https://registry.npmjs.org/klaw/-/klaw-2.1.1.tgz"; + sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; }; }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; + "latest-version-4.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-4.0.0.tgz"; + sha512 = "b4Myk7aQiQJvgssw2O8yITjELdqKRX4JQJUF1IUplgLaA8unv7s+UsAOwH6Q0/a09czSvlxEm306it2LBXrCzg=="; }; }; - "locate-path-2.0.0" = { + "locate-path-3.0.0" = { name = "locate-path"; packageName = "locate-path"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; "lodash-4.17.11" = { @@ -2029,22 +2452,22 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; - "lowercase-keys-1.0.1" = { + "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; - version = "1.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; }; }; - "lowercase-keys-2.0.0" = { + "lowercase-keys-1.0.1" = { name = "lowercase-keys"; packageName = "lowercase-keys"; - version = "2.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; "lru-cache-4.1.5" = { @@ -2056,6 +2479,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-queue-0.1.0" = { + name = "lru-queue"; + packageName = "lru-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; + sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; + }; + }; "makeerror-1.0.11" = { name = "makeerror"; packageName = "makeerror"; @@ -2083,6 +2515,15 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -2092,13 +2533,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mem-1.1.0" = { - name = "mem"; - packageName = "mem"; - version = "1.1.0"; + "memoizee-0.4.14" = { + name = "memoizee"; + packageName = "memoizee"; + version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz"; + sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg=="; }; }; "merge-descriptors-1.0.1" = { @@ -2164,15 +2605,6 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - }; "mimic-response-1.0.1" = { name = "mimic-response"; packageName = "mimic-response"; @@ -2209,13 +2641,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.3.5" = { + "minipass-2.4.0" = { name = "minipass"; packageName = "minipass"; - version = "2.3.5"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz"; - sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.4.0.tgz"; + sha512 = "6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA=="; }; }; "minizlib-1.2.1" = { @@ -2263,6 +2695,15 @@ let sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; "murmur-hash-js-1.0.0" = { name = "murmur-hash-js"; packageName = "murmur-hash-js"; @@ -2272,13 +2713,13 @@ let sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; }; }; - "mustache-2.3.2" = { + "mustache-3.0.3" = { name = "mustache"; packageName = "mustache"; - version = "2.3.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz"; - sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; + url = "https://registry.npmjs.org/mustache/-/mustache-3.0.3.tgz"; + sha512 = "vM5FkMHamTYmVYeAujypihuPrJQDtaUIlKeeVb1AMJ73OZLtWiF7GprqrjxD0gJWT53W9JfqXxf97nXQjMQkqA=="; }; }; "nan-2.14.0" = { @@ -2308,6 +2749,15 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -2362,13 +2812,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-url-4.3.0" = { + "normalize-url-2.0.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.3.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz"; - sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; + sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; }; }; "npm-conf-1.1.3" = { @@ -2389,13 +2839,13 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; + "npx-10.2.0" = { + name = "npx"; + packageName = "npx"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/npx/-/npx-10.2.0.tgz"; + sha512 = "DqjFkzET0DeaXYXNJnirnvEovwk4lBa33ZQCw1jxMuas4yH9jdU8q2U8L3cLaB2UqzgmW2Ssqk8lcGiPRL8pRg=="; }; }; "oauth-sign-0.9.0" = { @@ -2407,6 +2857,15 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; "object-copy-0.1.0" = { name = "object-copy"; packageName = "object-copy"; @@ -2416,6 +2875,15 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; "object-visit-1.0.1" = { name = "object-visit"; packageName = "object-visit"; @@ -2425,6 +2893,15 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + }; "object.pick-1.3.0" = { name = "object.pick"; packageName = "object.pick"; @@ -2452,6 +2929,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "opn-5.3.0" = { + name = "opn"; + packageName = "opn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; + }; + }; "opn-5.4.0" = { name = "opn"; packageName = "opn"; @@ -2461,6 +2947,15 @@ let sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; }; }; + "opn-5.5.0" = { + name = "opn"; + packageName = "opn"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + }; + }; "options-0.0.6" = { name = "options"; packageName = "options"; @@ -2479,15 +2974,6 @@ let sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-locale-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; - }; - }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -2497,13 +2983,13 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "p-cancelable-1.1.0" = { + "p-cancelable-0.4.1" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "1.1.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; }; }; "p-finally-1.0.0" = { @@ -2515,40 +3001,58 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-1.3.0" = { + "p-is-promise-1.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; + }; + }; + "p-limit-2.2.1" = { name = "p-limit"; packageName = "p-limit"; - version = "1.3.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; }; }; - "p-locate-2.0.0" = { + "p-locate-3.0.0" = { name = "p-locate"; packageName = "p-locate"; - version = "2.0.0"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-timeout-2.0.1" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; + sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; }; }; - "p-try-1.0.0" = { + "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; - version = "1.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "package-json-6.4.0" = { + "package-json-5.0.0" = { name = "package-json"; packageName = "package-json"; - version = "6.4.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz"; - sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q=="; + url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz"; + sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; }; }; "parseurl-1.3.3" = { @@ -2614,6 +3118,15 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; + "pem-1.13.2" = { + name = "pem"; + packageName = "pem"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz"; + sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg=="; + }; + }; "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; @@ -2623,6 +3136,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "picomatch-2.0.7" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz"; + sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA=="; + }; + }; "pify-3.0.0" = { name = "pify"; packageName = "pify"; @@ -2704,13 +3226,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.2.0" = { + "psl-1.3.0" = { name = "psl"; packageName = "psl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz"; - sha512 = "GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="; + url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz"; + sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="; }; }; "pump-3.0.0" = { @@ -2767,6 +3289,24 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; + "query-string-5.1.1" = { + name = "query-string"; + packageName = "query-string"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; + }; + }; + "querystringify-2.1.1" = { + name = "querystringify"; + packageName = "querystringify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + }; + }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -2830,6 +3370,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.1.2" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz"; + sha512 = "8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -2857,13 +3406,13 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; - "registry-url-5.1.0" = { + "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; - version = "5.1.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; "remove-trailing-separator-1.1.0" = { @@ -2929,13 +3478,22 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "require-main-filename-1.0.1" = { + "require-main-filename-2.0.0" = { name = "require-main-filename"; packageName = "require-main-filename"; - version = "1.0.1"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; "resolve-url-0.2.1" = { @@ -2974,13 +3532,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "rimraf-2.6.3" = { + "rimraf-2.7.1" = { name = "rimraf"; packageName = "rimraf"; - version = "2.6.3"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; - sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; "rsvp-4.8.5" = { @@ -3055,22 +3613,31 @@ let sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; }; }; - "semver-5.7.0" = { + "semver-5.7.1" = { name = "semver"; packageName = "semver"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; - sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; - "semver-6.2.0" = { - name = "semver"; - packageName = "semver"; - version = "6.2.0"; + "semver-regex-1.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; + sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + }; + }; + "semver-sort-0.0.4" = { + name = "semver-sort"; + packageName = "semver-sort"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz"; - sha512 = "jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A=="; + url = "https://registry.npmjs.org/semver-sort/-/semver-sort-0.0.4.tgz"; + sha1 = "34fdbddc6a6b2b4161398c3c4dba56243bfeaa8b"; }; }; "send-0.16.2" = { @@ -3091,6 +3658,15 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; + "serve-index-1.9.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + }; "serve-static-1.13.2" = { name = "serve-static"; packageName = "serve-static"; @@ -3208,6 +3784,15 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; @@ -3298,22 +3883,22 @@ let sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; }; }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; }; - "string-width-2.1.1" = { + "string-width-3.1.0" = { name = "string-width"; packageName = "string-width"; - version = "2.1.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; "string_decoder-0.10.31" = { @@ -3343,13 +3928,13 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; - "strip-ansi-4.0.0" = { + "strip-ansi-5.2.0" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "4.0.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-eof-1.0.0" = { @@ -3379,6 +3964,24 @@ let sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93"; }; }; + "supervisor-0.12.0" = { + name = "supervisor"; + packageName = "supervisor"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz"; + sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; "supports-color-4.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -3442,6 +4045,15 @@ let sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; }; }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -3451,6 +4063,15 @@ let sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; + "timers-ext-0.1.7" = { + name = "timers-ext"; + packageName = "timers-ext"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; + sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; + }; + }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -3487,15 +4108,6 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; - "to-readable-stream-1.0.0" = { - name = "to-readable-stream"; - packageName = "to-readable-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - }; "to-regex-3.0.2" = { name = "to-regex"; packageName = "to-regex"; @@ -3514,6 +4126,15 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -3568,6 +4189,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-1.0.3" = { + name = "type"; + packageName = "type"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz"; + sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -3685,6 +4315,15 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; + "url-parse-1.4.3" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz"; + sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw=="; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -3730,6 +4369,15 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -3739,13 +4387,13 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "uuid-3.3.2" = { + "uuid-3.3.3" = { name = "uuid"; packageName = "uuid"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; }; }; "vary-1.1.2" = { @@ -3793,13 +4441,13 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; - "wrap-ansi-2.1.0" = { + "wrap-ansi-5.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "2.1.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrappy-1.0.2" = { @@ -3829,6 +4477,15 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; + "ws-5.2.0" = { + name = "ws"; + packageName = "ws"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz"; + sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w=="; + }; + }; "ws-5.2.2" = { name = "ws"; packageName = "ws"; @@ -3838,13 +4495,13 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "ws-7.1.0" = { + "ws-6.2.1" = { name = "ws"; packageName = "ws"; - version = "7.1.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz"; - sha512 = "Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; "xmlbuilder-8.2.2" = { @@ -3865,13 +4522,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-3.2.1" = { + "y18n-4.0.0" = { name = "y18n"; packageName = "y18n"; - version = "3.2.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; "yallist-2.1.2" = { @@ -3892,22 +4549,22 @@ let sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; }; }; - "yargs-10.1.2" = { + "yargs-13.3.0" = { name = "yargs"; packageName = "yargs"; - version = "10.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz"; - sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig=="; + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; + sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; }; }; - "yargs-parser-8.1.0" = { + "yargs-parser-13.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "8.1.0"; + version = "13.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz"; - sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; }; }; "yn-2.0.0" = { @@ -3931,7 +4588,7 @@ in sha512 = "Qdy9QusZF+eT0203XBiT1Y/UhFeUjcSuyyzf3iyp32dsYpAfcoDTWHjlBVjia1CyvFauESQ4pc81nKaq6snClg=="; }; dependencies = [ - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -3959,7 +4616,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-1.13.1" - sources."binwrap-0.2.1" + sources."binwrap-0.2.2" sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -4073,7 +4730,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-2.0.0" @@ -4123,7 +4780,7 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.3.5" // { + (sources."minipass-2.4.0" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -4137,7 +4794,7 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."mustache-2.3.2" + sources."mustache-3.0.3" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" @@ -4167,7 +4824,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.2.0" + sources."psl-1.3.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -4181,7 +4838,7 @@ in sources."request-promise-core-1.1.2" sources."resolve-url-0.2.1" sources."ret-0.1.15" - (sources."rimraf-2.6.3" // { + (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.4" ]; @@ -4297,7 +4954,7 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -4317,14 +4974,14 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.0.tgz"; - sha512 = "oKptkeUX0MBbYJ2Yn5CwaT502O8hwJHubNbeO7redshHnoaLzVvCK3TCS9+Vx1mXW8/GuJ6bfM+PDXXPPX8MNA=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.1.tgz"; + sha512 = "YlkOLWIDnlgkKG8gnxQkKKJHkkx4MqyIXqjmYqvGPwatrPmLo46BJ2drOPHNIh43T7mh7c1K8vxrzV4seQtFUA=="; }; dependencies = [ - sources."ajv-6.10.1" - sources."ansi-regex-3.0.0" + sources."ajv-6.10.2" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -4352,7 +5009,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-1.13.1" - sources."binwrap-0.2.1" + sources."binwrap-0.2.2" sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -4363,7 +5020,7 @@ in }) sources."buffers-0.1.1" sources."cache-base-1.0.1" - sources."camelcase-4.1.0" + sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -4390,8 +5047,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cliui-4.1.0" - sources."code-point-at-1.1.0" + sources."cliui-5.0.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -4417,12 +5073,8 @@ in ]; }) sources."elmi-to-json-0.19.1" + sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - (sources."execa-0.7.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - ]; - }) (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -4466,7 +5118,7 @@ in ]; }) sources."find-parent-dir-0.3.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."firstline-1.2.1" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -4480,8 +5132,7 @@ in sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" - sources."get-caller-file-1.0.3" - sources."get-stream-3.0.0" + sources."get-caller-file-2.0.5" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.1" @@ -4490,7 +5141,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -4503,7 +5154,6 @@ in sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."invert-kv-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -4511,7 +5161,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ @@ -4519,7 +5169,6 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -4534,20 +5183,17 @@ in sources."jsprim-1.4.1" sources."kind-of-6.0.2" sources."klaw-1.3.1" - sources."lcid-1.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.11" sources."lru-cache-4.1.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-1.1.0" sources."micromatch-3.1.10" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.3.5" // { + (sources."minipass-2.4.0" // { dependencies = [ sources."yallist-3.0.3" ]; @@ -4561,13 +5207,11 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."mustache-2.3.2" + sources."mustache-3.0.3" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { dependencies = [ @@ -4585,22 +5229,19 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.2.0" + sources."psl-1.3.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -4613,10 +5254,10 @@ in sources."request-promise-4.2.4" sources."request-promise-core-1.1.2" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" - (sources."rimraf-2.6.3" // { + (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.4" ]; @@ -4631,9 +5272,6 @@ in sources."is-extendable-0.1.1" ]; }) - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -4687,14 +5325,9 @@ in ]; }) sources."stealthy-require-1.1.1" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."string-width-3.1.0" sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" + sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" (sources."tar-4.4.10" // { dependencies = [ @@ -4744,23 +5377,17 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."which-1.3.1" sources."which-module-2.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."xmlbuilder-8.2.2" - sources."y18n-3.2.1" + sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-10.1.2" - sources."yargs-parser-8.1.0" + sources."yargs-13.3.0" + sources."yargs-parser-13.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -4774,15 +5401,14 @@ in elm-doc-preview = nodeEnv.buildNodePackage { name = "elm-doc-preview"; packageName = "elm-doc-preview"; - version = "2.0.4"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-2.0.4.tgz"; - sha512 = "F6LlYWNs7BVQ9vLRHI6P/FDVf4hpNJPjHuL0sxGwC4KDcPEnjIwOC6jWxiUEC3226aYf/uY60qDDqzFNHgcPQg=="; + url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-3.0.1.tgz"; + sha512 = "NpAgEKNiYkQE932gMjFGC/BpcmUD9ohhrbSnGSoQBsC+VPRKCiGdmLJUiql/aPC2eXYIlWQJ5YJ5rFWI0iovbw=="; }; dependencies = [ sources."@cnakazawa/watch-1.0.3" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@sindresorhus/is-0.7.0" sources."accepts-1.3.7" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" @@ -4792,7 +5418,7 @@ in sources."array-flatten-1.1.1" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -4800,6 +5426,7 @@ in sources."define-property-1.0.0" ]; }) + sources."batch-0.6.1" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -4810,10 +5437,9 @@ in sources."bser-2.1.0" sources."bytes-3.1.0" sources."cache-base-1.0.1" - (sources."cacheable-request-6.1.0" // { + (sources."cacheable-request-2.1.4" // { dependencies = [ - sources."get-stream-5.1.0" - sources."lowercase-keys-2.0.0" + sources."lowercase-keys-1.0.0" ]; }) sources."capture-exit-2.0.0" @@ -4839,7 +5465,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.20.0" + sources."commander-3.0.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" @@ -4847,12 +5473,14 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" + sources."core-js-3.2.1" + sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."defer-to-connect-1.0.2" + sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -4860,11 +5488,17 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."exec-sh-0.3.2" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -4911,28 +5545,37 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" + sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."get-stream-4.1.0" + sources."function-bind-1.1.1" + sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.4" - sources."got-9.6.0" + sources."got-8.3.2" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.0" + sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."http-cache-semantics-4.0.3" + sources."http-cache-semantics-3.8.1" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" + sources."into-stream-3.1.0" sources."ipaddr.js-1.9.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" (sources."is-number-3.0.0" // { @@ -4940,16 +5583,23 @@ in sources."kind-of-3.2.2" ]; }) + sources."is-object-1.0.1" + sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" + sources."is-regex-1.0.4" + sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" + sources."isurl-1.0.0" sources."json-buffer-3.0.0" - sources."keyv-3.1.0" + sources."keyv-3.0.0" sources."kind-of-6.0.2" - sources."latest-version-5.1.0" + sources."latest-version-4.0.0" sources."lowercase-keys-1.0.1" sources."makeerror-1.0.11" sources."map-cache-0.2.2" @@ -4975,8 +5625,10 @@ in sources."nice-try-1.0.5" sources."node-int64-0.4.0" sources."normalize-path-2.1.1" - sources."normalize-url-4.3.0" + sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" + sources."npx-10.2.0" + sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -4990,51 +5642,62 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."p-cancelable-1.1.0" + sources."opn-5.5.0" + sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" - (sources."package-json-6.4.0" // { - dependencies = [ - sources."semver-6.2.0" - ]; - }) + sources."p-is-promise-1.1.0" + sources."p-timeout-2.0.1" + sources."package-json-5.0.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-to-regexp-0.1.7" + sources."pify-3.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" sources."pump-3.0.0" sources."qs-6.7.0" + sources."query-string-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" + sources."readable-stream-2.3.6" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" - sources."registry-url-5.1.0" + sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."ret-0.1.15" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."rsvp-4.8.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sane-4.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" ]; }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" + ]; + }) sources."serve-static-1.14.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -5073,6 +5736,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."sort-keys-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -5095,9 +5759,12 @@ in ]; }) sources."statuses-1.5.0" + sources."strict-uri-encode-1.1.0" + sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" + sources."timed-out-4.0.1" sources."tmp-0.1.0" sources."tmpl-1.0.4" (sources."to-object-path-0.3.0" // { @@ -5105,7 +5772,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" @@ -5124,39 +5790,114 @@ in }) sources."urix-0.1.0" sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."walker-1.0.7" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.1.0" + sources."ws-6.2.1" ]; buildInputs = globalBuildInputs; meta = { description = "Elm offline documentation previewer with hot reloading."; homepage = "https://github.com/dmy/elm-doc-preview#readme"; - license = "SEE LICENSE IN LICENSE.md"; + license = "BSD-3-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; - elm-analyse = nodeEnv.buildNodePackage { + elm-upgrade = nodeEnv.buildNodePackage { + name = "elm-upgrade"; + packageName = "elm-upgrade"; + version = "0.19.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.6.tgz"; + sha512 = "i7+z/6uAqKxOUD58nwyAJJGUCNKG7/wTBY1qBanveFSaQuX5vrfhQNH/3NWIGCufGoW3QEyADGhaLhAxNPVs5Q=="; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."bindings-1.5.0" + sources."brace-expansion-1.1.11" + sources."capture-stack-trace-1.0.1" + sources."caw-2.0.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.12" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."file-uri-to-path-1.0.0" + sources."fs-extra-0.30.0" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."glob-7.1.4" + sources."got-6.7.1" + sources."graceful-fs-4.2.2" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-object-1.0.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."isurl-1.0.0" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."lowercase-keys-1.0.1" + sources."minimatch-3.0.4" + sources."nan-2.14.0" + sources."npm-conf-1.1.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pify-3.0.0" + sources."prepend-http-1.0.4" + sources."proto-list-1.2.4" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" + sources."safename-1.0.2" + sources."semver-5.7.1" + sources."syncprompt-2.0.0" + sources."timed-out-4.0.1" + sources."tunnel-agent-0.6.0" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."yn-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Upgrade Elm projects"; + homepage = "https://github.com/avh4/elm-upgrade#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "elm-analyse-0.16.3" = nodeEnv.buildNodePackage { name = "elm-analyse"; packageName = "elm-analyse"; - version = "0.16.4"; + version = "0.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.4.tgz"; - sha512 = "6F6JfcOfbRgTBJj7MF+CqGcatCep8ppZtfIAri+fpC76MsSohJAOfLgmbmd4BWOXcTiWCpvQaaFwUutm7cOlpA=="; + url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.3.tgz"; + sha512 = "JFlGT0d6v3EPk1UnB5xb6VYWrKzwGD76wBwr2R0xwA3T6Rju7zEnzfs8LiBo+b3gSH5cmRDfnK9BLRFiosWEfQ=="; }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.10.1" + sources."ajv-6.10.2" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -5201,7 +5942,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.6.3" @@ -5242,7 +5983,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.5" - sources."psl-1.2.0" + sources."psl-1.3.0" sources."punycode-2.1.1" sources."qs-6.5.1" sources."range-parser-1.2.1" @@ -5287,7 +6028,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" (sources."ws-3.3.1" // { @@ -5306,76 +6047,179 @@ in bypassCache = true; reconstructLock = true; }; - elm-upgrade = nodeEnv.buildNodePackage { - name = "elm-upgrade"; - packageName = "elm-upgrade"; - version = "0.19.6"; + elm-live = nodeEnv.buildNodePackage { + name = "elm-live"; + packageName = "elm-live"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.6.tgz"; - sha512 = "i7+z/6uAqKxOUD58nwyAJJGUCNKG7/wTBY1qBanveFSaQuX5vrfhQNH/3NWIGCufGoW3QEyADGhaLhAxNPVs5Q=="; + url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz"; + sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw=="; }; dependencies = [ - sources."balanced-match-1.0.0" - sources."bindings-1.5.0" - sources."brace-expansion-1.1.11" - sources."capture-stack-trace-1.0.1" - sources."caw-2.0.1" - sources."concat-map-0.0.1" - sources."config-chain-1.1.12" - sources."create-error-class-3.0.2" - sources."duplexer3-0.1.4" - sources."file-uri-to-path-1.0.0" - sources."fs-extra-0.30.0" - sources."fs.realpath-1.0.0" - sources."get-proxy-2.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-3.0.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" + sources."chalk-1.1.3" + sources."charenc-0.0.2" + sources."chokidar-3.0.0" + sources."cli-color-1.2.0" + sources."commander-2.17.1" + sources."connect-pushstate-1.1.0" + sources."cross-spawn-5.0.1" + sources."crypt-0.0.2" + sources."d-1.0.1" + sources."debug-2.6.9" + sources."default-gateway-2.7.2" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ee-first-1.1.1" + (sources."elm-serve-0.4.0" // { + dependencies = [ + sources."commander-2.9.0" + ]; + }) + sources."encodeurl-1.0.2" + sources."es5-ext-0.10.50" + sources."es6-iterator-2.0.3" + sources."es6-promisify-6.0.2" + sources."es6-symbol-3.1.1" + sources."es6-weak-map-2.0.3" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."eventemitter3-3.1.2" + (sources."execa-0.10.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + ]; + }) + sources."fill-range-7.0.1" + sources."finalhandler-1.1.1" + (sources."follow-redirects-1.8.1" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."fresh-0.5.2" + sources."fsevents-2.0.7" sources."get-stream-3.0.0" - sources."glob-7.1.4" - sources."got-6.7.1" - sources."graceful-fs-4.2.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.5" - sources."is-object-1.0.1" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."glob-parent-5.0.0" + sources."graceful-readlink-1.0.1" + sources."has-ansi-2.0.0" + sources."http-errors-1.6.3" + sources."http-proxy-1.17.0" + sources."inherits-2.0.3" + sources."internal-ip-3.0.1" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-binary-path-2.1.0" + sources."is-buffer-1.1.6" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-promise-2.1.0" sources."is-stream-1.1.0" + sources."is-wsl-1.1.0" sources."isexe-2.0.0" - sources."isurl-1.0.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."lowercase-keys-1.0.1" - sources."minimatch-3.0.4" - sources."nan-2.14.0" - sources."npm-conf-1.1.3" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pify-3.0.0" - sources."prepend-http-1.0.4" - sources."proto-list-1.2.4" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" - sources."safename-1.0.2" - sources."semver-5.7.0" - sources."syncprompt-2.0.0" - sources."timed-out-4.0.1" - sources."tunnel-agent-0.6.0" - sources."unzip-response-2.0.1" - sources."url-parse-lax-1.0.0" - sources."url-to-options-1.0.1" + sources."lru-cache-4.1.5" + sources."lru-queue-0.1.0" + sources."md5-2.2.1" + sources."memoizee-0.4.14" + sources."mime-1.4.1" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."next-tick-1.0.0" + sources."nice-try-1.0.5" + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."on-finished-2.3.0" + sources."opn-5.3.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."parseurl-1.3.3" + sources."path-key-2.0.1" + sources."pem-1.13.2" + sources."picomatch-2.0.7" + sources."pseudomap-1.0.2" + sources."querystringify-2.1.1" + sources."range-parser-1.2.1" + sources."readdirp-3.1.2" + sources."requires-port-1.0.0" + sources."semver-5.7.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."statuses-1.4.0" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."supervisor-0.12.0" + sources."supports-color-2.0.0" + sources."timers-ext-0.1.7" + sources."to-regex-range-5.0.1" + sources."type-1.0.3" + sources."unpipe-1.0.0" + sources."url-parse-1.4.3" sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."yn-2.0.0" + sources."ws-5.2.0" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Upgrade Elm projects"; - homepage = "https://github.com/avh4/elm-upgrade#readme"; + description = "A flexible dev server for Elm. Live reload included!"; + homepage = "https://github.com/wking-io/elm-live#readme"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; + elm-xref = nodeEnv.buildNodePackage { + name = "elm-xref"; + packageName = "elm-xref"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.0.0.tgz"; + sha512 = "9AjXLkznJBVLHHO+KErcgFMKeXe3tcudjj3PYIH6gWXG6W3PT+HF+t2zCflvgFPlhJO5H/wQCCo4rfCApltBzg=="; + }; + dependencies = [ + sources."bluebird-3.5.5" + sources."core-util-is-1.0.2" + sources."fs-extra-6.0.1" + sources."graceful-fs-4.2.2" + sources."inherits-2.0.4" + sources."isarray-1.0.0" + sources."jsonfile-4.0.0" + sources."klaw-2.1.1" + sources."minimist-1.2.0" + sources."process-nextick-args-2.0.1" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."semver-regex-1.0.0" + sources."semver-sort-0.0.4" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + sources."universalify-0.1.2" + sources."util-deprecate-1.0.2" + sources."xtend-4.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Cross referencing tool for Elm - find usages and unused code"; + homepage = "https://github.com/zwilias/elm-xref#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } \ No newline at end of file diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index 1128fbe64ec..cb960227beb 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = src.rev; - name = "eql-git-${version}"; + pname = "eql-git"; src = fetchgit { rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; url = "https://gitlab.com/eql/eql.git"; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 405aa8aa3ca..ef445faec92 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -4,7 +4,7 @@ mesa, xorg, openssl, unzip }: stdenv.mkDerivation rec { - name = "factor-lang-${version}"; + pname = "factor-lang"; version = "0.98"; rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix index 47b90469234..4b20c4051a8 100644 --- a/pkgs/development/compilers/fasm/default.nix +++ b/pkgs/development/compilers/fasm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (fasm-bin) version src meta; - name = "fasm-${version}"; + pname = "fasm"; nativeBuildInputs = [ fasm-bin ]; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index b516019ffc9..a2b73f61c27 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { version = "3.0.0"; - name = "fpc-${version}"; + pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 3fe72e6b505..1b3f4d168ee 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -3,7 +3,7 @@ , libXi, xorgproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "lazarus-${version}"; + pname = "lazarus"; version = "1.8.4"; src = fetchurl { diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 2de487cc9c8..bcb95d9ca90 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { - name = "fsharp-${version}"; + pname = "fsharp"; version = "4.0.1.1"; src = fetchurl { diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index e0094c73098..e497deb2e87 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -1,14 +1,14 @@ # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }: +{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { - name = "fsharp-${version}"; - version = "4.1.7"; + pname = "fsharp"; + version = "4.1.34"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; + sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { automake which mono + msbuild dotnetbuildhelpers dotnetPackages.FsCheck262 dotnetPackages.FSharpCompilerTools - dotnetPackages.FSharpCore + dotnetPackages.FSharpCore302 + dotnetPackages.FSharpCore3125 + dotnetPackages.FSharpCore4001 + dotnetPackages.FSharpCore4117 dotnetPackages.FSharpData225 - dotnetPackages.FsLexYacc704 + dotnetPackages.FsLexYacc706 dotnetPackages.MicrosoftDiaSymReader dotnetPackages.MicrosoftDiaSymReaderPortablePdb dotnetPackages.NUnit350 @@ -31,6 +35,14 @@ stdenv.mkDerivation rec { dotnetPackages.SystemValueTuple ]; + # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches + # https://github.com/mono/mono/issues/7805 + patches = [ + ./fsharp-IsPathRooted-type-inference.patch + ./fsharp-string-switchName.patch + ./fsharp-path-overloads.patch + ]; + configurePhase = '' substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" ./autogen.sh --prefix $out @@ -47,24 +59,30 @@ stdenv.mkDerivation rec { mkdir packages ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 - ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4 - ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27 + ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2 + ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5 + ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17 ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 - ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4 + ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6 ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 - ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0 + ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1 ''; - # Make sure the executables use the right mono binary, - # and set up some symlinks for backwards compatibility. + # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key + # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path + # "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied. + preInstall = '' + find Release/ -name FSharp.Core.dll -exec chmod u+w {} \; + ''; + + # Set up some symlinks for backwards compatibility. postInstall = '' - substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " ln -s $out/bin/fsharpc $out/bin/fsc ln -s $out/bin/fsharpi $out/bin/fsi for dll in "$out/lib/mono/fsharp"/FSharp*.dll @@ -73,6 +91,26 @@ stdenv.mkDerivation rec { done ''; + doInstallCheck = true; + installCheckPhase = '' + echo 'printf "int = %i" (6 * 7);;' > script.fsx + $out/bin/fsi --exec script.fsx | grep "int = 42" + $out/bin/fsharpi --exec script.fsx | grep "int = 42" + $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42" + + cat > answer.fs <<EOF +open System + +[<EntryPoint>] +let main argv = + printfn "int = %i" (6 * 7) + 0 +EOF + + $out/bin/fsc answer.fs + ${mono}/bin/mono answer.exe | grep "int = 42" + ''; + # To fix this error when running: # The file "/nix/store/path/whatever.exe" is an not a valid CIL image dontStrip = true; diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch new file mode 100644 index 00000000000..06dd3e82adc --- /dev/null +++ b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch @@ -0,0 +1,21 @@ +commit c37fce5b3019c7a150203fc3a484885591b194de +Author: Alexis Christoforides <alexis@thenull.net> +Date: Sun Dec 2 00:10:24 2018 -0500 + + Help Path.IsPathRooted method overload selection. + + .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload. + +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..699c7bb93 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -92,7 +92,7 @@ module Scripting = + + module Process = + +- let processExePath baseDir exe = ++ let processExePath baseDir (exe:string) = + if Path.IsPathRooted(exe) then exe + else + match Path.GetDirectoryName(exe) with diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch new file mode 100644 index 00000000000..f791317d080 --- /dev/null +++ b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch @@ -0,0 +1,22 @@ +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..ae8a6d3cc 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -59,12 +59,12 @@ module Scripting = + + let (++) a b = Path.Combine(a,b) + +- let getBasename a = Path.GetFileNameWithoutExtension a +- let getFullPath a = Path.GetFullPath a +- let getFilename a = Path.GetFileName a +- let getDirectoryName a = Path.GetDirectoryName a ++ let getBasename (path: string) = Path.GetFileNameWithoutExtension path ++ let getFullPath (path: string) = Path.GetFullPath path ++ let getFilename (path: string) = Path.GetFileName path ++ let getDirectoryName (path: string) = Path.GetDirectoryName path + +- let copyFile source dir = ++ let copyFile (source: string) dir = + let dest = + if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore + let result = Path.Combine(dir, Path.GetFileName source) diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch new file mode 100644 index 00000000000..4b36eaabcaf --- /dev/null +++ b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch @@ -0,0 +1,13 @@ +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..5a7be7d2b 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -36,7 +36,7 @@ module Scripting = + #if INTERACTIVE + let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray + +- let getCmdLineArgOptional switchName = ++ let getCmdLineArgOptional (switchName: string) = + argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead + + let getCmdLineArg switchName defaultValue = diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 94836e84fd6..9306eec817f 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "fstar-${version}"; + pname = "fstar"; version = "0.9.6.0"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 65cd67f527d..eca2cba7775 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, ... }: stdenv.mkDerivation rec { - name = "gambit-bootstrap-${version}"; + pname = "gambit-bootstrap"; version = "4.9.3"; src = fetchurl { diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 65d16c48a61..7a3324d7560 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,7 +1,8 @@ { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }: stdenv.mkDerivation rec { - name = "gambit-${version}"; + pname = "gambit"; + inherit version; inherit src; bootstrap = import ./bootstrap.nix ( pkgs ); diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 9e5a172eed8..940dec0338c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses5, python27 }: stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "6-2017-q2-update"; subdir = "6-2017q2"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 80e042b5c2e..90f9d5957bb 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "7-2018-q2-update"; subdir = "7-2018q2"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index ee57dcc8c14..b2815cc7184 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -3,20 +3,20 @@ with lib; stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; - version = "8-2018-q4-major"; - subdir = "8-2018q4"; + pname = "gcc-arm-embedded"; + version = "8-2019-q3-update"; + subdir = "8-2019q3/RC1.1"; src = if stdenv.isLinux then fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; + sha256="b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; } else if stdenv.isDarwin then fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb"; + sha256="fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; } else throw "unsupported platform"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 350eed2fedd..b86b35525a6 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -14,7 +14,8 @@ let else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update in stdenv.mkDerivation { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; + inherit version; src = fetchurl { url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 16450cf24ab..1c3df80645a 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -8,7 +8,7 @@ assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { - name = "gcl-${version}"; + pname = "gcl"; version = "2.6.13pre50"; src = fetchgit { diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 50d397d2cd4..e3c2d0e09de 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -8,12 +8,12 @@ assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { - name = "gcl-${version}"; + pname = "gcl"; version = "2.6.12"; src = fetchurl { sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f"; - url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz"; + url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz"; }; patches = [(fetchurl { diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b20d6f9c47e..9ef650c330f 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -7,7 +7,8 @@ # TODO: make static compilation work stdenv.mkDerivation rec { - name = "gerbil-${version}"; + pname = "gerbil"; + inherit version; inherit src; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 675522d54ea..e90e0dc3d98 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -4,7 +4,8 @@ let version = "0.7.3"; in stdenv.mkDerivation { - name = "gforth-${version}"; + pname = "gforth"; + inherit version; src = fetchurl { url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 423eaf02d8c..95bbab3cb3e 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation (rec { - version = "8.8.0.20190721"; + version = "8.8.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/8.8.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1ih76zpxk8ay84xjyaflqc754002y8pdaainqfvb4cnhy6lpb1br"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "06kj4fhvijinjafiy4s873n60qly323rdlz9bmc79nhlp3cq72lh"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 3c46dfc107b..161e57b5479 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }: +{ stdenv, fetchFromGitHub +, bison +, cmake +, jq +, python3 +, spirv-headers +, spirv-tools +}: + stdenv.mkDerivation rec { - name = "glslang-${version}"; - version = "7.11.3113"; + pname = "glslang"; + version = "7.11.3214"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "${version}"; - sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6"; + rev = version; + sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins"; + }; + + # These get set at all-packages, keep onto them for child drvs + passthru = { + inherit spirv-tools spirv-headers; }; - nativeBuildInputs = [ cmake python bison jq ]; + nativeBuildInputs = [ cmake python3 bison jq ]; enableParallelBuilding = true; postPatch = '' @@ -18,6 +31,7 @@ stdenv.mkDerivation rec { ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers ''; + # Ensure spirv-headers and spirv-tools match exactly to what is expected preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index ae27964ae8f..df5202cb1c2 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -6,7 +6,7 @@ let lib = stdenv.lib; in stdenv.mkDerivation rec { - name = "gnu-cobol-${version}"; + pname = "gnu-cobol"; inherit version; src = fetchurl { diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 41c325c2b1a..1035091654a 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library. in stdenv.mkDerivation rec { version = "3.2.5"; - name = "gnu-smalltalk-${version}"; + pname = "gnu-smalltalk"; src = fetchurl { url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 69507685f29..e051d41993c 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-jsonnet-${version}"; + pname = "go-jsonnet"; version = "0.13.0"; goPackagePath = "github.com/google/go-jsonnet"; diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 39de36293c8..3b924f58bfe 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; + pname = "go"; version = "1.10.8"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 95312f9e1ea..97c243439e8 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; + pname = "go"; version = "1.4-bootstrap-20161024"; revision = "79d85a4965ea7c46db483314c3981751909d7883"; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index be03e1aeeed..61e3b6c16ae 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -214,7 +214,7 @@ in rec { jvmci8 = stdenv.mkDerivation rec { version = "19.2-b01"; - name = "jvmci-${version}"; + pname = "jvmci"; src = fetchFromGitHub { owner = "graalvm"; repo = "graal-jvmci-8"; @@ -280,7 +280,7 @@ in rec { graalvm8 = stdenv.mkDerivation rec { inherit version; - name = "graal-${version}"; + pname = "graal"; src = fetchFromGitHub { owner = "oracle"; repo = "graal"; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 0a974fccc88..7e11c75e07d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, prePatch }: stdenv.mkDerivation rec { - name = "haxe-${version}"; + pname = "haxe"; + inherit version; buildInputs = [ocaml zlib pcre neko camlp4]; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 010dacd0c71..24e88f9ee2e 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "hhvm-${version}"; + pname = "hhvm"; version = "3.23.2"; # use git version since we need submodules diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index dfe1c2425d5..bd28f0d6282 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "iasl-${version}"; + pname = "iasl"; version = "20190108"; src = fetchurl { diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index a6955c03051..2a6551aad18 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -2,7 +2,8 @@ let version = "6M62"; in stdenv.mkDerivation { - name = "inform7-${version}"; + pname = "inform7"; + inherit version; buildInputs = [ perl coreutils gnutar gzip ]; src = fetchzip { url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index f601dc254a4..6640c4aa89a 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "intercal-${version}"; + pname = "intercal"; version = "0.30"; src = fetchurl { - url = "http://catb.org/esr/intercal/${name}.tar.gz"; + url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz"; sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk"; }; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 1cbe95232eb..f240deda0bf 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit testedTargets; - name = "ispc-${version}"; + pname = "ispc"; src = fetchFromGitHub { owner = "ispc"; diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index 06f321bc39c..f49d3d6e210 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "javacard-devkit"; version = "2.2.2"; uscoreVersion = builtins.replaceStrings ["."] ["_"] version; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index d407fb46b9b..1349b7f0ddd 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -8,7 +8,6 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; version = "164"; - name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 7bbad0e1201..460ff405b94 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jsonnet-${version}"; + pname = "jsonnet"; version = "0.13.0"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index d8d521952bd..c0414c6259f 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -77,10 +77,9 @@ in stdenv.mkDerivation rec { pname = "julia"; inherit version; - name = "${pname}-${version}"; src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = src_sha256; }; prePatch = '' diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index 9800b33e7a9..b2db09e1c18 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jwasm-${version}"; + pname = "jwasm"; version = "git-2017-11-22"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 32659d5be56..754ab020d51 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -4,7 +4,7 @@ let version = "1.3.41"; in stdenv.mkDerivation rec { inherit version; - name = "kotlin-${version}"; + pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index e4ef37e4721..787a9352e22 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "ldc-${version}"; + pname = "ldc"; + inherit version; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 132cd67a4ae..9a602c62777 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -2,7 +2,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index d54ffd96382..e327fa79c6f 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,7 +1,8 @@ {stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { - name = "dragonegg-${version}"; + pname = "dragonegg"; + inherit version; src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw"; @@ -11,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; installPhase = '' - mkdir -p $out/lib $out/share/doc/${name} + mkdir -p $out/lib $out/share/doc/${pname}-${version} cp -d dragonegg.so $out/lib - cp README COPYING $out/share/doc/${name} + cp README COPYING $out/share/doc/${pname}-${version} ''; meta = { diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 6edd5e9798c..4f766e5f9a5 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -3,7 +3,8 @@ let version = "3.5.2"; in stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index 268f2702a23..d295ddbf8a4 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -8,7 +8,8 @@ let sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j"; }; in stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index 4a398bd96a0..8fe4dd6f1d5 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89"; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index a5161333b28..b4823e9d8c2 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 6eec9971778..95632a45999 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -18,7 +18,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index bacf4d30556..06bc7490c7b 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, isl, python, gmp, llvm, version }: stdenv.mkDerivation { - name = "polly-${version}"; + pname = "polly"; + inherit version; src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx"; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e2cf437e19e..3d09277ad4c 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index bd2cc19d2e0..af65fd6388e 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5"; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dffb207a32b..f799199d449 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 52f27de8cdb..1a7c9aeead8 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy"; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index c8d819cc963..4dde3be277a 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 2b543b9d793..74e9b8719d1 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 735c5e9e743..8e36c5ad53a 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index cf6de26a9e8..3ab56677d72 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 325149fc19b..8adf11abddd 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index a8a6b3dfea8..a69fe286ecc 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 19833e4d3d4..9660be4df11 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,7 +1,7 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b182f1250e7..e3015ae8448 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 227ecbeda19..1b891af09ed 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bf23f80ef10..bfee91d91bf 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index 5e670d4de15..cce44c7e50f 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 901015bf2ff..559377bcc1b 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index be18a315f12..da2a5cfb58a 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,7 +1,7 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 3a165e9da7b..906baa4ae64 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index df9c784a10f..ac1f4f653e6 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 1e68276945e..58b9b8060fa 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 9571e7ab5a6..d3db8082c96 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 908a5f1218f..447904b9ad5 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 989529ff8cc..e9cc6dfc1db 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index e2ec4e274f4..fc9e3714db0 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4"; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 2fe6f1c58f6..b5e6e0e7048 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 63ad43e62cd..823e9640cf4 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 1b2dff2c76c..44687ead4d1 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -16,7 +16,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index e55f4aa5ba1..7adc2aa588e 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 5959b99316d..1f216178b55 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index f8a07de0722..e0bc9e816f5 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz"; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 1ee6d069f4b..58a1241d823 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 75edd1fff54..646cd3c3ca4 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,7 +1,8 @@ { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { - name = "libunwind-${version}"; + pname = "libunwind"; + inherit version; src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index aec1b14b994..fc52d691d03 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index f31da000bb8..254933c82a0 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8"; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 8cf55173561..166e7f68eb3 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y"; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index efbf8561b7f..1c0bdf47987 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -3,7 +3,7 @@ let rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; in stdenv.mkDerivation rec { - name = "manticore-${version}"; + pname = "manticore"; version = "2018.09.29"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index b7fc3e4dd77..0327e0dc215 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -2,7 +2,7 @@ , readline }: stdenv.mkDerivation rec { - name = "mercury-${version}"; + pname = "mercury"; version = "14.01.1"; src = fetchurl { diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index f15a7624327..a18202b9f88 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, vim, makeWrapper }: stdenv.mkDerivation rec { - name = "microscheme-${version}"; + pname = "microscheme"; version = "0.9.3"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; }; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 1c8e9fb7eb2..5f72bd3649b 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,40 +1,7 @@ -# Updating the dependencies for this package: -# -# wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock -# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' -# -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: -let - crystalPackages = lib.mapAttrs (name: src: - stdenv.mkDerivation { - name = lib.replaceStrings ["/"] ["-"] name; - src = fetchFromGitHub src; - phases = "installPhase"; - installPhase = ''cp -r $src $out''; - passthru = { libName = name; }; - } - ) (import ./shards.nix); - - crystalLib = stdenv.mkDerivation { - name = "crystal-lib"; - src = lib.attrValues crystalPackages; - libNames = lib.mapAttrsToList (k: v: [k v]) crystalPackages; - phases = "buildPhase"; - buildPhase = '' - mkdir -p $out - linkup () { - while [ "$#" -gt 0 ]; do - ln -s $2 $out/$1 - shift; shift - done - } - linkup $libNames - ''; - }; -in -stdenv.mkDerivation rec { +{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: +crystal.buildCrystalPackage rec { version = "0.5.0"; - name = "mint-${version}"; + pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; @@ -42,23 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; - nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; - - buildPhase = '' - mkdir -p $out/bin tmp - cd tmp - ln -s ${crystalLib} lib - cp -r $src/* . - crystal build src/mint.cr -o $out/bin/mint --verbose --progress --release --no-debug - ''; + buildInputs = [ openssl_1_0_2 ]; - installPhase = ''true''; + # Update with + # nix-shell -p crystal2nix --run crystal2nix + # with mint's shard.lock file in the current directory + shardsFile = ./shards.nix; + crystalBinaries.mint.src = "src/mint.cr"; meta = { description = "A refreshing language for the front-end web"; homepage = https://mint-lang.com/; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ manveru ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 72626ec0014..405846343cf 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: with stdenv.lib; stdenv.mkDerivation rec { - name = "mkcl-${version}"; + pname = "mkcl"; version = "1.1.11"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index f495be8a93e..207ed8f29bc 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -9,32 +9,33 @@ let in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; binSrc = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; srcs = [ binSrc codeSrc ]; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix index 0589733cb3c..2b4998f91c9 100644 --- a/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -3,15 +3,15 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; version = "20180207"; src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz"; sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; }) else diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index 3a3538a7ea4..2585b599caf 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; src = fetchgit { inherit url rev sha256; diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix new file mode 100644 index 00000000000..ec91d7e979c --- /dev/null +++ b/pkgs/development/compilers/mono/6.nix @@ -0,0 +1,9 @@ +{ callPackage, Foundation, libobjc }: + +callPackage ./generic.nix (rec { + inherit Foundation libobjc; + version = "6.0.0.313"; + srcArchiveSuffix = "tar.xz"; + sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9"; + enableParallelBuilding = true; +}) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 43ef5d4b62d..9a2f01b9f3d 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +, enableParallelBuilding ? true +, srcArchiveSuffix ? "tar.bz2" +}: let llvm = callPackage ./llvm.nix { }; in stdenv.mkDerivation rec { - name = "mono-${version}"; + pname = "mono"; + inherit version; src = fetchurl { inherit sha256; - url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}"; }; buildInputs = diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 616ec420d2d..193e45bf55e 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; version = "3.6-mono-2017-02-15"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index b22072651a4..19324593a30 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gmp, perl }: stdenv.mkDerivation rec { - name = "mosml-${version}"; + pname = "mosml"; version = "2.10.1"; buildInputs = [ gmp perl ]; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index ef6cd1160b3..2067184a5b0 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "mozart-binary-${version}"; + pname = "mozart-binary"; + inherit version; preferLocalBuild = true; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index bfb3c154a3c..8d92bc4eba2 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "nasm-${version}"; + pname = "nasm"; version = "2.14.02"; src = fetchFromRepoOrCz { repo = "nasm"; - rev = name; + rev = "${pname}-${version}"; sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index e2aa5736c7a..74ccaac388f 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "neko-${version}"; + pname = "neko"; version = "2.2.0"; src = fetchurl { diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index c1e01ef7782..357f26cf314 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchFromGitHub, cmake , boost, python3, eigen , icestorm, trellis +, llvmPackages , enableGui ? true , wrapQtAppsHook , qtbase +, OpenGL ? null }: let @@ -12,13 +14,13 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2019.08.21"; + version = "2019.08.31"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4"; - sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf"; + rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b"; + sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh"; }; nativeBuildInputs @@ -26,7 +28,8 @@ with stdenv; mkDerivation rec { ++ (lib.optional enableGui wrapQtAppsHook); buildInputs = [ boostPython python3 eigen ] - ++ (lib.optional enableGui qtbase); + ++ (lib.optional enableGui qtbase) + ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); enableParallelBuilding = true; cmakeFlags = @@ -39,7 +42,10 @@ with stdenv; mkDerivation rec { "-DSERIALIZE_CHIPDB=OFF" # use PyPy for icestorm if enabled "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" - ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + ] + ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF") + ++ (lib.optional (enableGui && stdenv.isDarwin) + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); # Fix the version number. This is a bit stupid (and fragile) in practice # but works ok. We should probably make this overrideable upstream. diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 6bd4af05da3..fa49bf9dd73 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { date = "April2012"; - name = "nvidia-cg-toolkit-${version}"; + pname = "nvidia-cg-toolkit"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 0d171a474a2..8fd6f33740e 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,6 +1,6 @@ { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { - name = "obliv-c-${version}"; + pname = "obliv-c"; version = "0.0pre20180624"; buildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index 4337de702e1..cd621c131ff 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.08.0"; builder = ./builder.sh; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.tar.gz"; + url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz"; sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx"; }; configureScript = ./configure-3.08.0; diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 99a65dec150..556aefd3704 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.10.0"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index e65510c172e..4be41490534 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.11.2"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; }; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 8636f670059..edb3acdbdb1 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.12.1"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; }; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 0a30ef1352c..2669e8224bf 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "4.00.1"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index a933151de12..fb507b9836a 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "ber-metaocaml-${version}"; + pname = "ber-metaocaml"; version = metaocamlPatch; src = fetchurl { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { postConfigure = '' tar -xvzf $metaocaml - cd ${name} + cd ${pname}-${version} make patch cd .. ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { make installopt mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml - cd ${name} + cd ${pname}-${version} make all ''; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; checkPhase = '' - cd ${name} + cd ${pname}-${version} make test make test-compile make test-native diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index e9adbeff490..881748c36ea 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { - name = "metaocaml-${version}"; + pname = "metaocaml"; version = "3.09-alpha-30"; src = fetchurl { diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 06ed7c51e9a..da1df6f30bb 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "opa"; version = "4310"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "MLstate"; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index 690707265b4..31e3800a6c9 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "openspin-${version}"; + pname = "openspin"; version = "unstable-2018-10-02"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index ccd149bbb40..80ea9eb4c0b 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -1,33 +1,31 @@ -{ stdenv, fetchFromGitHub, coreutils, which }: +{ stdenv, fetchFromGitLab, coreutils, which }: stdenv.mkDerivation rec { - name = "owl-lisp-${version}"; - version = "0.1.16"; + pname = "owl-lisp"; + version = "0.1.19"; - src = fetchFromGitHub { - owner = "aoh"; - repo = "owl-lisp"; + src = fetchFromGitLab { + owner = "owl-lisp"; + repo = "owl"; rev = "v${version}"; - sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj"; + sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx"; }; nativeBuildInputs = [ which ]; prePatch = '' - substituteInPlace Makefile --replace /usr $out - - for f in tests/run tests/exec.sh ; do - substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo - done + substituteInPlace Makefile \ + --replace /usr $out ''; # tests are run as part of the compilation process doCheck = false; meta = with stdenv.lib; { - description = "A functional lisp"; - homepage = https://github.com/aoh/owl-lisp; + description = "A functional Scheme for world domination"; + homepage = "https://gitlab.com/owl-lisp/owl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 7f22f4de624..370c08f001a 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "polyml-${version}"; + pname = "polyml"; + inherit version; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index b7feed84c37..eef972a2cc3 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { - name = "polyml-${version}"; + pname = "polyml"; version = "5.7.1"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 91a3bb45352..5ab13d5f761 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { - name = "polyml-${version}"; + pname = "polyml"; version = "5.8"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 2aab6a99a1c..6719293af2a 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation rec { - name = "pony-stable-${version}"; + pname = "pony-stable"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index eee4507d6ce..3856ced250e 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -5,7 +5,7 @@ # in a published version. stdenv.mkDerivation rec { - name = "rgbds-${version}"; + pname = "rgbds"; version = "0.3.8"; src = fetchFromGitHub { owner = "rednex"; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binary.nix index cb2fba96e18..acccc749686 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -60,6 +60,8 @@ rec { # are very hard to track down. For details, see # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 ''; + + setupHooks = ./setup-hook.sh; }; cargo = stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 973d17e1c7b..5cf48715dae 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.35.0"; + version = "1.36.0"; - # fetch hashes by running `print-hashes.sh 1.34.2` + # fetch hashes by running `print-hashes.sh 1.36.0` hashes = { - i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee"; - x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c"; - armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e"; - aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952"; - i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19"; - x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6"; + i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d"; + x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55"; + armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb"; + aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d"; + i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60"; + x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325"; }; platform = @@ -35,7 +35,7 @@ let sha256 = hashes."${platform}"; }; -in callPackage ./binaryBuild.nix +in callPackage ./binary.nix { inherit version src platform; versionType = "bootstrap"; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d7776958390..daf7af1babd 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python2, tzdata, ps -, llvm_7, darwin, git, cmake, rustPlatform +, llvmPackages_7, darwin, git, cmake, rustPlatform , which, libffi, gdb , withBundledLLVM ? false }: @@ -9,21 +9,31 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; }; + llvmPackages = llvmPackages_7; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; }; # For use at runtime - llvmShared = llvm_7.override { enableSharedLibraries = true; }; -in stdenv.mkDerivation rec { + llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; }; +in + +stdenv.mkDerivation rec { pname = "rustc"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"; + sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"; }; + # Provide the compiler-rt sources needed for profiling. + preConfigure = '' + mkdir src/llvm-project/compiler-rt + tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1 + ''; + __darwinAllowLocalNetworking = true; # rustc complains about modified source files otherwise @@ -38,7 +48,6 @@ in stdenv.mkDerivation rec { # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 stripDebugList = [ "bin" ]; - NIX_LDFLAGS = # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 056ad745460..0d2a10b6a99 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -43,7 +43,7 @@ let in assert builtins.hasAttr stdenv.hostPlatform.system options; stdenv.mkDerivation rec { - name = "sbcl-bootstrap-${version}"; + pname = "sbcl-bootstrap"; version = cfg.version; src = fetchurl { diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e2cc7adc26e..e3d9ee98635 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - name = "sbcl-${version}"; - version = "1.5.3"; + pname = "sbcl"; + version = "1.5.6"; src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj"; + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; + sha256 = "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index ab42eae31a6..5a01e295e49 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.14.0-RC1"; - name = "dotty-bare-${version}"; + pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 4fd46c35a0a..cdac400b1af 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sdcc-${version}"; + pname = "sdcc"; version = "3.9.0"; src = fetchurl { @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://sdcc.sourceforge.net/; license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index a6abe6791d7..efcaf56110d 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -3,7 +3,7 @@ bison, flex, libGLU, pythonPackages }: stdenv.mkDerivation rec { - name = "seexpr-${version}"; + pname = "seexpr"; version = "2.11"; src = fetchFromGitHub { owner = "wdas"; diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index e9c6b706e5a..c9b4f9639d0 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "serpent-${version}"; + pname = "serpent"; # I can't find any version numbers, so we're just using the date # of the last commit. diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 75717b5ba09..82cccc3befc 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -24,7 +24,7 @@ let sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2"; }; in stdenv.mkDerivation rec { - name = "shaderc-${version}"; + pname = "shaderc"; version = "2019.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 21cfd408298..e2103fb718f 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: stdenv.mkDerivation rec { - name = "smlnj-bootstrap-${version}"; + pname = "smlnj-bootstrap"; version = "110.91"; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index dce46ade459..89912ac9ad6 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -29,7 +29,8 @@ let { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; } ]; in stdenv.mkDerivation { - name = "smlnj-${version}"; + pname = "smlnj"; + inherit version; inherit sources; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index f3428393832..b0fdc886378 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation rec { - name = "solc-${version}"; + pname = "solc"; version = "0.5.11"; # upstream suggests avoid using archive generated by github diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 219d5307790..a39a6c4a2e4 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -9,7 +9,7 @@ let toolsPath = stdenv.lib.makeBinPath [ mcpp ]; in stdenv.mkDerivation rec { - name = "souffle-${version}"; + pname = "souffle"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 25ea47978fc..c8379fe9090 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -2,7 +2,7 @@ , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: stdenv.mkDerivation rec { - name = "squeak-${version}"; + pname = "squeak"; version = "4.10.2.2614"; src = fetchurl { diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index bf452d21d1d..9245e59553f 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -13,7 +13,8 @@ let ''; in stdenv.mkDerivation { - name = "swi-prolog-${version}"; + pname = "swi-prolog"; + inherit version; src = fetchgit { url = "https://github.com/SWI-Prolog/swipl-devel"; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index b1f9ee799e5..dea6df1b7aa 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "terra-git-${version}"; + pname = "terra-git"; version = "1.0.0-beta1"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 04efe1a9134..41cc9b38606 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "teyjus-${version}"; + pname = "teyjus"; + inherit version; src = fetchurl { url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz"; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index a5c3db65857..338ba931249 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "tcc-${version}"; + pname = "tcc"; version = "0.9.27"; src = fetchFromRepoOrCz { diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 2300d63015b..01d4972a55d 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "urweb-${version}"; + pname = "urweb"; version = "20190217"; src = fetchurl { - url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s"; }; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 353963007d4..15ed7f8bd29 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -119,8 +119,8 @@ in rec { }; vala_0_40 = generic { - version = "0.40.15"; - sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19"; + version = "0.40.16"; + sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; }; vala_0_42 = generic { @@ -129,8 +129,8 @@ in rec { }; vala_0_44 = generic { - version = "0.44.5"; - sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv"; + version = "0.44.6"; + sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb"; }; vala = vala_0_44; diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index 8cb1e8e5f2c..3196592da48 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: stdenv.mkDerivation rec { - name = "wcc-unstable-${version}"; + pname = "wcc-unstable"; version = "2018-04-05"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 88666148da3..3d955c4394b 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "X11basic"; version = "1.26"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "kollokollo"; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 3ad0bc25787..1cc96455be7 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.3.3"; - name = "yap-${version}"; + pname = "yap"; src = fetchurl { - url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; + url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz"; sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; }; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 467d4e3b49e..1535c7a7de6 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { pname = "yosys"; - version = "2019.08.21"; + version = "2019.09.01"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4"; - sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw"; + rev = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0"; + sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs"; name = "yosys"; }) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index cc42ee1dd3f..f0e0693d12c 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; - name = "zulu-${version}"; + pname = "zulu"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index a43992164d2..d4c4c1f0ac3 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; - name = "zulu-${version}"; + pname = "zulu"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index f03e6e42739..d1e7ac882d7 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -7,10 +7,11 @@ , meta ? {}, ... } @ args: pkgs.stdenv.mkDerivation ( - args // + args // { - name = "emscripten-${args.name}"; + pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}"; + version = args.version or (builtins.parseDrvName args.name).version; buildInputs = [ emscripten python ] ++ buildInputs; nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 592e6ad8999..8377dad690f 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { - name = "guile-cairo-${version}"; + pname = "guile-cairo"; version = "1.10.0"; src = fetchurl { - url = "mirror://savannah/guile-cairo/${name}.tar.gz"; + url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; }; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 26fffac0a13..80ce29799a8 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -5,12 +5,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "guile-gnome-platform"; version = "2.16.4"; src = fetchurl { - url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz"; + url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; }; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 35bcd7bfc2f..6ffcc153ec4 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "guile-reader-${version}"; + pname = "guile-reader"; version = "0.6.2"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz"; + url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"; }; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a606b3ecf28..41bfb2ef62a 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "guile-sdl"; version = "0.5.2"; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d920baa0daf..7b173da2a91 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -32,9 +32,6 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # Use the latest version of the Cabal library. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_1_0; }); - # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; @@ -80,6 +77,13 @@ self: super: { hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; + # compatibility with servant-0.16.2. Remove with the next release + cachix = appendPatch super.cachix (pkgs.fetchpatch { + url = "https://github.com/cachix/cachix/commit/051679a99cd56e2497c0f05310035b6649129a13.patch"; + sha256 = "198n5byp9mfiymgzpvyd42l6vqy6hfy9kdi7svfx7mcwsy7sg7kp"; + stripLen = 1; + }); + # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; @@ -988,26 +992,19 @@ self: super: { ''; }); - # https://github.com/haskell-rewriting/term-rewriting/issues/11 - term-rewriting = dontCheck (doJailbreak super.term-rewriting); + # https://github.com/haskell-rewriting/term-rewriting/pull/15 + # remove on next hackage update + term-rewriting = doJailbreak super.term-rewriting; - # https://github.com/nick8325/twee/pull/1 - twee-lib = dontHaddock super.twee-lib; - - # Needs older hlint - hpio = dontCheck super.hpio; - - # https://github.com/fpco/inline-c/issues/72 - inline-c = dontCheck super.inline-c; - - # https://github.com/GaloisInc/pure-zlib/issues/6 + # https://github.com/GaloisInc/pure-zlib/pull/11 pure-zlib = doJailbreak super.pure-zlib; - # https://github.com/strake/lenz-template.hs/issues/1 + # https://github.com/strake/lenz-template.hs/pull/2 lenz-template = doJailbreak super.lenz-template; - # https://github.com/haskell-hvr/resolv/issues/1 + # https://github.com/haskell-hvr/resolv/pull/6 resolv = dontCheck super.resolv; + resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2; # spdx 0.2.2.0 needs older tasty # was fixed in spdx master (4288df6e4b7840eb94d825dcd446b42fef25ef56) @@ -1018,11 +1015,6 @@ self: super: { testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); - arbtt = overrideCabal super.arbtt (drv: { - preCheck = '' - for n in $PWD/dist/build/*; do PATH+=":$n"; done - ''; - }); # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; @@ -1033,14 +1025,11 @@ self: super: { # }; # https://github.com/dmwit/encoding/pull/3 - encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; - # https://github.com/fpco/streaming-commons/issues/49 - streaming-commons = dontCheck super.streaming-commons; - # Test suite depends on old QuickCheck 2.10.x. cassava = dontCheck super.cassava; @@ -1059,9 +1048,11 @@ self: super: { dontCheck super.dhall ); + # Missing test files in source distribution, fixed once 1.4.0 is bumped + # https://github.com/dhall-lang/dhall-haskell/pull/997 dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] ( - super.dhall-json + dontCheck super.dhall-json ); dhall-nix = @@ -1069,16 +1060,9 @@ self: super: { super.dhall-nix ); - # https://github.com/well-typed/cborg/issues/174 - cborg = doJailbreak super.cborg; - serialise = doJailbreak (dontCheck super.serialise); - # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; - # https://github.com/phadej/tree-diff/issues/19 - tree-diff = doJailbreak super.tree-diff; - # https://github.com/haskell-hvr/hgettext/issues/14 hgettext = doJailbreak super.hgettext; @@ -1089,23 +1073,6 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2” - haskell-names = doJailbreak super.haskell-names; - - # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*” - # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7 - hdocs = overrideCabal super.hdocs (drv: { - postPatch = '' - sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal - ''; - }); - - # Break out of tasty >=0.10 && <1.2. - aeson-compat = doJailbreak super.aeson-compat; - - # Break out of pretty-show >=1.6 && <1.9 - hedgehog = doJailbreak super.hedgehog; - # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { @@ -1146,22 +1113,6 @@ self: super: { # Generate shell completions purescript = generateOptparseApplicativeCompletion "purs" super.purescript; - # https://github.com/adinapoli/mandrill/pull/52 - mandrill = appendPatch super.mandrill (pkgs.fetchpatch { - url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch; - sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv"; - }); - - # https://github.com/Euterpea/Euterpea2/pull/22 - Euterpea = overrideSrc super.Euterpea { - src = pkgs.fetchFromGitHub { - owner = "Euterpea"; - repo = "Euterpea2"; - rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c"; - sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba"; - }; - }; - # https://github.com/kcsongor/generic-lens/pull/65 generic-lens = dontCheck super.generic-lens; @@ -1186,7 +1137,6 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 - these = doJailbreak super.these; # until these >= 0.7.6 uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; @@ -1198,13 +1148,6 @@ self: super: { testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; }); - # https://github.com/sighingnow/computations/pull/1 - primesieve = appendPatch super.primesieve (pkgs.fetchpatch { - url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch"; - sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; - stripLen = 1; - }); - # Fix for base >= 4.11 scat = overrideCabal super.scat (drv: { patches = [(pkgs.fetchpatch { @@ -1239,9 +1182,6 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; - # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) - yesod-markdown = doJailbreak super.yesod-markdown; - # These packages needs network 3.x, which is not in LTS-13.x. network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; }; lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); @@ -1270,9 +1210,6 @@ self: super: { # https://github.com/pruvisto/heap/issues/11 heap = dontCheck super.heap; - # https://github.com/hslua/tasty-lua/issues/1 - tasty-lua = dontCheck super.tasty-lua; - # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; @@ -1280,7 +1217,7 @@ self: super: { hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; }; # https://github.com/sol/hpack/issues/366 - hpack = dontCheck super.hpack; + hpack = self.hpack_0_32_0; # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 graphviz = dontCheck super.graphviz; 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 e8c138e594c..0919292d44a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -40,6 +40,9 @@ self: super: { unix = null; xhtml = null; + # Needs Cabal 3.0.x. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + # Restricts aeson to <1.4 # https://github.com/purescript/purescript/pull/3537 purescript = doJailbreak super.purescript; @@ -76,4 +79,7 @@ self: super: { aeson = addBuildDepend super.aeson self.contravariant; base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; + # Newer versions don't compile. + resolv = self.resolv_0_1_1_2; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 8d0582a8d06..4addc834040 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -41,6 +41,9 @@ self: super: { unix = null; xhtml = null; + # Needs Cabal 3.0.x. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; @@ -88,4 +91,7 @@ self: super: { version = "0.8.6.0-pre-release"; }; + # Newer versions don't compile. + resolv = self.resolv_0_1_1_2; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 417fc0b3a44..0eb9d67e18c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,18 +41,16 @@ self: super: { unix = null; xhtml = null; - # Use the cabal-install 3.0.0.0 beta release. - cabal-install = self.cabal-install-3; - Cabal_3_0_0_0 = null; # Our compiler has this already. - # Ignore overly restrictive upper version bounds. async = doJailbreak super.async; + cabal-install = doJailbreak super.cabal-install; ChasingBottoms = doJailbreak super.ChasingBottoms; cryptohash-sha256 = doJailbreak super.cryptohash-sha256; Diff = dontCheck super.Diff; doctest = doJailbreak super.doctest; hashable = doJailbreak super.hashable; hashable-time = doJailbreak super.hashable-time; + hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 integer-logarithms = doJailbreak super.integer-logarithms; lucid = doJailbreak super.lucid; parallel = doJailbreak super.parallel; @@ -61,8 +59,6 @@ self: super: { split = doJailbreak super.split; tasty-expected-failure = doJailbreak super.tasty-expected-failure; test-framework = doJailbreak super.test-framework; - th-lift = self.th-lift_0_8_0_1; - hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -85,51 +81,26 @@ self: super: { sed -i -e 's/time < 1.9/time < 2/' tar.cabal ''; }); - resolv = overrideCabal (overrideSrc super.resolv { - version = "20180411-git"; - src = pkgs.fetchFromGitHub { - owner = "haskell-hvr"; - repo = "resolv"; - rev = "a22f9dd900cb276b3dd70f4781fb436d617e2186"; - sha256 = "1j2jyywmxjhyk46kxff625yvg5y37knv7q6y0qkwiqdwdsppccdk"; - }; - }) (drv: { - buildTools = with pkgs; [autoconf]; - preConfigure = "autoreconf --install"; - }); - dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; - sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; - }); vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch"; sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19"; }); - cabal-doctest = appendPatch (doJailbreak super.cabal-doctest) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch"; - sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j"; - }); - QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch"; - sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl"; - }); - regex-base = appendPatch super.regex-base (pkgs.fetchpatch { + cabal-doctest = super.cabal-doctest_1_0_7; + regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; + })) (drv: { + preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal"; }); regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; }); - th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch"; - sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3"; - }); zlib = appendPatch super.zlib (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch"; sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif"; }); - haskell-src-exts = appendPatch super.haskell-src-exts_1_21_0 (pkgs.fetchpatch { + haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch"; sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3"; }); @@ -137,17 +108,13 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; }); - HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch"; - sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4"; - }); hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; }); happy = appendPatch super.happy (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.9.patch"; - sha256 = "1zmcb7dgcwivq2mddcy1f20djw2kds1m7ahwsa4xpbbwnijc6zjx"; + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch"; + sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk"; }); hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch"; @@ -158,15 +125,10 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - unordered-containers = self.unordered-containers_0_2_10_0; - attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch { + attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch"; sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl"; }); - aeson = appendPatch (dontCheck super.aeson) (pkgs.fetchpatch { # the test suite breaks the compiler - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch"; - sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f"; - }); cassava = appendPatch super.cassava (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch"; sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g"; @@ -175,9 +137,51 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; }); + socks = appendPatch super.socks (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; + sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; + }); lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch"; sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1"; }); - + polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; + sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; + }); + foundation = dontCheck super.foundation; + memory = overrideCabal (appendPatch super.memory (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.patch"; + sha256 = "16ar8921s3bi31y1az9zgyg0iaxxc2wvvwqjnl11a17p03wi6b29"; + })) (drv: { + editedCabalFile = null; + preConfigure = '' + cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal + ''; + }); + chell = overrideCabal (doJailbreak super.chell) (_drv: { + broken = false; + }); + th-expand-syns = doJailbreak super.th-expand-syns; + shelly = overrideCabal (appendPatch (doJailbreak super.shelly) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.patch"; + sha256 = "1kglbwrr4ra81v9x3bfsk5l6pyl0my2a1zkr3qjjx7acn0dfpgbc"; + })) (drv: { + editedCabalFile = null; + preConfigure = '' + cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.cabal"; sha256 = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";}} shelly.cabal + sed -i -e 's/< 1.9,/< 2,/' shelly.cabal # bump time version + ''; + }); + system-fileio = doJailbreak super.system-fileio; + yaml = self.yaml_0_11_1_2; + haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch"; + sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc"; + }); + asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch"; + sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5"; + }); + tls = self.tls_1_5_1; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b279652a5d5..c0f3ec25fe8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.2 + # LTS Haskell 14.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -70,7 +70,7 @@ default-package-overrides: - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - al ==0.1.4.2 - - alarmclock ==0.7.0.1 + - alarmclock ==0.7.0.2 - alerts ==0.1.2.0 - alex ==3.2.4 - alg ==0.2.10.0 @@ -91,7 +91,7 @@ default-package-overrides: - ANum ==0.2.0.2 - aos-signature ==0.1.1 - apecs ==0.8.1 - - apecs-gloss ==0.2.2 + - apecs-gloss ==0.2.3 - apecs-physics ==0.4.2 - api-field-json-th ==0.1.0.2 - appar ==0.1.8 @@ -144,7 +144,7 @@ default-package-overrides: - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 - backprop ==0.2.6.3 - - bank-holidays-england ==0.2.0.1 + - bank-holidays-england ==0.2.0.2 - barbies ==1.1.3.0 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -176,7 +176,7 @@ default-package-overrides: - bencoding ==0.4.5.1 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.4 + - bifunctors ==5.5.5 - bimap ==0.4.0 - bimap-server ==0.1.0.1 - binary-bits ==0.5 @@ -264,7 +264,7 @@ default-package-overrides: - c2hs ==0.28.6 - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 - - cabal-doctest ==1.0.6 + - cabal-doctest ==1.0.7 - cabal-file-th ==0.2.6 - cache ==0.1.1.2 - cacophony ==0.10.1 @@ -511,7 +511,7 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.4.2.3 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.6 + - deriving-compat ==0.5.7 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - dhall ==1.24.0 @@ -547,7 +547,7 @@ default-package-overrides: - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 - - doctest ==0.16.1 + - doctest ==0.16.2 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.1 - doldol ==0.4.1.2 @@ -629,7 +629,7 @@ default-package-overrides: - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.2 + - exceptions ==0.10.3 - exception-transformers ==0.4.0.7 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 @@ -639,7 +639,7 @@ default-package-overrides: - explicit-exception ==0.1.10 - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.17 + - extra ==1.6.18 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 @@ -709,7 +709,7 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.3.7 - foundation ==0.0.24 - - free ==5.1.1 + - free ==5.1.2 - freenect ==1.2.1 - freer-simple ==1.2.1.0 - freetype2 ==0.1.2 @@ -774,11 +774,11 @@ default-package-overrides: - ghc-lib ==8.8.0.20190424 - ghc-lib-parser ==8.8.0.20190424 - ghc-parser ==0.2.0.3 - - ghc-paths ==0.1.0.9 + - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.5 - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - - ghc-typelits-extra ==0.3 + - ghc-typelits-extra ==0.3.1 - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 @@ -944,7 +944,7 @@ default-package-overrides: - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 - - hsc2hs ==0.68.4 + - hsc2hs ==0.68.6 - hschema ==0.0.1.1 - hschema-aeson ==0.0.1.1 - hschema-prettyprinter ==0.0.1.1 @@ -963,7 +963,7 @@ default-package-overrides: - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==1.0.3.1 + - hslua ==1.0.3.2 - hslua-aeson ==1.0.0 - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 @@ -1037,7 +1037,7 @@ default-package-overrides: - hw-fingertree ==0.1.1.0 - hw-fingertree-strict ==0.1.1.1 - hw-hedgehog ==0.1.0.3 - - hw-hspec-hedgehog ==0.1.0.7 + - hw-hspec-hedgehog ==0.1.0.8 - hw-int ==0.0.0.3 - hw-ip ==2.3.4.1 - hw-json ==1.0.0.2 @@ -1258,7 +1258,7 @@ default-package-overrides: - loopbreaker ==0.1.1.0 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.6.0.0 + - lsp-test ==0.6.1.0 - lucid ==2.9.11 - lucid-extras ==0.2.2 - lxd-client-config ==0.1.0.1 @@ -1415,6 +1415,7 @@ default-package-overrides: - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - netpbm ==1.0.3 + - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 @@ -1510,8 +1511,8 @@ default-package-overrides: - pandoc-csv2table ==1.0.7 - pandoc-markdown-ghci-filter ==0.1.0.0 - pandoc-pyplot ==2.1.5.1 - - pandoc-types ==1.17.5.4 - - pantry ==0.1.1.1 + - pandoc-types ==1.17.6 + - pantry ==0.1.1.2 - parallel ==3.2.2.0 - parallel-io ==0.3.3 - paripari ==0.6.0.0 @@ -1567,11 +1568,11 @@ default-package-overrides: - pg-harness-client ==0.6.0 - pg-harness-server ==0.6.2 - pgp-wordlist ==0.1.0.3 - - pg-transact ==0.1.0.1 + - pg-transact ==0.1.2.0 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.1.4 - - pipes ==4.3.11 + - pipes ==4.3.12 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1730,7 +1731,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate ==0.1.5.0 - - reanimate-svg ==0.9.0.0 + - reanimate-svg ==0.9.0.1 - rebase ==1.3.1.1 - record-dot-preprocessor ==0.2 - record-hasfield ==1.0 @@ -1739,7 +1740,7 @@ default-package-overrides: - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 - - reflection ==2.1.4 + - reflection ==2.1.5 - RefSerialize ==0.4.0 - regex ==1.0.2.0 - regex-applicative ==0.3.3.1 @@ -1784,7 +1785,7 @@ default-package-overrides: - rhine ==0.5.1.0 - rhine-gloss ==0.5.1.0 - rigel-viz ==0.2.0.0 - - rio ==0.1.11.0 + - rio ==0.1.12.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 @@ -1808,9 +1809,9 @@ default-package-overrides: - safe-json ==0.1.0 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.3.4.1 - - salak-toml ==0.3.4.1 - - salak-yaml ==0.3.4.1 + - salak ==0.3.5.3 + - salak-toml ==0.3.5.3 + - salak-yaml ==0.3.5.3 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1824,7 +1825,7 @@ default-package-overrides: - scalpel-core ==0.6.0 - scanf ==0.1.0.0 - scanner ==0.3 - - scheduler ==1.4.1 + - scheduler ==1.4.2 - scientific ==0.3.6.2 - scotty ==0.11.4 - scrypt ==0.5.0 @@ -1842,7 +1843,7 @@ default-package-overrides: - selective ==0.3 - semialign ==1 - semigroupoid-extras ==5 - - semigroupoids ==5.3.2 + - semigroupoids ==5.3.3 - semigroups ==0.18.5 - semirings ==0.4.2 - semiring-simple ==1.0.0.1 @@ -1878,6 +1879,7 @@ default-package-overrides: - servant-mock ==0.8.5 - servant-multipart ==0.11.4 - servant-pipes ==0.15 + - servant-rawm ==0.3.1.0 - servant-ruby ==0.9.0.0 - servant-server ==0.16.2 - servant-static-th ==0.2.2.0 @@ -1928,7 +1930,7 @@ default-package-overrides: - simplistic-generics ==0.1.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - - singleton-nats ==0.4.2 + - singleton-nats ==0.4.3 - singletons ==2.5.1 - siphash ==1.0.3 - size-based ==0.1.2.0 @@ -2057,14 +2059,14 @@ default-package-overrides: - tagstream-conduit ==0.5.5.3 - tao ==1.0.0 - tao-example ==1.0.0 - - tar ==0.5.1.0 + - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - tasty-dejafu ==2.0.0.1 - tasty-discover ==4.2.1 - - tasty-expected-failure ==0.11.1.1 + - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.2 - tasty-hedgehog ==1.0.0.1 - tasty-hspec ==1.1.5.1 @@ -2123,7 +2125,7 @@ default-package-overrides: - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - these ==1.0.1 - - th-expand-syns ==0.4.4.0 + - th-expand-syns ==0.4.5.0 - th-extras ==0.0.0.4 - th-lift ==0.8.0.1 - th-lift-instances ==0.1.14 @@ -2192,7 +2194,7 @@ default-package-overrides: - trivial-constraint ==0.6.0.0 - true-name ==0.1.0.3 - tsv2csv ==0.1.0.2 - - ttl-hashtables ==1.3.1.0 + - ttl-hashtables ==1.3.1.1 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 @@ -2418,17 +2420,17 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.1.0 + - yaml ==0.11.1.2 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.3.0 - - yesod-auth ==1.6.7 + - yesod-auth ==1.6.8 - yesod-auth-hashdb ==1.7.1.1 - - yesod-auth-oauth2 ==0.6.1.1 + - yesod-auth-oauth2 ==0.6.1.2 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.15 + - yesod-core ==1.6.16 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2459,7 +2461,7 @@ default-package-overrides: - zip-archive ==0.4.1 - zippers ==0.3 - zip-stream ==0.2.0.1 - - zlib ==0.6.2 + - zlib ==0.6.2.1 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 @@ -2484,6 +2486,7 @@ extra-packages: - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x + - ghc-lib-parser == 8.8.0.20190723 # required by hlint-2.2.2 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x - haddock == 2.17.* # required on GHC 8.0.x @@ -2516,6 +2519,7 @@ extra-packages: - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - QuickCheck < 2 # required by test-framework-quickcheck and its users + - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -3384,7 +3388,6 @@ broken-packages: - birch-beer - bird - BirdPP - - bisc - bisect-binary - bit-array - bit-stream @@ -3461,6 +3464,8 @@ broken-packages: - boombox - boomslang - boots-app + - boots-cloud + - boots-web - borel - boring-window-switcher - bot @@ -3522,6 +3527,7 @@ broken-packages: - bv-sized - bytable - byteslice + - bytesmith - bytestring-builder-varword - bytestring-class - bytestring-csv @@ -3586,8 +3592,6 @@ broken-packages: - cabin - cabocha - cached - - cachix - - cachix-api - cacophony - caffegraph - cairo-core @@ -4280,7 +4284,6 @@ broken-packages: - dgim - dgs - dhall-check - - dhall-json - dhall-lsp-server - dhall-nix - dhall-to-cabal @@ -4542,7 +4545,6 @@ broken-packages: - Empty - empty-monad - enchant - - encoding - encoding-io - engine-io-growler - engine-io-snap @@ -4614,7 +4616,6 @@ broken-packages: - euler-tour-tree - euphoria - eurofxref - - Euterpea - eve - eve-cli - event @@ -5372,7 +5373,6 @@ broken-packages: - hakyll-dir-list - hakyll-favicon - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - hakyll-R - hakyll-sass @@ -7615,6 +7615,7 @@ broken-packages: - notcpp - notmuch-haskell - notmuch-web + - now-haskell - np-linear - nptools - ntha @@ -8769,7 +8770,6 @@ broken-packages: - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb - - servant-checked-exceptions - servant-cli - servant-client-namedargs - servant-csharp @@ -8798,7 +8798,6 @@ broken-packages: - servant-pushbullet-client - servant-py - servant-quickcheck - - servant-rawm - servant-reason - servant-reflex - servant-router @@ -10201,7 +10200,6 @@ broken-packages: - xkcd - xleb - xlsior - - xlsx - xlsx-tabular - xlsx-templater - xml-catalog diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 68925186925..19295cc2752 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1243,22 +1243,23 @@ self: { "BNFC" = callPackage ({ mkDerivation, alex, array, base, containers, deepseq, directory , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process - , QuickCheck, temporary + , QuickCheck, semigroups, temporary, time }: mkDerivation { pname = "BNFC"; - version = "2.8.2"; - sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h"; + version = "2.8.3"; + sha256 = "00w8g0kn4sgjyiq4hykkz8k0kl5b5861v7d9g2021vca78gif6wl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; executableHaskellDepends = [ array base containers deepseq directory filepath mtl pretty process + semigroups time ]; executableToolDepends = [ alex happy ]; testHaskellDepends = [ array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck temporary + HUnit mtl pretty process QuickCheck semigroups temporary time ]; description = "A compiler front-end generator"; license = stdenv.lib.licenses.gpl2; @@ -1510,8 +1511,8 @@ self: { }: mkDerivation { pname = "BiobaseBlast"; - version = "0.3.0.0"; - sha256 = "1p6ammx4fw5a9bvw503g46smmw5rx4rrpvlf8lmw7c73aczm9ga1"; + version = "0.3.1.0"; + sha256 = "153bxf221jga58ibxgd660465klbqj49qr3rk6ni77v7sb4qgrg0"; libraryHaskellDepends = [ aeson attoparsec base binary BiobaseENA BiobaseTypes BiobaseXNA bytestring cereal containers deepseq directory file-embed lens @@ -1945,8 +1946,8 @@ self: { }: mkDerivation { pname = "BlastHTTP"; - version = "1.4.0"; - sha256 = "0gvgwjsqrbk42vmbsh47d8fiwbwhdbsk5mlqj99pfmqi8fddwdm3"; + version = "1.4.1"; + sha256 = "1h7bj9a6qfzwlclr39dvbcz4r8l8s7n53z6ir8wff5ssq2wvq4qd"; libraryHaskellDepends = [ base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap HTTP http-conduit hxt mtl network transformers zip-archive @@ -5371,8 +5372,6 @@ self: { ]; description = "Library for computer music research and education"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "EventSocket" = callPackage @@ -10597,6 +10596,8 @@ self: { pname = "HsYAML"; version = "0.1.2.0"; sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54"; + revision = "1"; + editedCabalFile = "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11408,8 +11409,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "2"; - editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv"; + revision = "3"; + editedCabalFile = "1dkmlrn4vncx6n1646q1z9gfvpbgk0blax1i8n16dl6y5j042xf1"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -12698,8 +12699,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.0.2.0"; - sha256 = "1imnnd5plp3dqpfrpviwgabd0c47fxfxvh10gyxvssmslxi1k27p"; + version = "0.1.1.0"; + sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -14260,8 +14261,8 @@ self: { pname = "OTP"; version = "0.1.0.0"; sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb"; - revision = "1"; - editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin"; + revision = "2"; + editedCabalFile = "012yi2pvjjlk6vri5zj8a7pipscsfc6rgkw7s5qldqmvvwvrk64s"; libraryHaskellDepends = [ base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 time @@ -14426,8 +14427,8 @@ self: { pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; - revision = "2"; - editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3"; + revision = "3"; + editedCabalFile = "0m3a9fj2h0v529q3i1kq1jfbdj68wxsmhq65hgx2rwjpgb8cqf0z"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -15500,20 +15501,20 @@ self: { "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector - , containers, deepseq, DPutils, hashable, lens, log-domain, mtl - , OrderedBits, primitive, QuickCheck, smallcheck, tasty - , tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector + , containers, criterion, deepseq, DPutils, hashable, lens + , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck + , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "PrimitiveArray"; - version = "0.9.1.1"; - sha256 = "0q6i5754ysay2c4xs7m6hz69l35qd7irzxinmga431nvmbnqa21y"; + version = "0.10.0.0"; + sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck - tasty-th text vector vector-binary-instances vector-th-unbox + QuickCheck smallcheck text vector vector-binary-instances + vector-th-unbox ]; testHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq @@ -15521,6 +15522,12 @@ self: { QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck tasty-th text vector vector-binary-instances vector-th-unbox ]; + benchmarkHaskellDepends = [ + aeson base binary bits cereal cereal-vector containers criterion + deepseq DPutils hashable lens log-domain mtl OrderedBits primitive + QuickCheck smallcheck text vector vector-binary-instances + vector-th-unbox + ]; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -15740,8 +15747,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.8.0.0"; - sha256 = "0np08pyx5kd1wbnrxbzcbp6zryvh38iy2mbz1xbb6ldfmn98r78p"; + version = "0.8.0.2"; + sha256 = "1i3axpca5myig7wwdy770k2jy85m4cfpvhxrrw41q31fyv67j98n"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec template-haskell text @@ -16203,13 +16210,13 @@ self: { , ClustalParser, cmdargs, containers, directory, edit-distance , either-unwrap, filepath, hierarchical-clustering, HTTP , http-conduit, http-types, hxt, matrix, network, parsec, process - , pureMD5, random, split, Taxonomy, text, text-metrics, time - , transformers, vector, ViennaRNAParser + , pureMD5, random, silently, split, Taxonomy, text, text-metrics + , time, transformers, vector, ViennaRNAParser }: mkDerivation { pname = "RNAlien"; - version = "1.6.0"; - sha256 = "0pp9rim4k1gbc2dscqygi90c2721xc6q1fl2sqkfpafz30m022pq"; + version = "1.7.0"; + sha256 = "1yqf2i1q5s65i968ha4lhnn0njmgapb30sxwdq5rpf7wbw2f29by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16217,8 +16224,8 @@ self: { BlastHTTP bytestring cassava ClustalParser cmdargs containers directory edit-distance either-unwrap filepath hierarchical-clustering HTTP http-conduit http-types hxt matrix - network parsec process pureMD5 random Taxonomy text text-metrics - transformers vector ViennaRNAParser + network parsec process pureMD5 random silently Taxonomy text + text-metrics transformers vector ViennaRNAParser ]; executableHaskellDepends = [ base BiobaseFasta BiobaseTypes bytestring cassava cmdargs @@ -20428,6 +20435,8 @@ self: { pname = "X"; version = "0.3.0.0"; sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc"; + revision = "1"; + editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -24332,24 +24341,6 @@ self: { }: mkDerivation { pname = "alarmclock"; - version = "0.7.0.1"; - sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; - libraryHaskellDepends = [ - async base clock stm time unbounded-delays - ]; - testHaskellDepends = [ - async base clock hspec stm time unbounded-delays - ]; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alarmclock_0_7_0_2" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays - }: - mkDerivation { - pname = "alarmclock"; version = "0.7.0.2"; sha256 = "0sp9h8vy8i4pvyadnb1ibpxpfxjikdr9ds3y9y8321cmkprlbs87"; libraryHaskellDepends = [ @@ -24360,7 +24351,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alea" = callPackage @@ -24466,8 +24456,8 @@ self: { pname = "alex-tools"; version = "0.4"; sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi"; - revision = "1"; - editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg"; + revision = "2"; + editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -29266,8 +29256,8 @@ self: { }: mkDerivation { pname = "apecs-gloss"; - version = "0.2.2"; - sha256 = "0p8r8hraqa49f13p045j54kzyrcvgscppgqllwnqgdx0in8j71cf"; + version = "0.2.3"; + sha256 = "0f2cvjlsf00w69a6m52pwcp9srk441qfzbpdvdwh8pm2vl6nax69"; libraryHaskellDepends = [ apecs apecs-physics base containers gloss linear ]; @@ -30703,8 +30693,8 @@ self: { pname = "argon2"; version = "1.3.0.1"; sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry"; - revision = "1"; - editedCabalFile = "1bqzf2cfpd03sl3wq9dnrcxaysbs116ib33ja0v8zi4szddm33jv"; + revision = "2"; + editedCabalFile = "0y1dg4dp3f40ghh2zcn1s4l19i8pjs0d1zpbghy4aaar4npiqxz7"; libraryHaskellDepends = [ base bytestring deepseq text-short ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -30984,12 +30974,12 @@ self: { broken = true; }) {inherit (pkgs) arpack;}; - "array_0_5_3_0" = callPackage + "array_0_5_4_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.3.0"; - sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z"; + version = "0.5.4.0"; + sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -31614,8 +31604,8 @@ self: { pname = "asn1-data"; version = "0.7.2"; sha256 = "18dc4d71pvp5q6npxicqqj3fk6n39lm98450vvhgg4y9rc1rr6c3"; - revision = "1"; - editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm"; + revision = "2"; + editedCabalFile = "0xnj367rxj21gnxq7d5qih54g0zwwyc6r6gaaijikhprppbvjjvy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -31632,6 +31622,8 @@ self: { pname = "asn1-encoding"; version = "0.9.5"; sha256 = "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy"; + revision = "1"; + editedCabalFile = "0vsw8rd6fxd87rx3jyh3bb96sjd7ag0mrlylhkcmgaps2ma8sw5b"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -32691,8 +32683,8 @@ self: { pname = "atto-lisp"; version = "0.2.2.3"; sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd"; - revision = "1"; - editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q"; + revision = "2"; + editedCabalFile = "065v6vllvwvm0zpkra7bl2hpz1lnhara13965p75pzdppv8ghd6w"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -32757,6 +32749,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_3" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.3"; + sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -33192,46 +33213,41 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array - , async, aur, base, base-prelude, bytestring, compactable - , containers, directory, errors, filepath, freer-simple - , generic-lens, http-client, http-client-tls, http-types - , language-bash, megaparsec, microlens, microlens-ghc, mtl - , mwc-random, network-uri, non-empty-containers + ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base + , base-prelude, bytestring, compactable, containers, directory + , errors, filepath, fused-effects, generic-lens, http-client + , http-client-tls, http-types, language-bash, megaparsec, microlens + , microlens-ghc, mwc-random, network-uri, nonempty-containers , optparse-applicative, paths, pretty-simple, prettyprinter - , prettyprinter-ansi-terminal, semigroupoids, stm, tasty - , tasty-hunit, text, throttled, time, transformers, typed-process - , versions, witherable + , prettyprinter-ansi-terminal, scheduler, semigroupoids, stm, tasty + , tasty-hunit, text, these, time, transformers, typed-process + , unliftio, versions }: mkDerivation { pname = "aura"; - version = "2.0.0"; - sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996"; - revision = "1"; - editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj"; + version = "2.0.2"; + sha256 = "1r11dzyy7z759ch664cml6lywh7033s6qrv56mkn41kn91jrl3qy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty algebraic-graphs array async aur base - base-prelude bytestring compactable containers directory errors - filepath freer-simple generic-lens http-client http-types - language-bash megaparsec microlens microlens-ghc mtl mwc-random - network-uri non-empty-containers paths pretty-simple prettyprinter - prettyprinter-ansi-terminal semigroupoids stm text throttled time - transformers typed-process versions witherable + aeson aeson-pretty algebraic-graphs aur base base-prelude + bytestring compactable containers directory errors filepath + fused-effects generic-lens http-client http-types language-bash + megaparsec microlens microlens-ghc mwc-random network-uri + nonempty-containers paths prettyprinter prettyprinter-ansi-terminal + scheduler semigroupoids stm text these time transformers + typed-process unliftio versions ]; executableHaskellDepends = [ - base base-prelude bytestring containers errors freer-simple - http-client http-client-tls language-bash microlens - non-empty-containers optparse-applicative paths pretty-simple - prettyprinter prettyprinter-ansi-terminal text transformers - typed-process versions + base base-prelude bytestring containers errors fused-effects + http-client http-client-tls microlens nonempty-containers + optparse-applicative paths pretty-simple prettyprinter + prettyprinter-ansi-terminal text transformers typed-process + versions ]; testHaskellDepends = [ - base base-prelude bytestring containers errors freer-simple - http-client language-bash megaparsec microlens non-empty-containers - paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty - tasty-hunit text transformers typed-process versions + base base-prelude bytestring containers megaparsec microlens paths + tasty tasty-hunit text versions ]; description = "A secure package manager for Arch Linux and the AUR, written in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -35219,25 +35235,12 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.2.0.1"; - sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_2" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; version = "0.2.0.2"; sha256 = "1r82plqk1danqby90snmp4zjzdkwryvhbzj1c67b0h0k9w42v781"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -35479,8 +35482,8 @@ self: { pname = "base-encoding"; version = "0.1.0.0"; sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; - revision = "1"; - editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1"; + revision = "2"; + editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring text ]; @@ -35540,6 +35543,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base-noprelude_4_13_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.13.0.0"; + sha256 = "1ld1phm7jpyvm33dj568gy28inbiklrj00yvb83v5y7rn01w32kp"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "\"base\" package sans \"Prelude\" module"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck }: @@ -35804,6 +35820,8 @@ self: { pname = "basement"; version = "0.0.11"; sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37"; + revision = "2"; + editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; @@ -36229,6 +36247,25 @@ self: { broken = true; }) {}; + "bcp47" = callPackage + ({ mkDerivation, aeson, base, containers, country, doctest + , generic-arbitrary, hspec, iso639, megaparsec, QuickCheck, text + }: + mkDerivation { + pname = "bcp47"; + version = "0.1.0.0"; + sha256 = "1cy2wdp97mvyg1fvkmi6vzd8vd9v8645nd5cfzgp4whhy0v5y7rj"; + libraryHaskellDepends = [ + aeson base containers country generic-arbitrary iso639 megaparsec + QuickCheck text + ]; + testHaskellDepends = [ + aeson base containers country doctest hspec iso639 QuickCheck text + ]; + description = "Language tags as specified by BCP 47"; + license = stdenv.lib.licenses.mit; + }) {}; + "bcrypt" = callPackage ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { @@ -36776,6 +36813,8 @@ self: { pname = "bencode"; version = "0.6.0.0"; sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv"; + revision = "1"; + editedCabalFile = "0nvph7frmrra9k57v01saxgnhf1ma3m8qzwj1i53pswssfnj41mv"; libraryHaskellDepends = [ base binary bytestring containers parsec ]; @@ -37213,10 +37252,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.4"; - sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9"; - revision = "1"; - editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j"; + version = "5.5.5"; + sha256 = "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -39224,8 +39261,6 @@ self: { ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bisect-binary" = callPackage @@ -39924,8 +39959,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "1"; - editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs"; + revision = "2"; + editedCabalFile = "1mnh3629kgfivjwbbqwrkcyvg6iah5pncc5jzgq3ka5cq0kg09gz"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -41600,12 +41635,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "boots_0_1_1" = callPackage + "boots_0_2" = callPackage ({ mkDerivation, base, exceptions, hspec, mtl }: mkDerivation { pname = "boots"; - version = "0.1.1"; - sha256 = "1z9h8i1r0jccqn0230nzn97yqzrlsapc84dnwhczzvdbaryykhbz"; + version = "0.2"; + sha256 = "0v7p2pfs4kcczc4wpswb0rgl2ak9xijq7ha9c6lagyb1av17sx9r"; libraryHaskellDepends = [ base exceptions mtl ]; testHaskellDepends = [ base exceptions hspec mtl ]; description = "IoC Monad in Haskell"; @@ -41615,23 +41650,63 @@ self: { "boots-app" = callPackage ({ mkDerivation, base, boots, data-default, exceptions, fast-logger - , hspec, menshen, microlens, monad-logger, mtl, salak, salak-yaml - , splitmix, text, unliftio-core, vault + , menshen, microlens, mtl, salak, salak-yaml, splitmix, text, time + , unliftio-core, unordered-containers }: mkDerivation { pname = "boots-app"; - version = "0.1.1"; - sha256 = "1v8qbap22mpasjpmi9bd0n14q4vz80ksmlmk67yw840f2ly8sn0d"; + version = "0.2"; + sha256 = "0rnlb9fzaxcx4lvacqklv1kr2ygzgssgz1xzcfmbgkqpzp08nxqx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base boots data-default exceptions fast-logger menshen microlens - monad-logger mtl salak salak-yaml splitmix text unliftio-core vault + mtl salak salak-yaml splitmix text unliftio-core + unordered-containers ]; - testHaskellDepends = [ - base boots data-default exceptions fast-logger hspec menshen - microlens monad-logger mtl salak salak-yaml splitmix text - unliftio-core vault + executableHaskellDepends = [ base time ]; + description = "Factory for quickly building an application"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "boots-cloud" = callPackage + ({ mkDerivation, aeson, base, boots, boots-app, boots-web + , bytestring, http-client, salak, servant, servant-client, text + , unordered-containers + }: + mkDerivation { + pname = "boots-cloud"; + version = "0.2"; + sha256 = "0wfbzf753h3bgfdw0gfh4cwi40qv2ghyyznfahwxkh9aabrwckqp"; + libraryHaskellDepends = [ + aeson base boots boots-app boots-web bytestring http-client salak + servant servant-client text unordered-containers + ]; + description = "Factory for quickly building a microservice"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "boots-web" = callPackage + ({ mkDerivation, aeson, base, boots, boots-app, bytestring + , containers, ekg-core, http-types, microlens, monad-logger, salak + , servant-server, servant-swagger, swagger2, text, time + , unordered-containers, vault, wai, warp + }: + mkDerivation { + pname = "boots-web"; + version = "0.2"; + sha256 = "00f55k7gc4dirzxmgngw9vpcl0w8fgklsyscy5h584pbhd84x4mj"; + libraryHaskellDepends = [ + aeson base boots boots-app bytestring containers ekg-core + http-types microlens monad-logger salak servant-server + servant-swagger swagger2 text time unordered-containers vault wai + warp ]; - description = "Startup factories using IoC monad"; + description = "Factory for quickly building a web application"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -41911,8 +41986,8 @@ self: { ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }: mkDerivation { pname = "bowntz"; - version = "1"; - sha256 = "0b5fv59v7c896g56ixyhip8cnbfw2p2qvdmgj2dg97jvgjkxwpfn"; + version = "2"; + sha256 = "0i8fi5xq04s9mzyy1vdshmlyybzhim0sr9nyxxfdbvcaai796i5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42183,6 +42258,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_49" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, filepath + , microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.49"; + sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -42611,6 +42713,8 @@ self: { pname = "brotli"; version = "0.0.0.0"; sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j"; + revision = "1"; + editedCabalFile = "0fw26rv8i9zz4qyr32paz2y0psdppdaz427jp8mpbanwmg763024"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; testHaskellDepends = [ @@ -42691,6 +42795,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; + revision = "1"; + editedCabalFile = "07k9422yaw7rz66awmc20ni17xw2bd1pn48ja79c66d5va89f6wz"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -43516,6 +43622,8 @@ self: { pname = "butterflies"; version = "0.3.0.2"; sha256 = "0syykvrgq6i0zxy1pn934j1r9glv4yypva1mfkn0vc0nikh9fm31"; + revision = "1"; + editedCabalFile = "1xxdc352fp11b8mhhr3rwj5kffkglvbry2smwwfj1f10wr749zn9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -43715,6 +43823,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytes_0_16" = callPackage + ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal + , cabal-doctest, cereal, containers, directory, doctest, filepath + , hashable, mtl, scientific, text, time, transformers + , transformers-compat, unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.16"; + sha256 = "1m8nkviq4ckqi9v1w1fxzicdzmvb3wfxcmqmppjrrmkwawn4c6i9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary binary-orphans bytestring cereal containers hashable + mtl scientific text time transformers transformers-compat + unordered-containers void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + description = "Sharing code for serialization between binary and cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -43751,6 +43881,8 @@ self: { testHaskellDepends = [ base byteslice primitive ]; description = "Nonresumable byte parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring_0_10_10_0" = callPackage @@ -44007,14 +44139,16 @@ self: { }) {}; "bytestring-progress" = callPackage - ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: + ({ mkDerivation, base, bytestring, terminal-progress-bar, text + , time + }: mkDerivation { pname = "bytestring-progress"; - version = "1.2"; - sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi"; + version = "1.4"; + sha256 = "140dn6zyc1ka8vjxwd6zzc3mwd651zrawcwk3d5ipfxrgddf9bws"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring terminal-progress-bar time + base bytestring terminal-progress-bar text time ]; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; @@ -44716,27 +44850,23 @@ self: { "cabal-debian" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal , containers, data-default, debian, deepseq, Diff, directory - , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl - , network-uri, newtype-generics, optparse-applicative, parsec - , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix - , Unixutils, utf8-string + , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri + , newtype-generics, optparse-applicative, parsec, pretty, process + , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string }: mkDerivation { pname = "cabal-debian"; - version = "4.39"; - sha256 = "0cp1q9pa6wdij23bq7c3dac1byxxdr7maxvjj3jyi3v4d2mhgyvp"; + version = "5.0"; + sha256 = "1brbn45zg8ki54xl429qlzhzn30mgy7i1sidq1imd54c0rnai46v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bifunctors Cabal containers data-default debian - deepseq Diff directory exceptions filepath hsemail HUnit lens - memoize mtl network-uri newtype-generics optparse-applicative - parsec pretty process pureMD5 regex-tdfa set-extra syb text unix - Unixutils utf8-string - ]; - executableHaskellDepends = [ - base Cabal debian lens mtl pretty Unixutils + deepseq Diff directory exceptions filepath hsemail HUnit lens mtl + network-uri newtype-generics optparse-applicative parsec pretty + process pureMD5 regex-tdfa syb text unix unliftio utf8-string ]; + executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44803,10 +44933,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.6"; - sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; - revision = "2"; - editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60"; + version = "1.0.7"; + sha256 = "1v5dlwsxd9kdll07x5apnf76j2g2pqfp138pacc64j6agrgyv00h"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; @@ -44966,15 +45094,12 @@ self: { , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security , hashable, HTTP, mtl, network, network-uri, parsec, pretty - , process, random, resolv, stm, tar, text, time, unix, zip-archive - , zlib + , process, random, resolv, stm, tar, text, time, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "2.4.1.0"; - sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39"; - revision = "3"; - editedCabalFile = "1mnm6mfrgavq3blvkm3wz45pqrj10apjihg1g9cds58qp19m9r1h"; + version = "3.0.0.0"; + sha256 = "1wda29ifkn50376jidj6ihfk60a64y0bsd7lh3yw15py7a2sfcm4"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; @@ -44982,8 +45107,7 @@ self: { array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance filepath hackage-security hashable HTTP mtl network network-uri - parsec pretty process random resolv stm tar text time unix - zip-archive zlib + parsec pretty process random resolv stm tar text time unix zlib ]; doCheck = false; postInstall = '' @@ -45826,8 +45950,6 @@ self: { ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cachix-api" = callPackage @@ -45863,8 +45985,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cacophony" = callPackage @@ -46308,27 +46428,25 @@ self: { "camfort" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, fgl, filepath, flint, fortran-src, GenericPretty - , ghc-prim, happy, hmatrix, hspec, hspec-discover, lattices, lens - , matrix, mmorph, mtl, optparse-applicative, parallel, pretty - , QuickCheck, sbv, silently, singletons, strict, syb, syz - , template-haskell, temporary, text, time, transformers, uniplate - , vector, verifiable-expressions, vinyl, writer-cps-morph - , writer-cps-mtl, writer-cps-transformers + , deepseq, directory, fgl, filepath, flint, fortran-src + , GenericPretty, ghc-prim, happy, hmatrix, hspec, hspec-discover + , lattices, lens, matrix, mmorph, mtl, optparse-applicative + , parallel, pipes, pretty, QuickCheck, sbv, silently, singletons + , strict, syb, syz, template-haskell, temporary, text, time + , transformers, uniplate, vector, verifiable-expressions, vinyl }: mkDerivation { pname = "camfort"; - version = "0.906"; - sha256 = "164zrga458nmlyxaaa9wa0x1vamrlf1w1jisnwp87khkw8622nyi"; + version = "1.0"; + sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix - mmorph mtl parallel pretty sbv singletons strict syb syz - template-haskell text transformers uniplate vector - verifiable-expressions vinyl writer-cps-morph writer-cps-mtl - writer-cps-transformers + array base binary bytestring containers deepseq directory fgl + filepath fortran-src GenericPretty ghc-prim hmatrix lattices lens + matrix mmorph mtl parallel pipes pretty sbv singletons strict syb + syz template-haskell text transformers uniplate vector + verifiable-expressions vinyl ]; librarySystemDepends = [ flint ]; libraryToolDepends = [ alex happy ]; @@ -46397,8 +46515,8 @@ self: { ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { pname = "canon"; - version = "0.1.1.2"; - sha256 = "181c09kh76104b23hf52b049cc6clww1y9kffw1f0hnkxhds9n84"; + version = "0.1.1.3"; + sha256 = "1fc6vszr5j6iamjw07q2i1a96hsafx12zmqf3pr4aykan94vw6za"; libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; @@ -46426,6 +46544,8 @@ self: { pname = "canonical-json"; version = "0.6.0.0"; sha256 = "0lb847hvgkn49g6rvmavk14brvvpiy6q5fswk3cm9rc53hbq02zz"; + revision = "1"; + editedCabalFile = "18i3msxza5phvv5mz7gjqcygrm8rxd86pk2vqnsa715qrhsz88ch"; libraryHaskellDepends = [ base bytestring containers deepseq parsec pretty ]; @@ -47417,8 +47537,8 @@ self: { pname = "cassava"; version = "0.5.1.0"; sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; - revision = "2"; - editedCabalFile = "13mbhan3agzf8ki8hcac1xf50h9nbzx2b47zjqrch2050v6xa351"; + revision = "3"; + editedCabalFile = "0q9hwcn5jr5vs52n246qw8iw9jmc1d3dla071hhc0hdpck4igq6m"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -47433,6 +47553,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava_0_5_2_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, text-short, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.5.2.0"; + sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; + configureFlags = [ "-f-bytestring--lt-0_10_4" ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers deepseq hashable Only + scientific text text-short transformers unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck + quickcheck-instances scientific test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector + ]; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, containers, criterion, mtl, QuickCheck, text @@ -48634,23 +48780,23 @@ self: { "cgrep" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, async, base , bytestring, cmdargs, containers, directory, dlist, either - , exceptions, filepath, ghc-prim, mtl, process, regex-base + , exceptions, extra, filepath, ghc-prim, mtl, process, regex-base , regex-pcre, regex-posix, safe, split, stm, stringsearch , transformers, unicode-show, unix-compat, unordered-containers , utf8-string, yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.25"; - sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw"; + version = "6.6.30"; + sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal array async base bytestring cmdargs containers - directory dlist either exceptions filepath ghc-prim mtl process - regex-base regex-pcre regex-posix safe split stm stringsearch - transformers unicode-show unix-compat unordered-containers - utf8-string yaml + directory dlist either exceptions extra filepath ghc-prim mtl + process regex-base regex-pcre regex-posix safe split stm + stringsearch transformers unicode-show unix-compat + unordered-containers utf8-string yaml ]; description = "Command line tool"; license = stdenv.lib.licenses.gpl2; @@ -48881,6 +49027,25 @@ self: { license = "LGPL"; }) {}; + "chart-cli" = callPackage + ({ mkDerivation, attoparsec, base, Chart, Chart-cairo, colour + , data-default-class, dates, filepath, hashable, lens + , optparse-applicative, text, time + }: + mkDerivation { + pname = "chart-cli"; + version = "0.1.0.0"; + sha256 = "0z90jzhw0k1z20gn227r0jcpnfj6ajr9y54y5g7phb6cy1ff2iv3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base Chart Chart-cairo colour data-default-class dates + filepath hashable lens optparse-applicative text time + ]; + description = "Command-line utility to draw charts from input data easily"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chart-histogram" = callPackage ({ mkDerivation, base, Chart }: mkDerivation { @@ -49246,6 +49411,8 @@ self: { pname = "chell"; version = "0.5"; sha256 = "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg"; + revision = "1"; + editedCabalFile = "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -51018,8 +51185,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.25.0"; - sha256 = "1jgxchshpkpbgpkn31iymswb08wjjfmvqglv5brs0zw4ialirrh9"; + version = "0.25.2"; + sha256 = "087k0n6ri0pg5wmjnw3gkjaz5d627519vby9kmiagck7id7f89q9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -54374,8 +54541,8 @@ self: { pname = "complex-generic"; version = "0.1.1.1"; sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; - revision = "3"; - editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9"; + revision = "4"; + editedCabalFile = "00v0mr5fc090wph3s9ks3ppf81nqbkd0yfa347fkn3zrq3daqr8f"; libraryHaskellDepends = [ base template-haskell ]; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; @@ -54508,8 +54675,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.5.0"; - sha256 = "1hmhnkfmdjm5q8lkvlyr7rzs1lfycnblz3q2y8aziy27j7pvnz6h"; + version = "0.6.0.0"; + sha256 = "0r15hc6kwg0dibxix2f5afg91qwc6fd5m9sijn0k0mq62f0ln7ki"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -54534,8 +54701,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.5.0"; - sha256 = "0mm0dbsxqw5m78jgdn6vnbck2icqkzgwqyc3c3ghyz46cymd7pjz"; + version = "0.6.0.0"; + sha256 = "1plhqx0k0xab8fkip6v96rqnrdjq02ph1gmrk4r5zq5x4gc7gpps"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -54552,8 +54719,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.5.0"; - sha256 = "0qlg979cwkdlfpcwh7r0qr9fjs525b3xly0invr358h2g1lgi0fm"; + version = "0.6.0.0"; + sha256 = "188za7x9069ah8sgf8laqwkg3yfzl7cm23iacbcnbw25jd7k6vy3"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl @@ -54574,8 +54741,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.5.5.0"; - sha256 = "0bawdcx21dd0szxnnxs2iinzz6h4w2phk7mfs26fxiqx3f375lm4"; + version = "0.6.0.0"; + sha256 = "065aah2jx6r8i8qgwfql90nc6avhrrhc3aq3zlrqimqwv4772pvj"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -54592,8 +54759,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.5.0"; - sha256 = "0s54g9c1lm3jrdj44cvzxgbfaf7l2fdq2yy25vhqdmww50h8q1cx"; + version = "0.6.0.0"; + sha256 = "13hpvk6wx7yiz7klay7da8lllvszddlixk9xxyc8w9kqq48b4k92"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -54616,8 +54783,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.5.5.0"; - sha256 = "1qisvrs93jnrrjyhzdn0xwq54jc1mc8avpzq41a39ak5xdslzf6a"; + version = "0.6.0.0"; + sha256 = "1m0a77imgrs55vmzvfx7hy74siwnxpcgjg7cawsmsnarkymb1c5c"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -56073,8 +56240,8 @@ self: { }: mkDerivation { pname = "conferer"; - version = "0.1.0.0"; - sha256 = "0y62yj2cm7q9qwxl3jfdq16rza2mrjg60lchx4s0gbwiw959a83n"; + version = "0.1.0.1"; + sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467"; libraryHaskellDepends = [ base bytestring containers directory text ]; @@ -56525,14 +56692,34 @@ self: { pname = "connection"; version = "0.3.0"; sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34"; + revision = "3"; + editedCabalFile = "17l56sgrirlcfgi18svbkv9233yxd81ymyr3k8k712rzf5gi6rpi"; + libraryHaskellDepends = [ + base basement bytestring containers data-default-class network + socks tls x509 x509-store x509-system x509-validation + ]; + description = "Simple and easy network connections API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "connection_0_3_1" = callPackage + ({ mkDerivation, base, basement, bytestring, containers + , data-default-class, network, socks, tls, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "connection"; + version = "0.3.1"; + sha256 = "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax"; revision = "1"; - editedCabalFile = "0cm421anscv6h4nvhkaqvi5s3lwkc0f34p6z8lzap4wyc4gv578k"; + editedCabalFile = "08f1n38zryd0jklyv3yillilp040zxfxha6jphrmf28haq2irnk5"; libraryHaskellDepends = [ base basement bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation ]; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "connection-pool" = callPackage @@ -56810,15 +56997,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "constraints_0_11" = callPackage + "constraints_0_11_1" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec , hspec-discover, mtl, semigroups, transformers , transformers-compat }: mkDerivation { pname = "constraints"; - version = "0.11"; - sha256 = "1ik97w6ci9kw5ppw9nmh65j6ldqq2az8c37jlg3h5x3prn2cds1d"; + version = "0.11.1"; + sha256 = "15768bcd8z70wq0b2igvz8mrl62bqaqad6cpdp9p4awyylba37y6"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl semigroups transformers transformers-compat @@ -58666,15 +58853,15 @@ self: { }) {}; "cpsa" = callPackage - ({ mkDerivation, base, containers, parallel }: + ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.2"; - sha256 = "0byrfj9lqv4k5d0s3d7ib6bwcz50bl23qnk2nk8bzk9s1356g6yi"; + version = "3.6.3"; + sha256 = "121lrj9zhlcs4r2xghxw8cah705s5k9jkcl9g3mj5ixzki3b2bdm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ base containers parallel ]; + executableHaskellDepends = [ base containers directory parallel ]; description = "Symbolic cryptographic protocol analyzer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60215,8 +60402,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "3"; - editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m"; + revision = "4"; + editedCabalFile = "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -60235,8 +60422,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "3"; - editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l"; + revision = "4"; + editedCabalFile = "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -60255,8 +60442,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "2"; - editedCabalFile = "0m5h68xm60wrjv88gg6cn1q5qki5674mxl4d6sn3vxpbcj9b5417"; + revision = "3"; + editedCabalFile = "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -60277,8 +60464,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "3"; - editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl"; + revision = "4"; + editedCabalFile = "0iqs51a58w71j1zz3rn9kical63yvvqqqrc6971mh6wfscyi1gqr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -65263,28 +65450,26 @@ self: { "debian" = callPackage ({ mkDerivation, base, bytestring, bzlib, Cabal, containers - , directory, either, exceptions, filepath, HaXml, hostname, HUnit - , lens, ListLike, mtl, network-uri, old-locale, parsec, pretty - , process, process-extras, pureMD5, QuickCheck, regex-compat - , regex-tdfa, SHA, syb, template-haskell, text, th-lift, th-orphans - , time, unix, Unixutils, utf8-string, zlib + , directory, either, exceptions, filepath, hostname, HUnit, lens + , ListLike, mtl, network-uri, old-locale, parsec, pretty, process + , process-extras, pureMD5, QuickCheck, regex-compat, regex-tdfa + , SHA, syb, template-haskell, temporary, text, th-lift, th-orphans + , time, unix, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.95.1"; - sha256 = "1sfvjq9vilibvvcpm404z6j64ic54bd1s7yri8plfg849miynh95"; + version = "4.0.0"; + sha256 = "1gshvsgbgghskl4csngffdpnf49z27yhap86bwqnkp4asbh553h6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring bzlib Cabal containers directory either exceptions - filepath HaXml hostname HUnit lens ListLike mtl network-uri - old-locale parsec pretty process process-extras pureMD5 QuickCheck - regex-compat regex-tdfa SHA syb template-haskell text th-lift - th-orphans time unix Unixutils utf8-string zlib - ]; - executableHaskellDepends = [ - base directory filepath HaXml pretty process unix + filepath hostname HUnit lens ListLike mtl network-uri old-locale + parsec pretty process process-extras pureMD5 QuickCheck + regex-compat regex-tdfa SHA syb template-haskell temporary text + th-lift th-orphans time unix utf8-string zlib ]; + executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base Cabal HUnit parsec pretty regex-tdfa text ]; @@ -65512,14 +65697,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "decidable_0_2_0_0" = callPackage + "decidable_0_2_1_0" = callPackage ({ mkDerivation, base, functor-products, microlens, singletons , vinyl }: mkDerivation { pname = "decidable"; - version = "0.2.0.0"; - sha256 = "1b0mnkgk60qm84wim9lq6hlgm2ijxjx0s4gahvd5fjkccdryz2h2"; + version = "0.2.1.0"; + sha256 = "1l307j4n9xagarbqqa48c729fs63qlzy5sqzgfyzfqwnas8yrqhx"; libraryHaskellDepends = [ base functor-products microlens singletons vinyl ]; @@ -66355,12 +66540,13 @@ self: { }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.2.0.0"; - sha256 = "0cb3yhrqn2mwa3spfz6sky9bh9kh92kl4959187d6kqvvhqqmafj"; + version = "0.2.1.0"; + sha256 = "04flfszrn4ah9vrm6hyp2pk0sbldcjp0jjibdny7lxdmv0fskzj5"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum ]; + description = "JSON instances for DSum, DMap, and Some"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -66729,8 +66915,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5.6"; - sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf"; + version = "0.5.7"; + sha256 = "0bp4f0is84cv139s35669dv23mcp6lhp2wall72yvkk12lp2l2mg"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -67316,8 +67502,6 @@ self: { ]; description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-json_1_4_0" = callPackage @@ -67348,7 +67532,6 @@ self: { description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-lex" = callPackage @@ -70664,6 +70847,28 @@ self: { broken = true; }) {}; + "dl-fedora_0_6" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , http-directory, http-types, optparse-applicative, regex-posix + , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.6"; + sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath http-directory http-types + optparse-applicative regex-posix simple-cmd simple-cmd-args text + unix xdg-userdirs + ]; + description = "Fedora image download tool"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { @@ -71115,6 +71320,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doclayout" = callPackage + ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden + , tasty-hunit, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.1"; + sha256 = "1dmjj3z15vr5czy5gkwzs5zvz23ap1qpya3qlqfs5phslpbsada3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base mtl safe text ]; + testHaskellDepends = [ + base mtl tasty tasty-golden tasty-hunit text + ]; + benchmarkHaskellDepends = [ base criterion mtl text ]; + description = "A prettyprinting library for laying out text documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text, th-lift @@ -71167,24 +71390,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_3_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath - , Glob, mtl, parsec, scientific, tasty, tasty-golden, tasty-hunit - , temporary, text, unordered-containers, vector + "doctemplates_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty + , tasty-golden, tasty-hunit, temporary, text, unordered-containers + , vector }: mkDerivation { pname = "doctemplates"; - version = "0.3.0.1"; - sha256 = "11xvrmk9qb2izq8y61pna0lxlsfr5yb94nlk5ih8z1fcdn7ghl3j"; + version = "0.6"; + sha256 = "1bimvksijpz3czx0si9wwiigi4knc3d4i7rl6fssmz3z9qs6rhxg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers filepath mtl parsec scientific text - unordered-containers vector + aeson base containers doclayout filepath mtl parsec safe scientific + text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring filepath Glob mtl tasty tasty-golden + aeson base bytestring doclayout filepath Glob tasty tasty-golden tasty-hunit temporary text ]; + benchmarkHaskellDepends = [ + aeson base containers criterion filepath mtl text + ]; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71197,8 +71424,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.16.1"; - sha256 = "1xnm1sbm9lpfxw5yav8qpqr85aap94k9df6n5kx70bp6h69qnrrq"; + version = "0.16.2"; + sha256 = "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73128,6 +73355,19 @@ self: { broken = true; }) {}; + "dyepack" = callPackage + ({ mkDerivation, base, generics-sop }: + mkDerivation { + pname = "dyepack"; + version = "0.1.0.0"; + sha256 = "02kdcfnagp0aadfjhn17b47pz9bknl0yisyqpnf79v7g27szb74a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base generics-sop ]; + description = "Programatically identify space leaks in your program"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava , containers, http-conduit, text, unordered-containers, vector @@ -73436,6 +73676,41 @@ self: { broken = true; }) {}; + "dzen-dhall" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, dhall, directory + , file-embed-lzma, filepath, generic-random, hashable, hourglass + , hspec, http-conduit, http-types, HUnit, megaparsec, microlens + , microlens-th, network-uri, optparse-applicative, parsec, parsers + , pipes, prettyprinter, prettyprinter-ansi-terminal, process + , QuickCheck, random, tasty, tasty-hspec, tasty-hunit + , tasty-quickcheck, template-haskell, text, transformers, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "dzen-dhall"; + version = "1.0.1"; + sha256 = "16rkmiczdgknlq1f8m5n3ila8727z1db77g141sq5qqlgn7x37ww"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring dhall directory file-embed-lzma + filepath hashable hourglass http-conduit http-types megaparsec + microlens microlens-th network-uri optparse-applicative parsec + parsers pipes prettyprinter prettyprinter-ansi-terminal process + random text transformers unix unordered-containers utf8-string + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base dhall filepath generic-random hspec HUnit microlens + network-uri optparse-applicative parsec QuickCheck tasty + tasty-hspec tasty-hunit tasty-quickcheck template-haskell text + unordered-containers vector + ]; + description = "Configure dzen2 bars in Dhall language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dzen-utils" = callPackage ({ mkDerivation, base, colour, process }: mkDerivation { @@ -74927,6 +75202,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_6" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.6"; + sha256 = "1mxjp2ygf72k3yaiqpfi4lrmhwhx69zkm5kznrb6wainw5r6h0if"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -75709,6 +76003,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "emd_0_1_5_0" = callPackage + ({ mkDerivation, base, binary, containers, criterion + , data-default-class, deepseq, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit + , mwc-random, pure-fft, transformers, typelits-witnesses, vector + , vector-sized + }: + mkDerivation { + pname = "emd"; + version = "0.1.5.0"; + sha256 = "113rm1jmlawjms693zsx9kq8rk8jwn7ch6d4l2bfas3fvy4via61"; + libraryHaskellDepends = [ + base binary containers data-default-class deepseq finite-typelits + ghc-typelits-knownnat ghc-typelits-natnormalise transformers + typelits-witnesses vector vector-sized + ]; + testHaskellDepends = [ base containers HUnit ]; + benchmarkHaskellDepends = [ + base criterion deepseq ghc-typelits-knownnat mwc-random pure-fft + vector vector-sized + ]; + description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emgm" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, syb }: mkDerivation { @@ -75838,8 +76158,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck ]; description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "encoding-io" = callPackage @@ -78584,8 +78902,8 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.10.2"; - sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i"; + version = "0.10.3"; + sha256 = "1w25j4ys5s6v239vbqlbipm9fdwxl1j2ap2lzms7f7rgnik5ir24"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -79595,22 +79913,6 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.17"; - sha256 = "1zgp64ich4sjg59vwv6rgfz5amhhydcplv9l8k50p1mc49h2h2vc"; - libraryHaskellDepends = [ - base clock directory filepath process semigroups time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_18" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, semigroups, time, unix - }: - mkDerivation { - pname = "extra"; version = "1.6.18"; sha256 = "0jvd4l0hi8pf5899pxc32yc638y0mrc357w0rph99k3hm277i0cy"; libraryHaskellDepends = [ @@ -79619,7 +79921,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -82148,6 +82449,8 @@ self: { pname = "filepath"; version = "1.4.2.1"; sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb"; + revision = "1"; + editedCabalFile = "1harx8x3g3badj3087c662sd15fk850jqzx0lz5h16zbsv438lqa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; @@ -85241,18 +85544,18 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.3.0"; - sha256 = "03a1lk0c50v66jax2dya7qhjr3si2anp4yzx03vpf49am2kn2rxq"; + version = "0.4.0"; + sha256 = "1l66f9wcn5dp7i63wapzkx8bgiy22xrlxbfh3jbnhy7glhvk80ja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - GenericPretty mtl pretty text uniplate + array base binary bytestring containers deepseq directory fgl + filepath GenericPretty mtl pretty text uniplate ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - GenericPretty mtl pretty text uniplate + array base binary bytestring containers deepseq directory fgl + filepath GenericPretty mtl pretty text uniplate ]; testHaskellDepends = [ array base binary bytestring containers deepseq directory fgl @@ -85695,8 +85998,8 @@ self: { }: mkDerivation { pname = "free"; - version = "5.1.1"; - sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak"; + version = "5.1.2"; + sha256 = "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb"; libraryHaskellDepends = [ base comonad containers distributive exceptions mtl profunctors semigroupoids template-haskell transformers transformers-base @@ -86537,6 +86840,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "frotate" = callPackage + ({ mkDerivation, base, doctest, optparse-applicative, time }: + mkDerivation { + pname = "frotate"; + version = "0.1.1"; + sha256 = "1j8xh4k5kkix1aq79vg2kpzqb30pnggs8c6ksf4lqd8nmvzy47vc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base optparse-applicative time ]; + testHaskellDepends = [ base doctest ]; + description = "Advanced rotation of backups and other things"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "frown" = callPackage ({ mkDerivation, base, directory }: mkDerivation { @@ -86852,12 +87169,12 @@ self: { ({ mkDerivation, base, mtl, parsec }: mkDerivation { pname = "ft-generator"; - version = "1.0"; - sha256 = "1kgh8w1ny0zsrbf53vqabkap6zp6fmq2hx35nxw2hcfw7b0pvavk"; + version = "1.0.1"; + sha256 = "17lckkrzil8lznkzswjinh88pp8nm8ijsi2bh31ayjfaqg0m229b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl parsec ]; - description = "implementation accompanying a WFLP'19 submission"; + description = "implementation accompanying a WFLP'19 paper"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -87336,8 +87653,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "4"; - editedCabalFile = "1531cmcfgcgry254dn5mx7h5l6nd4afxz6lhlcr0lbbm4y1v59mk"; + revision = "5"; + editedCabalFile = "0n823v0avzdwvmfm5fgw5gsmrlvd12pdx1clkislpd5yq4ffgjw7"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -87653,6 +87970,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_0_5_0_1" = callPackage + ({ mkDerivation, base, deepseq, doctest, gauge, hspec + , inspection-testing, MonadRandom, QuickCheck, random, transformers + , unliftio-core + }: + mkDerivation { + pname = "fused-effects"; + version = "0.5.0.1"; + sha256 = "0s6y34x29w31lzqlj7xf9sld9dmh3q1f0rl3zfmzd4kpp2ybc965"; + libraryHaskellDepends = [ + base deepseq MonadRandom random transformers unliftio-core + ]; + testHaskellDepends = [ + base doctest hspec inspection-testing QuickCheck transformers + ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-exceptions" = callPackage ({ mkDerivation, base, fused-effects, safe-exceptions , unliftio-core @@ -89052,6 +89390,18 @@ self: { broken = true; }) {}; + "generic-constraints" = callPackage + ({ mkDerivation, base, HUnit, template-haskell, th-abstraction }: + mkDerivation { + pname = "generic-constraints"; + version = "1.1.1.1"; + sha256 = "1id341ih876qzq89cj6y3g87w4l3mfhv412l6czcs51r69s1770r"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + testHaskellDepends = [ base HUnit ]; + description = "Constraints via Generic"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-data" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, generic-lens, one-liner, show-combinators, tasty @@ -89132,6 +89482,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_13" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.13"; + sha256 = "0k4av4jamgpavn82q54g345la5i2ckfbq2w9nnf2a6vhvk1lnw8g"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -89444,6 +89812,8 @@ self: { pname = "generics-sop"; version = "0.5.0.0"; sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc"; + revision = "1"; + editedCabalFile = "10zfjhcipm77zfx32ls7bc8vk3affa5v7cyphwpw93d6sfqc9wym"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell ]; @@ -90372,6 +90742,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "getopt-generics_0_13_0_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, filepath + , generics-sop, hspec, QuickCheck, safe, silently, tagged + }: + mkDerivation { + pname = "getopt-generics"; + version = "0.13.0.4"; + sha256 = "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr"; + libraryHaskellDepends = [ + base base-compat base-orphans generics-sop tagged + ]; + testHaskellDepends = [ + base base-compat base-orphans filepath generics-sop hspec + QuickCheck safe silently tagged + ]; + description = "Create command line interfaces with ease"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -90490,14 +90880,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_6_5" = callPackage + "ghc-boot_8_8_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.6.5"; - sha256 = "1sxar25ji02a4yaz6s5hksf7b8pbl66vv9nb3bfc7fxq6gzj5n4b"; + version = "8.8.1"; + sha256 = "1f1701nkyn6cig2mh8wb5wn3vwddkfmfqz8lykh8k1sm76qx7yva"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -90506,12 +90896,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_6_5" = callPackage + "ghc-boot-th_8_8_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.6.5"; - sha256 = "18gjvxp3668np9n3c5l65q03nlqhgfjhh9wizvifmk673g0cl7n9"; + version = "8.8.1"; + sha256 = "14aa5jb5wz1yz12l0ixbbwiqj2rg1vgyd2rlfgm2ixsrryans4cb"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; @@ -90535,8 +90925,8 @@ self: { pname = "ghc-compact"; version = "0.1.0.0"; sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h"; - revision = "2"; - editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b"; + revision = "3"; + editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "In memory storage of deeply evaluated data structure"; license = stdenv.lib.licenses.bsd3; @@ -90596,8 +90986,8 @@ self: { ({ mkDerivation, base, deepseq, ghc-heap-view }: mkDerivation { pname = "ghc-datasize"; - version = "0.2.0"; - sha256 = "0wmlryqsw4mhk85wnril0p14gx2y0wjmq9iv9jjy0wl6gw5ps1yh"; + version = "0.2.1"; + sha256 = "0qsh4m6vif07nd0r5lbwggqrlykmlnspdx1jwzzhz6mk1hcf914d"; libraryHaskellDepends = [ base deepseq ghc-heap-view ]; description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; @@ -90688,8 +91078,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.9.0"; - sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10"; + version = "0.9.1"; + sha256 = "1phq4jxhm05xj42y7aqpjj43vj5mixi3hhf3h5c0dh1vmsz9w3z1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90774,6 +91164,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.6.2"; + sha256 = "1c36f7vjk3gapp761c7w1ncg9hyhx2kxwk51s0d9fvapi1bkxw9j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -90929,15 +91343,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib_8_8_0_20190723" = callPackage + "ghc-lib_8_8_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , haskeline, hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "8.8.0.20190723"; - sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63"; + version = "8.8.1"; + sha256 = "0lilr12pamss6x2vkqb700zy7yd15vd4y8f0h4q8fdp068bxn177"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90994,6 +91408,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-lib-parser_8_8_1" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.8.1"; + sha256 = "12aicsvc45ld2hv2qq0wdky4qa2mg8s6hhamilavcbp0da2s6wnh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -91153,27 +91587,12 @@ self: { ({ mkDerivation, base, Cabal, directory }: mkDerivation { pname = "ghc-paths"; - version = "0.1.0.9"; - sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; - revision = "4"; - editedCabalFile = "1fp0jyvi6prqsv0dxn010c7q4mmiwlcy1xk6ppd4d539adxxy67d"; - setupHaskellDepends = [ base Cabal directory ]; - libraryHaskellDepends = [ base ]; - description = "Knowledge of GHC's installation directories"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-paths_0_1_0_12" = callPackage - ({ mkDerivation, base, Cabal, directory }: - mkDerivation { - pname = "ghc-paths"; version = "0.1.0.12"; sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-pkg-autofix" = callPackage @@ -91352,13 +91771,17 @@ self: { }) {}; "ghc-source-gen" = callPackage - ({ mkDerivation, base, ghc, ghc-paths, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "ghc-source-gen"; - version = "0.1.0.0"; - sha256 = "0sw62jjbd7h9i96hn0srl9m8p0qip6hnm1am6if7snqdm5b4ki3k"; + version = "0.2.0.1"; + sha256 = "1diz1vrhxx8ppj4jljzfwlrg059kdcz20ba635f7hq4kpp0blbjy"; libraryHaskellDepends = [ base ghc ]; - testHaskellDepends = [ base ghc ghc-paths tasty tasty-hunit ]; + testHaskellDepends = [ + base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck + ]; description = "Constructs Haskell syntax trees for the GHC API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91422,8 +91845,8 @@ self: { pname = "ghc-tcplugins-extra"; version = "0.3"; sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h"; - revision = "1"; - editedCabalFile = "0x2d4bp5lhyfrqjshmgbirdn2ihc057a8a6khqmz91jj9zlhf7vb"; + revision = "2"; + editedCabalFile = "1hrbvixm25x1dx1ljy9x7f63kcan4ffz885xj6qsl8l070wj96s1"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = stdenv.lib.licenses.bsd2; @@ -91476,21 +91899,23 @@ self: { }) {}; "ghc-typelits-extra" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , tasty, tasty-hunit, template-haskell, transformers + ({ mkDerivation, base, containers, ghc, ghc-prim + , ghc-tcplugins-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit + , transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.3"; - sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7"; + version = "0.3.1"; + sha256 = "0v29lqz6q6wsdrhbcljyvcfdz1i7bvrp341816m2n5kbrkrk48ha"; libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp transformers + base containers ghc ghc-prim ghc-tcplugins-extra + ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp + transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit template-haskell + tasty-hunit ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; @@ -91516,6 +91941,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_7" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.7"; + sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b"; + revision = "1"; + editedCabalFile = "1jgwa66dbhqsav7764cfcmzs3p0f3csbdjbrnbilhv1bpqyhz8sm"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell, transformers @@ -91532,6 +91980,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_7" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra + , integer-gmp, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.7"; + sha256 = "1rfw67hhhka3ga8v3224ain7jvdc390glz5cr7vvxm1yqs1wgwx4"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra integer-gmp transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb @@ -93451,11 +93916,13 @@ self: { inherit (pkgs) which;}; "git-brunch" = callPackage - ({ mkDerivation, base, brick, microlens, process, vector, vty }: + ({ mkDerivation, base, brick, hspec, microlens, process, vector + , vty + }: mkDerivation { pname = "git-brunch"; - version = "1.0.4.0"; - sha256 = "1ss2axjwjx7pqx9dq7mxhbnn43k1g1zj7n54f2xq7zwq2ngd5x8f"; + version = "1.0.5.0"; + sha256 = "0bnag71l6vjygn5bbfav229pk44xn491jzj13n7m8xdc7nvh7zz1"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -93464,7 +93931,9 @@ self: { executableHaskellDepends = [ base brick microlens process vector vty ]; - testHaskellDepends = [ base brick microlens process vector vty ]; + testHaskellDepends = [ + base brick hspec microlens process vector vty + ]; doHaddock = false; description = "git checkout command-line tool"; license = stdenv.lib.licenses.bsd3; @@ -99577,8 +100046,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.5.0.0"; - sha256 = "12z4fws4vz88j8xj1xvzl8jv6s4i3vnca7xln2q4ssn23a025fcg"; + version = "0.6.0.0"; + sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3"; libraryHaskellDepends = [ base containers json text ]; description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; @@ -99738,8 +100207,8 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.7"; - sha256 = "0j2lzy15jiykz9b6cqzh7xhpf1idwxp8illvy3r50g1g4hc8zvyp"; + version = "1.5.8"; + sha256 = "1vli6dc0wc1an6vfhchai6s8xrg8rfds2k07x2xszaqg7r2njc9k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -99975,8 +100444,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.12"; - sha256 = "1ax536wr6h8kcnmnnxyd7vcdkqbjlrhrx6jab526b3f2a88n5q6z"; + version = "7.8.14"; + sha256 = "11rnsl6bs6qpx90p8jzdigncv6m5wbn6sav8gb3mlbm40fpi3p93"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -100589,8 +101058,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.2.1.0"; - sha256 = "0a4hhcggfbgxraq2jj40gvrg64nw37h7y6jj7pgswa623m85040j"; + version = "0.2.3.1"; + sha256 = "0iqrh6h2r7xr9xqk9w7yg1hilghcs0pp5mqq3s2rwmk2drp255l3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103657,14 +104126,14 @@ self: { , lrucache, mtl, network-uri, optparse-applicative, pandoc , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa , resourcet, scientific, tagsoup, tasty, tasty-hunit - , tasty-quickcheck, text, time, time-locale-compat - , unordered-containers, utillinux, vector, wai, wai-app-static - , warp, yaml + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, utillinux, vector, wai + , wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.12.5.2"; - sha256 = "13dc8hj3xnnpyb395pbplwxb4pj4gzckdd8r5wcwg1ln0gd6w7d5"; + version = "4.13.0.0"; + sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103673,7 +104142,7 @@ self: { cryptohash data-default deepseq directory file-embed filepath fsnotify http-conduit http-types lrucache mtl network-uri optparse-applicative pandoc pandoc-citeproc parsec process random - regex-tdfa resourcet scientific tagsoup text time + regex-tdfa resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; @@ -103949,8 +104418,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -105342,22 +105809,20 @@ self: { , filepath, hslogger, html, HUnit, monad-control, mtl, network , network-uri, old-locale, parsec, process, semigroups, sendfile , syb, system-filepath, template-haskell, text, threads, time - , time-compat, transformers, transformers-base, transformers-compat - , unix, utf8-string, xhtml, zlib + , transformers, transformers-base, transformers-compat, unix + , utf8-string, xhtml, zlib }: mkDerivation { pname = "happstack-server"; - version = "7.5.1.3"; - sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk"; - revision = "1"; - editedCabalFile = "15ira63nilqyq9ggl2jy5ip26aprw79sv5k1hp9n4wp9byhzzyjw"; + version = "7.5.2"; + sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html monad-control mtl network network-uri old-locale parsec process semigroups sendfile syb system-filepath template-haskell text - threads time time-compat transformers transformers-base - transformers-compat unix utf8-string xhtml zlib + threads time transformers transformers-base transformers-compat + unix utf8-string xhtml zlib ]; testHaskellDepends = [ base bytestring containers HUnit parsec zlib @@ -105933,6 +106398,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_5" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.5"; + sha256 = "0qd5rh0jdwhkjcz5kg1bqwd5hpz5w9ph9k0vxaam1lnjjniw7zbj"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, free, hasbolt, lens, mtl, neat-interpolation @@ -106689,6 +107175,8 @@ self: { pname = "haskeline"; version = "0.7.5.0"; sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj"; + revision = "1"; + editedCabalFile = "0i8fyhk7fvz2bxnh5xsmdw5rr7yywzc2wv115034q1g4sb018zrd"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -106913,21 +107401,24 @@ self: { }) {}; "haskell-ci" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , Cabal, containers, deepseq, Diff, directory, filepath - , generic-lens, HsYAML, microlens, optparse-applicative, parsec - , pretty, ShellCheck, tasty, tasty-golden, text, transformers + ({ mkDerivation, aeson, ansi-terminal, base, base-compat + , bytestring, Cabal, containers, deepseq, Diff, directory + , exceptions, filepath, generic-lens, HsYAML, lattices, microlens + , mtl, optparse-applicative, parsec, pretty, process, ShellCheck + , tasty, tasty-golden, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-ci"; - version = "0.2.1"; - sha256 = "07h99vq4bmphrpi1ggm7h06ard7hyxkmsxypicghvv24cgzl3c70"; + version = "0.4"; + sha256 = "0paw5jczmcayda2pjgp10p983g8kbly33hpabdv37b5mkrair9d8"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - base base-compat bytestring Cabal containers deepseq directory - filepath generic-lens HsYAML microlens optparse-applicative parsec - pretty ShellCheck text transformers + aeson base base-compat bytestring Cabal containers deepseq + directory exceptions filepath generic-lens HsYAML lattices + microlens mtl optparse-applicative parsec pretty process ShellCheck + temporary text transformers unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -106936,7 +107427,7 @@ self: { ]; doHaddock = false; description = "Cabal package script generator for Travis-CI"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -107345,12 +107836,13 @@ self: { }) {}; "haskell-holes-th" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { pname = "haskell-holes-th"; - version = "1.0.0.0"; - sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf"; - libraryHaskellDepends = [ base template-haskell ]; + version = "2.0.0.0"; + sha256 = "045spgarz68bay5yqd5cfllkmzja2jax9swcqhxc7gw5msfgxxw1"; + libraryHaskellDepends = [ base template-haskell transformers ]; + testHaskellDepends = [ base template-haskell transformers ]; description = "Infer haskell code by given type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -107993,6 +108485,8 @@ self: { pname = "haskell-src-exts"; version = "1.21.0"; sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm"; + revision = "1"; + editedCabalFile = "1mmjxh0vhf9pbx9jr1208bbrqj3k5qy6il4ypjmczh9zx2m65lyf"; libraryHaskellDepends = [ array base ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -113963,6 +114457,8 @@ self: { pname = "hex"; version = "0.1.2"; sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj"; + revision = "1"; + editedCabalFile = "0khmrdni6njr4wxgz15yz77l8ar4qm2jj6v0lvfnwqdms4s6i80y"; libraryHaskellDepends = [ base bytestring ]; description = "Convert strings into hexadecimal and back"; license = stdenv.lib.licenses.bsd3; @@ -114776,8 +115272,8 @@ self: { pname = "hgmp"; version = "0.1.1"; sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; - revision = "3"; - editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62"; + revision = "4"; + editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; @@ -116416,8 +116912,8 @@ self: { pname = "hjsonpointer"; version = "1.5.0"; sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y"; - revision = "2"; - editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi"; + revision = "3"; + editedCabalFile = "1y9fhqb8kjgflsds8nkw7nr1b9ydyz5f3227b4k8b7ir97rzy5d0"; libraryHaskellDepends = [ aeson base hashable text unordered-containers vector ]; @@ -116691,7 +117187,7 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, criterion, data-default, Decimal - , Diff, directory, easytest, filepath, hashable, haskeline + , Diff, directory, easytest, extra, filepath, hashable, haskeline , hledger-lib, html, lucid, math-functions, megaparsec, mtl , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa , safe, shakespeare, split, tabular, temporary, terminfo @@ -116701,38 +117197,39 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.14.2"; - sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4"; + version = "1.15.1"; + sha256 = "0rhq6dnss3n4b7ibq61amgalhjh89f51fn609dai2m3kf9xhign9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal Diff directory easytest filepath - hashable haskeline hledger-lib lucid math-functions megaparsec mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo text time transformers - unordered-containers utf8-string utility-ht wizards + containers data-default Decimal Diff directory easytest extra + filepath hashable haskeline hledger-lib lucid math-functions + megaparsec mtl mtl-compat old-time parsec pretty-show process + regex-tdfa safe shakespeare split tabular temporary terminfo text + time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal directory easytest filepath + containers data-default Decimal directory easytest extra filepath haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare - split tabular temporary terminfo text time transformers + split tabular temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards ]; testHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers data-default Decimal directory easytest filepath + containers data-default Decimal directory easytest extra filepath haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework - test-framework-hunit text time transformers unordered-containers - utf8-string utility-ht wizards + test-framework-hunit text time timeit transformers + unordered-containers utf8-string utility-ht wizards ]; benchmarkHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs - containers criterion data-default Decimal directory easytest + containers criterion data-default Decimal directory easytest extra filepath haskeline hledger-lib html math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time timeit @@ -116904,31 +117401,33 @@ self: { ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec , cmdargs, containers, data-default, Decimal, deepseq, directory - , doctest, easytest, extra, file-embed, filepath, Glob, hashtables - , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators - , pretty-show, regex-tdfa, safe, split, tabular, template-haskell - , text, time, transformers, uglymemo, utf8-string + , doctest, easytest, extra, fgl, file-embed, filepath, Glob + , hashtables, megaparsec, mtl, mtl-compat, old-time, parsec + , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular + , template-haskell, text, time, timeit, transformers, uglymemo + , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.14.1"; - sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2"; + version = "1.15.1"; + sha256 = "1d3mwrbgk3iqayvi0gjx4hkbf72jwknh5igx1p07h32l1d89phbh"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory easytest extra file-embed - filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular - template-haskell text time transformers uglymemo utf8-string + data-default Decimal deepseq directory easytest extra fgl + file-embed filepath Glob hashtables megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular template-haskell text time timeit transformers + uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory doctest easytest extra + data-default Decimal deepseq directory doctest easytest extra fgl file-embed filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec parser-combinators pretty-show regex-tdfa safe - split tabular template-haskell text time transformers uglymemo - utf8-string + split tabular template-haskell text time timeit transformers + uglymemo utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; @@ -116964,8 +117463,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.14.2"; - sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr"; + version = "1.15"; + sha256 = "047ssmix7pxq61hknd40z983aw8110zxzh6z2ick8xkhdsnw3s1q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117010,8 +117509,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.14.1"; - sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"; + version = "1.15"; + sha256 = "1m54m8v1fzlazrh9hhv4ff7jrg95d03i8wx360l1y731gry54zw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117561,25 +118060,28 @@ self: { }) {}; "hmatrix-sundials" = callPackage - ({ mkDerivation, base, containers, diagrams-lib - , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots + ({ mkDerivation, base, bytestring, cassava, clock, containers + , deepseq, diagrams-lib, diagrams-rasterific, hmatrix, hspec + , inline-c, lens, optparse-applicative, plots, split , sundials_arkode, sundials_cvode, template-haskell, vector }: mkDerivation { pname = "hmatrix-sundials"; - version = "0.19.1.0"; - sha256 = "1vbpx8661nnj15vrg177qwaylfvlp0fxdnpzncwkm4ka81v65hb5"; - revision = "1"; - editedCabalFile = "0vl85crf6zpbjpvrkydi5qk7ziaxcwr3bpm15cbxw6k94a3y9lvx"; + version = "0.20.1.0"; + sha256 = "0ysh3zamv8vm3i1a9bz0iqikfdxpmh95g4b0k8kgayjchhs3l6yn"; libraryHaskellDepends = [ - base containers hmatrix inline-c template-haskell vector + base containers deepseq hmatrix inline-c split template-haskell + vector ]; librarySystemDepends = [ sundials_arkode sundials_cvode ]; testHaskellDepends = [ base containers diagrams-lib diagrams-rasterific hmatrix hspec - inline-c lens plots template-haskell vector + inline-c lens plots split template-haskell vector ]; testSystemDepends = [ sundials_arkode sundials_cvode ]; + benchmarkHaskellDepends = [ + base bytestring cassava clock hmatrix optparse-applicative + ]; description = "hmatrix interface to sundials"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -119052,8 +119554,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.10"; - sha256 = "12s3n3l6lf2vwmh4jbxnra694fpnzjgd8c236pnan0jdcb6x82vl"; + version = "5.0.17.11"; + sha256 = "1svp8z9pad8z2j386pr0dda0ds8ddxab0salnz4gm51q877w93p1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -119843,6 +120345,45 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_32_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.32.0"; + sha256 = "11qfqyhcwihmx1z9pg5fhza1ww8wapr04wzyx8sknwpxs3hacm4z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -120060,8 +120601,8 @@ self: { pname = "hpc"; version = "0.6.0.3"; sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn"; - revision = "2"; - editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3"; + revision = "3"; + editedCabalFile = "06dbiaf0sangq3zdyr3x9wkvs2fgyas3ipqkfwfmycax6j17jgyy"; libraryHaskellDepends = [ base containers directory filepath time ]; @@ -121320,8 +121861,8 @@ self: { }: mkDerivation { pname = "hs-rqlite"; - version = "0.1.0.0"; - sha256 = "04q9vnwil3f30972pljs613wq1kb71w61jivdyxxy9i14grfcxsq"; + version = "0.1.2.0"; + sha256 = "1xfsbpfcy0s340jzdkl0bnx7isgx8dxhxvfdkrr9fpsga4s0l9bd"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers HTTP scientific text unordered-containers @@ -121879,10 +122420,8 @@ self: { }: mkDerivation { pname = "hsc2hs"; - version = "0.68.4"; - sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6"; - revision = "2"; - editedCabalFile = "178jimc9qwrjmiiz8f0kk7gv2jaf51vv1n40rp42ggmi8mvf0m4v"; + version = "0.68.6"; + sha256 = "1clj6bgs9vmiv3mjzp82lvyyik5zr5411nxab7hydbrgq94pbk70"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -123042,8 +123581,8 @@ self: { ({ mkDerivation, base, directory, ghc, ghc-boot, ghc-paths, time }: mkDerivation { pname = "hsinspect"; - version = "0.0.1"; - sha256 = "13z7dk42cnwdxfqnadis56m2wy0s5kyzw2dv55dnspd77hd5v28k"; + version = "0.0.3"; + sha256 = "11jn8knnh859wvzfqljkhlsaqsrm20m4ryf3ncg7rhs6jcm3vknr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory ghc ghc-boot time ]; @@ -123247,29 +123786,6 @@ self: { }: mkDerivation { pname = "hslua"; - version = "1.0.3.1"; - sha256 = "1w11d5csjl5jdzjzcq8gkd7lzyfsgaxmby5gq97jaj6r32l3zy9m"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions fail mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers exceptions fail mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_0_3_2" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances - , tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; version = "1.0.3.2"; sha256 = "183bgl5jcx5y2r94lviqfw0a5w9089nxjd1z40k8vx9y2h60pm6j"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; @@ -123284,7 +123800,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -124117,6 +124632,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-parsec" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, parsec }: + mkDerivation { + pname = "hspec-parsec"; + version = "0"; + sha256 = "1q5484dzc9vpbwv7bpx83xha9ly7lsbwn4zjd6z8z5j4p8r5mk6y"; + revision = "1"; + editedCabalFile = "03nsxwc5p6whq21dqwba0289g8fqqqws453kyanwgb6vvg1f0s9l"; + libraryHaskellDepends = [ base hspec-expectations parsec ]; + testHaskellDepends = [ base hspec parsec ]; + description = "Hspec expectations for testing Parsec parsers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -125956,6 +126485,8 @@ self: { pname = "http-api-data"; version = "0.4.1"; sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv"; + revision = "1"; + editedCabalFile = "0jhaj9qxw8a4gnvqi6i7lmn6vk8cmvc1mm1cp1saqz4whn13fgbs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring @@ -126113,6 +126644,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-overrides" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, network-uri, tasty, tasty-hunit + , text, yaml + }: + mkDerivation { + pname = "http-client-overrides"; + version = "0.1.0.0"; + sha256 = "1s6qblbw4z9afzdy43hk8rfhgxj3k60x03p3y0dmp1l2i712x89g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types network-uri text yaml + ]; + executableHaskellDepends = [ base http-client http-client-tls ]; + testHaskellDepends = [ + base bytestring http-client tasty tasty-hunit text + ]; + description = "HTTP client overrides"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-client-request-modifiers" = callPackage ({ mkDerivation, base, bytestring, exceptions, http-client , http-media, http-types, network, network-uri @@ -126357,6 +126910,8 @@ self: { pname = "http-directory"; version = "0.1.5"; sha256 = "075crysy7avf97vlskwlk8813q2bnqw9p3q29c5yb2yhmykrpwyn"; + revision = "1"; + editedCabalFile = "0ynm88f9v3h5dlyf2kzydqwr2l90gwjysffr6gbnlyqw9x46pb04"; libraryHaskellDepends = [ base bytestring html-conduit http-client http-client-tls http-date http-types text time xml-conduit @@ -126481,8 +127036,8 @@ self: { pname = "http-io-streams"; version = "0.1.0.0"; sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; - revision = "1"; - editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5"; + revision = "2"; + editedCabalFile = "0l6afs6bhf5q73nmlmc37qi0anr1dlrz1x10m9ipfssnkb5hp25k"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring case-insensitive containers directory HsOpenSSL io-streams mtl @@ -127823,6 +128378,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hvega_0_4_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , filepath, tasty, tasty-golden, text, unordered-containers, vector + }: + mkDerivation { + pname = "hvega"; + version = "0.4.0.0"; + sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base text unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers filepath tasty + tasty-golden text + ]; + description = "Create Vega-Lite visualizations (version 3) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hvega-theme" = callPackage + ({ mkDerivation, base, hvega, text }: + mkDerivation { + pname = "hvega-theme"; + version = "0.1.0.0"; + sha256 = "03rm4fl8vgl3yv60wx6vrj1dfbwsxwksm1dbiz0wzz1scdax1gc4"; + libraryHaskellDepends = [ base hvega text ]; + description = "Theme for hvega"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hw-aeson" = callPackage ({ mkDerivation, aeson, base, hedgehog, hspec, text }: mkDerivation { @@ -128179,14 +128767,12 @@ self: { }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.7"; - sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv"; - revision = "1"; - editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm"; + version = "0.1.0.8"; + sha256 = "0c54mhzbmjfjvy5lyvr6xffrncqmbbr10lran2x9czbkhhbikrss"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; - testHaskellDepends = [ base hedgehog hspec ]; + testHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; testToolDepends = [ hspec-discover ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; @@ -133111,6 +133697,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inspection-testing_0_4_2_2" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.2.2"; + sha256 = "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -133343,8 +133946,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "1"; - editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm"; + revision = "2"; + editedCabalFile = "1fhc91170q9q9k628wc3dqzdvxfjs97jzg5x7g0ndaqnh60l8cy5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -136930,6 +137533,17 @@ self: { broken = true; }) {}; + "joint" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "joint"; + version = "0.1.1"; + sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp"; + libraryHaskellDepends = [ base ]; + description = "Trying to compose non-composable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jonathanscard" = callPackage ({ mkDerivation, base, bytestring, containers, HTTP, json, mtl , network, old-locale, time @@ -137315,6 +137929,8 @@ self: { pname = "json"; version = "0.9.3"; sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb"; + revision = "2"; + editedCabalFile = "0iqmwfq6s1fc8jj16yx2d7jpzf94scd1hc4yvz281zxj7kds2ms5"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -142699,8 +143315,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.11.0"; - sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59"; + version = "0.11.0.1"; + sha256 = "0712xbijag03n61d80bnd9xw94fzywc76l8ya9ijv684ls0qymy2"; libraryHaskellDepends = [ alex-tools array base bytestring deepseq text ]; @@ -147277,30 +147893,64 @@ self: { "linnet" = callPackage ({ mkDerivation, base, bytestring, bytestring-conversion - , case-insensitive, either, exceptions, hspec, http-types - , io-streams, mtl, QuickCheck, quickcheck-classes - , quickcheck-instances, text, transformers, uri-encode, utf8-string - , wai, warp + , case-insensitive, either, exceptions, hspec, http-types, mtl + , QuickCheck, quickcheck-classes, quickcheck-instances, text + , transformers, uri-encode, wai, warp }: mkDerivation { pname = "linnet"; - version = "0.1.0.0"; - sha256 = "0ikrw7xm490rs46l7555mirkly3h5565kadwfrdjbqgrqv1cjx7k"; + version = "0.2.0.0"; + sha256 = "13k65016hm7shi3q5r47hx0s8bfpaypf0bknmwcvsrgsg5cyjz7q"; libraryHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either - exceptions http-types io-streams mtl text transformers uri-encode - utf8-string wai warp + exceptions http-types mtl text transformers uri-encode wai warp ]; testHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either - exceptions hspec http-types io-streams mtl QuickCheck - quickcheck-classes quickcheck-instances text transformers - uri-encode utf8-string wai warp + exceptions hspec http-types mtl QuickCheck quickcheck-classes + quickcheck-instances text transformers uri-encode wai warp ]; description = "Lightweight library for building HTTP API"; license = stdenv.lib.licenses.asl20; }) {}; + "linnet-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, linnet, QuickCheck + , quickcheck-classes, quickcheck-instances, text + }: + mkDerivation { + pname = "linnet-aeson"; + version = "0.2.0.0"; + sha256 = "118i6a9296sig9ldhblh8b3q8g9k55bgjxn33v8msz1sw1dw493k"; + libraryHaskellDepends = [ aeson base bytestring linnet ]; + testHaskellDepends = [ + aeson base bytestring hspec linnet QuickCheck quickcheck-classes + quickcheck-instances text + ]; + description = "Aeson JSON support for Linnet"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "linnet-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, hspec, http-types + , linnet, QuickCheck, quickcheck-classes, quickcheck-instances, wai + , warp + }: + mkDerivation { + pname = "linnet-conduit"; + version = "0.2.0.0"; + sha256 = "1q479v0abcrkfw6my2d5kcn6j8i4p9gkk3np5s5qkf097wyphh1r"; + libraryHaskellDepends = [ + base bytestring conduit http-types linnet wai warp + ]; + testHaskellDepends = [ + base bytestring conduit hspec http-types linnet QuickCheck + quickcheck-classes quickcheck-instances wai warp + ]; + description = "Conduit-backed support for streaming in Linnet"; + license = stdenv.lib.licenses.asl20; + }) {}; + "linode" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , errors, lens, process, retry, safe, tasty, tasty-hunit @@ -147976,8 +148626,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.4"; - sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp"; + version = "1.0.5"; + sha256 = "192yx9y0sp729dk9xaym1b6kyw9gv7n3fp1dvxw7z2w04s92l1k4"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; description = "List monad transformer"; @@ -148019,14 +148669,14 @@ self: { broken = true; }) {}; - "list-witnesses_0_1_2_0" = callPackage + "list-witnesses_0_1_3_2" = callPackage ({ mkDerivation, base, decidable, functor-products, microlens , profunctors, singletons, vinyl }: mkDerivation { pname = "list-witnesses"; - version = "0.1.2.0"; - sha256 = "10bflmrj747xs2ga8s0vw7hb419wvrwnm0bakxw7x1l7bcaa7z7m"; + version = "0.1.3.2"; + sha256 = "1hzm8ijx8id5ij199dg362ai1wmdrs8mr10qkv57639hv61almyq"; libraryHaskellDepends = [ base decidable functor-products microlens profunctors singletons vinyl @@ -149359,8 +150009,8 @@ self: { }: mkDerivation { pname = "log4hs"; - version = "0.0.7.0"; - sha256 = "0f05sqjrfg3wkr1avdwljfllfs40bakyims9xd5kn9fv48fzvran"; + version = "0.1.0.0"; + sha256 = "12crsq6gxhvamsn9ks3qn2r7aihf92aw1fcvck2wzjw9vps0y3ra"; libraryHaskellDepends = [ aeson base containers data-default directory filepath generic-lens lens template-haskell text time @@ -149993,8 +150643,8 @@ self: { pname = "long-double"; version = "0.1"; sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j"; - revision = "1"; - editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn"; + revision = "2"; + editedCabalFile = "03x83ycib19k2lmd3spwq2zmylfl5ihammb406fxxqqbyv4jw1mg"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = stdenv.lib.licenses.bsd3; @@ -150298,8 +150948,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.1.0"; - sha256 = "1gipdhbnyb7sll30ffcl42k8rqqwphi970ls7rn2g98yb39jk498"; + version = "2.1.1"; + sha256 = "0dynm0kib4lgyz00gbg4gi0ds5cgpbdx40davk53cknwxv7icri0"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -150411,8 +151061,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.6.0.0"; - sha256 = "01l5i41907rqxrndhqmnb2kcp62k4mz1dpbamp7zvff22pyd5zzv"; + version = "0.6.1.0"; + sha256 = "195p9m4992l01k8xsc8yxwsx3g74xfn6rdi00bwlzxw4ijy06lfi"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -151272,6 +151922,8 @@ self: { pname = "machines"; version = "0.6.4"; sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj"; + revision = "2"; + editedCabalFile = "1h0qq6kxv4kc0j0rmx7rhwhvfg1hc08r10q152km4p8kgshcwlig"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -153189,8 +153841,8 @@ self: { }: mkDerivation { pname = "marxup"; - version = "3.1.0.0"; - sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91"; + version = "3.1.1.0"; + sha256 = "0b22mf14qajkpf7hlm6086d951g0wgihlyiw93m0nh4yl1kmgf5q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -155080,8 +155732,8 @@ self: { pname = "memory"; version = "0.14.18"; sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm"; - revision = "1"; - editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm"; + revision = "2"; + editedCabalFile = "1kwlgsjxh4ncvc6x9rps82bm55qyzn8lvzg49s4rbyc7vjjsbmx6"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim ]; @@ -155715,8 +156367,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "1"; - editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq"; + revision = "2"; + editedCabalFile = "1n3jhbwic8c2pa6dcz36a6fgna4b854ml5d5n8qzzhjshb0v60ri"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -155829,6 +156481,8 @@ self: { pname = "microlens"; version = "0.4.10"; sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw"; + revision = "1"; + editedCabalFile = "1qh5ifbwh62v14ygg3fj22wqimylph17ykng70vqv5x2rkp630jq"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; license = stdenv.lib.licenses.bsd3; @@ -157380,8 +158034,8 @@ self: { }: mkDerivation { pname = "mixpanel-client"; - version = "0.2.0"; - sha256 = "1c0lgysznql57wff90r5s6mwq7gwah0j6pw10i4wppqs6pdiiwik"; + version = "0.2.1"; + sha256 = "1gangs1ivbg0hyc804flmxq7fgai3qlf2fnsw1r9dyjb5d91smp1"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring http-client http-client-tls servant servant-client string-conv text time @@ -159900,14 +160554,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_5_0_1" = callPackage + "monoidal-containers_0_6" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens , newtype, semialign, semigroups, these, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.5.0.1"; - sha256 = "1d7a4kkwv86f69zv5g6wxq9bkxq3bxarb26rr5q9gxkyx9m5rwd3"; + version = "0.6"; + sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -160274,32 +160928,35 @@ self: { }) {}; "morpheus-graphql" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, megaparsec - , mtl, scientific, scotty, tasty, tasty-hunit, text, transformers - , unordered-containers, uuid, vector, wai, wai-websockets, warp - , websockets + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , filepath, lens, megaparsec, mtl, optparse-applicative, scientific + , scotty, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, utf8-string, uuid, vector, wai + , wai-websockets, warp, websockets }: mkDerivation { pname = "morpheus-graphql"; - version = "0.1.1"; - sha256 = "1sp7dpbqd9kksldcqc2z43zv0g39qs4qxv9xxy1zg7hw4rwislfn"; + version = "0.2.2"; + sha256 = "1cgf6l6p97dfgj49gyygbd088smah3ichryrr8xvl1mr6pjclq5b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific text - transformers unordered-containers uuid vector wai-websockets - websockets + aeson attoparsec base bytestring containers lens megaparsec mtl + scientific template-haskell text transformers unordered-containers + utf8-string uuid vector wai-websockets websockets ]; executableHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific scotty - text transformers unordered-containers uuid vector wai - wai-websockets warp websockets + aeson attoparsec base bytestring containers filepath lens + megaparsec mtl optparse-applicative scientific scotty + template-haskell text transformers unordered-containers utf8-string + uuid vector wai wai-websockets warp websockets ]; testHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific tasty - tasty-hunit text transformers unordered-containers uuid vector - wai-websockets websockets + aeson attoparsec base bytestring containers lens megaparsec mtl + scientific tasty tasty-hunit template-haskell text transformers + unordered-containers utf8-string uuid vector wai-websockets + websockets ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.bsd3; @@ -160928,8 +161585,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.3.0.0"; - sha256 = "0pdv9x6743qaqk6fcm02hfrr09ckwbd9fpgzgmgmgnqhqxm0y9y6"; + version = "0.4.0.0"; + sha256 = "0smdr7inwix9hbllj5r217pa17i6ha0wbciqnq9cjsjs9wjnybhh"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -161065,20 +161722,20 @@ self: { }) {}; "mssql-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, hostname, ms-tds - , network, template-haskell, text, time, tls + ({ mkDerivation, base, binary, bytestring, hostname, ms-tds, mtl + , network, template-haskell, text, time, tls, uuid-types }: mkDerivation { pname = "mssql-simple"; - version = "0.4.0.2"; - sha256 = "0pa1q404xlq23ywdwkx9w1v8dn2nznkpng9ijwixkcd520bnx043"; + version = "0.5.0.1"; + sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs"; libraryHaskellDepends = [ - base binary bytestring hostname ms-tds network template-haskell - text time tls + base binary bytestring hostname ms-tds mtl network template-haskell + text time tls uuid-types ]; testHaskellDepends = [ - base binary bytestring hostname ms-tds network template-haskell - text time tls + base binary bytestring hostname ms-tds mtl network template-haskell + text time tls uuid-types ]; description = "SQL Server client library implemented in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -164635,8 +165292,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.2.4.1"; - sha256 = "0s0drakh05ygwkvlcd8z0f5168hvk8qmvdq3mg2bk1p2fjd2hfb2"; + version = "0.2.4.2"; + sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164948,8 +165605,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "5"; - editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka"; + revision = "6"; + editedCabalFile = "0mn0ar2xhjdsm50kmpw5ndvbyfmc30b3x0bx291d2ml7hqspnnsw"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -165886,8 +166543,8 @@ self: { ({ mkDerivation, base, network }: mkDerivation { pname = "network-run"; - version = "0.1.0"; - sha256 = "16n7d0vgzcp6qq3y2vs1wjlj81xdi3a1kyk9qncmj3h7djav3r5b"; + version = "0.2.0"; + sha256 = "1iabxk341yzsr28mpiam01wris20na4kbvbpxfzbcvlb1q2pjz5v"; libraryHaskellDepends = [ base network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -167128,6 +167785,26 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) nix;}; + "nixfmt" = callPackage + ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec + , parser-combinators, safe-exceptions, text, unix + }: + mkDerivation { + pname = "nixfmt"; + version = "0.3.0"; + sha256 = "0y9r7l2iwy6kqqli8bfcgrcr07pqvpaym895qn21d467ybcmgqih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base megaparsec parser-combinators text + ]; + executableHaskellDepends = [ + base cmdargs directory filepath safe-exceptions text unix + ]; + description = "An opinionated formatter for Nix"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "nixfromnpm" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , classy-prelude, containers, curl, data-default, data-fix @@ -168097,6 +168774,8 @@ self: { ]; description = "Zeit Now haskell-side integration and introspection tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nowdoc" = callPackage @@ -171307,6 +171986,89 @@ self: { broken = true; }) {}; + "optics" = callPackage + ({ mkDerivation, array, base, bytestring, containers, criterion + , inspection-testing, lens, mtl, optics-core, optics-extra + , optics-th, random, tasty, tasty-hunit, template-haskell + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "optics"; + version = "0.1"; + sha256 = "1xkccyshhzbf8c7v1vi7cw4k1a1gfgw9yl2wfma4q36bv96qq2lk"; + libraryHaskellDepends = [ + array base containers mtl optics-core optics-extra optics-th + transformers + ]; + testHaskellDepends = [ + base containers inspection-testing mtl optics-core random tasty + tasty-hunit template-haskell + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion lens transformers + unordered-containers vector + ]; + description = "Optics as an abstract interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-core" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "optics-core"; + version = "0.1"; + sha256 = "0vyvvjlqps0sa03rxp0p2v9vjllff53adn3y6qfwrpc08kxwh7q1"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "Optics as an abstract interface: core definitions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-extra" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable, mtl + , optics-core, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "optics-extra"; + version = "0.1"; + sha256 = "1z0blxm9gxbzqxxcm9bkj8jvf9apgn8abh0wdc4f220rs32c3v7g"; + libraryHaskellDepends = [ + array base bytestring containers hashable mtl optics-core text + transformers unordered-containers vector + ]; + description = "Extra utilities and instances for optics-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-th" = callPackage + ({ mkDerivation, base, containers, mtl, optics-core + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "optics-th"; + version = "0.1"; + sha256 = "1fqaxp7divk2wj7mvnsyzclly99l895dss1ssk6dzfgdijjjipk6"; + revision = "1"; + editedCabalFile = "034563mm7rdck8xhwjpqig3kj9rzk91s292rwcargbgbpma5ailv"; + libraryHaskellDepends = [ + base containers mtl optics-core template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base optics-core ]; + description = "Optics construction using TemplateHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optics-vl" = callPackage + ({ mkDerivation, base, optics-core, profunctors }: + mkDerivation { + pname = "optics-vl"; + version = "0.1"; + sha256 = "03khw0aqv7wdlym5maasm1l20gj4y1jzci89y592hx3y07mzvapl"; + libraryHaskellDepends = [ base optics-core profunctors ]; + description = "Utilities for compatibility with van Laarhoven optics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "optima" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base , optparse-applicative, rerebase, text, text-builder @@ -173191,6 +173953,7 @@ self: { pname = "pandoc-placetable"; version = "0.5.1"; sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; + configureFlags = [ "-finlineMarkdown" ]; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -173297,10 +174060,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.5.4"; - sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j"; - revision = "1"; - editedCabalFile = "0bpd2iqmriajl5qg44j4z9c4agb9gsdwbn5l4c5yry6flivysq3c"; + version = "1.17.6"; + sha256 = "1c4yf284wd2zbskhrqk0lhqkdyry40db087cdy86b5ywr0yy1li7"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -173519,8 +174280,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.1.1.1"; - sha256 = "082p2shapgnv10qjm77bpn0y6p6582n38xcgirh2l8mhs1yqflyg"; + version = "0.1.1.2"; + sha256 = "1m1sps9kc7y8zpba486lv5z8an3z8493zxb1qhghql6pybsprsgi"; libraryHaskellDepends = [ aeson ansi-terminal array base base-orphans base64-bytestring bytestring Cabal conduit conduit-extra containers contravariant @@ -174109,6 +174870,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; + revision = "1"; + editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -176587,29 +177350,28 @@ self: { "perceptual-hash" = callPackage ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip - , optparse-applicative, par-traverse, pHash, primitive, repa, stm + , hspec, optparse-applicative, par-traverse, primitive, repa, stm , vector, vector-algorithms }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.1.0"; - sha256 = "107f5xb4wg4zmwqldw8a04byazqyzd0vkn6zl5iv4f5ii2sdb5yh"; - revision = "1"; - editedCabalFile = "001nr9brgk05bbhz9lw8viqrc6rgfy0rjp08fcdhn302j55j33i3"; + version = "0.1.2.0"; + sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hip primitive repa vector vector-algorithms ]; executableHaskellDepends = [ base containers filepath optparse-applicative par-traverse stm ]; - benchmarkHaskellDepends = [ base criterion ]; - benchmarkPkgconfigDepends = [ pHash ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; license = stdenv.lib.licenses.bsd3; - }) {pHash = null;}; + }) {}; "perdure" = callPackage ({ mkDerivation, array, base, binary, bytestring, cognimeta-utils @@ -178120,8 +178882,8 @@ self: { }: mkDerivation { pname = "pg-transact"; - version = "0.1.0.1"; - sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr"; + version = "0.1.2.0"; + sha256 = "1xgma50c4pvvb9h2wksx8wl4sf0625ngbsb2c828xd0aqj171qmj"; libraryHaskellDepends = [ base bytestring exceptions monad-control postgresql-simple transformers @@ -178137,6 +178899,30 @@ self: { broken = true; }) {}; + "pg-transact_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hspec + , hspec-discover, hspec-expectations-lifted, monad-control + , postgresql-simple, tmp-postgres, transformers + }: + mkDerivation { + pname = "pg-transact"; + version = "0.2.0.0"; + sha256 = "0g3willpc3msbgbrjq6q3zlc195c2cv8bnhc3g4ksnz7c85z3vhc"; + libraryHaskellDepends = [ + base bytestring exceptions monad-control postgresql-simple + transformers + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-discover + hspec-expectations-lifted postgresql-simple tmp-postgres + ]; + testToolDepends = [ hspec-discover ]; + description = "Another postgresql-simple transaction monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pgdl" = callPackage ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit , conduit-extra, configurator, containers, directory @@ -178679,6 +179465,17 @@ self: { broken = true; }) {}; + "pickle" = callPackage + ({ mkDerivation, base, containers, network, text }: + mkDerivation { + pname = "pickle"; + version = "0.1.0.0"; + sha256 = "1jai9ys9mznc8v6z9jsh1yc4xdf12cr3gw7ci2nx9xzjspn4qy8z"; + libraryHaskellDepends = [ base containers network text ]; + description = "Instant StatsD in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "picologic" = callPackage ({ mkDerivation, base, containers, mtl, parsec, picosat, pretty , QuickCheck @@ -179142,8 +179939,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.11"; - sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv"; + version = "4.3.12"; + sha256 = "0ni5szs9jl4map05lcyl97dgb69g2xk1a1rdiw8p4024vfyskp8c"; libraryHaskellDepends = [ base exceptions mmorph mtl semigroups transformers void ]; @@ -182714,6 +183511,17 @@ self: { broken = true; }) {}; + "postgres-options" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "postgres-options"; + version = "0.1.0.1"; + sha256 = "0pysvgg2p032j5a9qdysbndy0a0fzm41zgv070cwqk199w1lh3h7"; + libraryHaskellDepends = [ base bytestring ]; + description = "An Options type representing options for postgres connections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgres-tmp" = callPackage ({ mkDerivation, base, bytestring, postgresql-simple, text }: mkDerivation { @@ -182980,10 +183788,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.5.0"; - sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp"; - revision = "1"; - editedCabalFile = "11clkx7j4k3wgk6h1g0flq7frvkfxhh4dhbjjrchc5f7rd5gmjbp"; + version = "3.6.0"; + sha256 = "1mf9441yb72jl1gm9zpfgwwjdiipcl0gghnazf1871dgvahbx3jz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -183138,20 +183944,20 @@ self: { "postgresql-simple-opts" = callPackage ({ mkDerivation, base, bytestring, data-default, either , generic-deriving, hspec, optparse-applicative, optparse-generic - , postgresql-simple, split, uri-bytestring + , postgres-options, postgresql-simple, split, uri-bytestring }: mkDerivation { pname = "postgresql-simple-opts"; - version = "0.3.0.1"; - sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly"; + version = "0.4.0.0"; + sha256 = "0zrmqd25xni2d51jna2a52l3bmdn6lpx9mbjzllnf6zn6ckw4ja8"; libraryHaskellDepends = [ base bytestring data-default either generic-deriving - optparse-applicative optparse-generic postgresql-simple split - uri-bytestring + optparse-applicative optparse-generic postgres-options + postgresql-simple split uri-bytestring ]; testHaskellDepends = [ base bytestring data-default hspec optparse-applicative - postgresql-simple + postgres-options postgresql-simple ]; description = "An optparse-applicative parser for postgresql-simple's connection options"; license = stdenv.lib.licenses.bsd3; @@ -187539,8 +188345,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20190630"; - sha256 = "0b35jayk5n8p7zn2nkgzvqgpiai0h7g3pf27i5bzxlaw2zwm9320"; + version = "0.20190826"; + sha256 = "1z6apxnp88jjpf5q7zg04r18lja7rafwlx1w2cy7d74qfrh1v2b7"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -191885,6 +192691,39 @@ self: { broken = true; }) {}; + "rattletrap_9_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, scientific, template-haskell, temporary, text + , transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "9.0.2"; + sha256 = "14dnnaii24c9vh4jvdymnnhrhvgwzfr6al4qcm4bj9wk55jgj71r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls scientific template-haskell + text transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls scientific template-haskell + text transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls HUnit scientific + template-haskell temporary text transformers + ]; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -192419,8 +193258,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.1"; - sha256 = "0wflw7rpknjj6qpf2ma1cxd03xg5v25rmfrmnli472h55jdcwdnz"; + version = "0.5.2"; + sha256 = "1gd6d3r0dsawi6zkr4fnkyrszikg1xzgfavxsaaswl4rw09znr7x"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -192897,8 +193736,8 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.9.0.0"; - sha256 = "0x4d06vsxz3845w05d4qnfbmws2bc7vxpny8hiqbv1wwgjwig327"; + version = "0.9.0.1"; + sha256 = "0a4gp16zm1j6xi9algg4fkl53rxjzq38dvfjk0bzw6sm727rxvnf"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -192910,6 +193749,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reanimate-svg_0_9_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, hspec + , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text + , transformers, vector, xml + }: + mkDerivation { + pname = "reanimate-svg"; + version = "0.9.0.2"; + sha256 = "1nlxdyvy4fzr21qm428112w7af9ziajg9vqiv73q45ijgc6icgc9"; + libraryHaskellDepends = [ + attoparsec base bytestring containers JuicyPixels lens linear mtl + scientific text transformers vector xml + ]; + testHaskellDepends = [ + attoparsec base hspec linear scientific svg-tree + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reason-export" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck @@ -193300,8 +194160,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.0.4.0"; - sha256 = "1wcg8a3aql1jmnfl7q5gzjgxl4z6780zgp8w10v3g52ilcdq4myn"; + version = "2.1.0.2"; + sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -193772,14 +194632,16 @@ self: { }) {}; "reflection" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, hspec, hspec-discover, QuickCheck + , template-haskell + }: mkDerivation { pname = "reflection"; - version = "2.1.4"; - sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj"; - revision = "1"; - editedCabalFile = "05ibi4ivvh87d96xl09yh0day08p5www5vp568mvn2dp37rxyngc"; + version = "2.1.5"; + sha256 = "0xr947nj1vww5b8fwqmypxm3y3j5sxl4z8wnf834f83jzfzyjbi7"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; description = "Reifies arbitrary terms into types that can be reflected back into terms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -193819,26 +194681,26 @@ self: { , filepath, haskell-src-exts, haskell-src-meta, hlint, lens , loch-th, MemoTrie, monad-control, monoidal-containers, mtl , prim-uniq, primitive, process, profunctors, random, ref-tf - , reflection, semigroupoids, semigroups, split, stm, syb - , template-haskell, these, time, transformers, transformers-compat + , reflection, semialign, semigroupoids, split, stm, syb + , template-haskell, these, these-lens, time, transformers , unbounded-delays, witherable }: mkDerivation { pname = "reflex"; - version = "0.6.2.1"; - sha256 = "0s8saim58bqqhg1nbrrdw2blnph7jrhqw97wxf73g4r1d8jacg3z"; + version = "0.6.2.4"; + sha256 = "1gm8w2ri16apy3b13i2f17pk1nsrsi0vbcrkckd1abbm4r4i16cd"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta lens MemoTrie monad-control monoidal-containers mtl prim-uniq primitive profunctors random ref-tf reflection - semigroupoids semigroups stm syb template-haskell these time - transformers transformers-compat unbounded-delays witherable + semialign semigroupoids stm syb template-haskell these time + transformers unbounded-delays witherable ]; testHaskellDepends = [ base bifunctors containers deepseq dependent-map dependent-sum directory filemanip filepath hlint lens monoidal-containers mtl - ref-tf semigroups split these transformers + ref-tf semialign split these these-lens transformers ]; benchmarkHaskellDepends = [ base containers criterion deepseq dependent-map dependent-sum @@ -194184,8 +195046,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.1.0"; - sha256 = "1nhi33d0yqx2pjccrcbsgwp2l56sdmqpl11vpvkvx4wkxckyz2qf"; + version = "0.1.1.1"; + sha256 = "1qhmpdfwavr4vip39p1ih3hz0yb1b308g3m24w80n3zw7xqnqz6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196145,6 +197007,23 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "replace-megaparsec" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec + , text + }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.1.0.0"; + sha256 = "1m1f0pwz6glpkc3n00c8c9v6dmfriss117p168wmx7kfx4kz56zs"; + libraryHaskellDepends = [ base megaparsec ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + benchmarkHaskellDepends = [ + base bytestring criterion megaparsec text + ]; + description = "Stream editing with parsers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "replica" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , file-embed, http-types, QuickCheck, quickcheck-instances @@ -196611,7 +197490,7 @@ self: { broken = true; }) {}; - "resolv" = callPackage + "resolv_0_1_1_2" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , containers, directory, filepath, tasty, tasty-hunit }: @@ -196627,6 +197506,25 @@ self: { ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resolv" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , containers, directory, filepath, tasty, tasty-hunit + }: + mkDerivation { + pname = "resolv"; + version = "0.1.1.3"; + sha256 = "10y9x63m2w87qfmx9fxjfliq9881cp1x8zkf94sb0hq52rgxd3r4"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers + ]; + testHaskellDepends = [ + base bytestring directory filepath tasty tasty-hunit + ]; + description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; + license = stdenv.lib.licenses.gpl2Plus; }) {}; "resolve" = callPackage @@ -198086,8 +198984,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.11.0"; - sha256 = "17p3zr1fncwqc1rz181mfbxi9dlyd2cd8xcxhnxm3fgnq6i9cj4l"; + version = "0.1.12.0"; + sha256 = "0xzjkh6aavynpyskikhs8dmv0zhkiqiwz9zdn80zbd25b2182pif"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -199247,16 +200145,17 @@ self: { "rounded" = callPackage ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr - , reflection, singletons + , reflection }: mkDerivation { pname = "rounded"; - version = "0.1.0.1"; - sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls"; + version = "1.0"; + sha256 = "1vwy8sc457bxq3x8wzfsr5v01lp38ynwg8hp97likkckd13vkh7v"; libraryHaskellDepends = [ - base ghc-prim hgmp long-double reflection singletons + base ghc-prim hgmp long-double reflection ]; librarySystemDepends = [ gmp mpfr ]; + libraryPkgconfigDepends = [ mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -200815,64 +201714,28 @@ self: { "salak" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, menshen, mtl - , QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "salak"; - version = "0.3.4.1"; - sha256 = "178vjvyqvs2m6671wckw8yb5s5xy0nvdivxvyxqq9w8ckdnnk1q0"; - libraryHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec menshen mtl scientific text time - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps hspec megaparsec menshen mtl QuickCheck - random scientific text time unliftio-core unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion data-default directory dlist - exceptions filepath hashable heaps megaparsec menshen mtl - scientific text time unliftio-core unordered-containers - ]; - description = "Configuration (re)Loader and Parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak_0_3_5_1" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, menshen, mtl - , QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers + , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random + , scientific, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.5.1"; - sha256 = "0g41h9a89cp24cm99q1lgiyz794szf85hinybbjz75s33a3lykgv"; + version = "0.3.5.3"; + sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec menshen mtl scientific text time + filepath hashable heaps megaparsec mtl scientific text time unliftio-core unordered-containers ]; testHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps hspec megaparsec menshen mtl QuickCheck - random scientific text time unliftio-core unordered-containers + base hspec mtl QuickCheck random scientific text + unordered-containers ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring containers criterion data-default directory dlist - exceptions filepath hashable heaps megaparsec menshen mtl - scientific text time unliftio-core unordered-containers + base criterion data-default mtl text time ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak-toml" = callPackage @@ -200881,32 +201744,8 @@ self: { }: mkDerivation { pname = "salak-toml"; - version = "0.3.4.1"; - sha256 = "1gsgl6wzrzhpgbz1paig9xbxknm9g5z3g3cq47i198qzxnmqad7c"; - libraryHaskellDepends = [ - base salak text time tomland unordered-containers - ]; - testHaskellDepends = [ - base exceptions hspec mtl QuickCheck salak text time tomland - unordered-containers - ]; - benchmarkHaskellDepends = [ - base criterion salak text time tomland unordered-containers - ]; - description = "Configuration Loader for toml"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "salak-toml_0_3_5_1" = callPackage - ({ mkDerivation, base, criterion, exceptions, hspec, mtl - , QuickCheck, salak, text, time, tomland, unordered-containers - }: - mkDerivation { - pname = "salak-toml"; - version = "0.3.5.1"; - sha256 = "1clgsr1aqz2zfnsazhql6m125161yxbfp6q0lc4dllbvdhjygmrf"; + version = "0.3.5.3"; + sha256 = "18spk2m75inddz9k0pwg58cr61rfbw1fnki56nnq7jng0wii376y"; libraryHaskellDepends = [ base salak text time tomland unordered-containers ]; @@ -200929,27 +201768,8 @@ self: { }: mkDerivation { pname = "salak-yaml"; - version = "0.3.4.1"; - sha256 = "083ba1pdv6pnlzc9ijh9pzvxn056yjhy46283jf49m4sbma105w4"; - libraryHaskellDepends = [ base conduit libyaml salak text ]; - testHaskellDepends = [ - base conduit exceptions hspec libyaml mtl QuickCheck salak text - ]; - benchmarkHaskellDepends = [ - base conduit criterion libyaml salak text - ]; - description = "Configuration Loader for yaml"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak-yaml_0_3_5_1" = callPackage - ({ mkDerivation, base, conduit, criterion, exceptions, hspec - , libyaml, mtl, QuickCheck, salak, text - }: - mkDerivation { - pname = "salak-yaml"; - version = "0.3.5.1"; - sha256 = "1qzpbv2g7ds3dbcfi90ncjrk66vm1kxdkkdx1i49jq9g2xcai9n6"; + version = "0.3.5.3"; + sha256 = "07wcwld58bdr8n5fdfq98x6c1xdr8rrx919y4f9y7abdnc4aj000"; libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit exceptions hspec libyaml mtl QuickCheck salak text @@ -200959,7 +201779,6 @@ self: { ]; description = "Configuration Loader for yaml"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -201636,6 +202455,35 @@ self: { broken = true; }) {inherit (pkgs) z3;}; + "sbv_8_4" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, transformers, z3 + }: + mkDerivation { + pname = "sbv"; + version = "8.4"; + sha256 = "0fv1l99zw29vsfgzym0qvb8qcy1jb7gkd1yj48vy1w0ayg9w01i0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time transformers + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -202091,32 +202939,6 @@ self: { "scheduler" = callPackage ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest - , criterion, deepseq, doctest, exceptions, fib, hspec, monad-par - , mwc-random, parallel, primitive, QuickCheck, streamly - , template-haskell, unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "scheduler"; - version = "1.4.1"; - sha256 = "1m8l780pv9il661faa0angq05a5db9jpkyxxkil73285fx459fkl"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - atomic-primops base deepseq exceptions primitive unliftio-core - ]; - testHaskellDepends = [ - base deepseq doctest hspec mwc-random QuickCheck template-haskell - unliftio vector - ]; - benchmarkHaskellDepends = [ - async base criterion deepseq fib monad-par parallel streamly - unliftio - ]; - description = "Work stealing scheduler"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scheduler_1_4_2" = callPackage - ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest , criterion, deepseq, doctest, exceptions, fib, genvalidity-hspec , hspec, monad-par, mwc-random, parallel, primitive, QuickCheck , streamly, template-haskell, unliftio, unliftio-core, vector @@ -202139,7 +202961,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedyield" = callPackage @@ -204085,10 +204906,8 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "5.3.2"; - sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31"; - revision = "1"; - editedCabalFile = "1r88pi1bvc1w0nys810p3drra6na02zhbaf257dl4lyxl8iv5466"; + version = "5.3.3"; + sha256 = "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -204135,12 +204954,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semigroups_0_19" = callPackage + "semigroups_0_19_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.19"; - sha256 = "1ficdd32y0v6bi0dxzjn9fph03ql0nmyjy0x3ahr8c4508xh779r"; + version = "0.19.1"; + sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; @@ -204653,8 +205472,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.3.2"; - sha256 = "0ghmhn9cmgxwn9nix309q300ma23snkvhmhg4vsl5gnx6bhg7caj"; + version = "1.3.2.1"; + sha256 = "0fl3sg4znmnil08vbjf50xcbs5blh9pvg1jakbhikj1aab68vpp5"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -205407,8 +206226,6 @@ self: { ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions-core" = callPackage @@ -206567,8 +207384,35 @@ self: { ]; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-rawm_0_3_2_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, filepath, Glob + , hspec-wai, http-client, http-media, http-types, lens, resourcet + , servant, servant-client, servant-client-core, servant-docs + , servant-server, tasty, tasty-hspec, tasty-hunit, text + , transformers, wai, wai-app-static, warp + }: + mkDerivation { + pname = "servant-rawm"; + version = "0.3.2.0"; + sha256 = "013d89zmlmwwwhgyc57xbzsd4phz347if5y6iz93wrw4lbvc341d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring filepath http-client http-media http-types lens + resourcet servant-client servant-client-core servant-docs + servant-server wai wai-app-static + ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai http-client http-media + http-types servant servant-client servant-client-core + servant-server tasty tasty-hspec tasty-hunit text transformers wai + warp + ]; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-reason" = callPackage @@ -207649,6 +208493,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "set-cover_0_1" = callPackage + ({ mkDerivation, array, base, containers, enummapset, non-empty + , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "set-cover"; + version = "0.1"; + sha256 = "1yidgc1nbhbkxpchd96vzfgkk95hdwgpvd9ys2b4xw2m1zyzi1kb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers enummapset non-empty prelude-compat psqueues + semigroups transformers utility-ht + ]; + testHaskellDepends = [ + array base containers enummapset QuickCheck transformers utility-ht + ]; + benchmarkHaskellDepends = [ + array base containers enummapset QuickCheck random timeit + transformers utility-ht + ]; + description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "set-extra" = callPackage ({ mkDerivation, base, containers, mtl, syb }: mkDerivation { @@ -208419,8 +209290,8 @@ self: { ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "3.1.0.0"; - sha256 = "1lbdz4bv95d0rwfpk1l494lrfd5qp029awbfiv1wpydbvvspdvx6"; + version = "3.1.0.2"; + sha256 = "04nhjq2s7iycjabh33jwbdc8pxdyxnfrwjvl1mxmwrx0zx96dbi9"; libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -208625,6 +209496,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_21" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.21"; + sha256 = "1assgcinf9i9rm7mphqfymzvn7z1m2jjkm98z7l2pb76z53mcvgh"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -209180,6 +210077,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shelly_1_9_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.9.0"; + sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process text time transformers + transformers-base unix unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -211089,8 +212014,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.2"; - sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg"; + version = "0.4.3"; + sha256 = "0xj5w6dszm832y90qxmwqnyiwpav30q199cjcdbdxr7q1d4klszi"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -211128,6 +212053,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons_2_6" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden + , template-haskell, text, th-desugar, transformers, turtle + }: + mkDerivation { + pname = "singletons"; + version = "2.6"; + sha256 = "1lc6p1f3h0j4nq5ppqwjihrjlgcwl5sx5fsw449m9lvs07vp39xy"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl pretty syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ + base filepath process tasty tasty-golden text turtle + ]; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singnal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -214725,6 +215672,8 @@ self: { pname = "socks"; version = "0.6.0"; sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp"; + revision = "1"; + editedCabalFile = "0a7p6gfcmxgrs3rx62qm7fi5hvn90r64px7wbqva4h6scrmywn50"; libraryHaskellDepends = [ base basement bytestring cereal network ]; @@ -215490,8 +216439,8 @@ self: { }: mkDerivation { pname = "sparse-tensor"; - version = "0.2.1"; - sha256 = "10950cp07m1p011n3a14bka2rpfrmn20k0kjb1cvca7dnxn2iv2f"; + version = "0.2.1.1"; + sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ ad base bytestring cereal containers deepseq ghc-typelits-knownnat @@ -215621,8 +216570,8 @@ self: { }: mkDerivation { pname = "spdx"; - version = "1"; - sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd"; + version = "1.0.0.1"; + sha256 = "00j0dqx9hrlpqy1jml85nykg0xl108q45ljan385bzb5nnap36l6"; libraryHaskellDepends = [ base Cabal containers transformers ]; testHaskellDepends = [ base base-compat Cabal tasty tasty-quickcheck @@ -217402,6 +218351,19 @@ self: { broken = true; }) {}; + "stack-fix" = callPackage + ({ mkDerivation, base, options, text, turtle }: + mkDerivation { + pname = "stack-fix"; + version = "0.1.0.0"; + sha256 = "13x4pd1h2f2akpja5mxnqx0pw1ax57r2q76gsb3fs1f6kxykypwl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base options text turtle ]; + description = "Console program used to fix Stack build errors automatically"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib @@ -219105,6 +220067,8 @@ self: { pname = "stm"; version = "2.5.0.0"; sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr"; + revision = "1"; + editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; @@ -225612,10 +226576,8 @@ self: { }: mkDerivation { pname = "tar"; - version = "0.5.1.0"; - sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8"; - revision = "1"; - editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x"; + version = "0.5.1.1"; + sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -225940,10 +226902,8 @@ self: { ({ mkDerivation, base, tagged, tasty }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.11.1.1"; - sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji"; - revision = "1"; - editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16"; + version = "0.11.1.2"; + sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n"; libraryHaskellDepends = [ base tagged tasty ]; description = "Mark tasty tests as failure expected"; license = stdenv.lib.licenses.mit; @@ -227016,12 +227976,12 @@ self: { broken = true; }) {}; - "template-haskell_2_14_0_0" = callPackage + "template-haskell_2_15_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.14.0.0"; - sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9"; + version = "2.15.0.0"; + sha256 = "16p8szb5by7gyk5r5cnrdp3b613vp5wasqj8dz63my17l2lsp2wl"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -227644,8 +228604,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.4.0.1"; - sha256 = "14mgpwhpfa0w5xgwsqa5nklagw6scs51cjwin7d34gx8bkvw9m13"; + version = "0.4.0.2"; + sha256 = "0k0aylm6vzcqghp5zw461p68zgzjzr6k4ki7d00zl471lmbdbs8n"; libraryHaskellDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -229274,6 +230234,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; + revision = "1"; + editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -229844,6 +230806,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-desugar_1_10" = callPackage + ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit + , mtl, ordered-containers, semigroups, syb, template-haskell + , th-abstraction, th-expand-syns, th-lift, th-orphans + , transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.10"; + sha256 = "1g3v427qlpxl1m4klsbqzg2xas5sj4059j5pdx0vpbshpq9v3x8v"; + libraryHaskellDepends = [ + base containers fail ghc-prim mtl ordered-containers semigroups syb + template-haskell th-abstraction th-lift th-orphans + transformers-compat + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-expand-syns + th-lift th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-dict-discovery" = callPackage ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { @@ -229874,10 +230860,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.4.0"; - sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc"; - revision = "1"; - editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9"; + version = "0.4.5.0"; + sha256 = "1p4wfyycan8zsp9wi7npx36qwbfsbcgdyxi3ii51scf69dkrx42y"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -231093,8 +232077,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.4.0"; - sha256 = "0zh1d5apjsayqjwl019qcd4b7v2f2w14amq3rysdwqx8cz7z5045"; + version = "1.4.3"; + sha256 = "1nj5pgzan7q070c8qhcq51mnrwpkxi51ixmmp7b4n4fxfc80v68g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -231147,8 +232131,8 @@ self: { }: mkDerivation { pname = "tidal-vis"; - version = "1.0.14"; - sha256 = "1l924nqv8ljd9ljpy05r18j0rc5if3k5lvpifv2g8fn967gi0nfs"; + version = "1.0.15"; + sha256 = "0h198v3p1z8bmn993w54a7pm4s445lvf7683h23wydpnfckxv06h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232661,6 +233645,30 @@ self: { broken = true; }) {}; + "tmp-postgres_0_3_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, directory, hspec + , hspec-discover, mtl, network, port-utils, postgres-options + , postgresql-libpq, postgresql-simple, process, temporary, unix + }: + mkDerivation { + pname = "tmp-postgres"; + version = "0.3.0.1"; + sha256 = "1h0n3kd5wz4lhg2m4zkyd0vhynrpdvvwlrngyj62d27i1qk2livy"; + libraryHaskellDepends = [ + async base bytestring directory network port-utils postgres-options + postgresql-simple process temporary unix + ]; + testHaskellDepends = [ + base bytestring directory hspec hspec-discover mtl postgresql-libpq + postgresql-simple process temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Start and stop a temporary postgres for testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tmpl" = callPackage ({ mkDerivation, base, bytestring, directory, template, text }: mkDerivation { @@ -233408,6 +234416,8 @@ self: { pname = "topograph"; version = "1"; sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7"; + revision = "1"; + editedCabalFile = "0pgvjjzmlc947xb1jx1l3bjxz6p9ldm3zlqlm7wf0bcfrznfxgqc"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -235655,8 +236665,8 @@ self: { }: mkDerivation { pname = "ttl-hashtables"; - version = "1.3.1.0"; - sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h"; + version = "1.3.1.1"; + sha256 = "14ammgggkfmc4divr1zykjadad5fzgspjnzpjfdzj3vwm1rf5gwv"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -235948,6 +236958,22 @@ self: { broken = true; }) {}; + "tuples" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "tuples"; + version = "0.1.0.0"; + sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck + ]; + description = "Small monomorphic tuples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tuples-homogenous-h98" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -236159,28 +237185,27 @@ self: { }) {}; "tweet-hs" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base - , bytestring, composition-prelude, containers, criterion - , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, megaparsec, microlens - , optparse-applicative, split, text, unordered-containers + ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base + , bytestring, composition-prelude, containers, criterion, directory + , extra, htoml-megaparsec, http-client, http-client-tls, http-types + , megaparsec, microlens, optparse-applicative, split, text + , unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.43"; - sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0"; + version = "1.0.2.1"; + sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default extra htoml-megaparsec - http-client http-client-tls http-types megaparsec microlens split - text unordered-containers + ansi-wl-pprint authenticate-oauth base bytestring + composition-prelude containers extra htoml-megaparsec http-client + http-client-tls http-types megaparsec microlens split text + unordered-containers ]; executableHaskellDepends = [ base bytestring directory optparse-applicative ]; - testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; @@ -237965,13 +238990,13 @@ self: { }: mkDerivation { pname = "typography-geometry"; - version = "1.0.0.1"; - sha256 = "1mrack0n940idy5rv7mm0gfif8xri6z59npxwkq1kgi606vazbpd"; + version = "1.0.1.0"; + sha256 = "0vi2ggpvvarqimrga985cks5wq67dqyrr5nh3a0ghy0mbdrb72ps"; libraryHaskellDepends = [ base containers parallel polynomials-bernstein vector ]; description = "Drawings for printed text documents"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -238511,6 +239536,8 @@ self: { pname = "unagi-chan"; version = "0.4.1.2"; sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn"; + revision = "1"; + editedCabalFile = "09pqi867wskwgc5lpn197f895mbn1174ydgllvcppcsmrz2b6yr6"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -243182,6 +244209,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.6"; sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy"; + revision = "1"; + editedCabalFile = "1bpxdliw7jmks1rkmb8hbr7hng3niz1pfc6n3s8ndj1acrksmfmv"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -243399,6 +244428,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_1_1" = callPackage + ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable + , megaparsec, microlens, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.1.1"; + sha256 = "1cs004ixw6rp2zg9hyw4yf0n15rq3s1ns9yy18rr8sxmcsw6jb9g"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base base-prelude checkers megaparsec microlens QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -243550,6 +244598,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_29" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.29"; + sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -251072,8 +252139,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xlsx-tabular" = callPackage @@ -253021,37 +254086,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.1.0"; - sha256 = "1kd64j2ka246n8c0z30rckq75998ajaja6ylmpdc74pzn23iydq9"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.11.1.1"; - sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp"; + version = "0.11.1.2"; + sha256 = "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -253068,7 +254104,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -253923,8 +254958,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.7"; - sha256 = "0p9c26ic45bmsjvfb7kam87ja2vbd4m7qm27znvfrn9wvijhjzp9"; + version = "1.6.8"; + sha256 = "0d2nrzrqymbbp5hfwp7c6k6gr0vn6ladq0dl7wgwrybfx8nqgf65"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -254243,8 +255278,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.1"; - sha256 = "19y5m94njn26vglnyrpzy59614dj7f7wbgnc354syr8qmdiliczp"; + version = "0.6.1.2"; + sha256 = "07jm60q1fbdk53ncirbi8clsimg28k9j12kaq0vx2apn2rlmdy2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254502,8 +255537,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.15"; - sha256 = "0rzmx9cx2lzlmhjrbczdpzv6divwr0n6h3330rsdh15kn8wjkfr8"; + version = "1.6.16"; + sha256 = "02bzg0cyvb56hjmrcc0m6a0r7y4kq1cjqhkds542rh73w6dm6fpd"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -257349,8 +258384,8 @@ self: { }: mkDerivation { pname = "zeromq4-simple"; - version = "0.0.0"; - sha256 = "04i8ksdyf19yywjb0gfkbc0mx90vzvrld5ba7lbnlxvx6iwmah66"; + version = "0.0.0.1"; + sha256 = "0h16chz3x0ipdbw935fvfhpdljbknczk1ivf87519dkrl3c1ypjv"; libraryHaskellDepends = [ aeson base bytestring constraints hashable uuid zeromq4-haskell ]; @@ -257779,8 +258814,8 @@ self: { }: mkDerivation { pname = "zlib"; - version = "0.6.2"; - sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d"; + version = "0.6.2.1"; + sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index c7fbab6ab88..0bb930a8bb3 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation { name = "hoogle-local-0.1"; buildInputs = [ghc hoogle]; - phases = [ "buildPhase" ]; - inherit docPackages; - buildPhase = '' + passAsFile = ["buildCommand"]; + + buildCommand = '' ${lib.optionalString (packages != [] -> docPackages == []) ("echo WARNING: localHoogle package list empty, even though" + " the following were specified: " diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 1793299bf6c..8b667a1e669 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -13,43 +13,4 @@ self: super: { # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - cabal-install-3 = (self.callPackage - ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, containers, cryptohash-sha256, deepseq - , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, parsec, pretty - , process, random, resolv, stdenv, stm, tar, text, time, unix, zlib - , fetchFromGitHub - }: - mkDerivation { - pname = "cabal-install"; - version = "3.0.0.0"; - src = fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "b0e52fa173573705e861b129d9675e59de891e46"; - sha256 = "1fbph6crsn9ji8ps1k8dsxvgqn38rp4ffvv6nia1y7rbrdv90ass"; - }; - postUnpack = "sourceRoot+=/cabal-install"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal filepath process ]; - executableHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP mtl network network-uri - parsec pretty process random resolv stm tar text time unix zlib - ]; - doCheck = false; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; - }) {}).overrideScope (self: super: { - Cabal = self.Cabal_3_0_0_0; - }); - } diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index a88d07d1655..d53337aca1a 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -11,7 +11,7 @@ revs = { "8.2" = "8.2"; }; in stdenv.mkDerivation rec { - name = "acl2-${version}"; + pname = "acl2"; version = "8.2"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 85794b09ae0..744106bce5d 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, gnugrep }: stdenv.mkDerivation rec { - name = "bats-${version}"; + pname = "bats"; version = "1.1.0"; src = fetchzip { diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index b597ba6fe78..918c577356c 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.30"; - name = "clips-${version}"; + pname = "clips"; src = fetchurl { url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z"; sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy"; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 57ced325aad..369d84708dc 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -3,7 +3,8 @@ let version = "0.4.4"; in stdenv.mkDerivation { - name = "clooj-${version}"; + pname = "clooj"; + inherit version; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 16f3e7f73e2..ab8e616ac6d 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -128,7 +128,7 @@ let # packageJSON=./package.json; in stdenv.mkDerivation rec { inherit version; - name = "lumo-${version}"; + pname = "lumo"; src = fetchurl { url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index fa8996f0fb5..02ac6bfbcde 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -47,7 +47,8 @@ in stdenv.mkDerivation { - name = "dart-${version}"; + pname = "dart"; + inherit version; nativeBuildInputs = [ unzip diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index f79c30740a1..f968e04bbe9 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "duktape-${version}"; + pname = "duktape"; version = "2.4.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 258aebe8172..7c7cd9abb7e 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -4,7 +4,8 @@ let version = "5.0"; in stdenv.mkDerivation { - name = "eff-${version}"; + pname = "eff"; + inherit version; src = fetchFromGitHub { owner = "matijapretnar"; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 84ebc49a221..54ee243cb33 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "08zsdl6pkg6dx7k0ns8cd070v7ydsxkscd2ms8wh9r68c08vwzcp"; + sha256 = "1j2vsqgljqw7415rgjlnc1w3nmr9ghizx2mncbm1yipwj8xbrmf6"; }; - cargoSha256 = "1hqlagwl94xcybfqq5h2mrz9296mjns2l598d6jclls7ac5wsdfc"; + cargoSha256 = "0ckxpmi547y7q4w287znimpxgaj3mjkgmkcs2n9cp4m8cw143hly"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 857a1e5cd8d..744a0f76ff0 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: stdenv.mkDerivation rec { - name = "falcon-${version}"; + pname = "falcon"; version = "2013-09-19"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index a0d20b7ebe4..71542046af9 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gauche-${version}"; + pname = "gauche"; version = "0.9.8"; src = fetchurl { diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index c8dc48bab00..94ec0244382 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { - name = "gnu-apl-${version}"; + pname = "gnu-apl"; version = "1.8"; src = fetchurl { diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index d5635fc2232..bdd13841896 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -3,7 +3,7 @@ # at runtime, need jdk stdenv.mkDerivation rec { - name = "groovy-${version}"; + pname = "groovy"; version = "2.5.8"; src = fetchurl { diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 56becd3d6c9..0d3fe100329 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { - name = "icon-lang-${version}"; + pname = "icon-lang"; version = "9.5.1"; src = fetchFromGitHub { owner = "gtownsend"; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 11feb1170c2..791ac6dd338 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline, libedit, bc }: stdenv.mkDerivation rec { - name = "j-${version}"; + pname = "j"; version = "807"; jtype = "release"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 704e3eb4031..91b4c0b9a9e 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -4,7 +4,7 @@ let makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { - name = "jimtcl-${version}"; + pname = "jimtcl"; version = "0.78"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ba65c00f1e9..233900cadd0 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,27 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "joker-${version}"; - version = "0.12.4"; - - goPackagePath = "github.com/candid82/joker"; +buildGoModule rec { + pname = "joker"; + version = "0.12.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1swi991khmyhxn6w6xsdqp1wbyx3qmd9d7yhpwvqasyxp8gg3szm"; + sha256 = "0panmhrg1i158xbvqvq3s3217smbj7ynwlaiks18pmss36xx9dk4"; }; - preBuild = "go generate ./..."; - - postBuild = "rm go/bin/sum256dir"; - - dontInstallSrc = true; - - excludedPackages = "gen"; # Do not install private generators. - - goDeps = ./deps.nix; + modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; meta = with stdenv.lib; { homepage = https://github.com/candid82/joker; diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix deleted file mode 100644 index 4eff988796b..00000000000 --- a/pkgs/development/interpreters/joker/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559"; - sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; - }; - } - { - goPackagePath = "github.com/pkg/profile"; - fetch = { - type = "git"; - url = "https://github.com/pkg/profile"; - rev = "5b67d428864e92711fcbd2f8629456121a56d91f"; - sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } -] diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 56c0f1f73e6..6c4a9f20fa3 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -4,7 +4,7 @@ let # The version number here is whatever is reported by the RUBY_VERSION string rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { - name = "jruby-${version}"; + pname = "jruby"; version = "9.2.8.0"; diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index f822fdd9c8f..0e1734565f2 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "jython-${version}"; + pname = "jython"; version = "2.7.1"; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 03c836d9251..a9922a38765 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "kona-${version}"; + pname = "kona"; version = "3.21"; src = fetchurl { url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 284773fe660..3ef239e89a9 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lolcode-${version}"; + pname = "lolcode"; version = "0.11.2"; src = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/build-rocks.nix b/pkgs/development/interpreters/lua-5/build-rocks.nix deleted file mode 100644 index e69de29bb2d..00000000000 --- a/pkgs/development/interpreters/lua-5/build-rocks.nix +++ /dev/null diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/pkgs/development/interpreters/lua-5/build-rockspec.nix deleted file mode 100644 index e69de29bb2d..00000000000 --- a/pkgs/development/interpreters/lua-5/build-rockspec.nix +++ /dev/null diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 7aa41e95cc9..0ac1fa30e2f 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; - name = "lua-filesystem-${version}"; + pname = "lua-filesystem"; isLibrary = true; src = fetchurl { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index d8a789e9209..f0eb1becc57 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lua5 }: stdenv.mkDerivation rec { - name = "lua-sockets-${version}"; + pname = "lua-sockets"; version = "2.0.2"; src = fetchurl { url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 30013946886..afd2627d20e 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation rec { - name = "maude-${version}"; + pname = "maude"; + inherit version; src = fetchurl { url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index e8e23cee830..cd325c94948 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "metamath-${version}"; + pname = "metamath"; version = "0.172"; buildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index ceea3932063..aef23ad6881 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-${version}"; + pname = "mujs"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 277993339e2..bde2f5d9fa9 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { - name = "nix-exec-${version}"; + pname = "nix-exec"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index d3dda7655c2..cc9f6fcc3c9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -19,9 +19,9 @@ in stdenv.mkDerivation rec { version = "5.1.0"; - name = "octave-${version}"; + pname = "octave"; src = fetchurl { - url = "mirror://gnu/octave/${name}.tar.gz"; + url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3"; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { # Keep a copy of the octave tests detailed results in the output # derivation, because someone may care postInstall = '' - cp test/fntests.log $out/share/octave/${name}-fntests.log || true + cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true ''; passthru = { diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 62ab7b02585..6e57ad250bb 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - name = "picoc-${version}"; + pname = "picoc"; version = "2015-05-04"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 5adf41a0f3b..dc3b08acbd9 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "picoLisp-${version}"; + pname = "picoLisp"; version = "19.6"; src = fetchurl { - url = "https://www.software-lab.de/${name}.tgz"; + url = "https://www.software-lab.de/${pname}-${version}.tgz"; sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq"; }; buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index d1f2edce936..99c763615e3 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -30,7 +30,7 @@ let bin-path = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [ gcc ]); build = {flags, target}: stdenv.mkDerivation rec { - name = "pixie-${version}"; + pname = "pixie"; version = "0-r${commit-count}-${variant}"; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = libs; diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 9e38e825074..0b9ddc0bb34 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "python-boot-${version}"; + pname = "python-boot"; version = "2.7.12"; libPrefix = "python2.7"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index de980f1ca68..4e323898afb 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,6 +79,12 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) + (fetchpatch { + url = "https://github.com/python/cpython/commit/979daae300916adb399ab5b51410b6ebd0888f13.patch"; + name = "CVE-2018-20852.patch"; + sha256 = "0p838ycssd6abxzby69rhngjqqm59cmlp07910mpjx7lmsz049pb"; + }) + # Fix race-condition during pyc creation. Has a slight backwards # incompatible effect: pyc symlinks will now be overridden # (https://bugs.python.org/issue17222). Included in python >= 3.4, diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 7561fdad785..60d067c1bf2 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -83,6 +83,8 @@ in with passthru; stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' + '' + optionalString (stdenv.isDarwin && x11Support) '' + substituteInPlace setup.py --replace /Library/Frameworks /no-such-path ''; patches = [ diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 779039c6d6a..3b41e14be85 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: stdenv.mkDerivation rec { - name = "qnial-${version}"; + pname = "qnial"; version = "6.3"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e37c43a0bd6..35bd1729866 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -45,7 +45,7 @@ let in stdenv.mkDerivation rec { - name = "racket-${version}"; + pname = "racket"; version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { inherit sha256; } )) { - inherit name; + inherit ;name = "${pname}-${version}"; sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"; }; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 1244ad5ecd2..ab5493e8a9d 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ , CoreServices, ApplicationServices }: stdenv.mkDerivation rec { - name = "rakudo-star-${version}"; + pname = "rakudo-star"; version = "2017.01"; src = fetchurl { - url = "http://rakudo.org/downloads/star/${name}.tar.gz"; + url = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz"; sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; }; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 4d98f18eee4..274b70b2c79 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: stdenv.mkDerivation rec { - name = "rebol-nightly-${version}"; + pname = "rebol-nightly"; version = "3-alpha"; src = fetchFromGitHub { rev = "bd45d0de512ff5953e098301c3d610f6024515d6"; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 56ff0283174..2121f54a3b1 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "red-${version}"; + pname = "red"; version = "0.6.3"; src = fetchFromGitHub { rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { rm -rf $out/opt/red/rebol install -Dm755 console $out/bin/red install -Dm644 BSD-3-License.txt \ - $out/share/licenses/${name}/BSD-3-License.txt + $out/share/licenses/${pname}-${version}/BSD-3-License.txt install -Dm644 BSL-License.txt \ - $out/share/licenses/${name}/BSL-License.txt + $out/share/licenses/${pname}-${version}/BSL-License.txt install -Dm644 docs/red-system-quick-test.html \ - $out/share/doc/${name}/red-system-quick-test.html + $out/share/doc/${pname}-${version}/red-system-quick-test.html install -Dm644 docs/red-system-specs.html \ - $out/share/doc/${name}/red-system-specs.html + $out/share/doc/${pname}-${version}/red-system-specs.html # PathElf patchelf --set-interpreter \ diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index 1d67193a73c..ec19b0679f4 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "Regina-REXX-${version}"; + pname = "Regina-REXX"; version = "3.9.1"; src = fetchurl { - url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz"; sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx"; }; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index f438e9fb13c..db68578d62a 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -6,7 +6,7 @@ with pythonPackages; stdenv.mkDerivation rec { - name = "renpy-${version}"; + pname = "renpy"; version = "7.3.2"; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4e617ce67eb..cfe76a2caa1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -3,6 +3,7 @@ , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix +, makeWrapper, buildRubyGem, defaultGemConfig } @ args: let @@ -44,9 +45,11 @@ let , autoreconfHook, bison, autoconf , buildEnv, bundler, bundix , libiconv, libobjc, libunwind, Foundation + , makeWrapper, buildRubyGem, defaultGemConfig }: stdenv.mkDerivation rec { - name = "ruby-${version}"; + pname = "ruby"; + inherit version; src = if useRailsExpress then fetchFromGitHub { owner = "ruby"; @@ -194,6 +197,12 @@ let ruby = self; }; + inherit (import ../../ruby-modules/with-packages { + inherit lib stdenv makeWrapper buildRubyGem buildEnv; + gemConfig = defaultGemConfig; + ruby = self; + }) withPackages gems; + # deprecated 2016-09-21 majorVersion = ver.major; minorVersion = ver.minor; @@ -213,26 +222,26 @@ in { }; ruby_2_4 = generic { - version = rubyVersion "2" "4" "5" ""; + version = rubyVersion "2" "4" "7" ""; sha256 = { - src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7"; - git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43"; + src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd"; + git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z"; }; }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "5" ""; + version = rubyVersion "2" "5" "6" ""; sha256 = { - src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98"; - git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz"; + src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx"; + git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz"; }; }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "3" ""; + version = rubyVersion "2" "6" "4" ""; sha256 = { - src = "1yw23hmllxsc4b7zqndn5l4d9503gdik6rsf3lfdkf12bxwx6zsp"; - git = "1h4k2kw0vr4jh2ra9l89i8lnddfh2qfw67y9cknjylf7kw2m1pmh"; + src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag"; + git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 47d8397c966..5bf59a96f74 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,17 +6,17 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.5" = ops useRailsExpress [ + "2.4.7" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.5" = ops useRailsExpress [ + "2.5.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.3" = ops useRailsExpress [ + "2.6.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 95b38fc8ebd..883987683b0 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3"; - sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy"; + rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a"; + sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag"; } diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 594bbc05b7c..c6c8caa7cf3 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # $ Self -s myimage.snap # version = "4.5.0"; - name = "self-${version}"; + pname = "self"; src = fetchgit { url = "https://github.com/russellallen/self"; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 9c81b230ada..e00af621347 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,7 +1,7 @@ { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; version = "1.8.5"; src = fetchurl { diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 2c45ba58976..89bbd713a5c 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "38.8.0"; - name = "spidermonkey-${version}"; + pname = "spidermonkey"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 2ec5923b0e1..1e1ea10ef6d 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -3,7 +3,8 @@ let version = "52.9.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 518fc5f77b7..175b2f2e767 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -6,7 +6,8 @@ with stdenv.lib; let version = "60.4.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 057375182f5..049dd9192d7 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -7,8 +7,8 @@ let optional = stdenv.lib.optional; in -stdenv.mkDerivation rec { - name = "supercollider-${version}"; +mkDerivation rec { + pname = "supercollider"; version = "3.10.2"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; - cmakeFlags = '' - -DSC_WII=OFF - -DSC_EL=${if useSCEL then "ON" else "OFF"} - ''; + cmakeFlags = [ + "-DSC_WII=OFF" + "-DSC_EL=${if useSCEL then "ON" else "OFF"}" + ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index cd377e70cd9..d4ec1677bfb 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "tcl-${version}"; + pname = "tcl"; + inherit version; inherit src; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index f2c5fd938ce..ca897ec692c 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tinyscheme-${version}"; + pname = "tinyscheme"; version = "1.41"; src = fetchurl { - url = "mirror://sourceforge/tinyscheme/${name}.tar.gz"; + url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz"; sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a"; }; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 77154b54fd8..30ea124cf4b 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, libX11, libXt }: stdenv.mkDerivation rec { - name = "unicon-lang-${version}"; + pname = "unicon-lang"; version = "11.7"; src = fetchurl { url = "http://unicon.org/dist/uni-2-4-2010.zip"; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 36c4af5f496..abb549110a8 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -16,7 +16,8 @@ in fetchSubmodules = true; }; in stdenv.mkDerivation rec { - name = "jogl-${version}"; + pname = "jogl"; + inherit version; src = fetchgit { url = git://jogamp.org/srv/scm/jogl.git; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index c67d7270548..69cb24fc0b0 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { - name = "postgresql-jdbc-${version}"; + pname = "postgresql-jdbc"; version = "42.2.5"; src = fetchMavenArtifact { diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index fbf9615f88a..f251d2bed0c 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "CoinMP-${version}"; + pname = "CoinMP"; version = "1.8.4"; src = fetchurl { - url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz"; sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 9522038df6a..418900ddeeb 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "LASzip-${version}"; + pname = "LASzip"; src = fetchurl { url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index a8d5d608f89..610f1b768f2 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "SDL-${version}"; + pname = "SDL"; version = "1.2.15"; src = fetchurl { - url = "https://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 94aca192852..d538a0969b0 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -23,11 +23,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "SDL2-${version}"; + pname = "SDL2"; version = "2.0.9"; src = fetchurl { - url = "https://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"; }; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 803cc97a8ae..d57bb6cbc94 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,12 +1,11 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index ba33b1fbc1d..326d9d66264 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { - name = "SDL2_image-${version}"; + pname = "SDL2_image"; version = "2.0.5"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; }; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 61e15d621bc..826cf793cd2 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -4,11 +4,11 @@ , enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { - name = "SDL2_mixer-${version}"; + pname = "SDL2_mixer"; version = "2.0.4"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 1cb74ac1b2d..309102e70b5 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,11 +1,11 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_net-${version}"; + pname = "SDL2_net"; version = "2.0.1"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index b219922223f..50e47bc1d36 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { - name = "SDL2_ttf-${version}"; + pname = "SDL2_ttf"; version = "2.0.15"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; }; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 68c8c16ed4e..74a31d94687 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_gfx-${version}"; + pname = "SDL_gfx"; version = "2.0.26"; src = fetchurl { - url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz"; sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 961a0a7f5aa..8e3078563e2 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { - name = "SDL_image-${version}"; + pname = "SDL_image"; version = "1.2.12"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 887319062be..427439f496e 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "SDL_mixer"; version = "1.2.12"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz"; + url = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz"; sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index f1c5a5462d1..6ac91a6d129 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { pname = "SDL_net"; version = "1.2.8"; - name = "${pname}-${version}"; - src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 6279bfcb428..7b8fb67a30f 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: stdenv.mkDerivation rec { - name = "SDL_sixel-${version}"; + pname = "SDL_sixel"; version = "1.2-nightly"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 0e717c53035..94534ecd699 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { - name = "SDL_sound-${version}"; + pname = "SDL_sound"; version = "1.0.3"; src = fetchurl { - url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz"; + url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz"; sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; }; diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 7f276387c83..9695d51ed89 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_stretch-${version}"; + pname = "SDL_stretch"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2"; sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index cf6b53021f7..96b60b1061f 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, SDL, freetype }: stdenv.mkDerivation rec { - name = "SDL_ttf-${version}"; + pname = "SDL_ttf"; version = "2.0.11"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; }; diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 4e1da866622..5795d0baa62 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "abseil-cpp-${version}"; + pname = "abseil-cpp"; date = "20190322"; rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a"; version = "${date}-${rev}"; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index a50c92924e9..0aace12569a 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: stdenv.mkDerivation rec { - name = "accounts-qt-${version}"; + pname = "accounts-qt"; version = "1.15"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 8713663ecca..860ac3fde41 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dadmin_group=wheel" "-Dlocalstatedir=/var" - "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; postPatch = '' diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 75c942d4d48..04ab1331475 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libtool, perl }: stdenv.mkDerivation rec { - name = "ace-${version}"; + pname = "ace"; version = "6.5.6"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; - + preConfigure = '' export INSTALL_PREFIX=$out export ACE_ROOT=$(pwd) diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 76e49768d53..c9797b31eaa 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -4,7 +4,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "adns-${version}"; + pname = "adns"; + inherit version; src = fetchurl { urls = [ diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 5170e384f77..f0d87c81133 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.7.18"; - name = "afflib-${version}"; + pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 22e91ee61d7..a1d4c225909 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "aften-${version}"; + pname = "aften"; version = "0.0.8"; src = fetchurl { - url = "mirror://sourceforge/aften/${name}.tar.bz2"; + url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; }; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 5c25da92055..1e9496c1a1c 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "alembic-${version}"; + pname = "alembic"; version = "1.7.11"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index f98c8fa480e..407aa557ea2 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -4,11 +4,11 @@ }: mkDerivation rec { - name = "alkimia-${version}"; + pname = "alkimia"; version = "8.0.1"; src = fetchurl { - url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m"; }; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 9f8ca69a70f..b267c62d6c7 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "allegro-${version}"; - version = "5.2.4.0"; + pname = "allegro"; + version = "5.2.5.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d"; + sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; }; buildInputs = [ @@ -28,14 +28,6 @@ stdenv.mkDerivation rec { libpulseaudio libpthreadstubs ]; - patches = [ - # fix compilation with mesa 18.2.5 - (fetchpatch { - url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch"; - sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m"; - }) - ]; - postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c ''; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index eca32b740e3..6b44ec1b598 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -4,11 +4,11 @@ , libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { - name = "allegro-${version}"; + pname = "allegro"; version="4.4.2"; src = fetchurl { - url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 95828c44f85..a4f3b714e1c 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, openal }: stdenv.mkDerivation rec { - name = "alure-${version}"; + pname = "alure"; version = "1.2"; src = fetchurl { diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index 15331c22599..7525b3baab0 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "amrwb-${version}"; + pname = "amrwb"; version = "11.0.0.0"; srcAmr = fetchurl { diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index fc79cae36f8..9fc11555b69 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apache-activemq-${version}"; + pname = "apache-activemq"; version = "5.14.5"; src = fetchurl { sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; - url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; + url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 4068e36badf..694d91d5a0a 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,7 +1,26 @@ -{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib -, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant -, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42 -, libuuid, json-glib, meson, gperf, ninja, gdk-pixbuf +{ stdenv +, fetchFromGitHub +, substituteAll +, docbook_xml_dtd_42 +, docbook_xsl +, fontconfig +, freetype +, gdk-pixbuf +, gettext +, glib +, gobject-introspection +, gperf +, gtk-doc +, gtk3 +, json-glib +, libarchive +, libsoup +, libuuid +, libxslt +, meson +, ninja +, pkgconfig +, pngquant }: stdenv.mkDerivation rec { name = "appstream-glib-0.7.15"; @@ -12,19 +31,39 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; + rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; sha256 = "16cqs1s7nqc551sipgaxbbzwap1km0n12s4lcgfbxzzl9bcjbp9m"; }; nativeBuildInputs = [ - meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 gobject-introspection + docbook_xml_dtd_42 + docbook_xsl + gettext + gobject-introspection + gperf + gtk-doc + libxslt + meson + ninja + pkgconfig ]; + buildInputs = [ - glib gettext sqlite libsoup - attr acl libuuid json-glib - libarchive gperf gdk-pixbuf + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + json-glib + libarchive + libsoup + libuuid + ]; + + propagatedBuildInputs = [ + glib + gdk-pixbuf ]; - propagatedBuildInputs = [ gtk3 ]; patches = [ (substituteAll { diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 429da8de835..62d72844386 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "appstream-${version}"; + pname = "appstream"; version = "0.12.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 0013764d779..307f57d20cf 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -3,7 +3,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here stdenv.mkDerivation rec { - name = "appstream-qt-${version}"; + pname = "appstream-qt"; inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index b26291469e7..8be98f061a8 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -5,14 +5,14 @@ let inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "aqbanking-${version}"; + pname = "aqbanking"; inherit version; src = let qstring = "package=03&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index bb337e471cf..061ed77849f 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -13,14 +13,14 @@ let inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "gwenhywfar-${version}"; + pname = "gwenhywfar"; inherit version; src = let qstring = "package=01&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 9a0b70e0d97..23c300ab48a 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -3,14 +3,14 @@ let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "libchipcard-${version}"; + pname = "libchipcard"; inherit version; src = let qstring = "package=02&release=${releaseId}&file=01"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index eb58003a5f6..ac67a101bc5 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "arb"; version = "2.16.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 3b93a351f7f..127c2f3ae31 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { + pname = "armadillo"; version = "9.600.6"; - name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7660ea81eaf..f763f98799d 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "arrow-cpp-${version}"; + pname = "arrow-cpp"; version = "0.14.1"; src = fetchurl { diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index 72305cb633f..b8d166507a9 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -5,7 +5,8 @@ with stdenv.lib; stdenv.mkDerivation { - name = "asio-${version}"; + pname = "asio"; + inherit version; src = fetchurl { url = "mirror://sourceforge/asio/asio-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 24e06b0d65a..d5a98b0ce92 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { - name = "assimp-${version}"; + pname = "assimp"; version = "4.1.0"; src = fetchFromGitHub{ diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 2268d438902..a805949bf11 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,12 +16,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "at-spi2-atk"; version = "2.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 47c8c090d08..7adc84f4786 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -17,12 +17,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "at-spi2-core"; version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"; }; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index b79d85bcd7c..02409d6ace0 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0-beta.1"; - name = "JamomaCore-${version}"; + pname = "JamomaCore"; src = fetchFromGitHub { owner = "jamoma"; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 3a4c363e23c..2fde40327e9 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libsndfile }: stdenv.mkDerivation rec { - name = "libbs2b-${version}"; + pname = "libbs2b"; version = "3.1.0"; src = fetchurl { - url = "mirror://sourceforge/bs2b/${name}.tar.bz2"; + url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2"; sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index ac6f0470a0a..b8f1a5c088a 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -2,7 +2,8 @@ let version = "0.6.2"; in stdenv.mkDerivation { - name = "libgme-${version}"; + pname = "libgme"; + inherit version; meta = with stdenv.lib; { description = "A collection of video game music chip emulators"; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 0f9f5f5aac6..0e0f0c5d425 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { - name = "libmysofa-${version}"; + pname = "libmysofa"; version = "0.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index fe0e0854a32..1c5a5302d71 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "libsmf-${version}"; + pname = "libsmf"; src = fetchurl { - url = "https://github.com/stump/libsmf/archive/${name}.tar.gz"; + url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz"; sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 373d50a0a43..04752fd2951 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { - name = "lilv-${version}"; + pname = "lilv"; version = "0.24.4"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index d026dd258bc..50593cab647 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lv2-${version}"; + pname = "lv2"; version = "1.16.0"; src = fetchurl { - url = "http://lv2plug.in/spec/${name}.tar.bz2"; + url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2"; sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy"; }; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 81cc868f52c..978376eb4fa 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lv2-unstable-${version}"; + pname = "lv2-unstable"; version = "2017-07-08"; src = fetchgit { diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 78763ca29e2..826c36db1a6 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lvtk-${version}"; + pname = "lvtk"; version = "1.2.0"; src = fetchurl { diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index ddd3940098a..7cb151e4203 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { - name = "ntk-${version}"; + pname = "ntk"; version = "1.3.1000"; src = fetchFromGitHub { owner = "original-male"; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 2adec665e1c..dad36209ed8 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.1.0"; - name = "rtaudio-${version}"; + pname = "rtaudio"; src = fetchFromGitHub { owner = "thestk"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 41bb9ca9f11..6cd7d06da9d 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; - name = "rtmidi-${version}"; + pname = "rtmidi"; src = fetchFromGitHub { owner = "thestk"; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 09a6230184a..21d6cdfb5d4 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }: stdenv.mkDerivation rec { - name = "sratom-${version}"; + pname = "sratom"; version = "0.6.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; }; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 320fc41f76c..d91784ce14f 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , alsaLib, }: stdenv.mkDerivation rec { - name = "zita-alsa-pcmi-${version}"; + pname = "zita-alsa-pcmi"; version = "0.3.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; }; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 4fc5c12ccc4..308aa020e36 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fftwFloat }: stdenv.mkDerivation rec { - name = "zita-convolver-${version}"; + pname = "zita-convolver"; version = "4.0.3"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs"; }; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index e9cccab39f0..98e272d5dab 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zita-resampler-${version}"; + pname = "zita-resampler"; version = "1.6.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; }; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 11c66db7075..a2fdb66d7e9 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -3,7 +3,8 @@ let version = "1.8.2"; in stdenv.mkDerivation { - name = "avro-c++-${version}"; + pname = "avro-c++"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index cbd29a095d4..9582e54ffac 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation rec { - name = "avro-c-${version}"; + pname = "avro-c"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7233a187053..1cc65b53b3e 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "aws-sdk-cpp-${version}"; + pname = "aws-sdk-cpp"; version = "1.7.90"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index eff6ff62632..c4b1d36ce70 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,15 +1,39 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gobject-introspection +, lcms2 +}: stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.66"; + version = "0.1.72"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n"; + url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"; }; - doCheck = true; + patches = [ + # Apple linker does not know --version-script flag + # https://gitlab.gnome.org/GNOME/babl/merge_requests/26 + ./fix-darwin.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + ]; + + buildInputs = [ + lcms2 + ]; meta = with stdenv.lib; { description = "Image pixel format conversion library"; diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch new file mode 100644 index 00000000000..eaeff63689f --- /dev/null +++ b/pkgs/development/libraries/babl/fix-darwin.patch @@ -0,0 +1,16 @@ +diff --git a/babl/meson.build b/babl/meson.build +index b551c9a..f452435 100644 +--- a/babl/meson.build ++++ b/babl/meson.build +@@ -24,9 +24,9 @@ + ] + + # Linker arguments +-babl_link_args = [ ++babl_link_args = cc.get_supported_link_arguments([ + '-Wl,--version-script,' + version_script, +-] ++]) + if platform_win32 + babl_link_args += '-Wl,--no-undefined' + endif diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 42621a1792c..af727e394d1 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "backward-${version}"; + pname = "backward"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 9d5063d8f07..b1fb17b08fa 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , xorgserver, dbus, python2, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "bamf-${version}"; + pname = "bamf"; version = "0.5.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; preConfigure = '' diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 05ff5593205..05203d6c233 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "beignet-${version}"; + pname = "beignet"; version = "unstable-2018.08.20"; src = fetchFromGitHub { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru.utests = stdenv.mkDerivation rec { - name = "beignet-utests-${version}"; + pname = "beignet-utests"; inherit version src; preConfigure = '' diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index e6702d0db64..16be4600ec6 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "biblesync-${version}"; + pname = "biblesync"; version = "1.1.2"; src = fetchurl{ - url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz"; + url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz"; sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8"; }; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 812ad546f86..c7520c89ef5 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -3,7 +3,7 @@ , utillinux, yodl }: stdenv.mkDerivation rec { - name = "bobcat-${version}"; + pname = "bobcat"; version = "4.08.03"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 68f5d7afcf4..c2b5c7b6062 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-${version}"; + pname = "boehm-gc"; version = "7.6.6"; src = fetchurl { diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index a241b42e187..cf76d9e7d24 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-${version}"; + pname = "boehm-gc"; version = "8.0.4"; src = fetchurl { diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index ee62d5423a1..7db73f5ad47 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -2,7 +2,7 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation rec { - name = "boringssl-${version}"; + pname = "boringssl"; version = "2017-02-23"; src = fetchgit { diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 2580b959bf2..18b1b47f6d3 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "botan-${version}"; + pname = "botan"; version = "${baseVersion}.${revision}"; src = fetchurl { diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 102e7bfcc12..328ac434d85 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -2,7 +2,7 @@ , libXi, pkgconfig }: stdenv.mkDerivation rec { - name = "box2d-${version}"; + pname = "box2d"; version = "2.3.1"; src = fetchurl { diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index b4a57396cc8..ba7b51bb0e4 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "brigand-${version}"; + pname = "brigand"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index b4a2133f7d8..f6041802a9c 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bullet-${version}"; + pname = "bullet"; version = "2.87"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 12fc1834e90..97fe7e51299 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bullet-${version}"; + pname = "bullet"; version = "2019-03-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix index b61ac1dcb09..f64090bd53a 100644 --- a/pkgs/development/libraries/bulletml/default.nix +++ b/pkgs/development/libraries/bulletml/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "bulletml-${version}"; + pname = "bulletml"; + inherit version; srcs = [ (fetchurl { diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 1e2bda285a7..e763afc4a43 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { - name = "bwidget-${version}"; + pname = "bwidget"; version = "1.9.13"; src = fetchurl { diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 3603667fbf2..396e419406a 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "c-blosc-${version}"; + pname = "c-blosc"; version = "1.16.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 4a1ea394207..890e2996f5d 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "actor-framework-${version}"; + pname = "actor-framework"; version = "0.17.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index e388b3af5f6..82570fbf7b4 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -16,10 +16,11 @@ let version = "1.16.0"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "cairo-${version}"; + pname = "cairo"; + inherit version; src = fetchurl { - url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index b175250872f..9020ccf08b5 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "capnproto-${version}"; + pname = "capnproto"; version = "0.7.0"; src = fetchurl { diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index c02633d880c..956fd74da58 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "capstone-${version}"; + pname = "capstone"; version = "4.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index d83060fc24d..92e5c04e032 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch-${version}"; + pname = "catch"; version = "1.12.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 2d0fd4cb1bc..d7876affe2f 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch2-${version}"; + pname = "catch2"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 2930ffa61e3..5897f84efff 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, darwin }: stdenv.mkDerivation rec { - name = "cctz-${version}"; + pname = "cctz"; version = "2.3"; src = fetchFromGitHub { @@ -13,8 +13,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + installTargets = [ "install_hdrs" "install_shared_lib" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 68d34c75c01..5f6b3766012 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "cddlib-${version}"; + pname = "cddlib"; version = "0.94j"; src = fetchFromGitHub { owner = "cddlib"; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 4c311f07e01..8487435981c 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "cdk-${version}"; + pname = "cdk"; version ="5.0-20190224"; buildInputs = [ diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 7e5c768036f..eaeb6bf8e43 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: stdenv.mkDerivation rec { - name = "cegui-${version}"; + pname = "cegui"; version = "0.8.7"; src = fetchurl { - url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2"; + url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2"; sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; }; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 6bf7975034b..d9e69b8e751 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -7,7 +7,8 @@ # The celt codec has been deprecated and is now a part of the opus codec stdenv.mkDerivation rec { - name = "celt-${version}"; + pname = "celt"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 52e0f06eeec..3ce8c4ef080 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -11,7 +11,7 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { - name = "ceres-solver-${version}"; + pname = "ceres-solver"; version = "1.14.0"; src = fetchurl { diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index df75d3a1f1d..39ed74d0075 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo, allegro, perl, libX11 }: stdenv.mkDerivation rec { - name = "cgui-${version}"; + pname = "cgui"; version="2.1.0"; src = fetchurl { - url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz"; sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; }; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index ae8b6ca18df..08610d1e9af 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "check-${version}"; + pname = "check"; version = "0.12.0"; src = fetchurl { diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index f460b69a4f8..76f722f31aa 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "chipmunk-${version}"; + pname = "chipmunk"; majorVersion = "7"; version = "${majorVersion}.0.1"; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 02420735ff7..fd868884f98 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, boost, ffmpeg }: stdenv.mkDerivation rec { - name = "chromaprint-${version}"; + pname = "chromaprint"; version = "1.3.2"; src = fetchurl { - url = "https://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz"; sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 3e6e62e5a96..3e7ef6d96ee 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - - name = "cimg-${version}"; + pname = "cimg"; version = "2.7.0"; src = fetchurl { diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 1890d2b25a0..a7d7a0ea982 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "cl-${version}"; + pname = "cl"; src = fetchFromGitHub { owner = "tonyrog"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # 'cp' line taken from Arch recipe # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl installPhase = '' - DIR=$out/lib/erlang/lib/${name} + DIR=$out/lib/erlang/lib/${pname}-${version} mkdir -p $DIR cp -ruv c_src doc ebin include priv src $DIR ''; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index d329b1945fc..ff8e1ca6759 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -3,7 +3,8 @@ let version = "1.0.10"; in stdenv.mkDerivation { - name = "classads-${version}"; + pname = "classads"; + inherit version; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix index 086816655d3..11752423906 100644 --- a/pkgs/development/libraries/clipper/default.nix +++ b/pkgs/development/libraries/clipper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.4.2"; - name = "Clipper-${version}"; + pname = "Clipper"; src = fetchurl { url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 7764e9c67ed..7adc2a365c5 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "cln-${version}"; + pname = "cln"; version = "1.3.4"; src = fetchurl { - url = "${meta.homepage}${name}.tar.bz2"; + url = "${meta.homepage}${pname}-${version}.tar.bz2"; sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d"; }; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index ede2049b6ee..e7c02312b66 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.29.0"; - name = "cmark-${version}"; + pname = "cmark"; src = fetchFromGitHub { owner = "jgm"; diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 8044d7165f7..11e719b36df 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: stdenv.mkDerivation rec { - name = "cmrt-${version}"; + pname = "cmrt"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 9f4c4c3b6b3..7c42a7479b1 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation { - name = "codec2-${version}"; + pname = "codec2"; + inherit version; src = fetchsvn { url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 29ce216cadf..cc42407433c 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "concurrencykit-${version}"; + pname = "concurrencykit"; version = "0.6.0"; src = fetchurl { diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix index 5630daa0d93..86f4485a900 100644 --- a/pkgs/development/libraries/coprthr/default.nix +++ b/pkgs/development/libraries/coprthr/default.nix @@ -2,7 +2,7 @@ , bison, flex }: stdenv.mkDerivation rec { - name = "coprthr-${version}"; + pname = "coprthr"; version = "1.6"; src = fetchurl { diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 33b8c5519b2..d172ab55fa3 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { - name = "cpp-hocon-${version}"; + pname = "cpp-hocon"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index c13b32a67b0..2585a7abaed 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: stdenv.mkDerivation rec { - name = "cpp-ipfs-api-${version}"; + pname = "cpp-ipfs-api"; version = "2017-01-04"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index a2493e55fb0..7bb2bad9689 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { - name = "cppcms-${version}"; + pname = "cppcms"; version = "1.2.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; }; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 3423b29d76c..737122c57bf 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { - name = "cppdb-${version}"; + pname = "cppdb"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 3f8b2d896ac..76fd6db18b0 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cppunit-${version}"; + pname = "cppunit"; version = "1.14.0"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/${name}.tar.gz"; + url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz"; sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index 2dce60d4b2c..28ab31a08cc 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.8"; - name = "cpputest-${version}"; + pname = "cpputest"; src = fetchurl { - url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8"; }; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 5bffda607ee..2328bd53362 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zeromq }: stdenv.mkDerivation rec { - name = "cppzmq-${version}"; + pname = "cppzmq"; version = "4.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index d8130d0b8f9..a4313fa94d3 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -2,8 +2,8 @@ libtool, pkgconfig, re2, texinfo }: stdenv.mkDerivation rec { - name = "cre2-${version}"; - version = "0.3.6"; + pname = "cre2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "marcomaggi"; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 61a825cd374..cb481fc7084 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "crypto++-${version}"; + pname = "crypto++"; majorVersion = "5.6"; version = "${majorVersion}.5"; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 9b74ecdb0f7..506aa5f475d 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "csfml-${version}"; + pname = "csfml"; + inherit version; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index fd81de5139d..5696684e91d 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "ctpl-${version}"; + pname = "ctpl"; version = "0.3.4"; src = fetchurl { diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 5a2a53ef24d..ea2230909a2 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "ctpp2-${version}"; + pname = "ctpp2"; version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/${name}.tar.gz"; + url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index a2188f687d1..647c80bf8ac 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { - name = "curlcpp-${version}"; + pname = "curlcpp"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 58f88e6d8eb..490f472a066 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { - name = "curlpp-${version}"; + pname = "curlpp"; version = "0.8.1"; src = fetchFromGitHub { owner = "jpbarrette"; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index ba1d02380e2..1658f8a6fa7 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "cutee"; version = "0.4.2"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 216b644b38e..e84fbe89aa9 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "cutelyst-${version}"; + pname = "cutelyst"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix index 8be68a314e3..e668e653477 100644 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cxx-prettyprint-unstable-${version}"; + pname = "cxx-prettyprint-unstable"; version = "2016-04-30"; rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533"; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 77b27640fd7..4c572cf781a 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.2.1"; - name = "cxxtools-${version}"; + pname = "cxxtools"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 0bdaf1be955..a050dd8d9ca 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cyrus-sasl-${version}"; + pname = "cyrus-sasl"; version = "2.1.27"; src = fetchurl { urls = - [ "http://www.cyrusimap.org/releases/${name}.tar.gz" - "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" + "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index d418b879d1d..73a51cd2731 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.2"; - name = "czmq-${version}"; + pname = "czmq"; src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; + url = "http://download.zeromq.org/${pname}-${version}.tar.gz"; sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; }; diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 13cee8fe86b..05e499c73d0 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.2.0"; - name = "czmq-${version}"; + pname = "czmq"; src = fetchurl { - url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg"; }; diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix index 0c026b9f47a..079eb0806d2 100644 --- a/pkgs/development/libraries/czmqpp/default.nix +++ b/pkgs/development/libraries/czmqpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: stdenv.mkDerivation rec { - name = "czmqpp-${version}"; + pname = "czmqpp"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 5f7ca179d4a..d065554d7c9 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchFromGitLab , meson, ninja, nasm, pkgconfig , withTools ? false, SDL2 +, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers }: +assert useVulkan -> withTools; + stdenv.mkDerivation rec { pname = "dav1d"; version = "0.4.0"; @@ -17,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja nasm pkgconfig ]; # TODO: doxygen (currently only HTML and not build by default). - buildInputs = stdenv.lib.optional withTools SDL2; + buildInputs = stdenv.lib.optional withTools SDL2 + ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; mesonFlags= [ "-Denable_tools=${stdenv.lib.boolToString withTools}" diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 163b0f4be88..2609f47b276 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, dbus, glib, pkgconfig, expat }: stdenv.mkDerivation rec { - name = "dbus-cplusplus-${version}"; + pname = "dbus-cplusplus"; version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 0f897d97467..22c0a9137ca 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { - name = "dbus-sharp-glib-${version}"; + pname = "dbus-sharp-glib"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index cd020317f4c..496a109b58f 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-glib-${version}"; + pname = "dbus-sharp-glib"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 18ea3ad3ecb..084beae5972 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-${version}"; + pname = "dbus-sharp"; version = "0.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 14db5baea3f..0fd638dbf8e 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-${version}"; + pname = "dbus-sharp"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index da7549aeea3..b940315aed8 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, db62, xercesc, xqilla }: stdenv.mkDerivation rec { - name = "dbxml-${version}"; + pname = "dbxml"; version = "6.1.4"; src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz"; sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a"; }; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 04ecadadefa..093cc2bdf05 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-gtk-doc" - "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index 5b05d64f072..93e5da5b792 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.2"; - name = "dirac-${version}"; + pname = "dirac"; src = fetchurl { - url = "mirror://sourceforge/dirac/${name}.tar.gz"; + url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz"; sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1"; }; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index d52f1b6a2cf..643e7d3cc5d 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; - name = "${pname}-${version}"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 97d74e1ed3c..dfa5509fb98 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { + pname = "dlib"; version = "19.17"; - name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 83466b693f5..59578ef796e 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; - name = "docopt.cpp-${version}"; + pname = "docopt.cpp"; src = fetchFromGitHub { owner = "docopt"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 095697762dd..bc4bc8b2352 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "double-conversion-${version}"; + pname = "double-conversion"; version = "3.1.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index c85f6de0405..756a03503b3 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "drumstick-${version}"; + pname = "drumstick"; version = "1.1.2"; src = fetchurl { - url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp"; }; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 9be19f51e7e..779e6b07762 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "dssi-${version}"; + pname = "dssi"; version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/project/dssi/dssi/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz"; sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; }; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 832b013123d..8d8b41e0609 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "3.12.2"; - name = "dxflib-${version}"; + pname = "dxflib"; src = fetchurl { - url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; + url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz"; sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9"; }; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 704f5c51c9c..a6ff37bee97 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dyncall-${version}"; + pname = "dyncall"; version = "1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 4ca9eab51bb..028cd221614 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -3,7 +3,7 @@ # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { - name = "easyloggingpp-${version}"; + pname = "easyloggingpp"; version = "9.96.7"; src = fetchFromGitHub { owner = "muflihun"; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 78f80d2baf4..a9a77f6a9da 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -5,7 +5,7 @@ , enableOpenMPThreads ? false}: with stdenv.lib; stdenv.mkDerivation rec { - name = "eccodes-${version}"; + pname = "eccodes"; version = "2.12.5"; src = fetchurl { diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 62f04e061cf..71229909431 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -13,7 +13,6 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "eclib"; version = "20190226"; # upgrade might break the sage interface # sage tests to run: diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 6dfd4edd071..5f9c72f04af 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "editline-${version}"; + pname = "editline"; version = "1.16.1"; src = fetchFromGitHub { owner = "troglobit"; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 6aec15f976b..63e2707917a 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -4,7 +4,8 @@ let version = "3.3.7"; in stdenv.mkDerivation { - name = "eigen-${version}"; + pname = "eigen"; + inherit version; src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 710338842f8..566f8bfd8d1 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "elementary-cmake-modules-${version}"; + pname = "elementary-cmake-modules"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index c973c2bd944..4fc85aee69f 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -3,7 +3,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: stdenv.mkDerivation rec { - name = "embree-${version}"; + pname = "embree"; version = "2.17.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index b7303468cba..ed91f791149 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.6.1"; pname = "enchant"; src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz"; + url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz"; sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; }; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 8b559bd03c8..92e34145abd 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,23 +1,50 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: +{ stdenv +, fetchurl +, aspell +, pkgconfig +, glib +, hunspell +, hspell +, unittest-cpp +}: -let - version = "2.2.3"; +stdenv.mkDerivation rec { pname = "enchant"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.2.5"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b"; + url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "0r41qjz3104h5raiwlw5ywwybafbxdjz12j1bnq3kq60jlr6d2pf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib hunspell ]; - propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file + nativeBuildInputs = [ + pkgconfig + ]; - doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory" + buildInputs = [ + glib + hunspell + ]; + + checkInputs = [ + unittest-cpp + ]; + + # libtool puts these to .la files + propagatedBuildInputs = [ + hspell + aspell + ]; + + enableParallelBuilding = true; + + doCheck = true; + + configureFlags = [ + "--enable-relocatable" # needed for tests + ]; meta = with stdenv.lib; { description = "Generic spell checking library"; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index c4285eadabc..d45767058bb 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "epoxy-${version}"; + pname = "epoxy"; version = "1.5.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 3bc5270f053..22c812ba4c2 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,24 +1,14 @@ { stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.5"; + pname = "exempi"; + version = "2.5.1"; src = fetchurl { - url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; - patches = [ - # CVE-2018-12648 - # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9 - # remove with exempi > 2.4.5 - (fetchpatch { - name = "CVE-2018-12648.patch"; - url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch; - sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q"; - }) - ]; - configureFlags = [ "--with-boost=${boost.dev}" ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 9b05165e1b2..ec6f07f0953 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -14,20 +14,15 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub rec { owner = "exiv2"; repo = "exiv2"; - rev = version; - sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c"; + rev = "v${version}"; + sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; - patches = [ - # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments - ./fix-cmake.patch - ]; - cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" @@ -58,7 +53,7 @@ stdenv.mkDerivation rec { "doc" ]; - doCheck = stdenv.isLinux; + doCheck = true; # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. checkTarget = "tests"; @@ -72,6 +67,14 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString stdenv.isAarch64 '' rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} + + ${stdenv.lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + # Removing tests depending on charset conversion + substituteInPlace ../test/Makefile --replace "conversions.sh" "" + rm -f ../tests/bugfixes/redmine/test_issue_460.py + rm -f ../tests/bugfixes/redmine/test_issue_662.py + ''} ''; postCheck = '' diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch deleted file mode 100644 index 1e19aed8b90..00000000000 --- a/pkgs/development/libraries/exiv2/fix-cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 34087004..41b3a068 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -239,9 +239,9 @@ install(FILES - ${CMAKE_BINARY_DIR}/exiv2lib_export.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) - --install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - - # ****************************************************************************** - # exiv2 application diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 332504e46b5..4968c38bfd3 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { - name = "libexosip2-${version}"; + pname = "libexosip2"; version = "4.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index c568a670f55..7a5afd8e801 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -7,11 +7,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "faac-${version}"; + pname = "faac"; version = "1.29.9.2"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; }; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index e7e4835d2ed..29c0252482e 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "faad2-${version}"; + pname = "faad2"; version = "2.8.8"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index c23fc0bc59f..a29cbb9bbd1 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { - name = "farbfeld-${version}"; + pname = "farbfeld"; version = "4"; src = fetchgit { diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index bac867978f4..75d9146c335 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.99.8"; - name = "fastjson-${version}"; + pname = "fastjson"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index de78647dc48..5eb7e3866ce 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "fcgi-${version}"; + pname = "fcgi"; version = "2.4.0"; src = fetchurl { diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 9b7cea3ebbc..70269002e2f 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fdk-aac-${version}"; + pname = "fdk-aac"; version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp"; }; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index eae0326c832..4a276db12c0 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "1.6.0"; src = fetchurl { diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index a67210e860c..858bc209391 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,7 +2,6 @@ , gmpxx }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "2.4.0"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 28ab53feebd..3b1aeeebaab 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -237,7 +237,7 @@ assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { - name = "ffmpeg-full-${version}"; + pname = "ffmpeg-full"; version = "4.2"; src = fetchurl { diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 4607d3e2f19..439342a50b8 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "ffmpeg-sixel-${version}"; + pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 72929e127bc..84260f3f57c 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -65,11 +65,11 @@ assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { - name = "ffmpeg-${version}"; + pname = "ffmpeg"; inherit version; src = fetchurl { - url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index a1cc11fb8c1..45238690fe0 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "ffmpegthumbnailer-${version}"; + pname = "ffmpegthumbnailer"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 1ad861fc63d..c404a12f3df 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-${version}"; + pname = "ffms"; version = "2.23"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 4a2bed6b497..07f1c7ec917 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "filter-audio-${version}"; + pname = "filter-audio"; version = "0.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 504b58b6aa4..d96ceb5d26b 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "flatbuffers-${version}"; + pname = "flatbuffers"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index d92a0c61aab..20a80119b13 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -12,7 +12,7 @@ assert withBlas -> openblas != null; stdenv.mkDerivation rec { - name = "flint-${version}"; + pname = "flint"; version = "2.5.2"; # remove libflint.so.MAJOR patch when updating src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index cad4419a26c..eebe119d142 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index bb9f8fe76c9..a22b5eef8d2 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 2cfc87d6a2e..6ade5eb833a 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.3.0"; - name = "fmt-${version}"; + pname = "fmt"; src = fetchFromGitHub { owner = "fmtlib"; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index a2c3d41d35d..b072df506a9 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,7 +2,7 @@ , gflags, libiberty, openssl }: stdenv.mkDerivation rec { - name = "folly-${version}"; + pname = "folly"; version = "2019.08.05.00"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index 9aeb12344ec..b95d6dd559d 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -2,7 +2,8 @@ let version = "2016-04-23"; in stdenv.mkDerivation { - name = "fontconfig-ultimate-${version}"; + pname = "fontconfig-ultimate"; + inherit version; src = fetchFromGitHub { sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498"; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index f730e3e3408..186560ae101 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -17,11 +17,11 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-${version}"; + pname = "fontconfig"; version = "2.12.6"; src = fetchurl { - url = "http://fontconfig.org/release/${name}.tar.bz2"; + url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2"; sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 40430f34334..fa4a8c23e2f 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -2,11 +2,11 @@ , CoreServices ? null }: stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; version = "1.7.9"; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 4f1e0eaee7f..af387b7232f 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; + inherit version; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"; }; diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix index 952ecb0eade..1fd18254e10 100644 --- a/pkgs/development/libraries/fplll/20160331.nix +++ b/pkgs/development/libraries/fplll/20160331.nix @@ -2,7 +2,6 @@ , gmp, mpfr }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fplll"; version = "20160331"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 063217a4504..f06f7bf4a02 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -2,7 +2,6 @@ , gmp, mpfr }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fplll"; version = "5.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index e15626a160e..feccfd1bfd2 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -2,10 +2,10 @@ , stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "frame-${version}"; + pname = "frame"; version = "2.5.0"; src = fetchurl { - url = "https://launchpad.net/frame/trunk/v${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz"; sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index c34d9591d38..8412248b617 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -2,7 +2,8 @@ let version = "3.0.0"; in stdenv.mkDerivation { - name = "freeglut-${version}"; + pname = "freeglut"; + inherit version; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 3771880d360..41480789a08 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "freenect-${version}"; + pname = "freenect"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index ee63ce2f2f9..0ff9cea3d27 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -7,11 +7,11 @@ assert odbcSupport -> unixODBC != null; # Work is in progress to move to cmake so revisit that later stdenv.mkDerivation rec { - name = "freetds-${version}"; + pname = "freetds"; version = "1.1.6"; src = fetchurl { - url = "https://www.freetds.org/files/stable/${name}.tar.bz2"; + url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; }; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index cdeddd82b71..560855c908b 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: stdenv.mkDerivation rec { - name = "frei0r-plugins-${version}"; + pname = "frei0r-plugins"; version = "1.6.1"; src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz"; sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index b60f4be245e..9798347eadd 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , fetchpatch - , meson , ninja , pkgconfig @@ -10,7 +9,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fribidi"; version = "1.0.5"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; }; @@ -33,10 +31,11 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - checkInptus = [ python3 ]; + doCheck = true; + checkInputs = [ python3 ]; meta = with stdenv.lib; { homepage = https://github.com/fribidi/fribidi; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 68f3c9d0ee5..5e8197d5e81 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, libtool, ghostscript, groff }: stdenv.mkDerivation rec { - name = "fstrcmp-${version}"; + pname = "fstrcmp"; version = "0.7"; src = fetchzip { diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 3fcf218d6b5..380f64cf523 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }: stdenv.mkDerivation rec { - name = "fstrm-${version}"; + pname = "fstrm"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 7e35ed2e530..a990da4b010 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { - name = "gbenchmark-${version}"; + pname = "gbenchmark"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 4762d1fb119..2589b6cfa16 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, flex, bison, file }: stdenv.mkDerivation rec { - name = "libstdc++5-${version}"; + pname = "libstdc++5"; version = "3.3.6"; src = [ diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 5ceded0546c..6f57d735980 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { - name = "gd-${version}"; + pname = "gd"; version = "2.2.5"; src = fetchurl { - url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; + url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"; }; diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index 14113d8b87e..baf847d4e0a 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "2.4.0"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 0db16e2efe3..413d4e19dde 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 40308a95791..a6574053414 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,11 +3,11 @@ , libpng }: stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "1.11.5"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index a9b79dac7b8..b7043b61c8a 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -3,7 +3,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; in stdenv.mkDerivation rec { - name = "gdata-sharp-${version}"; + pname = "gdata-sharp"; version = "2.2.0.0"; src = fetchsvn { diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index fa99dbe1d9f..29a30a1b157 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.1"; - name = "gdcm-${version}"; + pname = "gdcm"; src = fetchurl { - url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; + url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq"; }; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 32e1163e0f0..0d96b9b5a92 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { - name = "gecode-${version}"; + pname = "gecode"; version = "3.7.3"; src = fetchurl { - url = "http://www.gecode.org/download/${name}.tar.gz"; + url = "http://www.gecode.org/download/${pname}-${version}.tar.gz"; sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 9a6b5d9cf27..454e811447a 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: stdenv.mkDerivation rec { - name = "gecode-${version}"; + pname = "gecode"; version = "6.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix deleted file mode 100644 index 54ee7662d06..00000000000 --- a/pkgs/development/libraries/gegl/3.0.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: - -stdenv.mkDerivation rec { - name = "gegl-0.3.34"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; - }; - - hardeningDisable = [ "format" ]; - - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 - ]; - - propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc - - nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; - - meta = with stdenv.lib; { - description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; - license = licenses.gpl3; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 4b9f67b7aaf..97b9ba087e2 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -21,11 +21,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "geis-${version}"; + pname = "geis"; version = "2.2.17"; src = fetchurl { - url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 22e7d216e6c..0e0477cd24d 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "getdata-${version}"; + pname = "getdata"; version = "0.10.0"; src = fetchurl { - url = "mirror://sourceforge/getdata/${name}.tar.xz"; + url = "mirror://sourceforge/getdata/${pname}-${version}.tar.xz"; sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 0493071ee22..3a6c4ee1dbd 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "getdns"; - name = "${pname}-${version}"; version = "1.5.1"; src = fetchurl { diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6eb8bae435b..9547c6c31ad 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -2,11 +2,11 @@ let allowBisonDependency = !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gettext-${version}"; + pname = "gettext"; version = "0.19.8.1"; src = fetchurl { - url = "mirror://gnu/gettext/${name}.tar.gz"; + url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; }; patches = [ diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index a00e07376c7..b1a2524065a 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -4,7 +4,7 @@ , optimize ? false # impure hardware optimizations }: stdenv.mkDerivation rec { - name = "gf2x-${version}"; + pname = "gf2x"; version = "1.2"; # remember to also update the url src = fetchurl { diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index b0a115eb4a5..86c5b7949a1 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { - name = "gio-sharp-${version}"; + pname = "gio-sharp"; version = "0.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index 3101bc64333..debddc6723f 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "3.7.2"; src = fetchurl { diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index d73a448f166..efed0926bb3 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "3.8.0"; src = fetchurl { diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 1a97150aa48..79fb7a8d738 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "4.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index aadc6986f5a..8b522c6e92b 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.4.0"; - name = "gl2ps-${version}"; + pname = "gl2ps"; src = fetchurl { - url = "http://geuz.org/gl2ps/src/${name}.tgz"; + url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; }; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index d12b8a7c11d..6498419bc27 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "glbinding"; version = "3.1.0"; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 6944d5b9292..2ee36d405b3 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "glfw-${version}"; + pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ecbcbea1394..48e65cc063b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,15 +46,16 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.60.4"; + version = "2.60.6"; in stdenv.mkDerivation rec { - name = "glib-${version}"; + pname = "glib"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b"; + url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -98,8 +99,12 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") - ++ [ "-Wno-error=nonnull" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=nonnull" + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; postPatch = '' # substitute fix-gio-launch-desktop-path.patch @@ -135,7 +140,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc @@ -144,7 +149,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 319a0359c58..e7d4c934db8 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.8.5"; - name = "glm-${version}"; + pname = "glm"; src = fetchzip { - url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip"; + url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip"; sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; }; diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 269071434d5..9cb5dda507d 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -6,7 +6,8 @@ let version = "5.7"; in stdenv.mkDerivation { - name = "globalarrays-${version}"; + pname = "globalarrays"; + inherit version; src = fetchFromGitHub { owner = "GlobalArrays"; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index f01fb13c3c3..b3cf36107af 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { - name = "globalplatform-${version}"; + pname = "globalplatform"; version = "6.0.0"; src = fetchurl { - url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 87addaa9991..e01deea1175 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { - name = "gppcscconnectionplugin-${version}"; + pname = "gppcscconnectionplugin"; version = "1.1.0"; src = fetchurl { - url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 9ae181e9453..6aa300e2b62 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { - name = "glog-${version}"; + pname = "glog"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index d532e906a51..d44bcdda9ae 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -14,7 +14,8 @@ let version = "1.0.22"; in stdenv.mkDerivation rec { - name = "gloox-${version}"; + pname = "gloox"; + inherit version; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 1d35c0696d2..84a7aff7107 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -14,10 +14,10 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { version = "4.65"; - name = "glpk-${version}"; + pname = "glpk"; src = fetchurl { - url = "mirror://gnu/glpk/${name}.tar.gz"; + url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index b373095a814..3b4ad1393d0 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.23"; - name = "gmime-${version}"; + pname = "gmime"; src = fetchurl { - url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; + url = "mirror://gnome/sources/gmime/2.6/${pname}-${version}.tar.xz"; sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi"; }; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 699d2854f3d..81546e5c127 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.2.3"; - name = "gmime-${version}"; + pname = "gmime"; src = fetchurl { - url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz"; + url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a"; }; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 6423e1fce98..63d9d8c2762 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gmm-${version}"; + pname = "gmm"; version = "5.3"; src = fetchurl { - url = "mirror://savannah/getfem/stable/${name}.tar.gz"; + url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46"; }; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index 0fac97aaa43..10d584c6ccb 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -2,7 +2,7 @@ , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { - name = "gmtk-${version}"; + pname = "gmtk"; version = "1.0.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 501fe4d0849..f6ff3a2ea4a 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5e525ad46af..36d42644e0b 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "gnome-sharp-${version}"; + pname = "gnome-sharp"; version = "2.24.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 7918fb7b9c4..e914f9d78ee 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -14,7 +14,7 @@ let }; in stdenv.mkDerivation rec { - name = "gnu-config-${version}"; + pname = "gnu-config"; version = "2019-04-15"; buildCommand = '' diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 036863c9c0b..af225cc50f2 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pciutils }: with stdenv.lib; stdenv.mkDerivation rec { - name = "gnu-efi-${version}"; + pname = "gnu-efi"; version = "3.0.9"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; + url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7"; }; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 75c71632aeb..cb81b52b730 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -15,7 +15,8 @@ let doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { - name = "gnutls-kdh-${version}"; + pname = "gnutls-kdh"; + inherit version; inherit src patches; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 99b1307179a..c7556276dc3 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -3,12 +3,13 @@ let version = "2.0.4"; in stdenv.mkDerivation rec { - name = "goocanvas-${version}"; + pname = "goocanvas"; + inherit version; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz"; sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index c462f2e685a..26d5e9c88c7 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "gpgme-${version}"; + pname = "gpgme"; version = "1.13.1"; src = fetchurl { - url = "mirror://gnupg/gpgme/${name}.tar.bz2"; + url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index a48490ffae5..722fb79d5d6 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -2,11 +2,11 @@ stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { - name = "grail-${version}"; + pname = "grail"; version = "3.1.1"; src = fetchurl { - url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 52c087b1914..45096e031d3 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,15 +1,14 @@ { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { - name = "grantlee-${version}"; + pname = "grantlee"; version = "5.1.0"; - grantleeCompatVersion = "5.1"; - grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}"; + grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; buildInputs = [ qtbase qtscript ]; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch new file mode 100644 index 00000000000..d049d6c96f8 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch @@ -0,0 +1,24 @@ +From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sat, 20 Jul 2019 17:35:30 +0200 +Subject: [PATCH] Fix compile with newer Qt/cmake combination + +Without this i get huge errors about Qt needing C++11 support +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d51110..0859788 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,9 @@ endif() + + project(Grantlee) + ++set (CMAKE_CXX_STANDARD 11) ++set (CMAKE_CXX_EXTENSIONS OFF) ++ + # Workaround for http://public.kitware.com/Bug/view.php?id=12301 + if (MINGW) + if(NOT CMAKE_BUILD_TYPE) diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 9c4015a1c19..19850b2e7e4 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1,2 +1,3 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch +grantlee-cxx11.patch diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 3e21f3c229f..66c5d8eb061 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "graphene-hardened-malloc-${version}"; + pname = "graphene-hardened-malloc"; version = "2"; src = fetchurl { diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 7c61b222486..0348135c7b2 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -5,6 +5,7 @@ , ninja , python3 , mutest +, nixosTests , glib , gtk-doc , docbook_xsl @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" - "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" - "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" ]; nativeBuildInputs = [ @@ -57,6 +58,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + tests = { + installedTests = nixosTests.graphene; + }; + }; + meta = with stdenv.lib; { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 224cd125dce..38243ce5a6d 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -3,7 +3,7 @@ enablePython ? false, pythonPackages }: stdenv.mkDerivation rec{ - name = "grib-api-${version}"; + pname = "grib-api"; version = "1.28.0"; src = fetchurl { diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 78335e073ed..d45aba1cb37 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too - name = "grpc-${version}"; + pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index d454ca63fd7..ffb8be85d3a 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -6,11 +6,11 @@ , gnome3 }: stdenv.mkDerivation rec { - name = "gsettings-desktop-schemas-${version}"; + pname = "gsettings-desktop-schemas"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; }; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 744d9eb6de9..812128fb12f 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gsettings-qt-${version}"; + pname = "gsettings-qt"; version = "0.1.20170824"; src = fetchbzr { diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 7c15e10620a..0ba3bf35423 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-lastfm-${version}"; + pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 887376d3187..d9afecc6d0c 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -3,7 +3,7 @@ , docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-oauth-${version}"; + pname = "gsignond-plugin-oauth"; version = "2018-10-15"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 655f73931f6..b9eecaf0946 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-sasl-${version}"; + pname = "gsignond-plugin-sasl"; version = "2018-10-15"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 33583a4c6bb..1405d4782ad 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "gsm-${version}"; + pname = "gsm"; version = "1.0.18"; src = fetchurl { - url = "http://www.quut.com/gsm/${name}.tar.gz"; + url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; }; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index f099d3fabc0..a1a0da51017 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -4,7 +4,7 @@ let majorVersion = "2.8"; in stdenv.mkDerivation rec { - name = "gsoap-${version}"; + pname = "gsoap"; version = "${majorVersion}.53"; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 2ae0ad2b453..735ab4e6e18 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -51,7 +51,7 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-${version}"; + pname = "gst-plugins-bad"; version = "1.16.0"; meta = with stdenv.lib; { @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz"; sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"; }; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 87bbef227de..fb1d627d7b1 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -14,7 +14,7 @@ , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: stdenv.mkDerivation rec { - name = "gst-plugins-base-${version}"; + pname = "gst-plugins-base"; version = "1.16.0"; meta = with lib; { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz"; sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"; }; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index fa838d5ff77..f0f01a977fd 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-${version}"; + pname = "gstreamer"; version = "1.16.0"; meta = with lib ;{ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; + url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz"; sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; }; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 703fcb58898..810cee650ca 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-${version}"; + pname = "gstreamer-editing-services"; version = "1.16.0"; meta = with stdenv.lib; { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; + url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz"; sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2"; }; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 557e3caa722..c801684b065 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -25,7 +25,7 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-good-${version}"; + pname = "gst-plugins-good"; version = "1.16.0"; meta = with stdenv.lib; { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz"; sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"; }; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 297c8ada884..1847b8d0c12 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-${version}"; + pname = "gst-libav"; version = "1.16.0"; meta = { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz"; sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"; }; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index c4620a29e94..5c571fa4a1e 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-rtsp-server-${version}"; + pname = "gst-rtsp-server"; version = "1.16.0"; meta = with stdenv.lib; { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz"; sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr"; }; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 5c3a56814ba..552ab1ec292 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-${version}"; + pname = "gst-plugins-ugly"; version = "1.16.0"; meta = with lib; { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz"; sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"; }; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index c0541857e8b..7e64636d96d 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-vaapi-${version}"; + pname = "gst-vaapi"; version = "1.16.0"; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 06d275078f3..ad013d1570e 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-${version}"; + pname = "gst-validate"; version = "1.16.0"; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz"; sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck"; }; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 9ceb571983e..5fecd45b7da 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -2,7 +2,7 @@ , static ? false }: stdenv.mkDerivation rec { - name = "gtest-${version}"; + pname = "gtest"; version = "1.8.1"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 94b745794f1..40be17fcac7 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -77,6 +77,13 @@ stdenv.mkDerivation rec { "-Dtests=false" ]; + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = [ + "-DG_ENABLE_DEBUG" + "-DG_DISABLE_CAST_CHECKS" + ]; + postPatch = '' files=( build-aux/meson/post-install.py diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 7f35f088da2..1e3b7d45edd 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { - name = "gtk-sharp-beans-${version}"; + pname = "gtk-sharp-beans"; version = "2.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 659dc14800e..615ea66f4d9 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -23,7 +23,7 @@ }: stdenv.mkDerivation rec { - name = "gtk-sharp-${version}"; + pname = "gtk-sharp"; version = "2.12.45"; builder = ./builder.sh; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index c2f05b51a65..d26cc969259 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -4,7 +4,7 @@ let inherit (gst_all_1) gstreamer gst-plugins-base; in stdenv.mkDerivation rec { - name = "gtkd-${version}"; + pname = "gtkd"; version = "3.8.5"; src = fetchzip { diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 9d1751afaf9..1b35221f066 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -2,11 +2,11 @@ , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "3.24.11"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 553e9fd9cbb..fde94e79f05 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -2,11 +2,11 @@ , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "4.2.0"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 455cc4d4b81..1b66bfd031f 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { - name = "gtksourceviewmm-${version}"; + pname = "gtksourceviewmm"; version = "3.21.3"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; }; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index f0baecb1990..54b4b001d81 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { - name = "gtkspell-${version}"; + pname = "gtkspell"; version = "3.0.10"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index cb141f8c556..97f1a12c178 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "gtkspellmm-${version}"; + pname = "gtkspellmm"; version = "3.0.5"; src = fetchurl { url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" + - "${name}.tar.xz"; + "${pname}-${version}.tar.xz"; sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv"; }; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index d0da7f8cef6..9cc079d6103 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "gts-${version}"; + pname = "gts"; version = "0.7.6"; src = fetchurl { - url = "mirror://sourceforge/gts/${name}.tar.gz"; + url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz"; sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 17ca323a5fe..2db8c1e6739 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "gumbo-${version}"; + pname = "gumbo"; version = "0.10.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 78a2d365033..2f39b03898d 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -3,7 +3,7 @@ , glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { - name = "gusb-${version}"; + pname = "gusb"; version = "0.3.0"; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 60188d77962..8b3bc30a661 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,20 +1,49 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome, gcr, wrapGAppsHook -, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata, python3 +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, dbus +, glib +, libgudev +, udisks2 +, libgcrypt +, libcap +, polkit +, libgphoto2 +, avahi +, libarchive +, fuse +, libcdio +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, samba +, libmtp +, gnomeSupport ? false +, gnome3 +, gcr +, glib-networking +, gnome-online-accounts +, wrapGAppsHook +, libimobiledevice +, libbluray +, libcdio-paranoia +, libnfs +, openssh +, libsecret +, libgdata +, python3 }: -let +stdenv.mkDerivation rec { pname = "gvfs"; version = "1.40.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; }; @@ -26,28 +55,56 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - meson ninja python3 - pkgconfig gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + meson + ninja + python3 + pkgconfig + gettext + wrapGAppsHook + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_42 ]; buildInputs = [ - glib libgudev udisks2 libgcrypt dbus - libgphoto2 avahi libarchive fuse libcdio - samba libmtp libcap polkit libimobiledevice libbluray - libcdio-paranoia libnfs openssh - # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup gcr + glib + libgudev + udisks2 + libgcrypt + dbus + libgphoto2 + avahi + libarchive + fuse + libcdio + samba + libmtp + libcap + polkit + libimobiledevice + libbluray + libcdio-paranoia + libnfs + openssh + # TODO: a ligther version of libsoup to have FTP/HTTP support? + ] ++ stdenv.lib.optionals gnomeSupport [ + gnome3.libsoup + gcr glib-networking # TLS support - gnome-online-accounts libsecret libgdata - ]); + gnome-online-accounts + libsecret + libgdata + ]; mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "-Dtmpfilesdir=no" ] ++ stdenv.lib.optionals (!gnomeSupport) [ - "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" + "-Dgcr=false" + "-Dgoa=false" + "-Dkeyring=false" + "-Dhttp=false" "-Dgoogle=false" ] ++ stdenv.lib.optionals (samba == null) [ # Xfce don't want samba diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix index d235c6cb086..063d416a8fc 100644 --- a/pkgs/development/libraries/half/default.nix +++ b/pkgs/development/libraries/half/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.12.0"; - name = "half-${version}"; + pname = "half"; src = fetchzip { url = "mirror://sourceforge/half/${version}/half-${version}.zip"; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index b9cd31432fc..000af7fd74e 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "hamlib"; version = "3.3"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index a5f8f00a6bf..ec86db036e9 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; - name = "herqq-${version}"; + pname = "herqq"; nativeBuildInputs = [ qt5.qmake ]; buildInputs = [ qt5.qtbase unzip qtmultimedia ]; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 05e180161c0..28e96244ba5 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb , darwin }: stdenv.mkDerivation rec { - name = "hidapi-0.8.0-rc1"; + pname = "hidapi"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "signal11"; + owner = "libusb"; repo = "hidapi"; - rev = name; - sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; + rev = "${pname}-${version}"; + sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; + + enableParallelBuilding = true; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); meta = with stdenv.lib; { - homepage = https://github.com/signal11/hidapi; description = "Library for communicating with USB and Bluetooth HID devices"; + homepage = "https://github.com/libusb/hidapi"; # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 13f7c421906..6dc3871e1c1 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hiredis-${version}"; + pname = "hiredis"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 37f01372005..ca547faa2ab 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -2,11 +2,11 @@ , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { - name = "hivex-${version}"; + pname = "hivex"; version = "1.3.18"; src = fetchurl { - url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; + url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; }; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 99777bbd6f0..a3a8c7baa09 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }: stdenv.mkDerivation rec { - name = "hpx-${version}"; + pname = "hpx"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 1537f9cc480..f0968c47822 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "htmlcxx-${version}"; + pname = "htmlcxx"; version = "0.86"; src = fetchurl { - url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz"; sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 68bf4ebec34..76173bc5b99 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -3,7 +3,8 @@ let version = "2.9.2"; in stdenv.mkDerivation { - name = "http-parser-${version}"; + pname = "http-parser"; + inherit version; src = fetchFromGitHub { owner = "nodejs"; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 18e32585ce2..a8dcea0059a 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; - name = "hunspell-${version}"; + pname = "hunspell"; src = fetchurl { url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index b9a283d80d2..4fa369e299d 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -640,12 +640,12 @@ in rec { uk_UA = uk-ua; uk-ua = mkDict rec { name = "hunspell-dict-uk-ua-${version}"; - version = "4.2.5"; - _version = "4-2.5"; + version = "4.6.3"; + _version = "4-6.3"; src = fetchurl { url = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/${_version}/@@download/file/dict-uk_UA-${version}.oxt"; - sha256 = "1s2i9cd569g97kafrswczvwmvg7m9aks8qsbxd1mi73zy2y1r7n4"; + sha256 = "14rd07yx4fx2qxjr5xqc8qy151idd8k2hr5yi18d9r8gccnm9w50"; }; dictFileName = "uk_UA"; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index d4ebb5534d9..3d00d20f170 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "idnkit-${version}"; + pname = "idnkit"; version = "2.3"; src = fetchurl { - url = "https://jprs.co.jp/idn/${name}.tar.bz2"; + url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2"; sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; }; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 867ce024d2f..297365be874 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -4,7 +4,8 @@ let version = "2.6.0"; in stdenv.mkDerivation rec { - name = "ign-math2-${version}"; + pname = "ign-math2"; + inherit version; src = fetchurl { url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 8abff4c5f05..31b9a4b0e9f 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "ign-transport-${version}"; + pname = "ign-transport"; + inherit version; inherit src; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index b97f62dcf25..6330347cd27 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { - name = "iksemel-${version}"; + pname = "iksemel"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 2d22788e1ec..5cc0f7c1f46 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-${version}"; + pname = "ilmbase"; version = "2.3.0"; src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; }; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index b55d13ecc3f..5ad3e249fc3 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchurl, gmp, openblas}: stdenv.mkDerivation rec { - name = "iml-${version}"; + pname = "iml"; version = "1.0.5"; src = fetchurl { url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index a4a009c6658..2beff09d0b4 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, tcl}: stdenv.mkDerivation rec { - name = "incrtcl-${version}"; + pname = "incrtcl"; version = "4.0.4"; src = fetchurl { diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 36b637c62bb..f97f8b7d82d 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "indicator-application-gtk2-${version}"; + pname = "indicator-application-gtk2"; version = "12.10.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 8beda8663c5..51c6728e8b0 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "iniparser-${version}"; + pname = "iniparser"; version = "4.1"; src = fetchFromGitHub { @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { mkdir -p $out/include cp src/*.h $out/include - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} for i in AUTHORS INSTALL LICENSE README.md; do - bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; + bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2; done; - cp -r html $out/share/doc/${name} + cp -r html $out/share/doc/${pname}-${version} cp libiniparser.a $out/lib cp libiniparser.so.1 $out/lib diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 1212d3817d4..53b89f17ea5 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "intel-gmmlib-${version}"; + pname = "intel-gmmlib"; version = "19.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb"; }; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index e549067b11f..e3dbfa52db2 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "intel-media-driver-${version}"; + pname = "intel-media-driver"; version = "19.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 274058b7ec9..67bee86bfa9 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "intel-media-sdk-${version}"; + pname = "intel-media-sdk"; version = "19.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index a48908f41dd..50ae63f2d0d 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "ip2location-c-${version}"; + pname = "ip2location-c"; version = "7.0.2"; # meta.homepage might change after a major update src = fetchurl { diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index d28ae012e57..35ef14cbc13 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "irrlicht-${version}"; + pname = "irrlicht"; version = "1.8.4"; src = fetchzip { - url = "mirror://sourceforge/irrlicht/${name}.zip"; + url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip"; sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f"; }; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 43ab20da8ae..599e8dcc597 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { - name = "iso-codes-${version}"; + pname = "iso-codes"; version = "3.79"; src = fetchurl { - url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz"; sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 29fabdbb3b6..26ec06fad7b 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, tnt}: stdenv.mkDerivation rec { - name = "jama-${version}"; + pname = "jama"; version = "1.2.5"; src = fetchurl { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ tnt ]; unpackPhase = '' - mkdir "${name}" + mkdir "${pname}-${version}" unzip "$src" ''; installPhase = '' diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 946bc17e764..1bad3394b6a 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-${version}"; + pname = "jasper"; version = "2.0.16"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 8d9b4e54fe8..4a2b030a3db 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.2"; - name = "commons-bcel-${version}"; + pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz"; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 3c729f42320..d418145e1b5 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.18"; - name = "commons-compress-${version}"; + pname = "commons-compress"; src = fetchurl { - url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; }; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 6fddc3cfe0c..0aca6bf8baa 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.3.1"; - name = "commons-fileupload-${version}"; + pname = "commons-fileupload"; src = fetchurl { - url = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 03b083328da..c545ad68e72 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6"; - name = "commons-io-${version}"; + pname = "commons-io"; src = fetchurl { - url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; }; diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 322cb486e93..675265ed4e3 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.9"; - name = "commons-lang-${version}"; + pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 10c39f03789..7c4fc5c632e 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.6.1"; - name = "commons-math-${version}"; + pname = "commons-math"; src = fetchurl { url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz"; diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index de031a08fe8..e485eabe1cb 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jdk, ant } : stdenv.mkDerivation rec { - name = "java-cup-${version}"; + pname = "java-cup"; version = "11b-20160615"; src = fetchurl { diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 7d1fac39b1c..68e2a737791 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, ant, jdk }: stdenv.mkDerivation rec { - name = "hydra-ant-logger-${version}"; + pname = "hydra-ant-logger"; version = "2010.2"; src = fetchgit { diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 402f893034b..e25106e22c6 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: stdenv.mkDerivation rec { - name = "jzmq-${version}"; + pname = "jzmq"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 691b9905b04..c0eabe51657 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl} : stdenv.mkDerivation rec { - name = "lucene-${version}"; + pname = "lucene"; version = "1.4.3"; builder = ./builder.sh; src = fetchurl { - url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz"; + url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz"; sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 544f0f4c4e9..0fdce1bceed 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "rhino-${version}"; + pname = "rhino"; + inherit version; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index c2acd234893..591de48d319 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "4.5"; fullVersion = "${version}-201506032000"; - name = "swt-${version}"; + pname = "swt"; hardeningDisable = [ "format" ]; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index c14ac7c65ab..c41455a6544 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jemalloc-${version}"; + pname = "jemalloc"; inherit version; src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 175097ef785..726e00b58bb 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jitterentropy-${version}"; + pname = "jitterentropy"; version = "2.1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index fa2b45ae948..c62f1e2de3f 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9"; + sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj"; }; /* During darwin bootstrap, we have a cp that doesn't understand the diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index 47c87da065b..bc5be3172ec 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "jxrlib"; version = "1.1"; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 0cd8ab50356..4a403a19964 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -7,10 +7,9 @@ mkDerivation rec { pname = "kdb"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; }; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 7745d78f8fc..e8a7aa7322f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -77,7 +77,7 @@ let license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; platforms = lib.platforms.linux; } // (args.meta or {}); diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index afab8a4e9a4..096376ca671 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.61/ ) diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix index b7dcfb7fe64..9f682b44975 100644 --- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -8,4 +8,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kio kparts ]; propagatedBuildInputs = [ qtwebkit ]; outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DBUILD_DESIGNERPLUGIN=OFF" + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch index 75e632d4129..89145e3e1dd 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch @@ -2,15 +2,13 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp =================================================================== --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp +++ kinit-5.32.0/src/kdeinit/kinit.cpp -@@ -96,11 +96,9 @@ static const char *extra_libs[] = { +@@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else - "libKF5KIOCore.so.5", - "libKF5Parts.so.5", --//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see. - "libKF5Plasma.so.5" --//#endif + NIXPKGS_KF5_KIOCORE, + NIXPKGS_KF5_PARTS, + NIXPKGS_KF5_PLASMA diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index ee19b39bd15..c19836ed7a7 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, propagateBin, extra-cmake-modules, - qtbase, wayland + qtbase, wayland, wayland-protocols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ wayland ]; + buildInputs = [ wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS } diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 147c4123a10..1484b2d0489 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, extra-cmake-modules, qtbase -, qtdeclarative, kconfig, kcoreaddons, ki18n, kio +, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2 }: mkDerivation { @@ -9,6 +9,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtdeclarative kconfig kcoreaddons - ki18n kio + ki18n kio kirigami2 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 17473db9eeb..549f99a5588 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz"; - sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a"; - name = "attica-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/attica-5.61.0.tar.xz"; + sha256 = "9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde"; + name = "attica-5.61.0.tar.xz"; }; }; baloo = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz"; - sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227"; - name = "baloo-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/baloo-5.61.0.tar.xz"; + sha256 = "dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1"; + name = "baloo-5.61.0.tar.xz"; }; }; bluez-qt = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz"; - sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0"; - name = "bluez-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz"; + sha256 = "0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27"; + name = "bluez-qt-5.61.0.tar.xz"; }; }; breeze-icons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz"; - sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491"; - name = "breeze-icons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/breeze-icons-5.61.0.tar.xz"; + sha256 = "1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30"; + name = "breeze-icons-5.61.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz"; - sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7"; - name = "extra-cmake-modules-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/extra-cmake-modules-5.61.0.tar.xz"; + sha256 = "a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c"; + name = "extra-cmake-modules-5.61.0.tar.xz"; }; }; frameworkintegration = { - version = "5.58.1"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz"; - sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274"; - name = "frameworkintegration-5.58.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/frameworkintegration-5.61.0.tar.xz"; + sha256 = "a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb"; + name = "frameworkintegration-5.61.0.tar.xz"; }; }; kactivities = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz"; - sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b"; - name = "kactivities-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kactivities-5.61.0.tar.xz"; + sha256 = "0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5"; + name = "kactivities-5.61.0.tar.xz"; }; }; kactivities-stats = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz"; - sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611"; - name = "kactivities-stats-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kactivities-stats-5.61.0.tar.xz"; + sha256 = "9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068"; + name = "kactivities-stats-5.61.0.tar.xz"; }; }; kapidox = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz"; - sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165"; - name = "kapidox-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kapidox-5.61.0.tar.xz"; + sha256 = "3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f"; + name = "kapidox-5.61.0.tar.xz"; }; }; karchive = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz"; - sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad"; - name = "karchive-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/karchive-5.61.0.tar.xz"; + sha256 = "457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387"; + name = "karchive-5.61.0.tar.xz"; }; }; kauth = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz"; - sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f"; - name = "kauth-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kauth-5.61.0.tar.xz"; + sha256 = "b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1"; + name = "kauth-5.61.0.tar.xz"; }; }; kbookmarks = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz"; - sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02"; - name = "kbookmarks-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kbookmarks-5.61.0.tar.xz"; + sha256 = "24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377"; + name = "kbookmarks-5.61.0.tar.xz"; }; }; kcmutils = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz"; - sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d"; - name = "kcmutils-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcmutils-5.61.0.tar.xz"; + sha256 = "b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7"; + name = "kcmutils-5.61.0.tar.xz"; }; }; kcodecs = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz"; - sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef"; - name = "kcodecs-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcodecs-5.61.0.tar.xz"; + sha256 = "4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee"; + name = "kcodecs-5.61.0.tar.xz"; }; }; kcompletion = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz"; - sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd"; - name = "kcompletion-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcompletion-5.61.0.tar.xz"; + sha256 = "68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec"; + name = "kcompletion-5.61.0.tar.xz"; }; }; kconfig = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz"; - sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e"; - name = "kconfig-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kconfig-5.61.0.tar.xz"; + sha256 = "94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372"; + name = "kconfig-5.61.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz"; - sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0"; - name = "kconfigwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kconfigwidgets-5.61.0.tar.xz"; + sha256 = "4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165"; + name = "kconfigwidgets-5.61.0.tar.xz"; }; }; kcoreaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz"; - sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e"; - name = "kcoreaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcoreaddons-5.61.0.tar.xz"; + sha256 = "6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813"; + name = "kcoreaddons-5.61.0.tar.xz"; }; }; kcrash = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz"; - sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44"; - name = "kcrash-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcrash-5.61.0.tar.xz"; + sha256 = "83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8"; + name = "kcrash-5.61.0.tar.xz"; }; }; kdbusaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz"; - sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1"; - name = "kdbusaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdbusaddons-5.61.0.tar.xz"; + sha256 = "f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d"; + name = "kdbusaddons-5.61.0.tar.xz"; }; }; kdeclarative = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz"; - sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec"; - name = "kdeclarative-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdeclarative-5.61.0.tar.xz"; + sha256 = "464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa"; + name = "kdeclarative-5.61.0.tar.xz"; }; }; kded = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz"; - sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1"; - name = "kded-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kded-5.61.0.tar.xz"; + sha256 = "ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc"; + name = "kded-5.61.0.tar.xz"; }; }; kdelibs4support = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz"; - sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a"; - name = "kdelibs4support-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kdelibs4support-5.61.0.tar.xz"; + sha256 = "ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c"; + name = "kdelibs4support-5.61.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz"; - sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b"; - name = "kdesignerplugin-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdesignerplugin-5.61.0.tar.xz"; + sha256 = "6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33"; + name = "kdesignerplugin-5.61.0.tar.xz"; }; }; kdesu = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz"; - sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b"; - name = "kdesu-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdesu-5.61.0.tar.xz"; + sha256 = "398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888"; + name = "kdesu-5.61.0.tar.xz"; }; }; kdewebkit = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz"; - sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc"; - name = "kdewebkit-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kdewebkit-5.61.0.tar.xz"; + sha256 = "1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211"; + name = "kdewebkit-5.61.0.tar.xz"; }; }; kdnssd = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz"; - sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05"; - name = "kdnssd-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdnssd-5.61.0.tar.xz"; + sha256 = "02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d"; + name = "kdnssd-5.61.0.tar.xz"; }; }; kdoctools = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz"; - sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4"; - name = "kdoctools-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdoctools-5.61.0.tar.xz"; + sha256 = "e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f"; + name = "kdoctools-5.61.0.tar.xz"; }; }; kemoticons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz"; - sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd"; - name = "kemoticons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kemoticons-5.61.0.tar.xz"; + sha256 = "cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380"; + name = "kemoticons-5.61.0.tar.xz"; }; }; kfilemetadata = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz"; - sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c"; - name = "kfilemetadata-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kfilemetadata-5.61.0.tar.xz"; + sha256 = "15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e"; + name = "kfilemetadata-5.61.0.tar.xz"; }; }; kglobalaccel = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz"; - sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf"; - name = "kglobalaccel-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kglobalaccel-5.61.0.tar.xz"; + sha256 = "ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e"; + name = "kglobalaccel-5.61.0.tar.xz"; }; }; kguiaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz"; - sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3"; - name = "kguiaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kguiaddons-5.61.0.tar.xz"; + sha256 = "40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520"; + name = "kguiaddons-5.61.0.tar.xz"; }; }; kholidays = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz"; - sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef"; - name = "kholidays-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kholidays-5.61.0.tar.xz"; + sha256 = "ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1"; + name = "kholidays-5.61.0.tar.xz"; }; }; khtml = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz"; - sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff"; - name = "khtml-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/khtml-5.61.0.tar.xz"; + sha256 = "5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b"; + name = "khtml-5.61.0.tar.xz"; }; }; ki18n = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz"; - sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977"; - name = "ki18n-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ki18n-5.61.0.tar.xz"; + sha256 = "d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9"; + name = "ki18n-5.61.0.tar.xz"; }; }; kiconthemes = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz"; - sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480"; - name = "kiconthemes-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kiconthemes-5.61.0.tar.xz"; + sha256 = "341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7"; + name = "kiconthemes-5.61.0.tar.xz"; }; }; kidletime = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz"; - sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90"; - name = "kidletime-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kidletime-5.61.0.tar.xz"; + sha256 = "8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2"; + name = "kidletime-5.61.0.tar.xz"; }; }; kimageformats = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz"; - sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9"; - name = "kimageformats-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kimageformats-5.61.0.tar.xz"; + sha256 = "5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207"; + name = "kimageformats-5.61.0.tar.xz"; }; }; kinit = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz"; - sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53"; - name = "kinit-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kinit-5.61.0.tar.xz"; + sha256 = "1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f"; + name = "kinit-5.61.0.tar.xz"; }; }; kio = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz"; - sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069"; - name = "kio-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kio-5.61.0.tar.xz"; + sha256 = "1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e"; + name = "kio-5.61.0.tar.xz"; }; }; kirigami2 = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz"; - sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3"; - name = "kirigami2-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kirigami2-5.61.0.tar.xz"; + sha256 = "afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30"; + name = "kirigami2-5.61.0.tar.xz"; }; }; kitemmodels = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz"; - sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491"; - name = "kitemmodels-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kitemmodels-5.61.0.tar.xz"; + sha256 = "47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68"; + name = "kitemmodels-5.61.0.tar.xz"; }; }; kitemviews = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz"; - sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6"; - name = "kitemviews-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kitemviews-5.61.0.tar.xz"; + sha256 = "0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da"; + name = "kitemviews-5.61.0.tar.xz"; }; }; kjobwidgets = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz"; - sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133"; - name = "kjobwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kjobwidgets-5.61.0.tar.xz"; + sha256 = "5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378"; + name = "kjobwidgets-5.61.0.tar.xz"; }; }; kjs = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz"; - sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c"; - name = "kjs-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kjs-5.61.0.tar.xz"; + sha256 = "968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17"; + name = "kjs-5.61.0.tar.xz"; }; }; kjsembed = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz"; - sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d"; - name = "kjsembed-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kjsembed-5.61.0.tar.xz"; + sha256 = "d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44"; + name = "kjsembed-5.61.0.tar.xz"; }; }; kmediaplayer = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz"; - sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea"; - name = "kmediaplayer-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kmediaplayer-5.61.0.tar.xz"; + sha256 = "ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181"; + name = "kmediaplayer-5.61.0.tar.xz"; }; }; knewstuff = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz"; - sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd"; - name = "knewstuff-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knewstuff-5.61.0.tar.xz"; + sha256 = "87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b"; + name = "knewstuff-5.61.0.tar.xz"; }; }; knotifications = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz"; - sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469"; - name = "knotifications-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knotifications-5.61.0.tar.xz"; + sha256 = "f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac"; + name = "knotifications-5.61.0.tar.xz"; }; }; knotifyconfig = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz"; - sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01"; - name = "knotifyconfig-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knotifyconfig-5.61.0.tar.xz"; + sha256 = "bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee"; + name = "knotifyconfig-5.61.0.tar.xz"; }; }; kpackage = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz"; - sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90"; - name = "kpackage-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpackage-5.61.0.tar.xz"; + sha256 = "8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f"; + name = "kpackage-5.61.0.tar.xz"; }; }; kparts = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz"; - sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4"; - name = "kparts-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kparts-5.61.0.tar.xz"; + sha256 = "f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436"; + name = "kparts-5.61.0.tar.xz"; }; }; kpeople = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz"; - sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32"; - name = "kpeople-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpeople-5.61.0.tar.xz"; + sha256 = "549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298"; + name = "kpeople-5.61.0.tar.xz"; }; }; kplotting = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz"; - sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b"; - name = "kplotting-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kplotting-5.61.0.tar.xz"; + sha256 = "95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba"; + name = "kplotting-5.61.0.tar.xz"; }; }; kpty = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz"; - sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017"; - name = "kpty-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpty-5.61.0.tar.xz"; + sha256 = "b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c"; + name = "kpty-5.61.0.tar.xz"; }; }; kross = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz"; - sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872"; - name = "kross-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kross-5.61.0.tar.xz"; + sha256 = "103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e"; + name = "kross-5.61.0.tar.xz"; }; }; krunner = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz"; - sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c"; - name = "krunner-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/krunner-5.61.0.tar.xz"; + sha256 = "f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be"; + name = "krunner-5.61.0.tar.xz"; }; }; kservice = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz"; - sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395"; - name = "kservice-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kservice-5.61.0.tar.xz"; + sha256 = "4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9"; + name = "kservice-5.61.0.tar.xz"; }; }; ktexteditor = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz"; - sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e"; - name = "ktexteditor-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ktexteditor-5.61.0.tar.xz"; + sha256 = "ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb"; + name = "ktexteditor-5.61.0.tar.xz"; }; }; ktextwidgets = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz"; - sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7"; - name = "ktextwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ktextwidgets-5.61.0.tar.xz"; + sha256 = "a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a"; + name = "ktextwidgets-5.61.0.tar.xz"; }; }; kunitconversion = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz"; - sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa"; - name = "kunitconversion-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kunitconversion-5.61.0.tar.xz"; + sha256 = "e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24"; + name = "kunitconversion-5.61.0.tar.xz"; }; }; kwallet = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz"; - sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030"; - name = "kwallet-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwallet-5.61.0.tar.xz"; + sha256 = "628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8"; + name = "kwallet-5.61.0.tar.xz"; }; }; kwayland = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz"; - sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1"; - name = "kwayland-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwayland-5.61.0.tar.xz"; + sha256 = "42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07"; + name = "kwayland-5.61.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz"; - sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0"; - name = "kwidgetsaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwidgetsaddons-5.61.0.tar.xz"; + sha256 = "5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891"; + name = "kwidgetsaddons-5.61.0.tar.xz"; }; }; kwindowsystem = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz"; - sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129"; - name = "kwindowsystem-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwindowsystem-5.61.0.tar.xz"; + sha256 = "17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984"; + name = "kwindowsystem-5.61.0.tar.xz"; }; }; kxmlgui = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz"; - sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f"; - name = "kxmlgui-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kxmlgui-5.61.0.tar.xz"; + sha256 = "867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b"; + name = "kxmlgui-5.61.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz"; - sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3"; - name = "kxmlrpcclient-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kxmlrpcclient-5.61.0.tar.xz"; + sha256 = "382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a"; + name = "kxmlrpcclient-5.61.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz"; - sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb"; - name = "modemmanager-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/modemmanager-qt-5.61.0.tar.xz"; + sha256 = "c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a"; + name = "modemmanager-qt-5.61.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz"; - sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe"; - name = "networkmanager-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/networkmanager-qt-5.61.0.tar.xz"; + sha256 = "1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3"; + name = "networkmanager-qt-5.61.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz"; - sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7"; - name = "oxygen-icons5-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/oxygen-icons5-5.61.0.tar.xz"; + sha256 = "1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26"; + name = "oxygen-icons5-5.61.0.tar.xz"; }; }; plasma-framework = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz"; - sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad"; - name = "plasma-framework-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/plasma-framework-5.61.0.tar.xz"; + sha256 = "873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe"; + name = "plasma-framework-5.61.0.tar.xz"; }; }; prison = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz"; - sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d"; - name = "prison-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/prison-5.61.0.tar.xz"; + sha256 = "9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab"; + name = "prison-5.61.0.tar.xz"; }; }; purpose = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz"; - sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df"; - name = "purpose-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/purpose-5.61.0.tar.xz"; + sha256 = "810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08"; + name = "purpose-5.61.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz"; - sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3"; - name = "qqc2-desktop-style-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/qqc2-desktop-style-5.61.0.tar.xz"; + sha256 = "26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4"; + name = "qqc2-desktop-style-5.61.0.tar.xz"; }; }; solid = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz"; - sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00"; - name = "solid-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/solid-5.61.0.tar.xz"; + sha256 = "c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf"; + name = "solid-5.61.0.tar.xz"; }; }; sonnet = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz"; - sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823"; - name = "sonnet-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/sonnet-5.61.0.tar.xz"; + sha256 = "4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29"; + name = "sonnet-5.61.0.tar.xz"; }; }; syndication = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz"; - sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643"; - name = "syndication-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/syndication-5.61.0.tar.xz"; + sha256 = "2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576"; + name = "syndication-5.61.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz"; - sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76"; - name = "syntax-highlighting-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/syntax-highlighting-5.61.0.tar.xz"; + sha256 = "475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721"; + name = "syntax-highlighting-5.61.0.tar.xz"; }; }; threadweaver = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz"; - sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d"; - name = "threadweaver-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/threadweaver-5.61.0.tar.xz"; + sha256 = "e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843"; + name = "threadweaver-5.61.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index d2283f5c1d5..2eb9262d189 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "heimdal-${version}"; + pname = "heimdal"; version = "7.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index abbb2457f6a..0a130c017c0 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -5,11 +5,11 @@ let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "keybinder-${version}"; + pname = "keybinder"; version = "0.3.0"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz"; sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 91ad59ad27a..ed2dd341f45 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "keybinder3-${version}"; + pname = "keybinder3"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d3733ea5f72..3f84706bffb 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "kmsxx"; version = "2018-10-23"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index c49402b74e8..991fd4d27a7 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -8,10 +8,9 @@ mkDerivation rec { pname = "kproperty"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; }; diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index fc9c77e8fd6..46d55b1f550 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -7,10 +7,9 @@ mkDerivation rec { pname = "kreport"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92"; }; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 2f713cb5977..933d51b9575 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -22,11 +22,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "lame-${version}"; + pname = "lame"; version = "3.100"; src = fetchurl { - url = "mirror://sourceforge/lame/${name}.tar.gz"; + url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz"; sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index e93467fba0a..f401f231de2 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "lasso-${version}"; + pname = "lasso"; version = "2.6.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index 839f0a75156..ae8fc1e22db 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ldacBT-${version}"; + pname = "ldacBT"; version = "2.0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 82496a54aea..1aa208c2044 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { pname = "ldns"; version = "1.7.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; + url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1"; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index e27f758ff58..a84e6b5c08d 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { - name = "leatherman-${version}"; + pname = "leatherman"; version = "1.7.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index f4018cbf961..6137638222e 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.95"; - name = "lensfun-${version}"; + pname = "lensfun"; src = fetchurl { - url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz"; sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; }; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index dd3c42e8b7f..62c01e4f356 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "leptonica-${version}"; + pname = "leptonica"; version = "1.78.0"; src = fetchurl { - url = "http://www.leptonica.org/source/${name}.tar.gz"; + url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2"; }; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index b18af4cf834..17a754a027a 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "leveldb-${version}"; + pname = "leveldb"; version = "1.20"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 0d67c6b4dcb..bda7d560fcd 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -8,11 +8,11 @@ # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libaacs-${version}"; + pname = "libaacs"; version = "0.9.0"; src = fetchurl { - url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; }; diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index 6df7bc22772..11b31d62b5d 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.6"; - name = "libaal-${version}"; + pname = "libaal"; src = fetchurl { - url = "mirror://sourceforge/reiser4/${name}.tar.gz"; + url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz"; sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di"; }; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index aa4a40cf32d..f953c170ab5 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }: stdenv.mkDerivation rec { - name = "libabw-${version}"; + pname = "libabw"; version = "0.1.2"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz"; sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 525ec6e35f6..07e0a3500a7 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { - name = "libaccounts-glib-${version}"; + pname = "libaccounts-glib"; version = "1.24"; outputs = [ "out" "dev" "devdoc" "py" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 patches = [ ./py-override.patch ]; - nativeBuildInputs = [ + nativeBuildInputs = [ check docbook_xml_dtd_43 docbook_xsl @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 49e5bcdd905..a8ddab2978d 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -5,7 +5,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation rec { - name = "libagar-${version}"; + pname = "libagar"; inherit (srcs) version src; preConfigure = '' diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index c1e9ba7d1c7..43d66b8251c 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -2,7 +2,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation rec { - name = "libagar-test-${version}"; + pname = "libagar-test"; inherit (srcs) version src; sourceRoot = "agar-1.5.0/tests"; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index cc6c9464de3..325a7d71598 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "libamqpcpp-${version}"; + pname = "libamqpcpp"; version = "4.1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 826f72b1f5f..698182dbd4e 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.2.2"; - name = "libao-${version}"; + pname = "libao"; # the github mirror is more up to date than downloads.xiph.org src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 62e0a850bad..2d9a9f18fa2 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "libaom-${version}"; + pname = "libaom"; version = "1.0.0-errata1"; src = fetchgit { diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index dd3320005a4..5b9647d275c 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.2.7-9-g177589f"; - name = "libaosd-${version}"; + pname = "libaosd"; src = fetchFromGitHub { owner = "atheme-legacy"; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 3cf8a6da736..e3927f34fab 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -9,7 +9,7 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { - name = "libarchive-${version}"; + pname = "libarchive"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index c0dd406dd31..9bf05a679cc 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "libargon2"; @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - installPhase = '' - runHook preInstall - mkdir -p $out/lib/pkgconfig - substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \ - --replace @UPSTREAM_VER@ "${version}" \ - --replace @HOST_MULTIARCH@ "" \ - --replace 'prefix=/usr' "prefix=$out" + patches = [ + # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released + (fetchpatch { + url = "https://github.com/P-H-C/phc-winner-argon2/commit/cd1c1d8d204e4ec4557e358013567c097cb70562.patch"; + sha256 = "0whqv8b6q9602n7vxpzbd8bk8wz22r1jz9x5lrm9z7ib3wz81c8a"; + }) + ]; - make install PREFIX=$out LIBRARY_REL=lib - ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 - runHook postInstall - ''; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation + "PREFIX=${placeholder "out"}" + "ARGON2_VERSION=${version}" + "LIBRARY_REL=lib" + "PKGCONFIG_REL=lib" + ]; meta = with stdenv.lib; { description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index a06ae978d51..0c8f82138e7 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl }: stdenv.mkDerivation rec { - name = "libasr-${version}"; + pname = "libasr"; version= "1.0.2"; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6"; }; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index d7ebf781a04..41406ce18ea 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -18,11 +18,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libass-${version}"; + pname = "libass"; version = "0.14.0"; src = fetchurl { - url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; }; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 313cb7f8d5d..348cfa9ed5b 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "libast-${version}"; + pname = "libast"; version = "0.7.1"; src = fetchurl { - url = "http://www.eterm.org/download/${name}.tar.gz"; + url = "http://www.eterm.org/download/${pname}-${version}.tar.gz"; sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 0df8ed0f969..b576896876e 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libatomic_ops-${version}"; + pname = "libatomic_ops"; version = "7.6.10"; src = fetchurl { diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 1ef453f24cd..feeb4de15e1 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -33,10 +33,11 @@ let }; libavFun = version : sha1 : stdenv.mkDerivation rec { - name = "libav-${version}"; + pname = "libav"; + inherit version; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.xz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.xz"; inherit sha1; # upstream directly provides sha1 of releases over https }; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index 6a7720b99bc..d39c12d58d5 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { - name = "libb2-${version}"; + pname = "libb2"; version = "0.98.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 09c5444a644..3c9a9768427 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libb64-${version}"; + pname = "libb64"; version = "1.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 2a129bc648f..b20850e88ff 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -2,7 +2,7 @@ which }: stdenv.mkDerivation rec { - name = "libbap-${version}"; + pname = "libbap"; version = "master-2019-04-05"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 3a1b7752514..3af98a578f2 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -8,11 +8,11 @@ # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libbdplus-${version}"; + pname = "libbdplus"; version = "0.1.2"; src = fetchurl { - url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 64b3832d335..5af8acb5ed7 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libbfd-${version}"; + pname = "libbfd"; inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index d22518e96d4..c8c58315b64 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -13,7 +13,8 @@ let version = "2.2.0"; in stdenv.mkDerivation { - name = "libbladeRF-${version}"; + pname = "libbladeRF"; + inherit version; src = fetchFromGitHub { owner = "Nuand"; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d8f2426e477..d9639cf5c14 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libbluedevil"; # bluedevil must have the same major version (x.y) as libbluedevil! # do not update this package without checking bluedevil version = "2.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index b7ca9dda1ea..517251e137e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -18,11 +18,11 @@ assert withFonts -> freetype != null; # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libbluray-${version}"; + pname = "libbluray"; version = "1.1.2"; src = fetchurl { - url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3"; }; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index a8d1925e5c0..fe4af163a54 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "libbsd-${version}"; + pname = "libbsd"; version = "0.9.1"; src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; + url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n"; }; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6244c3a351e..5bd6b11ac7a 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, perl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "libbson-${version}"; + pname = "libbson"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f68141ef3b4..01588187936 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libburn-${version}"; + pname = "libburn"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq"; }; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 18593f80799..4fea84723f9 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -6,7 +6,8 @@ let version = "2.1"; in stdenv.mkDerivation rec { - name = "libbytesize-${version}"; + pname = "libbytesize"; + inherit version; src = fetchFromGitHub { owner = "storaged-project"; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 62d70973375..2e134c5bb63 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, nss }: stdenv.mkDerivation rec { - name = "libcacard-${version}"; + pname = "libcacard"; version = "2.7.0"; src = fetchurl { - url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz"; + url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz"; sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 6838362c794..42a49713a0b 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,7 +1,7 @@ { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: stdenv.mkDerivation rec { - name = "libcangjie-${version}"; + pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e016484e677..2688881e66d 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -3,7 +3,8 @@ let version = "4.0.4"; in stdenv.mkDerivation { - name = "libcec-${version}"; + pname = "libcec"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 0005525a7cd..e43cfb10a37 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -3,7 +3,8 @@ let version = "2.1.0.1"; in stdenv.mkDerivation { - name = "p8-platform-${version}"; + pname = "p8-platform"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ecba18cd58c..e161948db40 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -13,7 +13,7 @@ let ]; in stdenv.mkDerivation rec { - name = "cef-binary-${version}"; + pname = "cef-binary"; version = "3.3497.1833.g13f506f"; src = fetchurl { url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2"; diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 410c83953aa..11617a0107c 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libchardet-${version}"; + pname = "libchardet"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index d3ef799ef60..3c234d780ef 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sqlite }: stdenv.mkDerivation rec{ - name = "libchewing-${version}"; + pname = "libchewing"; version = "0.5.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index f101eb22310..d896cf63733 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "libcli-${version}"; + pname = "libcli"; version = "1.9.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index a2f6858a05c..325afc56ae7 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libclthreads-${version}"; + pname = "libclthreads"; version = "2.4.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 49bc2347ba7..d6e2ad398d7 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: stdenv.mkDerivation rec { - name = "libclxclient-${version}"; + pname = "libclxclient"; version = "3.9.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index f247c48821f..8eb7ff303de 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libcommuni-${version}"; + pname = "libcommuni"; version = "3.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index ee3f511d435..cfef09c480a 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, flex }: stdenv.mkDerivation rec { - name = "libconfuse-${version}"; + pname = "libconfuse"; version = "3.2.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 894faf0b910..23b39bca1f3 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: stdenv.mkDerivation rec { - name = "libcouchbase-${version}"; + pname = "libcouchbase"; version = "2.10.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index fff31a96ce7..ba9a6325b07 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoconf, automake, libtool, libpcap }: stdenv.mkDerivation rec { - name = "libcrafter-${version}"; + pname = "libcrafter"; version = "0.3"; src = fetchzip { diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index 3d32f4d0b95..4bf26bde228 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libcsptr-${version}"; + pname = "libcsptr"; version = "2.0.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 94dc733a69b..f4e2e621c28 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "ctemplate-${version}"; + pname = "ctemplate"; version = "2.3"; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index e50b8a13b95..8ebab123524 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { - name = "libcue-${version}"; + pname = "libcue"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 86d14fe7974..df2e4c367bf 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { version = "3.20.4"; - name = "libdap-${version}"; + pname = "libdap"; nativeBuildInputs = [ bison flex ]; buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { - url = "https://www.opendap.org/pub/source/${name}.tar.gz"; + url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i"; }; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 32b0c9758f7..2ae4eec99ec 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { - name = "libdbusmenu-qt-${version}"; + pname = "libdbusmenu-qt"; version = "0.9.3+16"; src = fetchgit { diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index e064084f695..a7bfe7f17a2 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" + "sysconfdir=${placeholder "out"}/etc" "localstatedir=\${TMPDIR}" - "typelibdir=${placeholder ''out''}/lib/girepository-1.0" + "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; meta = { diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 86b9fcd0bef..0f2ba019d3f 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -2,11 +2,11 @@ , libusb1, CoreServices }: stdenv.mkDerivation rec { - name = "libdc1394-${version}"; + pname = "libdc1394"; version = "2.2.6"; src = fetchurl { - url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; + url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz"; sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 6c9fabf5cae..3c31ba805d8 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libde265-${version}"; + pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index a5b178caf82..b06a0a9450a 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libdeflate-${version}"; + pname = "libdeflate"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 78e7490cd99..afbff3dc0cf 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "libdevil-${version}"; + pname = "libdevil"; version = "1.7.8"; src = fetchurl { diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 7fe7319ff15..06ba10904a7 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.10.4"; - name = "libdigidoc-${version}"; + pname = "libdigidoc"; src = fetchurl { url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index e3172c2fc1f..4aec6fdef91 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.13.7"; - name = "libdigidocpp-${version}"; + pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 287494b6b1f..d7d88b38386 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin }: stdenv.mkDerivation rec { - name = "libdiscid-${version}"; + pname = "libdiscid"; version = "0.6.2"; nativeBuildInputs = [ cmake pkgconfig ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; src = fetchurl { - url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; + url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index c94806b50c1..5598e6b2fa7 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdivecomputer-${version}"; + pname = "libdivecomputer"; version = "0.6.0"; src = fetchurl { - url = "https://www.libdivecomputer.org/releases/${name}.tar.gz"; + url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch new file mode 100644 index 00000000000..478534e65e5 --- /dev/null +++ b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch @@ -0,0 +1,48 @@ +From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Fri, 2 Aug 2019 10:26:37 +0100 +Subject: [PATCH] meson: support for custom nm path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When cross-compiling target toolchains i.e. binutils are often +prefixed by its target architecture. This patch gives the user +to option to specify the nm used during the build process. + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + meson.build | 2 +- + meson_options.txt | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e292554a..64607139 100644 +--- a/meson.build ++++ b/meson.build +@@ -327,7 +327,7 @@ pkg.generate( + ) + + env_test = environment() +-env_test.set('NM', find_program('nm').path()) ++env_test.set('NM', find_program(get_option('nm-path')).path()) + + if with_libkms + subdir('libkms') +diff --git a/meson_options.txt b/meson_options.txt +index 8af33f1c..b4f46a52 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -141,3 +141,9 @@ option( + value : false, + description : 'Enable support for using udev instead of mknod.', + ) ++option( ++ 'nm-path', ++ type : 'string', ++ description : 'path to nm', ++ value : 'nm' ++) +-- +2.22.0 + diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index bdc191fe8a3..29d59659f90 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja ]; buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; + patches = [ ./cross-build-nm-path.patch ]; + postPatch = '' for a in */*-symbol-check ; do patchShebangs $a @@ -21,7 +23,9 @@ stdenv.mkDerivation rec { ''; mesonFlags = - [ "-Dinstall-test-programs=true" ] + [ + "-Dnm-path=${stdenv.cc.targetPrefix}nm" + "-Dinstall-test-programs=true" ] ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "-Dtegra=true" "-Detnaviv=true" ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 0984eb6e00b..aed6f05fec4 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libdvbpsi-${version}"; + pname = "libdvbpsi"; version = "1.3.2"; src = fetchurl { - url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2"; sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc"; }; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index f18e0622d0c..fd89077a256 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, IOKit}: stdenv.mkDerivation rec { - name = "libdvdcss-${version}"; + pname = "libdvdcss"; version = "1.4.2"; buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; src = fetchurl { - url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; }; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index b0dfd1e8fc1..45a73a62488 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: stdenv.mkDerivation rec { - name = "libdvdnav-${version}"; + pname = "libdvdnav"; version = "6.0.0"; src = fetchurl { - url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph"; }; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 5f0f0827503..c133c0ba6f9 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation rec { - name = "libdvdread-${version}"; + pname = "libdvdread"; version = "6.0.1"; src = fetchurl { - url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; sha256 = "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8"; }; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 1a4da7713af..3fd2a328558 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -17,7 +17,8 @@ let in rec { libdwarf = stdenv.mkDerivation rec { - name = "libdwarf-${version}"; + pname = "libdwarf"; + inherit version; configureFlags = [ "--enable-shared" "--disable-nonshared" ]; @@ -37,7 +38,8 @@ in rec { }; dwarfdump = stdenv.mkDerivation rec { - name = "dwarfdump-${version}"; + pname = "dwarfdump"; + inherit version; preConfigure = '' cd dwarfdump diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 93fbf380a34..249f3f4f21a 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -2,7 +2,8 @@ let version = "0.7.2"; in stdenv.mkDerivation { - name = "libdynd-${version}"; + pname = "libdynd"; + inherit version; src = fetchFromGitHub { owner = "libdynd"; diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index 293b1c28e93..2fdb1d071b6 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libeb-${version}"; + pname = "libeb"; version = "4.4.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 6a4078f92cf..16624a78079 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "libebur128-${version}"; + pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index be9f5e772d9..855386114c1 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }: stdenv.mkDerivation rec { - name = "libechonest-${version}"; + pname = "libechonest"; version = "2.3.0"; src = fetchurl { - url = "http://files.lfranchi.com/${name}.tar.bz2"; + url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2"; sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db"; }; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 26fe2d90963..1835b924ec1 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { version = "3258"; - name = "libelf-freebsd-${version}"; + pname = "libelf-freebsd"; src = fetchsvn { url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 980cee2e687..8555449f28b 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libESMTP-${version}"; + pname = "libESMTP"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 365c128239d..56710945ecb 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libev-${version}"; + pname = "libev"; version="4.27"; src = fetchurl { - url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; + url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d"; }; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 611287b9aaa..5fb46bff075 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -5,7 +5,7 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "libevent-${version}"; + pname = "libevent"; version = "2.1.10"; src = fetchurl { diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index d150d4a0033..fd1e203ed37 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "20171104"; - name = "libewf-${version}"; + pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index a61d51aa6b7..2eee9bafe44 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "libexecinfo-${version}"; + pname = "libexecinfo"; version = "1.1"; src = fetchurl { - url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2"; + url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2"; sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9"; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index e36c4ee12b9..196f0e50bef 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: stdenv.mkDerivation rec { - name = "libfakekey-${version}"; + pname = "libfakekey"; version = "0.1"; src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz"; sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index f70886f7358..10e9efed26a 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "libfaketime-${version}"; + pname = "libfaketime"; version = "0.9.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix index 5ac7a244df2..5e1c985fe2c 100644 --- a/pkgs/development/libraries/libfann/default.nix +++ b/pkgs/development/libraries/libfann/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libfann-${version}"; + pname = "libfann"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 513a4dc3d38..8d11cd86c45 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libffcall-${version}"; + pname = "libffcall"; version = "2.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 4b02d651929..0c8a7084e09 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -3,7 +3,7 @@ zlib, libpng, boost, qt5, guile }: stdenv.mkDerivation rec { - name = "libfive-${version}"; + pname = "libfive"; version = "2018-07-01"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 2d2d56dda4f..9c9b6c8034c 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name="libfixposix-${version}"; + pname = "libfixposix"; version="0.4.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index cfae74b4b9e..c0595ac93d1 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -2,7 +2,7 @@ , libobjc ? null }: stdenv.mkDerivation rec { - name = "libfreefare-${version}"; + pname = "libfreefare"; version = "0.4.0"; src = fetchurl { diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index 5491fab3edf..ce7d615f4d3 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libfsm-${version}"; + pname = "libfsm"; version = "0.1pre1869_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index a6fe2bc1435..d83b43a782e 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libgaminggear-${version}"; + pname = "libgaminggear"; version = "0.15.1"; src = fetchurl { - url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2"; + url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2"; sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz"; }; diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index 42e812ec1f5..b6a8ae3c8df 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -7,7 +7,7 @@ # - https://github.com/markuspf/gap/issues/2 # - https://trac.sagemath.org/ticket/22626 stdenv.mkDerivation rec { - name = "libgap-${version}"; + pname = "libgap"; # Has to be the same version as "gap" version = "4.8.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 4d8a7eac27c..36a1b7d3720 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,11 +5,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { - name = "libgcrypt-${version}"; + pname = "libgcrypt"; version = "1.8.4"; src = fetchurl { - url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; + url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"; }; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f61283aec4a..14fc7e64a0b 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=false" - "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" - "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_tests=true" ]; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 51520eb0fe3..db75ff1784f 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; - name = "libgeotiff-${version}"; + pname = "libgeotiff"; src = fetchFromGitHub { owner = "OSGeo"; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 56f160838e6..27939238278 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "libgig-${version}"; + pname = "libgig"; version = "4.2.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 9bec00b9f52..24052ea4058 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -6,10 +6,9 @@ stdenv.mkDerivation rec { version = "2.0.12"; pname = "libgksu"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; }; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index ba340752826..f604de21a1a 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { - name = "libglvnd-${version}"; + pname = "libglvnd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e87f535a1f7..0bb3af37eee 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -2,23 +2,38 @@ libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.64.0"; - - name = "libgnurl-${version}"; + pname = "libgnurl"; + version = "7.65.3"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8"; + sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; - + buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; configureFlags = [ "--disable-ntlm-wb" "--without-ca-bundle" "--with-ca-fallback" + # below options will cause errors if enabled + "--disable-ftp" + "--disable-tftp" + "--disable-file" + "--disable-ldap" + "--disable-dict" + "--disable-rtsp" + "--disable-telnet" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--without-ssl" # disables only openssl, not ssl in general + "--without-libpsl" + "--without-librtmp" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 23f46ad2a0c..782c0a8857a 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-bindings-cxx" - "--prefix=${placeholder ''out''}" + "--prefix=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 89fcfdfde8d..76d7ebcc8cc 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { - name = "libgringotts-${version}"; + pname = "libgringotts"; version = "1.2.1"; src = fetchurl { - url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2"; + url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2"; sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index bd5a5f06851..fd34f28c1e8 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.3.0"; - name = "libgroove-${version}"; + pname = "libgroove"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index d3dea766cbb..b52a2b1e0fa 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, pkgconfig +, udev +, glib +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "libgudev"; -in stdenv.mkDerivation rec { - name = "libgudev-${version}"; - version = "232"; + version = "233"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e3d7741ba86..9b50ddd4b7f 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -10,7 +10,7 @@ assert appliance == null || stdenv.lib.isDerivation appliance; assert javaSupport -> jdk != null; stdenv.mkDerivation rec { - name = "libguestfs-${version}"; + pname = "libguestfs"; version = "1.38.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index d5d35678b4f..b82c547fb33 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libgumath-${version}"; + pname = "libgumath"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 9c3d9faf1f4..4883b39b7cf 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.10"; + version = "0.0.11"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs"; + sha256 = "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 3182345bfd4..7e1bb2daa9e 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.0"; - name = "libheif-${version}"; + pname = "libheif"; src = fetchFromGitHub { owner = "strukturag"; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index b86a48ecd1b..d8881b929a0 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -2,7 +2,7 @@ , python3, tzdata, glib, libxml2, icu }: stdenv.mkDerivation rec { - name = "libical-${version}"; + pname = "libical"; version = "3.0.4"; outputs = [ "out" "dev" ]; #"devdoc" ]; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index c5379692ad3..7dc90d9ae3e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -6,11 +6,11 @@ # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { - name = "libiconv-${version}"; + pname = "libiconv"; version = "1.16"; src = fetchurl { - url = "mirror://gnu/libiconv/${name}.tar.gz"; + url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz"; sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 4b7d9bdc2e3..674862d694c 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { - name = "libid3tag-${version}"; + pname = "libid3tag"; version = "0.15.1b"; src = fetchurl { diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 5ec5b8e04dd..7e7b691e3c1 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libidn2-${version}"; + pname = "libidn2"; version = "2.2.0"; src = fetchurl { - url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; + url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz"; sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw"; }; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 4fa3addc0a6..936d165a6cf 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; - name = "libiec61883-${version}"; + pname = "libiec61883"; src = fetchurl { url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz"; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index df5035461af..9392061a269 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libiio-${version}"; + pname = "libiio"; version = "0.18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 6464e4e5820..7eccfc37363 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -5,8 +5,6 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; version = "2019-04-04"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = pname; repo = pname; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c57590aad21..9be58ac537a 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -12,10 +12,10 @@ let mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; self = stdenv.mkDerivation rec { - name = "libinfinity-${version}"; + pname = "libinfinity"; version = "0.7.1"; src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz"; sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; }; diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 6fc507daf64..75cd1a00507 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { - name = "libinotify-kqueue-${version}"; + pname = "libinotify-kqueue"; version = "20180201"; src = fetchzip { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0c759835183..c1ee68a2470 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -26,11 +26,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-${version}"; + pname = "libinput"; version = "1.13.4"; src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; }; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index fea5a86da44..c4dca659d36 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libipfix-${version}"; + pname = "libipfix"; version = "110209"; src = fetchurl { url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 71238dda162..561a5248278 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.10"; pname = "libircclient"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv"; }; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 32a2971b3e3..be05f120e13 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # as only the `idevicerestore` binary was tested so far (which worked # without further configuration). configureFlags = [ - "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" + "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' ]; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index ce2028e805d..cefce19d465 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: stdenv.mkDerivation rec { - name = "libisoburn-${version}"; + pname = "libisoburn"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; }; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index d5281448387..59726094c4a 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, attr, zlib }: stdenv.mkDerivation rec { - name = "libisofs-${version}"; + pname = "libisofs"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys"; }; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 0b00cf90ba0..73801102ba3 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: stdenv.mkDerivation rec { - name = "libite-${version}"; + pname = "libite"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 51b2dd7c7bd..bd1432b8a21 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: stdenv.mkDerivation rec { - name = "libivykis-${version}"; + pname = "libivykis"; version = "0.42.3"; diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 68835c1414c..1790f3f68b2 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "148"; version = "hg-2012-12-02"; - name = "libixp-${version}"; + pname = "libixp"; src = fetchurl { url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip; diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 2167b447703..9e81c932405 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: stdenv.mkDerivation rec { - name = "libjreen-${version}"; + pname = "libjreen"; version = "1.2.0"; src = fetchurl { - url = "https://qutim.org/dwnl/73/${name}.tar.bz2"; + url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2"; sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index f352c8e9ed1..a7c9427080d 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libjson-rpc-cpp-${version}"; + pname = "libjson-rpc-cpp"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index c83143dd6b1..ba92bdd5165 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -2,7 +2,8 @@ let version = "7.6.1"; in stdenv.mkDerivation rec { - name = "libjson-${version}"; + pname = "libjson"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libjson/libjson_${version}.zip"; sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 93f3b2a4f84..12205a6a63b 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fftw, qtbase, qmake }: stdenv.mkDerivation rec { - name = "libkeyfinder-${version}"; + pname = "libkeyfinder"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 24dd34d7a6a..67d525112cc 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liblangtag"; version = "0.6.1"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 767485a7515..ff1a39fc204 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -4,12 +4,13 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "liblastfm-${version}"; + pname = "liblastfm"; + inherit version; # Upstream does not package git tags as tarballs. Get tarball from github. src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index cafd6a66aa0..dd999db2759 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.5"; - name = "liblaxjson-${version}"; + pname = "liblaxjson"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 9870e024687..fe513d378cd 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: stdenv.mkDerivation rec { - name = "liblcf-${version}"; + pname = "liblcf"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 1a177dc2237..e8d8e971bc5 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "liblinear-${version}"; + pname = "liblinear"; version = "2.30"; src = fetchurl { diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index c2731e44efb..a61c21ffec5 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -5,7 +5,8 @@ let version = "3.10.0"; in stdenv.mkDerivation rec { - name = "liblouis-${version}"; + pname = "liblouis"; + inherit version; src = fetchFromGitHub { owner = "liblouis"; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 1a5a4baf808..471f277fb52 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "liblscp-${version}"; + pname = "liblscp"; version = "0.6.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.gz"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 8ff02b49e58..3786c5e77d3 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: stdenv.mkDerivation rec { - name = "libmatchbox-${version}"; + pname = "libmatchbox"; version = "1.11"; buildInputs = [ libXft libICE pango libjpeg ]; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 0f43c0d4616..7f5c8b4c4c2 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { version = "1.1.11"; - name = "libmatheval-${version}"; + pname = "libmatheval"; nativeBuildInputs = [ pkgconfig autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { - url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; + url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz"; sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; }; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index f1b15a91cca..46ed250b7b1 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmaxminddb-${version}"; + pname = "libmaxminddb"; version = "1.3.2"; src = fetchurl { - url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; + url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76"; }; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 406b88ea8c1..7a7bd115328 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; configureFlags = [ - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index de8baa7ad19..a38e71bb540 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libmd"; version = "1.0.1"; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index bf6aa0d23fb..adf856544c4 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "19.07"; - name = "libmediainfo-${version}"; + pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index e46eb9208de..7ec06b51e8c 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { - name = "libmesode-${version}"; + pname = "libmesode"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index d3f30a75273..598f0b7f789 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "mhash"; version = "0.9.9.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; }; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index f75d32c4313..719053e7ecf 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: stdenv.mkDerivation rec { - name = "libmicrohttpd-${version}"; + pname = "libmicrohttpd"; version = "0.9.64"; src = fetchurl { - url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; + url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7"; }; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index aa606e2a177..3eb688f9572 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { - name = "libmilter-${version}"; + pname = "libmilter"; version = "8.15.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 9c89d2e8d7b..8b659c46792 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libtool, autoconf, automake }: stdenv.mkDerivation rec { - name = "libmkv-${version}"; + pname = "libmkv"; version = "0.6.5.1"; src = fetchgit { diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 85800491016..231f18377e4 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -3,7 +3,8 @@ let version = "0.8.9.0"; in stdenv.mkDerivation rec { - name = "libmodplug-${version}"; + pname = "libmodplug"; + inherit version; meta = with stdenv.lib; { description = "MOD playing library"; @@ -14,7 +15,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz"; sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; } diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 512add5616a..99f04bc09de 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmowgli-${version}"; + pname = "libmowgli"; version = "2.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index 4df38a9cc3c..e8392f88ac7 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool }: stdenv.mkDerivation rec { - name = "libmpack-${version}"; + pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { owner = "tarruda"; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 106f6fe6c37..e4010280f4b 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -6,7 +6,8 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "libmpc-${version}"; # to avoid clash with the MPD client + pname = "libmpc"; + inherit version; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index dac7cf48aac..4c886078aa8 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.1"; - name = "libmpeg2-${version}"; + pname = "libmpeg2"; src = fetchurl { - url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz"; + url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz"; sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 2b59adf8f92..05532df1abd 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.1.0"; - name = "libmusicbrainz-${version}"; + pname = "libmusicbrainz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake neon libdiscid libxml2 ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 6653025eb05..483c5ff1ff7 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libmx-${version}"; + pname = "libmx"; version = "1.4.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 8719f19acc1..91e0b5ef072 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -1,30 +1,45 @@ -{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}: - -let - version = "1.3.0"; -in stdenv.mkDerivation rec { - name = "libmypaint-${version}"; +{ stdenv +, autoconf +, automake +, fetchFromGitHub +, glib +, intltool +, json_c +, libtool +, pkgconfig +, python2 +}: + +stdenv.mkDerivation rec { + pname = "libmypaint"; + version = "1.4.0"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc"; + sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch; - sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi"; - }) + nativeBuildInputs = [ + autoconf + automake + intltool + libtool + pkgconfig + python2 ]; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; - - buildInputs = [ glib ]; + buildInputs = [ + glib + ]; - propagatedBuildInputs = [ json_c ]; # for libmypaint.pc + # for libmypaint.pc + propagatedBuildInputs = [ + json_c + ]; doCheck = true; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 2b7258031c3..166ff2ef5a0 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, boost, mysql }: stdenv.mkDerivation rec { - name = "libmysqlconnectorcpp-${version}"; + pname = "libmysqlconnectorcpp"; version = "1.1.9"; src = fetchurl { diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index b461bfb3ddf..9414ebdcc2a 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.7"; - name = "libnabo-${version}"; + pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 17626bb23e1..695d46ba38f 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnatpmp-${version}"; + pname = "libnatpmp"; version = "20150609"; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 38c6bb00863..bfff0c84522 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libndctl-${version}"; + pname = "libndctl"; version = "66"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 51e4deed462..6c4fc798f33 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libndtypes-${version}"; + pname = "libndtypes"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index ba116e20177..75cea004143 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnet-${version}"; + pname = "libnet"; version = "1.2-rc3"; src = fetchurl { - url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; + url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz"; sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 95533696ddf..328688612b6 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libnetfilter_acct-${version}"; + pname = "libnetfilter_acct"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2"; sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; }; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 41245e6539f..85fbf458ac2 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_conntrack-${version}"; + pname = "libnetfilter_conntrack"; version = "1.0.7"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k"; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index a680e009ab6..563843cca46 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_cthelper-${version}"; + pname = "libnetfilter_cthelper"; version = "1.0.0"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2"; sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index d16155374ca..9f706d619c3 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_cttimeout-${version}"; + pname = "libnetfilter_cttimeout"; version = "1.0.0"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2"; sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 0d8de14513e..2b932bc0809 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_log-${version}"; + pname = "libnetfilter_log"; version = "1.0.1"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2"; sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; }; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 94b3dc90a0b..5f84bc03f82 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libnetfilter_queue-${version}"; + pname = "libnetfilter_queue"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; }; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index bef977caa28..695ddadb5f3 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libusb, readline }: stdenv.mkDerivation rec { - name = "libnfc-${version}"; + pname = "libnfc"; version = "1.7.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 8ed6dfa8ac0..d2848d9a1e9 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libnfs-${version}"; + pname = "libnfs"; version = "4.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index c6348b7b2e6..d9b2df6148a 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -3,7 +3,7 @@ # Note that this does not provide the ngspice command-line utility. For that see # the ngspice derivation. stdenv.mkDerivation rec { - name = "libngspice-${version}"; + pname = "libngspice"; version = "30"; src = fetchurl { diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index a4b0b26a345..c0c66bc1a4a 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -3,7 +3,8 @@ let version = "1.0.3"; in stdenv.mkDerivation rec { - name = "libnih-${version}"; + pname = "libnih"; + inherit version; src = fetchurl { url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 8131420cfd6..7dc23aa1e8a 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -5,10 +5,11 @@ let deb_patch = "5"; in stdenv.mkDerivation rec { - name = "libofa-${version}"; + pname = "libofa"; + inherit version; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index e284cb0615a..9cec66d0898 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libomxil-bellagio-${version}"; + pname = "libomxil-bellagio"; version = "0.9.3"; src = fetchurl { - url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz"; + url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz"; sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r"; }; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 450b9058d0b..c42cd3206b4 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libopcodes-${version}"; + pname = "libopcodes"; inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix index a29f8dc4a80..4ad1e2b7735 100644 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libopenaptx-${version}"; + pname = "libopenaptx"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 10d438500a6..752be52963c 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -5,7 +5,8 @@ let version = "1.3.1"; in stdenv.mkDerivation rec { - name = "libopus-${version}"; + pname = "libopus"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 4ca0849447f..e1d70bee6c4 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -4,7 +4,8 @@ let version = "0.2.1"; in stdenv.mkDerivation rec { - name = "libopusenc-${version}"; + pname = "libopusenc"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 885880c54c3..eeb8fec5f93 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: stdenv.mkDerivation rec { - name = "libosmium-${version}"; + pname = "libosmium"; version = "2.15.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 952509acc2e..47d9c4215fd 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -3,7 +3,8 @@ let version = "1.6.2"; in stdenv.mkDerivation { - name = "libossp-uuid-${version}"; + pname = "libossp-uuid"; + inherit version; src = fetchurl { url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index 7797061a71a..fa0db0cd4ff 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.2p1"; - name = "libow-${version}"; + pname = "libow"; src = fetchFromGitHub { owner = "owfs"; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 774019de0d5..903aa66ce60 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -2,13 +2,13 @@ , openssl }: stdenv.mkDerivation rec { - name = "libp11-${version}"; + pname = "libp11"; version = "0.4.10"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz"; }; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index b4b72e5a36d..3c37cf82495 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.24"; - name = "libpaper-${version}"; + pname = "libpaper"; src = fetchurl { url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index cf97744069b..bbdce71bad6 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -3,10 +3,11 @@ let version = "0.4"; in stdenv.mkDerivation rec { - name = "libpar2-${version}"; + pname = "libpar2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index bf1d26cf90d..d0572de537e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.10.1"; - name = "libpfm-${version}"; + pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index f8c91df6468..b3dae0c60ea 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "libpgf-${version}"; + pname = "libpgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index bf516b33d02..63035f74ea0 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation rec { - name = "libpinyin-${version}"; + pname = "libpinyin"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix new file mode 100644 index 00000000000..3fd8f86612c --- /dev/null +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, vulkan-headers +, vulkan-loader +, shaderc +, glslang +, lcms2 +}: + +stdenv.mkDerivation rec { + pname = "libplacebo"; + version = "1.18.0"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + rev = "v${version}"; + sha256 = "0ib12i2491piwiz0g5n5izr5jmn5fhwzicq97vfki3r7wrdb54mz"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + vulkan-headers + vulkan-loader + shaderc + glslang + lcms2 + ]; + + meta = with stdenv.lib; { + description = "Reusable library for GPU-accelerated video/image rendering primitives"; + homepage = "https://code.videolan.org/videolan/libplacebo"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index d622584c9da..19b700ca5e3 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { pname = "libplist"; version = "2019-04-04"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 3b050c3dc6a..09bb0e4aa3f 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -3,7 +3,7 @@ , SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { - name = "libproxy-${version}"; + pname = "libproxy"; version = "0.4.15"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index 7d697ee10f1..60c01565e63 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }: stdenv.mkDerivation rec { - name = "libpwquality-${version}"; + pname = "libpwquality"; version = "1.4.0"; src = fetchFromGitHub { owner = "libpwquality"; repo = "libpwquality"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd"; }; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f175bb6ea6d..f1c7874e313 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: prefix: stdenv.mkDerivation rec { - name = "libqmatrixclient-${version}"; + pname = "libqmatrixclient"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 8a239048390..930eafc9675 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; configureFlags = [ - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 048ba48bb67..22245f5fa2a 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { - name = "libqtav-${version}"; + pname = "libqtav"; version = "1.12.0"; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 5eb8049437c..360b2c15a63 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lcms2, jasper, pkgconfig }: stdenv.mkDerivation rec { - name = "libraw-${version}"; + pname = "libraw"; version = "0.19.3"; src = fetchurl { diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index d92b017712d..5b39940bb3f 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; - name = "liblrdf-${version}"; + pname = "liblrdf"; src = fetchurl { url = "https://github.com/swh/LRDF/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index c9debe61743..e365ec7a01a 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { version = "0.6.0"; - name = "libre-${version}"; + pname = "libre"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf"; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 3805965d11c..468bcfb0a18 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}: stdenv.mkDerivation rec { - name = "librealsense-${version}"; + pname = "librealsense"; version = "2.25.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 50c20d12ccc..aeda663342e 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { version = "0.6.0"; - name = "librem-${version}"; + pname = "librem"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1"; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 2f78222cebb..f11a7eb1fe5 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "librep-${version}"; + pname = "librep"; version = "0.92.7"; sourceName = "librep_${version}"; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 7fbe25addc0..71b8d2bb20e 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -3,11 +3,11 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libressl-${version}"; + pname = "libressl"; inherit version; src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index e4e96df86c1..79b05619ac5 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: stdenv.mkDerivation rec { - name = "librsync-${version}"; + pname = "librsync"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 479da52f8d9..b9ae1f829a1 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libscrypt-${version}"; + pname = "libscrypt"; version = "1.21"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 785dac4aef2..b2a79967477 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - name = "libsearpc-${version}"; + pname = "libsearpc"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 6b38bcf2c77..8c9c6ac107c 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, getopt, makeWrapper, utillinux }: stdenv.mkDerivation rec { - name = "libseccomp-${version}"; + pname = "libseccomp"; version = "2.4.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 82caacf93e6..970c4aff246 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -9,10 +9,9 @@ stdenv.mkDerivation rec { minor = "8"; level = "7"; version = "${major}.${minor}.${level}"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz"; + url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz"; sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da"; }; diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index 2da5d68d117..bc34318d0a9 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { version = "2.3.1"; - name = "libsieve-${version}"; + pname = "libsieve"; src = fetchurl { url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 34d959423a3..561b547a8d7 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { version = "1.8.2"; - name = "libsixel-${version}"; + pname = "libsixel"; src = fetchFromGitHub { repo = "libsixel"; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 19ebbd363e1..d0f822a23f5 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -4,7 +4,7 @@ libgee, json-glib, skk-dicts, libxkbcommon }: stdenv.mkDerivation rec { - name = "libskk-${version}"; + pname = "libskk"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 25f2a1e0846..208aa6c9d61 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -1,11 +1,11 @@ { stdenv , fetchurl }: stdenv.mkDerivation rec { - name = "libsmi-${version}"; + pname = "libsmi"; version = "0.5.0"; src = fetchurl { - url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz"; + url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz"; sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 8ffae53be19..263623c3d37 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "libsolv-${version}"; + pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index f53db7241cf..e7ec858cc7b 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "libsoundio-${version}"; + pname = "libsoundio"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 52a52e7e732..5f88ba80cd6 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,12 +3,11 @@ , libpsl, python3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libsoup"; version = "2.66.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"; }; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 8018b84a52b..bdca44dc7d0 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -3,7 +3,8 @@ let version = "1.8.5"; in stdenv.mkDerivation rec { - name = "libspatialindex-${version}"; + pname = "libspatialindex"; + inherit version; src = fetchurl { url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 00579600cb7..5f547a97370 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,10 +1,10 @@ {stdenv, pkgconfig, fetchurl}: stdenv.mkDerivation rec { - name = "libspiro-${version}"; + pname = "libspiro"; version = "0.5.20150702"; src = fetchurl { - url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; }; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 5bae04a88f9..9ef3d665413 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -8,7 +8,8 @@ in if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux") then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" else stdenv.mkDerivation { - name = "libspotify-${version}"; + pname = "libspotify"; + inherit version; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -61,7 +62,8 @@ else stdenv.mkDerivation { then throw '' Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly '' else stdenv.mkDerivation { - name = "libspotify-samples-${version}"; + pname = "libspotify-samples"; + inherit version; src = libspotify.src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libspotify readline ] diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index 7d9ea25e9d2..f8fc6a446d1 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "libsrs2-${version}"; + pname = "libsrs2"; version = "1.0.18"; src = fetchurl { diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index c1e6a1f7fb8..0ef96f67505 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { - name = "libstrophe-${version}"; + pname = "libstrophe"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 6eb8b6b1a8e..fcd010b46cc 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libsvm-${version}"; + pname = "libsvm"; version = "3.23"; src = fetchurl { diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 29d83bcd9d7..ca0407bd0aa 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "libtap-${version}"; + pname = "libtap"; version = "1.12.0"; src = fetchurl { - url = "https://web-cpan.shlomifish.org/downloads/${name}.tar.bz2"; + url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s"; }; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index f2cb879b3e0..c4614103b3f 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.20"; - name = "libtar-${version}"; + pname = "libtar"; # Maintenance repo for libtar (Arch Linux uses this) src = fetchgit { diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 4e859c28227..7a25980a38b 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "libtcod-${version}"; + pname = "libtcod"; version = "1.5.1"; src = fetchFromBitbucket { diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 0bc619051c6..139de830972 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: stdenv.mkDerivation rec { - name = "libtelnet-${version}"; + pname = "libtelnet"; version = "0.21+45f2d5c"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 7261fb7b6b7..38a09218dd1 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }: stdenv.mkDerivation rec { - name = "libtermkey-${version}"; + pname = "libtermkey"; version = "0.20"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 55c747540f7..093d6a18544 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.0.10"; - name = "libtiff-${version}"; + pname = "libtiff"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index f9e7f9684ba..6520ddd0a9e 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "libtomcrypt-${version}"; + pname = "libtomcrypt"; version = "1.18.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index a90377dad34..8ce82bcf07c 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "libtommath-${version}"; + pname = "libtommath"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 046229e8f1d..26605eb41db 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -11,7 +11,8 @@ let boostPython = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation { - name = "libtorrent-rasterbar-${version}"; + pname = "libtorrent-rasterbar"; + inherit version; src = fetchFromGitHub { owner = "arvidn"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 50fdbf2a81f..9bccff49b54 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -4,7 +4,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; + pname = "libtoxcore"; + inherit version; src = fetchFromGitHub { owner = "TokTok"; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index b0be3cb3c12..5ac456a60f6 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -3,10 +3,11 @@ let version = "1.0.1"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn-${version}"; + pname = "libtxc_dxtn"; + inherit version; src = fetchurl { - url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index aad8ae00c11..9a3671c3258 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -3,7 +3,8 @@ let version = "1.0"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn_s2tc-${version}"; + pname = "libtxc_dxtn_s2tc"; + inherit version; src = fetchurl { url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index 3b45d4de884..7080edcd738 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7"; - name = "libuecc-${version}"; + pname = "libuecc"; src = fetchgit { url = "git://git.universe-factory.net/libuecc"; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index e21f9400848..35ec5dfed7c 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "libunarr-${version}"; + pname = "libunarr"; version = "1.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 50bc0539589..7e75954fb45 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libunibreak-${version}"; + pname = "libunibreak"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz"; sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; }; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b302e1d0ba0..b315d0f16b0 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { majorVer = "3.0"; minorVer = "2"; version = "${majorVer}.${minorVer}"; - name = "libunique3-${version}"; + pname = "libunique3"; srcName = "libunique-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index e066c072367..e02e5228aa4 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libunistring-${version}"; + pname = "libunistring"; version = "0.9.10"; src = fetchurl { - url = "mirror://gnu/libunistring/${name}.tar.gz"; + url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8"; }; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index a0ec3b74cc1..501bf9a3dc9 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-static" - "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 9bea14bd8e8..70e6b698ec5 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { - name = "libunwind-${version}"; + pname = "libunwind"; version = "1.3.1"; src = fetchurl { - url = "mirror://savannah/libunwind/${name}.tar.gz"; + url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"; }; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 90be7740114..3ed45e788c4 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; - name = "liburcu-${version}"; + pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 7d595db85dd..855c6ce280e 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "liburing-${version}"; + pname = "liburing"; version = "0.1"; src = fetchgit { diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index d9e008af977..debccb9087d 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; version = "2019-03-23"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix index f9703e3c593..ff2044242b9 100644 --- a/pkgs/development/libraries/libutempter/default.nix +++ b/pkgs/development/libraries/libutempter/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "libutempter-${version}"; + pname = "libutempter"; version = "1.1.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index 9883de59feb..c604ce71cb7 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libva-utils-${version}"; + pname = "libva-utils"; inherit (libva) version; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 6a067244543..9b12f83bcb8 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "libva-${version}"; + pname = "libva"; version = "1.7.3"; src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 50b995a0356..039e3308f88 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -2,7 +2,7 @@ , libXext, libvdpau, glib, libva, ffmpeg, libGLU }: stdenv.mkDerivation rec { - name = "libvdpau-va-gl-${version}"; + pname = "libvdpau-va-gl"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index d6842226014..792a31bcf9f 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg, mesa }: stdenv.mkDerivation rec { - name = "libvdpau-${version}"; + pname = "libvdpau"; version = "1.2"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2"; sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 9dd89133f4b..1803ce1dc20 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,12 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl -, libapparmor, vala -, xenSupport ? false, xen ? null +{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +, libcap_ng, libvirt, libxml2 }: -let - inherit (pythonPackages) python pygobject2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libvirt-glib-2.0.0"; outputs = [ "out" "dev" ]; @@ -16,15 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"; }; - nativeBuildInputs = [ pkgconfig vala ]; - buildInputs = [ - libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobject-introspection libcap_ng numactl libapparmor - ] ++ stdenv.lib.optionals xenSupport [ - xen - ]; + nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; + strictDeps = true; meta = with stdenv.lib; { description = "Library for working with virtual machines"; @@ -36,7 +28,7 @@ in stdenv.mkDerivation rec { - libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gobject - GObjects for managing libvirt objects ''; - homepage = http://libvirt.org/; + homepage = https://libvirt.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 125259a6bee..0556e311736 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,13 +16,13 @@ with stdenv.lib; let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "libvirt-${version}"; + pname = "libvirt"; version = "5.4.0"; src = if buildFromTarball then fetchurl { - url = "http://libvirt.org/sources/${name}.tar.xz"; + url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; } else diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index 5cb1c673be5..b807691671f 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "libvisio-${version}"; + pname = "libvisio"; version = "0.1.7"; outputs = [ "out" "bin" "dev" "doc" ]; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz"; sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; }; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 44b2a81b2d3..e49ab9b38a0 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libvmi-${version}"; + pname = "libvmi"; version = "0.12.0"; libVersion = "0.0.12"; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index cd0cc9798fa..ee36365c03f 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -55,7 +55,7 @@ assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { - name = "libvpx-${version}"; + pname = "libvpx"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index a1e10b6d003..a4f0a44e60b 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }: stdenv.mkDerivation rec { - name = "libwacom-${version}"; + pname = "libwacom"; version = "0.33"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index c11f70290a4..fc9932567cf 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -26,11 +26,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libwebp-${version}"; + pname = "libwebp"; version = "1.0.3"; src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; + url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; }; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 144bde9a23a..a297bf61f78 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: stdenv.mkDerivation rec { - name = "libwebsockets-${version}"; + pname = "libwebsockets"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 62211a6b75d..cafd25ede0a 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { - name = "libwhereami-${version}"; + pname = "libwhereami"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 76ac946d618..e8f39754885 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: stdenv.mkDerivation rec { - name = "libwps-${version}"; + pname = "libwps"; version = "0.4.10"; src = fetchurl { - url = "mirror://sourceforge/libwps/${name}.tar.bz2"; + url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; }; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index d56c20cb75a..271823ace28 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libx86-${version}"; + pname = "libx86"; version = "1.1"; src = fetchurl { - url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz"; sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; }; patches = [./constants.patch ./non-x86.patch ]; diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index 2e00b5b5ab9..f361b3e1b1f 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libx86emu-${version}"; + pname = "libx86emu"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 7bd89b44d88..fede13fcd9b 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -4,7 +4,8 @@ let version = "4.3.4"; in stdenv.mkDerivation { - name = "libxc-${version}"; + pname = "libxc"; + inherit version; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index b4ad501c2ef..fb1f4b29423 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { - name = "libxcomp-${version}"; + pname = "libxcomp"; version = "3.5.99.16"; src = fetchurl { diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 773389e60f5..9408b0c4587 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -5,11 +5,12 @@ let version = "5.4"; in stdenv.mkDerivation rec { - name = "libxklavier-${version}"; + pname = "libxklavier"; + inherit version; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index a2a576edc0f..12658996646 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libxls-${version}"; + pname = "libxls"; version = "1.5.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 33f818f7d62..04954f3e1f5 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,11 +10,11 @@ let python = python2; in stdenv.mkDerivation rec { - name = "libxml2-${version}"; + pname = "libxml2"; version = "2.9.9"; src = fetchurl { - url = "http://xmlsoft.org/sources/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; }; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index cb93ec63e67..9eb891544b5 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libxnd-${version}"; + pname = "libxnd"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 2dde7fe32ef..1a3efee176a 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -11,10 +11,9 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; version = "1.1.33"; - name = pname + "-" + version; src = fetchurl { - url = "http://xmlsoft.org/sources/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; }; diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index af665c6d9a4..75b377ff8d4 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libyaml-cpp-${version}"; + pname = "libyaml-cpp"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index 710e7a3f072..e46064ae56e 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "libytnef-${version}"; + pname = "libytnef"; version = "1.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index f3cbddf1ec4..b16d897fb5f 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.1"; - name = "libzdb-${version}"; + pname = "libzdb"; src = fetchurl { diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index afa7696aca9..fbbfb5364b0 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.37"; - name = "libzen-${version}"; + pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn"; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 50ed00711df..43a5f7dc841 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libzip-${version}"; + pname = "libzip"; version = "1.3.0"; src = fetchurl { - url = "https://www.nih.at/libzip/${name}.tar.gz"; + url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 1413da4a18d..85b9308237f 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libzmf"; version = "0.0.2"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz"; sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 3f963c7ca19..8a5026e307f 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lightning-${version}"; + pname = "lightning"; version = "2.1.2"; src = fetchurl { - url = "mirror://gnu/lightning/${name}.tar.gz"; + url = "mirror://gnu/lightning/${pname}-${version}.tar.gz"; sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"; }; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index ab0e51bae26..7f82d49462c 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "lightstep-tracer-cpp-${version}"; + pname = "lightstep-tracer-cpp"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 9af0c20d701..f5cb197dfe5 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -9,7 +9,6 @@ , withSage ? false # sage support }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "linbox"; version = "1.6.3"; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 5fa1035868d..b105aa64bff 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "linenoise-ng-${version}"; + pname = "linenoise-ng"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 6bbcc725f22..857f5247cd5 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "linenoise-${version}"; + pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 99ea6343d70..8b0aecdab16 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "liquid-dsp-${version}"; + pname = "liquid-dsp"; version = "20170307"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index ff77cd71265..57dcb3ee6a6 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,7 +2,7 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { - name = "live555-${version}"; + pname = "live555"; version = "2019.08.16"; src = fetchurl { # the upstream doesn't provide a stable URL diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 690a42cfb30..830ec7bdaee 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lmdb-${version}"; + pname = "lmdb"; version = "0.9.24"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 232a67c23f3..f4ecba7ad1e 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -3,7 +3,7 @@ , lmdb }: stdenv.mkDerivation rec { - name = "lmdbxx-${version}"; + pname = "lmdbxx"; version = "0.9.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix index f0904726eed..c4e55b14407 100644 --- a/pkgs/development/libraries/loadcaffe/default.nix +++ b/pkgs/development/libraries/loadcaffe/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}: stdenv.mkDerivation rec { - name = "loadcaffe-${version}"; + pname = "loadcaffe"; version = "0.0pre2016.08.01"; buildInputs = [cmake torch protobuf protobufc]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 8e854156424..04b91e5d80f 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "log4cxx-${version}"; + pname = "log4cxx"; version = "0.10.0"; src = fetchurl { - url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz"; + url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index b2fba7df509..ab8c2c9385f 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { - name = "log4shib-${version}"; + pname = "log4shib"; version = "1.0.9"; src = fetchgit { diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 2ff927048ad..631233f0ecb 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "loki-${version}"; + pname = "loki"; version = "0.1.7"; src = fetchurl { diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index cad5d0d7eca..e00fc07480e 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.3"; - name = "loudmouth-${version}"; + pname = "loudmouth"; src = fetchurl { - url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2"; + url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index c45fa6bc61a..32eec84e69e 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { - name = "lucene++-${version}"; + pname = "lucene++"; version = "3.0.7"; src = fetchurl { diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 8a8a004a5e6..7355248b5c5 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, yasm }: stdenv.mkDerivation rec { - name = "mac-${version}"; + pname = "mac"; version = "4.11-u4-b5-s7"; src = fetchurl { diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index c7794b1a8bf..04f2208a35d 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mailcore2-${version}"; + pname = "mailcore2"; version = "0.6.3"; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 3a90a4cdf33..1feea915c02 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "mapnik-${version}"; + pname = "mapnik"; version = "3.0.22"; src = fetchzip { diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 064f04f220c..cec9e5adc29 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { - name = "martyr-${version}"; + pname = "martyr"; version = "0.3.9"; src = fetchurl { - url = "mirror://sourceforge/martyr/${name}.tar.gz"; + url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index a72d5a825c6..a06d082b226 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "mbedtls-${version}"; + pname = "mbedtls"; version = "2.17.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw"; }; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 8f0a6317a25..04ebfced52e 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, hdf5 }: stdenv.mkDerivation rec { - name = "medfile-${version}"; + pname = "medfile"; version = "4.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index b8a8c64011c..ebd68134ba5 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mediastreamer-openh264-${version}"; + pname = "mediastreamer-openh264"; version = "0.0pre20160801"; src = fetchgit { diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 94622b8a8f9..902fd920568 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: stdenv.mkDerivation rec { - name = "glu-${version}"; + pname = "glu"; version = "9.0.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${pname}-${version}.tar.bz2"; sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; }; postPatch = '' diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7b1b5a3cfa9..7610b15296e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 788d2c5d618..0919ee6cd28 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -5,7 +5,7 @@ let nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform; in stdenv.mkDerivation rec { - name = "microsoft_gsl-${version}"; + pname = "microsoft_gsl"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 7a06f9277c9..5f4dc5eedde 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "mimetic"; version = "0.9.8"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 791cc9f3f91..3493bc5d967 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniball-${version}"; + pname = "miniball"; version = "3.0"; src = fetchurl { diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 972cc3e738c..5bdacbba11d 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mxml-${version}"; + pname = "mxml"; version = "3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index a56deff66e4..5099991c117 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "mlt-${version}"; + pname = "mlt"; version = "6.16.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f46ec57197f..f017e4452a6 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -6,7 +6,7 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "mlt-${version}"; + pname = "mlt"; version = "6.16.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 2a933ef7840..49116c349a8 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mongoc-${version}"; + pname = "mongoc"; version = "1.8.0"; src = fetchzip { diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 58905cce82a..2bba61975f9 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { - name = "mono-addins-${version}"; + pname = "mono-addins"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index ba9e2a741e4..89db7344f99 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, pkgconfig, mono }: stdenv.mkDerivation rec { - name = "mono-zeroconf-${version}"; + pname = "mono-zeroconf"; version = "0.9.0"; src = fetchurl { diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 51591c9d8e8..ba61cb8414a 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -8,11 +8,11 @@ # refer to the gentoo package stdenv.mkDerivation rec { - name = "motif-${version}"; + pname = "motif"; version = "2.3.6"; src = fetchurl { - url = "mirror://sourceforge/motif/${name}.tar.gz"; + url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz"; sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs"; }; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 96444ea4a23..8162d3bb911 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }: stdenv.mkDerivation rec { - name = "movit-${version}"; + pname = "movit"; version = "1.6.3"; src = fetchurl { - url = "https://movit.sesse.net/${name}.tar.gz"; + url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; }; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 6b607e94bd4..baefab487e5 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, mpfr}: stdenv.mkDerivation rec { - name = "mpfi-${version}"; + pname = "mpfi"; version = "1.5.3"; file_nr = "37331"; src = fetchurl { diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index e32c83af8a7..a91d220be33 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "4.0.2"; - name = "mpfr-${version}"; + pname = "mpfr"; src = fetchurl { urls = [ #"https://www.mpfr.org/${name}/${name}.tar.xz" - "mirror://gnu/mpfr/${name}.tar.xz" + "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx"; }; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 1c6b8df1511..2232bfb9a38 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -3,7 +3,7 @@ } : stdenv.mkDerivation rec { - name = "mpich-${version}"; + pname = "mpich"; version = "3.3.1"; src = fetchurl { diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index fe9cd6f492e..3b40f02c01c 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { - name = "mpir-${version}"; + pname = "mpir"; version = "3.0.0"; nativeBuildInputs = [ m4 which yasm ]; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 23f271ae04b..ec3b4e20147 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, sqlite }: stdenv.mkDerivation rec { - name = "mps-${version}"; + pname = "mps"; version = "1.117.0"; src = fetchurl { diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 29ec205d7a1..04f84d49f84 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "msgpack-${version}"; + pname = "msgpack"; + inherit version; inherit src patches; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index e177694e894..b200a12ef95 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "msgpuck-${version}"; + pname = "msgpuck"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index ef8525cf54d..da41aceeef5 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -2,7 +2,7 @@ , boost, openssl, zlib, libsodium, olm, nlohmann_json }: stdenv.mkDerivation rec { - name = "mtxclient-${version}"; + pname = "mtxclient"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 53f348f93f8..d058322660c 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "muparser-${version}"; + pname = "muparser"; version = "2.2.3"; url-version = stdenv.lib.replaceChars ["."] ["_"] version; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index b247706067e..423a93b69a8 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { pname = "mutest"; - version = "unstable-2019-10-12"; + version = "unstable-2019-08-26"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "ebassi"; repo = "mutest"; - rev = "822b5ddf07f957135ba39889d81e513d525b9b8e"; - sha256 = "0a5fjdq9p0q5bibqngbbpd9lga0gzrv8yj5wgdfb8ylxzg0jph2p"; + rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a"; + sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index f4a869255f8..0907f0174c9 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -4,7 +4,7 @@ let renderSystem = if withOgre then "3" else "4"; in stdenv.mkDerivation rec { - name = "mygui-${version}"; + pname = "mygui"; version = "3.2.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index f29fb9564f3..5c0238fe41e 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "nanoflann-${version}"; + pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 8f72b333aa4..94bc8186f30 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.5"; - name = "nanomsg-${version}"; + pname = "nanomsg"; src = fetchFromGitHub { owner = "nanomsg"; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 55e9f44eae3..c842eac4311 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.8.1"; - name = "nco-${version}"; + pname = "nco"; buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index cbe1f984059..7f08d0a7535 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -4,7 +4,8 @@ let version = "0.6.3"; in stdenv.mkDerivation { - name = "ndn-cxx-${version}"; + pname = "ndn-cxx"; + inherit version; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 913a4a087a9..83d01f85d0a 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -3,7 +3,8 @@ let version = "2.8"; in stdenv.mkDerivation rec { - name = "ndpi-${version}"; + pname = "ndpi"; + inherit version; src = fetchFromGitHub { owner = "ntop"; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index 87f9b5effac..fbffb138e96 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { version = "0.29.6"; - name = "neon-${version}"; + pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; + url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; }; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 61a40753a56..ffefc8e51c4 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { version = "0.30.2"; - name = "neon-${version}"; + pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; + url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv"; }; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index a57884912ba..665145a92ac 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { - name = "netcdf-cxx4-${version}"; + pname = "netcdf-cxx4"; version = "4.3.0"; src = fetchurl { diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index bb621a3eda6..c9c52636a5b 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { - name = "netcdf-fortran-${version}"; + pname = "netcdf-fortran"; version = "4.4.5"; src = fetchurl { diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index cc5a115ed71..442fcf2e761 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: let version = "6.0.0"; in stdenv.mkDerivation { - name = "nix-plugins-${version}"; + pname = "nix-plugins"; + inherit version; src = fetchFromGitHub { owner = "shlevy"; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 3c5ae8537a4..4609fd1a376 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -2,7 +2,7 @@ , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { - name = "notify-sharp-${version}"; + pname = "notify-sharp"; version = "3.0.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 43732406064..2cbf88633e7 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npapi-sdk-${version}"; + pname = "npapi-sdk"; version = "0.27.2"; src = fetchurl { - url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2"; sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; }; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 4772f1111ac..b62fa1cb704 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -5,7 +5,8 @@ let version = "4.21"; in stdenv.mkDerivation { - name = "nspr-${version}"; + pname = "nspr"; + inherit version; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index b410686865f..b7b4ea45d8b 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { - name = "nss-${version}"; + pname = "nss"; inherit version; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; }; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index dac65e1c2f9..5ea43097b8c 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ntbtls-${version}"; + pname = "ntbtls"; version = "0.1.2"; src = fetchurl { diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 12d3c9ad942..e83fe2e7e7b 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -13,7 +13,7 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { - name = "ntl-${version}"; + pname = "ntl"; version = "11.3.2"; src = fetchurl { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { perl # needed for ./configure ]; - sourceRoot = "${name}/src"; + sourceRoot = "${pname}-${version}/src"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index c0a73fa984e..b79f940affa 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "ntrack-${version}"; + pname = "ntrack"; + inherit version; src = fetchurl { - url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w"; }; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 91318c802d8..db542ec93a9 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: stdenv.mkDerivation rec { - name = "nuspell-${version}"; + pname = "nuspell"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 77167361ff2..73b5e3fe772 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "nvidia-texture-tools-${version}"; + pname = "nvidia-texture-tools"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index abdc7502052..6cab843a22b 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { - name = "ocl-icd-${version}"; + pname = "ocl-icd"; version = "2.2.10"; src = fetchurl { - url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz"; + url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz"; sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index aa188650860..a540d89ed3b 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ode-${version}"; + pname = "ode"; version = "0.12"; src = fetchurl { diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 42babc32ecd..2855d1139c3 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { pname = "ogre"; version = "1.9.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "OGRECave"; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index f1b6060e166..dc3bf8cf009 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -10,7 +10,7 @@ , withSamples ? false }: stdenv.mkDerivation rec { - name = "ogre-${version}"; + pname = "ogre"; version = "1.12.1"; src = fetchurl { diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index e4045bcd5dc..0844c44c8a8 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { - name = "ogre-paged-${version}"; + pname = "ogre-paged"; version = "1.2.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 253d185fa0c..15e83cf9d76 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "ois-${version}"; + pname = "ois"; version = "${majorVersion}.${minorVersion}"; src = fetchurl { diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 49daff30e7b..dd3f83a0130 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "olm-${version}"; + pname = "olm"; version = "3.0.0"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; + url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz"; sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c"; }; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index e64d21c87ed..8a1e1d37c1d 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "onig-${version}"; + pname = "onig"; version = "6.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index b60a53e55ca..32b13115957 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "opae-${version}"; + pname = "opae"; version = "1.0.0"; # the tag has a silly name for some reason. drop this in the future if diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 3c082926e06..89ac85b752b 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -11,12 +11,12 @@ assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.19.1"; - name = "openal-soft-${version}"; + pname = "openal-soft"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; }; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 81754ffad4d..26bcf3d20ff 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { - name = "openbabel-${version}"; + pname = "openbabel"; version = "2.4.1"; src = fetchurl { diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 4d3e9e9a04e..5aeb07de923 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.5"; - name = "openbr-${version}"; + pname = "openbr"; src = fetchFromGitHub { owner = "biometrics"; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 2b2fc3ff4d5..292b824709b 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -2,13 +2,12 @@ stdenv.mkDerivation rec { pname = "openbsm"; - name = "${pname}-${version}"; version = "1.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}"; + rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}")}"; sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 613aeddd77b..5ed2dd5e23d 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, opencl-headers }: stdenv.mkDerivation rec { - name = "opencl-clhpp-${version}"; + pname = "opencl-clhpp"; version = "2.0.10"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index cd3da4a7960..9bd25bfb93a 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -2,7 +2,7 @@ , darwin}: stdenv.mkDerivation rec { - name = "opencollada-${version}"; + pname = "opencollada"; version = "1.6.68"; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3081c6c839c..cbd05848173 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "opencolorio-${version}"; + pname = "opencolorio"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 9a8787ad7f4..e2d34ae5f07 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -4,7 +4,8 @@ let version = "0.1.5"; in stdenv.mkDerivation { - name = "opencore-amr-${version}"; + pname = "opencore-amr"; + inherit version; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 11c66f0d497..1fdddf930cf 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.4.2"; - name = "opencsg-${version}"; + pname = "opencsg"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 5ad7eecace1..5f1c2b5c6f6 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "openct-${version}"; + pname = "openct"; version = "0.6.20"; src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; - rev = name; + rev = "${pname}-${version}"; sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2"; }; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d5dc716c4a8..d3efb022a0e 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false @@ -140,7 +141,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3fdc392e92b..205a87d78e8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false @@ -153,7 +154,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 784071c6e4d..b91a1489eb6 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; version = "2.4.13"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 17e2c9098a1..77569590142 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "opendht-${version}"; + pname = "opendht"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 71885ba46f1..66496af12f9 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -2,11 +2,11 @@ , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "opendkim-${version}"; + pname = "opendkim"; version = "2.10.3"; src = fetchurl { - url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; + url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz"; sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 072848d7bbc..9eef138c532 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { - name = "openexr-${version}"; + pname = "openexr"; version = lib.getVersion ilmbase; src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; }; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 099bd8d1e97..5d26063adb6 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openexrid-unstable-${version}"; + pname = "openexrid-unstable"; version = "2017-09-17"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index cd3210dd08b..6554d025311 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "openfst"; version = "1.7.2"; src = fetchurl { - url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1"; }; meta = { diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 42edb1958ce..abc60f026e5 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openfx-${version}"; + pname = "openfx"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index c8208ce27ba..cd91a132597 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { - name = "openh264-${version}"; + pname = "openh264"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index e26f4160921..55d003d2d92 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -24,7 +24,8 @@ let in stdenv.mkDerivation rec { - name = "openjpeg-${version}"; + pname = "openjpeg"; + inherit version; src = fetchFromGitHub { owner = "uclouvain"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 760fc3e3232..06e4726054e 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -12,10 +12,11 @@ let version = "4.0.1"; in stdenv.mkDerivation rec { - name = "openmpi-${version}"; + pname = "openmpi"; + inherit version; src = with stdenv.lib.versions; fetchurl { - url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; + url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index ed646b9e221..6d53d23ae0e 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "openpa"; version = "1.0.4"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz"; + url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz"; sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; }; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 339f6064999..b217527269d 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "openpam-${version}"; + pname = "openpam"; version = "20170430"; src = fetchurl { - url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz"; + url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz"; sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 9488ef484c6..0edf6dfa728 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "opensaml-cpp-${version}"; + pname = "opensaml-cpp"; version = "3.0.1"; src = fetchgit { diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index f07ebad9e81..46028d3a7ea 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openssl-chacha-${version}"; + pname = "openssl-chacha"; version = "2016-08-22"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 67b903970d3..bd4802b8775 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,10 +8,11 @@ with stdenv.lib; let common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { - name = "openssl-${version}"; + pname = "openssl"; + inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 72e532ae782..81ef6a3bf5d 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "opensubdiv-${version}"; + pname = "opensubdiv"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index 00f4f45df96..f29972a64bd 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "opentracing-cpp-${version}"; + pname = "opentracing-cpp"; version = "1.5.1"; src = fetchFromGitHub { owner = "opentracing"; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index af88172c57a..800acebac34 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openvdb-${version}"; + pname = "openvdb"; version = "6.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index a986b71bc1d..134ec74d530 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -2,7 +2,7 @@ , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { - name = "openwsman-${version}"; + pname = "openwsman"; version = "2.6.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index d1a20552ff7..8013d686585 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q"; + sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 5a5e8ffaef7..c3407289f02 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -6,7 +6,8 @@ let version = "2018-11-13"; in stdenv.mkDerivation rec { - name = "openzwave-${version}"; + pname = "openzwave"; + inherit version; # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index ce917ccbe7f..a243b5c0b51 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0"; }; - name = "libosip2-${version}"; + pname = "libosip2"; meta = { license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index a1e7215fd9a..551c70cebcc 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,7 +1,7 @@ { cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "osm-gps-map-${version}"; + pname = "osm-gps-map"; version = "1.1.0"; src = fetchzip { diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 47c6a27639d..67c4e75c1e1 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "pagmo2-${version}"; + pname = "pagmo2"; version = "2.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 6fb123f5094..44293d52da4 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "pangolin-${version}"; + pname = "pangolin"; version = "2017-08-02"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index b45ed296691..d90a27ed545 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "partio-${version}"; + pname = "partio"; version = "2018-03-01"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 2050e5cdfe7..32fc27f9ab4 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -4,7 +4,7 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { - name = "pcaudiolib-${version}"; + pname = "pcaudiolib"; version = "2016-07-19"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 654698c1b32..58fbb26532e 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.94"; - name = "pcg-c-${version}"; + pname = "pcg-c"; src = fetchzip { - url = "http://www.pcg-random.org/downloads/${name}.zip"; + url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip"; sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv"; }; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index f080de82ddc..e27c71314d9 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcre2-${version}"; + pname = "pcre2"; version = "10.33"; src = fetchurl { - url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2"; sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m"; }; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 4cc607345e8..473fb3bfd48 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pHash"; version = "0.9.4"; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 4d68d3718c0..2dd0cc10c94 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -6,7 +6,7 @@ with lib; let - v = "4.10.2"; + v = "4.10.3"; soname = if withQt5 then "phonon4qt5" else "phonon"; buildsystemdir = "share/cmake/${soname}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; - sha256 = "02c8fyyvg5qb0lxwxmnxc5grkg6p3halakjf02vmwmvqaycb3v9l"; + sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf"; }; buildInputs = diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 6edea7f5141..cf9e201b3f6 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -4,10 +4,11 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "physfs-${version}"; + pname = "physfs"; + inherit version; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; + url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index d542c6cf1d7..5302ad21258 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }: stdenv.mkDerivation rec { - name = "apfel-${version}"; + pname = "apfel"; version = "3.0.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 983523e1f2f..2ba87024bc5 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { - name = "apfelgrid-${version}"; + pname = "apfelgrid"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 1ad5dcb8b25..edda5148068 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: stdenv.mkDerivation rec { - name = "applgrid-${version}"; + pname = "applgrid"; version = "1.4.70"; src = fetchurl { - url = "https://www.hepforge.org/archive/applgrid/${name}.tgz"; + url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz"; sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index f01fab74635..2a1846e40a6 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2006"; - name = "cernlib-${version}"; + pname = "cernlib"; src = fetchurl { url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 3828cfda2af..826362cc586 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "fastjet-${version}"; + pname = "fastjet"; version = "3.3.2"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e3291907d31..5ef446319a8 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { - name = "fastnlo_toolkit-${version}"; + pname = "fastnlo_toolkit"; version = "2.3.1pre-2402"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 5f51c6a194c..fb108dd7c25 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { version = "10.4.1"; - name = "geant4-${version}"; + pname = "geant4"; src = fetchurl{ url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 0b1f3f0490d..dd39fbbc84b 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit (geant4_nomt) version src; - name = "g4py-${version}"; + pname = "g4py"; sourceRoot = "geant4.10.04.p01/environments/g4py"; diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index d61a68ebe34..665cd417dc0 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "hepmc-${version}"; + pname = "hepmc"; version = "2.06.10"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index c4717800f70..3116c4d36bb 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, coreutils, root }: stdenv.mkDerivation rec { - name = "hepmc3-${version}"; + pname = "hepmc3"; version = "3.1.1"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 7a146bb7309..d252e62286b 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "herwig-${version}"; + pname = "herwig"; version = "7.1.5"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 9c379f6a347..9e68fbd3fc4 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { - name = "hoppet-${version}"; + pname = "hoppet"; version = "1.2.0"; src = fetchurl { - url = "https://hoppet.hepforge.org/downloads/${name}.tgz"; + url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz"; sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 3ad0b3dc4cc..dff9fb1c1dd 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2, makeWrapper }: stdenv.mkDerivation rec { - name = "lhapdf-${version}"; + pname = "lhapdf"; version = "6.2.3"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index b287e52b243..74b4ba4224e 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fastnlo, rivet, pkgconfig }: stdenv.mkDerivation rec { - name = "mcgrid-${version}"; + pname = "mcgrid"; version = "2.0.2"; src = fetchurl { - url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz"; sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; }; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index a608a7f6b0f..1518c23718a 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gfortran }: stdenv.mkDerivation rec { - name = "mela-${version}"; + pname = "mela"; version = "2.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 2f79a2b76ab..20df49d9ae7 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nlojet++-${version}"; + pname = "nlojet++"; version = "4.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index e6b351c206d..0398175a9a2 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { - name = "pythia-${version}"; + pname = "pythia"; version = "8.243"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 620f227250d..ad5f994620f 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { - name = "QCDNUM-${version}"; + pname = "QCDNUM"; version = "17-01-13"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c068424e416..914eee5c286 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { - name = "rivet-${version}"; + pname = "rivet"; version = "2.7.2"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 272761977ba..fa293eab350 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { - name = "thepeg-${version}"; + pname = "thepeg"; version = "2.1.5"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 08afe6d6452..c6c6f742d0b 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { - name = "yoda-${version}"; + pname = "yoda"; version = "1.7.7"; src = fetchurl { diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d3bbb867974..1f9996ec213 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-${version}"; + pname = "pixman"; version = "0.38.4"; src = fetchurl { - url = "mirror://xorg/individual/lib/${name}.tar.bz2"; + url = "mirror://xorg/individual/lib/${pname}-${version}.tar.bz2"; sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 5cf5d34b9af..ce511544a42 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: stdenv.mkDerivation rec { - name = "pkcs11-helper-${version}"; + pname = "pkcs11-helper"; version = "1.25.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns"; }; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index ceb49fc0153..e945154c003 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pmdk-${version}"; + pname = "pmdk"; version = "1.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 3f6a609121a..8509468f59a 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -4,7 +4,7 @@ assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "pngpp-${version}"; + pname = "pngpp"; version = "0.2.10"; src = fetchurl { diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 68ddf5c91d1..c19e343f19a 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }: stdenv.mkDerivation rec { - name = "poco-${version}"; + pname = "poco"; version = "1.9.2"; src = fetchurl { - url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; + url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz"; sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd"; }; @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 722c1cae872..809159b8c2f 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.9.6"; - name = "podofo-${version}"; + pname = "podofo"; src = fetchurl { - url = "mirror://sourceforge/podofo/${name}.tar.gz"; + url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; }; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index f790c62f5af..ffe7f46b77d 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: stdenv.mkDerivation rec { - name = "portmidi-${version}"; + pname = "portmidi"; version = "217"; src = fetchurl { diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 566d88dcdb5..8f6adaf03d9 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -3,7 +3,8 @@ let version = "1.2"; in stdenv.mkDerivation rec { - name = "ppl-${version}"; + pname = "ppl"; + inherit version; src = fetchurl { url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index a98521a2d1e..957b59a6f66 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -7,7 +7,8 @@ let mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 1a20d806b96..773e3139175 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index e0c5d4db930..91c0ae5624e 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-c-${version}"; + pname = "protobuf-c"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 25e0f14d026..0bbfab62fcd 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "protozero-${version}"; + pname = "protozero"; version = "1.6.8"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 74c6e8ef1b3..d1825171596 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: stdenv.mkDerivation rec { - name = "pugixml-${version}"; + pname = "pugixml"; version = "1.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index b5a01698e5e..66a395801b2 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, autoreconfHook }: stdenv.mkDerivation rec { - name = "libupnp-${version}"; + pname = "libupnp"; version = "1.8.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index aa1f8d10ba9..7dfbdc4d64a 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { - name = "pybind-${version}"; + pname = "pybind"; version = "2.2.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 4b5b7ace074..2b630de14b2 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2"; - name = "python-qt-${version}"; + pname = "python-qt"; src = fetchurl { url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 885b7b378cc..19b11a60e7b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl_1_0_2, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { - name = "qca-${version}"; + pname = "qca"; version = "2.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a7077c69dd8..2156c0e5350 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "qjson-${version}"; + pname = "qjson"; src = fetchFromGitHub { owner = "flavio"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index ba62324d586..d3f4a8e88e2 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018-11-24"; - name = "qmltermwidget-unstable-${version}"; + pname = "qmltermwidget-unstable"; src = fetchFromGitHub { repo = "qmltermwidget"; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 5bccbf74965..789a63bef74 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -3,10 +3,11 @@ let version = "8.4.2"; in stdenv.mkDerivation rec { - name = "qpdf-${version}"; + pname = "qpdf"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9"; }; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 1bc63d0e2b9..7b4addd9161 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -59,7 +59,6 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch - ./qtwebengine-CVE-2019-5786.patch ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index aa3a0fe9489..a4d2fc82ff2 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch index aa987acbe92..87ed0ddc4d4 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf 2019-07-10 09:35:08.917628566 -0500 +@@ -24,7 +24,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -318,7 +293,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..4c7c8da21a 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-10 09:35:08.917628566 -0500 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -272,25 +228,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -309,25 +253,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -346,11 +278,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,19 +256,17 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 99f68b78f5..dde69cb7c2 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -63,199 +63,3 @@ qt { - } +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -64,202 +64,6 @@ } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { -- QMAKE_RPATHDIR += @executable_path/Frameworks +- QMAKE_RPATHDIR += @executable_path/../Frameworks - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks -} - @@ -463,10 +458,13 @@ index 99f68b78f5..dde69cb7c2 100644 - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) + generate_xcode_project.target = xcodeproj +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf 2019-07-10 09:35:08.917628566 -0500 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -528,11 +526,10 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -1,54 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -568,10 +565,6 @@ index 8360dd8b38..8b13789179 100644 -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) - --sysrootified = --for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val --QMAKE_INCDIR_OPENGL = $$sysrootified -- -QMAKESPEC_NAME = $$basename(QMAKESPEC) - -# Resolve SDK version of various tools @@ -591,37 +584,34 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 65212b2abf..accd4c07f0 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_ - # Tools need qmldir and plugins.qmltypes always installed on the file system - qmldir.files = $$qmldir_file $$fq_aux_qml_files +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -54,7 +54,7 @@ + + qmldir.files = $$qmldir_file install_qml_files: qmldir.files += $$fq_qml_files --qmldir.path = $$instbase/$$TARGETPATH +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += qmldir - !debug_and_release|!build_all|CONFIG(release, debug|release) { -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index cd6377dcc6..e98bf98151 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -56,7 +56,7 @@ qml1_target { - instbase = $$[QT_INSTALL_QML] - } + qmlfiles.base = $$_PRO_FILE_PWD_ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -50,7 +50,7 @@ + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH --target.path = $$instbase/$$TARGETPATH +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += target # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -30,7 +30,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -630,11 +620,10 @@ index 8354f30eea..62028fef8e 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -643,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4ad9946ae0..6d66f29c26 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -34,8 +34,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -658,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -671,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -682,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -697,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -710,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -723,10 +708,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf 2019-07-10 09:35:08.918628595 -0500 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -746,7 +730,7 @@ index 8f98987b99..21b3bb8b32 100644 !static: target.CONFIG = no_dll INSTALLS += target } -@@ -29,33 +23,33 @@ +@@ -29,35 +23,35 @@ #headers qt_install_headers { gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES @@ -762,6 +746,8 @@ index 8f98987b99..21b3bb8b32 100644 private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist INSTALLS += private_headers qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES @@ -786,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 40528a65e2..903f795284 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ } } @@ -799,11 +784,63 @@ index 40528a65e2..903f795284 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -2668,6 +2668,15 @@ + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h 2019-07-10 09:35:08.920628655 -0500 +@@ -212,7 +212,7 @@ + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include <os/activity.h> +@@ -290,7 +290,19 @@ + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-07-10 09:35:08.918628595 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::qmake IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -812,7 +849,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) +@@ -18,7 +18,7 @@ add_executable(Qt5::moc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -821,7 +858,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) +@@ -35,7 +35,7 @@ add_executable(Qt5::rcc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -830,7 +867,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -116,7 +116,7 @@ !!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -839,7 +876,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -130,7 +130,7 @@ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -848,10 +885,9 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-07-10 09:35:08.918628595 -0500 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) @@ -860,10 +896,9 @@ index c357237d0e..6f0c75de3c 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-07-10 09:35:08.918628595 -0500 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) @@ -872,31 +907,10 @@ index 706304cf34..546420f6ad 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 463e30e1c3..0e1ab669e4 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bed62a02bd..73158993f7 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -909,7 +923,7 @@ index bed62a02bd..73158993f7 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -931,10 +945,9 @@ index bed62a02bd..73158993f7 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -948,7 +961,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -961,10 +974,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -974,7 +986,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -990,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1008,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 57629ac03a..8a7f219a98 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -317,10 +317,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1025,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp 2019-07-10 09:35:08.919628625 -0500 @@ -39,6 +39,7 @@ #include <qpa/qplatformthemeplugin.h> @@ -1037,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1061,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp 2019-07-10 09:35:08.920628655 -0500 +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h 2019-07-10 09:35:08.919628625 -0500 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1081,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) +diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -1094,63 +1114,33 @@ index 99d87e2e46..a4eab2aa72 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index b14a494296..779c4eda95 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -211,7 +211,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include <os/activity.h> -@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index 2c1005ad80..244147ea7d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index 1268730cc6..a50e9b0764 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - #endif - } - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Logger that also feeds messages to AUL. It needs to wrap the existing - // logger, as it needs to be able to short circuit the existing logger - // in case AUL prints to stderr. +diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +index c40f58c987..e69de29bb2 100644 +--- a/mkspecs/features/mac/sdk.mk ++++ b/mkspecs/features/mac/sdk.mk +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch deleted file mode 100644 index ec9a432ea70..00000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -@@ -135,14 +135,16 @@ - if (!raw_data_ || error_code_) - return nullptr; - -- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -- if (finished_loading_) { -- array_buffer_result_ = result; -- AdjustReportedMemoryUsageToV8( -- -1 * static_cast<int64_t>(raw_data_->ByteLength())); -- raw_data_.reset(); -+ if (!finished_loading_) { -+ return DOMArrayBuffer::Create( -+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); - } -- return result; -+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -+ AdjustReportedMemoryUsageToV8(-1 * -+ static_cast<int64_t>(raw_data_->ByteLength())); -+ -+ raw_data_.reset(); -+ return array_buffer_result_; - } - - String FileReaderLoader::StringResult() { diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix index d83edc97e94..ce567c3a2bc 100644 --- a/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1"; - name = "qt3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d"; + name = "qt3d-everywhere-src-5.12.3.tar.xz"; }; }; qtactiveqt = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52"; - name = "qtactiveqt-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz"; + sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f"; + name = "qtactiveqt-everywhere-src-5.12.3.tar.xz"; }; }; qtandroidextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm"; - name = "qtandroidextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f"; + name = "qtandroidextras-everywhere-src-5.12.3.tar.xz"; }; }; qtbase = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz"; - sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy"; - name = "qtbase-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz"; + sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701"; + name = "qtbase-everywhere-src-5.12.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj"; - name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea"; + name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz"; }; }; qtcharts = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz"; - sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww"; - name = "qtcharts-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz"; + sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9"; + name = "qtcharts-everywhere-src-5.12.3.tar.xz"; }; }; qtconnectivity = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz"; - sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f"; - name = "qtconnectivity-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz"; + sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661"; + name = "qtconnectivity-everywhere-src-5.12.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf"; - name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313"; + name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz"; }; }; qtdeclarative = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz"; - sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag"; - name = "qtdeclarative-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz"; + sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7"; + name = "qtdeclarative-everywhere-src-5.12.3.tar.xz"; }; }; qtdoc = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz"; - sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h"; - name = "qtdoc-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz"; + sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f"; + name = "qtdoc-everywhere-src-5.12.3.tar.xz"; }; }; qtgamepad = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz"; - sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac"; - name = "qtgamepad-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz"; + sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642"; + name = "qtgamepad-everywhere-src-5.12.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1"; - name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; + sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73"; + name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; }; }; qtimageformats = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z"; - name = "qtimageformats-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz"; + sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2"; + name = "qtimageformats-everywhere-src-5.12.3.tar.xz"; }; }; qtlocation = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz"; - sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh"; - name = "qtlocation-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz"; + sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6"; + name = "qtlocation-everywhere-src-5.12.3.tar.xz"; }; }; qtmacextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr"; - name = "qtmacextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed"; + name = "qtmacextras-everywhere-src-5.12.3.tar.xz"; }; }; qtmultimedia = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw"; - name = "qtmultimedia-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz"; + sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301"; + name = "qtmultimedia-everywhere-src-5.12.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz"; - sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1"; - name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz"; + sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332"; + name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz"; }; }; qtpurchasing = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr"; - name = "qtpurchasing-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz"; + sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e"; + name = "qtpurchasing-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz"; - sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb"; - name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz"; + sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46"; + name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; - sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9"; - name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; + sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a"; + name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09"; - name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz"; + sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42"; + name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz"; }; }; qtscript = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp"; - name = "qtscript-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz"; + sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e"; + name = "qtscript-everywhere-src-5.12.3.tar.xz"; }; }; qtscxml = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz"; - sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw"; - name = "qtscxml-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz"; + sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19"; + name = "qtscxml-everywhere-src-5.12.3.tar.xz"; }; }; qtsensors = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz"; - sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5"; - name = "qtsensors-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz"; + sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc"; + name = "qtsensors-everywhere-src-5.12.3.tar.xz"; }; }; qtserialbus = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz"; - sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb"; - name = "qtserialbus-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz"; + sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d"; + name = "qtserialbus-everywhere-src-5.12.3.tar.xz"; }; }; qtserialport = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz"; - sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r"; - name = "qtserialport-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz"; + sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51"; + name = "qtserialport-everywhere-src-5.12.3.tar.xz"; }; }; qtspeech = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz"; - sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r"; - name = "qtspeech-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz"; + sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5"; + name = "qtspeech-everywhere-src-5.12.3.tar.xz"; }; }; qtsvg = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz"; - sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb"; - name = "qtsvg-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz"; + sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2"; + name = "qtsvg-everywhere-src-5.12.3.tar.xz"; }; }; qttools = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz"; - sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p"; - name = "qttools-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz"; + sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8"; + name = "qttools-everywhere-src-5.12.3.tar.xz"; }; }; qttranslations = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz"; - sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv"; - name = "qttranslations-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz"; + sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca"; + name = "qttranslations-everywhere-src-5.12.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv"; - name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; + sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22"; + name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; }; }; qtwayland = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz"; - sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m"; - name = "qtwayland-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz"; + sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff"; + name = "qtwayland-everywhere-src-5.12.3.tar.xz"; }; }; qtwebchannel = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz"; - sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5"; - name = "qtwebchannel-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz"; + sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a"; + name = "qtwebchannel-everywhere-src-5.12.3.tar.xz"; }; }; qtwebengine = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz"; - sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x"; - name = "qtwebengine-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz"; + sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317"; + name = "qtwebengine-everywhere-src-5.12.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5"; - name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz"; + sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3"; + name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz"; }; }; qtwebsockets = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4"; - name = "qtwebsockets-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz"; + sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577"; + name = "qtwebsockets-everywhere-src-5.12.3.tar.xz"; }; }; qtwebview = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz"; - sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p"; - name = "qtwebview-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz"; + sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5"; + name = "qtwebview-everywhere-src-5.12.3.tar.xz"; }; }; qtwinextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6"; - name = "qtwinextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b"; + name = "qtwinextras-everywhere-src-5.12.3.tar.xz"; }; }; qtx11extras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz"; - sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06"; - name = "qtx11extras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz"; + sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613"; + name = "qtx11extras-everywhere-src-5.12.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; - sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk"; - name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; + sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61"; + name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 2c300d1c2f1..8250e42a1b6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -234,6 +234,8 @@ stdenv.mkDerivation { "-widgets" "-opengl desktop" "-icu" + "-L" "${icu.out}/lib" + "-I" "${icu.dev}/include" "-pch" ] ++ lib.optionals (compareVersion "5.11.0" < 0) @@ -270,10 +272,18 @@ stdenv.mkDerivation { ++ [ "-system-zlib" + "-L" "${zlib.out}/lib" + "-I" "${zlib.dev}/include" "-system-libjpeg" + "-L" "${libjpeg.out}/lib" + "-I" "${libjpeg.dev}/include" "-system-harfbuzz" + "-L" "${harfbuzz.out}/lib" + "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" + "-L" "${openssl.out}/lib" + "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' @@ -302,10 +312,14 @@ stdenv.mkDerivation { "-system-xcb" "-xcb" "-qpa xcb" + "-L" "${libX11.out}/lib" + "-I" "${libX11.out}/include" + "-L" "${libXext.out}/lib" + "-I" "${libXext.out}/include" + "-L" "${libXrender.out}/lib" + "-I" "${libXrender.out}/include" - "-system-xkbcommon" "-libinput" - "-xkbcommon-evdev" "-no-eglfs" "-no-gbm" @@ -326,6 +340,19 @@ stdenv.mkDerivation { "-no-feature-renameat2" "-no-feature-getentropy" ] + ++ lib.optionals (compareVersion "5.12.1" < 0) [ + # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 + "-system-xkbcommon" + "-xkbcommon-evdev" + ] + ++ lib.optionals (cups != null) [ + "-L" "${cups.lib}/lib" + "-I" "${cups.dev}/include" + ] + ++ lib.optionals (mysql != null) [ + "-L" "${mysql.out}/lib" + "-I" "${mysql.out}/include" + ] ); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index ae99035d226..b7857372d1c 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; - name = "qt-mobility-${version}"; + pname = "qt-mobility"; src = fetchFromGitHub { owner = "qtproject"; repo = "qt-mobility"; diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index 1578593b8ae..3c4c192bd4b 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }: stdenv.mkDerivation rec { - name = "qtinstaller-${version}"; + pname = "qtinstaller"; propagatedBuildInputs = [ qtdeclarative qttools ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 84be9876c1c..2e47a213565 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 35d16ee5e19..14bfd40a593 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "quickder"; - name = "${pname}-${version}"; version = "1.2-6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 5ed05ec6b32..79d4d652424 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -1,7 +1,7 @@ { stdenv, which, coreutils, fetchzip, qt4 }: stdenv.mkDerivation rec { - name = "qxt-${version}"; + pname = "qxt"; version = "0.6.2"; src = fetchzip { diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 286c5c868df..fe48d99b383 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { - name = "rabbitmq-c-${version}"; + pname = "rabbitmq-c"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 256b756ed45..e02b22af756 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "range-v3-${version}"; + pname = "range-v3"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 9d8ce8cef20..92c42d19af6 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec{ - name = "rapidcheck-${version}"; + pname = "rapidcheck"; version = "unstable-2018-09-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index a1671aa3e0f..ea91c1507dc 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: stdenv.mkDerivation rec { - name = "rapidjson-${version}"; + pname = "rapidjson"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index 99f88091690..ca072f2ca4b 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "rapidxml"; version = "1.13"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; }; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 9f4fe54e805..165e9716a97 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { - name = "rdkafka-${version}"; + pname = "rdkafka"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index a6a5fbed4fc..e36b6f9488a 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "re2-${version}"; + pname = "re2"; version = "20190401"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index e96b4f1ebe2..11d5c378015 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "readline-${version}"; + pname = "readline"; version = "7.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index eefef972766..cdc36617c52 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "readline-${version}"; + pname = "readline"; version = "8.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 681fc3a012f..a43700ce439 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "rep-gtk-${version}"; + pname = "rep-gtk"; version = "0.90.8.3"; sourceName = "rep-gtk_${version}"; diff --git a/pkgs/development/libraries/rocksdb/0001-findzlib.patch b/pkgs/development/libraries/rocksdb/0001-findzlib.patch deleted file mode 100644 index eb532620773..00000000000 --- a/pkgs/development/libraries/rocksdb/0001-findzlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132d3b0..37fec63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - if(ZLIB_INCLUDE_DIRS) - # CMake 3 diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 05ecf0f8f25..1b6b5b1b57b 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.1.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y"; + sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ ./0001-findzlib.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " + ''; cmakeFlags = [ "-DPORTABLE=1" diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 195db9a1685..82a2998be1e 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "rote-${version}"; + pname = "rote"; version = "0.2.8"; src = fetchurl { sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky"; - url = "mirror://sourceforge/rote/${name}.tar.gz"; + url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index daa499061c5..b69cd56d35d 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "safefile"; version = "1.0.5"; src = fetchurl { - url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz"; + url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz"; sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; }; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index ba0b8f4e996..9ffa2efc376 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { - name = "sblim-sfcc-${version}"; + pname = "sblim-sfcc"; version = "2.2.9"; # this is technically 2.2.9-preview src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index e4e556ab4d6..e41ee23bcb9 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "5.6.0"; - name = "papi-${version}"; + pname = "papi"; src = fetchurl { url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz"; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 2ee9144b316..367fc635c8b 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "htslib"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0"; }; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 22bcc56c82a..e6c58b96e5c 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "mirtk-${version}"; + pname = "mirtk"; src = fetchFromGitHub { owner = "BioMedIA"; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 4668839ebb9..d4333146406 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "QuadProgpp-${version}"; + pname = "QuadProgpp"; version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 05373cd1cbd..36576de0563 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -7,7 +7,8 @@ let version = "3.7.0"; in stdenv.mkDerivation { - name = "arpack-${version}"; + pname = "arpack"; + inherit version; src = fetchFromGitHub { owner = "opencollab"; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 286be260052..a14ed4e6a30 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { - name = "blas-${version}"; + pname = "blas"; version = "3.8.0"; src = fetchurl { - url = "http://www.netlib.org/blas/${name}.tgz"; + url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; }; @@ -44,6 +44,15 @@ stdenv.mkDerivation rec { install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" ln -s libblas.so.${version} "$out/lib/libblas.so.3" ln -s libblas.so.${version} "$out/lib/libblas.so" + # Write pkgconfig alias. + # See also openblas/default.nix + mkdir $out/lib/pkgconfig + cat <<EOF > $out/lib/pkgconfig/blas.pc +Name: blas +Version: ${version} +Description: blas provided by the BLAS package. +Libs: -L$out/lib -lblas +EOF ''; preFixup = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 16850fb1665..bc276b9923c 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; - name = "brial-${version}"; + pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 4746f77a216..d22858d64d0 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation rec { - name = "caffe2-${version}"; + pname = "caffe2"; version = "0.8.1"; src = fetchFromGitHub { owner = "caffe2"; diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 537fcb93a87..52c775c9a0d 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -5,8 +5,6 @@ in let # SuiteSparse must use the same openblas suitesparse = suitesparse_.override { inherit openblas; }; in stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "cholmod-extra"; version = "1.2.0"; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40dbfc53e2c..8a474e06e55 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "clblas-${version}"; + pname = "clblas"; version = "2.12"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 2441aff9fa3..5193c2db5c5 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.21"; - name = "cliquer-${version}"; + pname = "cliquer"; # autotoolized version of the original cliquer src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index 645a865eb95..77973a95449 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ecos-${version}"; + pname = "ecos"; version = "2.0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4ae5ea52255..a93ede63a26 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -30,7 +30,8 @@ let version = "2017.1.0"; dijitso = pythonPackages.buildPythonPackage { - name = "dijitso-${version}"; + pname = "dijitso"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg"; @@ -54,7 +55,8 @@ let }; fiat = pythonPackages.buildPythonPackage { - name = "fiat-${version}"; + pname = "fiat"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l"; @@ -72,7 +74,8 @@ let }; ufl = pythonPackages.buildPythonPackage { - name = "ufl-${version}"; + pname = "ufl"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg"; @@ -90,7 +93,8 @@ let }; ffc = pythonPackages.buildPythonPackage { - name = "ffc-${version}"; + pname = "ffc"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0"; @@ -109,7 +113,8 @@ let }; instant = pythonPackages.buildPythonPackage { - name = "instant-${version}"; + pname = "instant"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz"; sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q"; @@ -125,7 +130,8 @@ let in stdenv.mkDerivation { - name = "dolfin-${version}"; + pname = "dolfin"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds"; diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index 2891429c857..6fd16535459 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.0"; pname = "flintqs"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sagemath"; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 30453086d45..1995fb9c85d 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - name = "ipopt-${version}"; + pname = "ipopt"; version = "3.12.13"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 51fbd9f14cb..0f23f08145e 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.23"; pname = "lcalc"; - name = "${pname}-${version}"; src = fetchurl { # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index be650f3c3ce..c8f1138d69f 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "libbraiding-${version}"; + pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index e96ee475d7d..a2c0dd4fa17 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.02r5"; - name = "llibhomfly-${version}"; + pname = "llibhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 46538d0022e..2e5bb5e371f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -12,7 +12,8 @@ let in stdenv.mkDerivation rec { - name = "liblapack-${version}"; + pname = "liblapack"; + inherit version; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz"; sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny"; diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index 3cf5c3619a9..b0cfbca5aa3 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lrs"; version = "7.0"; diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index b9ee1e2a10d..b8c4fa67148 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20140914"; - name = "m4ri-${version}"; + pname = "m4ri"; src = fetchFromBitbucket { owner = "malb"; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 23fc03655cf..6a664b1dfff 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20150908"; - name = "m4rie-${version}"; + pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 8444d88809a..d036e39d01a 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "2.0.2"; in stdenv.mkDerivation { - name = "magma-${version}"; + pname = "magma"; + inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d967bbf8c3e..f8d392691ab 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -86,13 +86,13 @@ let mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); in stdenv.mkDerivation rec { - name = "openblas-${version}"; - version = "0.3.6"; + pname = "openblas"; + version = "0.3.7"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1"; + sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz"; }; inherit blas64; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 01b0faf89f9..6fc96623a33 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openlibm-${version}"; + pname = "openlibm"; version = "0.6.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 2dd63ebfc85..c6e065320a2 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -4,7 +4,7 @@ , pythonProtobuf }: stdenv.mkDerivation rec { - name = "or-tools-${version}"; + pname = "or-tools"; version = "v7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index ca35ce2f413..3a9ef770459 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "parmetis-${version}"; + pname = "parmetis"; version = "4.0.3"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index ac8129c9032..c2eda9dac48 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -6,7 +6,7 @@ , python }: stdenv.mkDerivation rec { - name = "petsc-${version}"; + pname = "petsc"; version = "3.8.4"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index 7394fb9e1b4..e7dfaecf1de 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "planarity"; version = "3.0.0.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "graph-algorithms"; diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index 3eee63dbf4f..faa219044bd 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "primesieve-${version}"; + pname = "primesieve"; version = "7.4"; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index fda54fe44ab..66c573245db 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "rankwidth"; version = "0.7"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 624885c501a..207406388e0 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "rubiks"; version = "20070912"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index b4c6574d13a..14277c8c631 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "scalapack-${version}"; + pname = "scalapack"; version = "2.0.2"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index f9d1a84b1f0..51a72585c0c 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }: stdenv.mkDerivation rec { - name = "scs-${version}"; + pname = "scs"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 7e71eafef69..48de128edc5 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "4.2.1"; - name = "suitesparse-${version}"; + pname = "suitesparse"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 9938a3096a0..570c9814485 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.2.1"; - name = "superlu-${version}"; + pname = "superlu"; src = fetchurl { url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz"; diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 2e543abd411..e67f61599b5 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.023.5"; - name = "sympow-${version}"; + pname = "sympow"; src = fetchFromGitLab { group = "rezozer"; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index ad4d4c01737..4ee6f6cb992 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { version = "0.9.1"; pname = "zn_poly"; - name = "${pname}-${version}"; # sage has picked up the maintenance (bug fixes and building, not development) # from the original, now unmaintained project which can be found at diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 5f2263d821d..640eefbd733 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "ispike-${version}"; + pname = "ispike"; version = "2.1.1"; src = fetchurl { - url = "mirror://sourceforge/ispike/${name}.tar.gz"; + url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz"; sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; }; diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index ba291dc97ff..eb8d17c6457 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { - name = "scriptaculous-${version}"; + pname = "scriptaculous"; version = "1.9.0"; src = fetchurl { diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 533fefa9f19..63b6ae94a38 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "serd-${version}"; + pname = "serd"; version = "0.30.0"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; }; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 1b043d33ad6..cf73e205830 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "sfml-${version}"; + pname = "sfml"; + inherit version; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 1e9a8ba6a58..261658b0547 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sfsexp-${version}"; + pname = "sfsexp"; version = "1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index dd9b01a0a01..77b9714066d 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { - name = "shibboleth-sp-${version}"; + pname = "shibboleth-sp"; version = "3.0.4.1"; src = fetchgit { diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f795dfef9e4..14af55c2afc 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.6"; - name = "graphite2-${version}"; + pname = "graphite2"; src = fetchurl { url = "https://github.com/silnrsi/graphite/releases/download/" diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index 941e75b8ba9..14cefdea77b 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "smarty-i18n-${version}"; + pname = "smarty-i18n"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 66bfd601a62..4876c39ce83 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "smarty3-${version}"; + pname = "smarty3"; version = "3.1.33"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 36077d71126..73cc88882d0 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "snappy-${version}"; + pname = "snappy"; version = "1.1.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 48ee1af0e30..edcb3549c31 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sonic-${version}"; + pname = "sonic"; version = "2016-03-01"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 10258e791ba..c1c22cb910d 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }: stdenv.mkDerivation rec { - name = "sord-${version}"; + pname = "sord"; version = "0.16.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; }; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index be2fc503e39..c2dc20cc392 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, audiofile, libtiff}: stdenv.mkDerivation rec { version = "0.0.6"; - name = "spandsp-${version}"; + pname = "spandsp"; src=fetchurl { url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index cab0e69ad1a..a18edc0a6df 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }: stdenv.mkDerivation rec { - name = "spdk-${version}"; + pname = "spdk"; version = "19.04"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index b27fd0843bc..43360d781cd 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let else throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { - name = "speech-dispatcher-${version}"; + pname = "speech-dispatcher"; version = "0.8.8"; src = fetchurl { - url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; + url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz"; sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; }; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 40d272fd07d..9b2c0032d4e 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: + stdenv.mkDerivation rec { - name = "spirv-headers-${version}"; - version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit + pname = "spirv-headers"; + version = "1.4.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + rev = version; + sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 6cf8d97cb67..9365ee006d1 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -3,7 +3,7 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { - name = "sqlcipher-${version}"; + pname = "sqlcipher"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index f0390486b10..3c5761b767e 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-analyzer-${version}"; + pname = "sqlite-analyzer"; version = "3.28.0"; src = assert version == sqlite.version; fetchurl { diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ea1c38ea476..9ba5da0c910 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-${version}"; + pname = "sqlite"; version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index e5d322330e8..e4c1f8eb5f6 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fuse, zlib }: stdenv.mkDerivation rec { - name = "sqlar-${version}"; + pname = "sqlar"; version = "2018-01-07"; src = fetchurl { diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index bb66174c884..5edb2d92b55 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4"; + sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index c9073fc0b7e..3940faf1d6d 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libsrtp-${version}"; + pname = "libsrtp"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index fc771a493b6..82cbce8055e 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -4,7 +4,8 @@ let version = "0.12"; in stdenv.mkDerivation { - name = "libstartup-notification-${version}"; + pname = "libstartup-notification"; + inherit version; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 4f36ac2ba1c..440f0c22ea6 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "stb-${version}"; + pname = "stb"; version = "20180211"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 36768acd991..8121b7a501f 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "strigi-${version}"; + pname = "strigi"; version = "0.7.8"; src = fetchurl { - url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 2244803f4d3..5589a5560eb 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "stxxl-${version}"; + pname = "stxxl"; version = "1.4.1"; src = fetchurl { diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index 35bacff0525..9a5f4db2deb 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -3,11 +3,11 @@ # NOTE: for subunit python library see pkgs/top-level/python-packages.nix stdenv.mkDerivation rec { - name = "subunit-${version}"; + pname = "subunit"; version = "1.1.0"; src = fetchurl { - url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; }; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index 2e6e2d3fbbf..628ab7e28ef 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, nss, nspr }: stdenv.mkDerivation rec { - name = "svrcore-${version}"; + pname = "svrcore"; version = "4.0.4"; src = fetchurl { - url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; + url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index e30da732a46..c8c60c1f8ea 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,6 @@ { stdenv, python, fetchurl, openssl, boost, scons }: stdenv.mkDerivation rec { - name = "swiften-${version}"; + pname = "swiften"; version = "4.0.2"; nativeBuildInputs = [ scons]; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index a8a110cf9b1..3d146a5a227 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "sword-${version}"; + pname = "sword"; version = "1.7.4"; src = fetchurl { - url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz"; sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 424dc116c7e..47b93ab373a 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "symengine-${version}"; + pname = "symengine"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 6577ebeae28..6fd1d1ca941 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "szip-${version}"; + pname = "szip"; version = "2.1.1"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 27ac0fdd5ff..227d3c4c547 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -12,10 +12,10 @@ assert withPngSupport -> libpng != null; assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { - name = "tachyon-${version}"; + pname = "tachyon"; version = "0.99b2"; src = fetchurl { - url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz"; + url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 86006806baa..28ce5c60481 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: stdenv.mkDerivation rec { - name = "taglib-sharp-${version}"; + pname = "taglib-sharp"; version = "2.1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 89b163a0917..6fe4e45521e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: with stdenv.lib; stdenv.mkDerivation rec { - name = "tbb-${version}"; + pname = "tbb"; version = "2019_U8"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 24b1d477b8a..40e137204e2 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { - name = "tcllib-${version}"; + pname = "tcllib"; version = "1.19"; src = fetchurl { diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 4e1f0bcab03..f1fd6760c61 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, openssl }: stdenv.mkDerivation rec { - name = "tcltls-${version}"; + pname = "tcltls"; version = "1.6.7"; src = fetchurl { diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index eefc976a62b..8ebf0156be8 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: stdenv.mkDerivation rec { - name = "termbox-${version}"; + pname = "termbox"; version = "1.1.2"; src = fetchFromGitHub { owner = "nsf"; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 8d72d9a7d8e..646cc60406a 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.5"; - name = "theft-${version}"; + pname = "theft"; src = fetchFromGitHub { owner = "silentbicycle"; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 92cc76273ba..0fce957df22 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "thrift-${version}"; + pname = "thrift"; version = "0.12.0"; src = fetchurl { - url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3"; }; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 7f1b3ebcbf5..4fc1da1fe0a 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "tinyxml-2-${version}"; + pname = "tinyxml-2"; version = "6.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index d61076e569b..cc7c996f7c3 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,7 +4,8 @@ let version = "2.6.2"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { - name = "tinyxml-${version}"; + pname = "tinyxml"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 232c95e6257..61d9c710801 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.4.3"; - name = "tix-${version}"; + pname = "tix"; src = fetchurl { url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 229e4cfaa6c..d7162067deb 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "tnt-${version}"; + pname = "tnt"; version = "3.0.12"; src = fetchurl { diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 9edfcc88f16..13b4e6b97a9 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }: stdenv.mkDerivation rec { - name = "tntdb-${version}"; + pname = "tntdb"; version = "1.3"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index aaff759525b..86b0080a824 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { - name = "tntnet-${version}"; + pname = "tntnet"; version = "2.2.1"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; }; diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix index e5803d644f3..6dd51944111 100644 --- a/pkgs/development/libraries/torch-hdf5/default.nix +++ b/pkgs/development/libraries/torch-hdf5/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, torch, cmake, hdf5}: stdenv.mkDerivation rec { - name = "torch-hdf5-${version}"; + pname = "torch-hdf5"; version = "0.0pre2016-07-01"; buildInputs = [cmake torch hdf5]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix index d4c61890afb..ff8c26062d3 100644 --- a/pkgs/development/libraries/torch/default.nix +++ b/pkgs/development/libraries/torch/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec{ version = "0.0pre20160820"; - name = "torch-${version}"; + pname = "torch"; buildInputs = [ luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 libjpeg zeromq3 ncurses openssl libpng readline pkgconfig diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 397184f798a..db4f620a740 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" "-Ddocs=true" diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 552bd4c1c51..af2fc6c879a 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "trompeloeil-${version}"; + pname = "trompeloeil"; version = "34"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index bcc91d058f0..d5af39d3f2a 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tsocks-${version}"; + pname = "tsocks"; version = "1.8beta5"; src = fetchurl { - url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz"; sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index a752da8cb57..46b65a08eaa 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "twolame-${version}"; + pname = "twolame"; version = "2017-09-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 9c899eb21ba..18f270e70db 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -4,7 +4,7 @@ # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 stdenv.mkDerivation rec { - name = "udns-${version}"; + pname = "udns"; version = "0.4"; configurePhase = "./configure --enable-ipv6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s"; src = fetchurl { - url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz"; + url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz"; sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; }; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 664bc29a72d..faee73fd393 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "udunits-${version}"; + pname = "udunits"; version = "2.2.27.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 6eef95309aa..1b5fbe6c2ca 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version="0.5.0"; - name = "uhttpmock-${version}"; + pname = "uhttpmock"; src = fetchFromGitLab { repo = "uhttpmock"; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 6a228556306..e257088c41f 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -3,13 +3,13 @@ , usbutils, which, python3 }: stdenv.mkDerivation rec { - name = "umockdev-${version}"; + pname = "umockdev"; version = "0.13.1"; outputs = [ "bin" "out" "dev" "doc" ]; src = fetchurl { - url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla"; }; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 717edda18a2..73ca55cffd0 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: stdenv.mkDerivation rec { - name = "unibilium-${version}"; + pname = "unibilium"; version = "2.0.0"; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index a902b6f8451..7fa8fe81c11 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { - name = "libunicap-${version}"; + pname = "libunicap"; version="0.9.12"; src = fetchurl { - url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz"; + url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index aa4a7890b23..96f318ff0ef 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { - name = "unicorn-emulator-${version}"; + pname = "unicorn-emulator"; version = "1.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 90a28df6a15..0e5971945f3 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "unittest-cpp-${version}"; + pname = "unittest-cpp"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 1275df69f59..3a51e2c986a 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unixODBC-${version}"; + pname = "unixODBC"; version = "2.3.7"; src = fetchurl { - url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; + url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; }; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7b72e12a66b..b9aa1696d48 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad { psql = stdenv.mkDerivation rec { - name = "psqlodbc-${version}"; + pname = "psqlodbc"; version = "10.01.0000"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz"; sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7"; }; @@ -28,11 +28,11 @@ }; mariadb = stdenv.mkDerivation rec { - name = "mariadb-connector-odbc-${version}"; + pname = "mariadb-connector-odbc"; version = "2.0.10"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz"; + url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz"; sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz"; }; @@ -57,12 +57,12 @@ }; mysql = stdenv.mkDerivation rec { - name = "mysql-connector-odbc-${version}"; + pname = "mysql-connector-odbc"; majorVersion = "5.3"; version = "${majorVersion}.6"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz"; + url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${pname}-${version}-src.tar.gz"; sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr"; }; @@ -86,7 +86,7 @@ }; sqlite = stdenv.mkDerivation rec { - name = "sqlite-connector-odbc-${version}"; + pname = "sqlite-connector-odbc"; version = "0.9993"; src = fetchurl { @@ -121,20 +121,20 @@ }; msodbcsql17 = stdenv.mkDerivation rec { - name = "msodbcsql17-${version}"; + pname = "msodbcsql17"; version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; - versionMinor = "2"; - versionAdditional = "0.1"; + versionMinor = "4"; + versionAdditional = "1.1"; src = fetchurl { url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; - sha256 = "1966ymbbk0jsacqwzi3dmhxv2n8hfgnpjsx3hr3n7s9d88chgpx5"; + sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ unixODBC dpkg openssl kerberos curl libuuid stdenv.cc.cc ]; + buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ]; unpackPhase = "dpkg -x $src ./"; buildPhase = ""; @@ -142,8 +142,6 @@ installPhase = '' mkdir -p $out mkdir -p $out/lib - ln -s ${lib.getLib openssl}/lib/libssl.so.1.0.0 $out/lib/libssl.so.1.0.2 - ln -s ${lib.getLib openssl}/lib/libcrypto.so.1.0.0 $out/lib/libcrypto.so.1.0.2 cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/ ''; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 89efdc006a5..9c48488bff8 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: stdenv.mkDerivation rec { - name = "uriparser-${version}"; + pname = "uriparser"; version = "0.9.1"; # Release tarball differs from source tarball src = fetchurl { - url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; + url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; }; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 3d09545c931..2eee80a7696 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb }: stdenv.mkDerivation rec { - name = "usbredir-${version}"; + pname = "usbredir"; version = "0.8.0"; src = fetchurl { - url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; + url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2"; sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index c15259c585a..18eae87e11c 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ustr-${version}"; + pname = "ustr"; version = "1.0.4"; src = fetchurl { - url = "http://www.and.org/ustr/${version}/${name}.tar.bz2"; + url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2"; sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; }; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index b80984303d7..e1f3c0bd39c 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -4,7 +4,8 @@ let version = "2.1.0"; in stdenv.mkDerivation rec { - name = "uthash-${version}"; + pname = "uthash"; + inherit version; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 827274251ed..7f9e8508a65 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index a7dddd14124..e134c9ea60f 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "3.16.14.11"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" - + "${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2"; sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj"; }; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index 2b9fa5cc04c..cb53765e394 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -102,7 +102,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "5.4.232"; inherit doCheck; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index f7c4f34e8e6..2d9c5d4b92a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -44,7 +44,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "7.4.255"; doCheck = true; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 8d2276def70..a72c9473d4a 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -1,6 +1,8 @@ # NOTE: this expression is NOT exported from the top-level of all-packages.nix, -# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a -# very exact version. +# it is exclusively used by the 'plv8' PostgreSQL extension. +# Since plv8 2.3.2, plv8 no longer requires this specific version, but as of +# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which +# is a bit outdated. plv8 3.x is planned to support v8 7.x { stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig , doCheck ? false @@ -109,7 +111,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "6.4.388.40"; inherit doCheck; diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 56ded2c5644..678d7dd265c 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { - name = "intel-hybrid-driver-${version}"; + pname = "intel-hybrid-driver"; version = "1.0.2"; src = fetchurl { diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 640f50eb45b..722079ff347 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "intel-vaapi-driver-${version}"; + pname = "intel-vaapi-driver"; # TODO: go back to stable releases with the next stable release after 2.3.0. # see: https://github.com/NixOS/nixpkgs/issues/55975 (and the libva comment v) rev = "329975c63123610fc750241654a3bd18add75beb"; # generally try to match libva version, but not required diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index abdf9fbeed3..8a2e3af4791 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "vapoursynth-mvtools-${version}"; + pname = "vapoursynth-mvtools"; version = "21"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 65132806d88..53d70f4d369 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R46"; + version = "R47.2"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1xbwva12l68awplardf47ydlx904wifw468npaxa9cx9dvd5mv13"; + sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ]; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 1af70056d2e..18b2659cc5d 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "Vc-${version}"; + pname = "Vc"; version = "0.7.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 66c8e4fbc53..2194c7be38b 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "Vc-${version}"; + pname = "Vc"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index b7249c8ee82..eb37d14b532 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { - name = "vcg-${version}"; + pname = "vcg"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index e516c94866a..eb88b36a142 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "vid-stab-${version}"; + pname = "vid-stab"; version = "0.98b"; src = fetchurl { diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index fb69d4bf63e..625ec2cee38 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -5,7 +5,7 @@ let inherit (python2Packages) python numpy; # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... in stdenv.mkDerivation rec { - name = "vigra-${version}"; + pname = "vigra"; version = "1.11.1"; src = fetchurl { diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 72803e09f07..71bd608e93a 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "virglrenderer-${version}"; + pname = "virglrenderer"; version = "0.7.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index e0398487abc..a68880c2f95 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "vmime-${version}"; + pname = "vmime"; version = "0.9.2"; src = fetchFromGitHub { owner = "kisli"; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 18b9278539f..b9eb29422c5 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; - name = "vmmlib-${version}"; + pname = "vmmlib"; src = fetchFromGitHub { owner = "VMML"; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index f6669f2f8fe..77cd3be0cbd 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -7,7 +7,8 @@ let version = "0.3.11"; in stdenv.mkDerivation rec { - name = "volume_key-${version}"; + pname = "volume_key"; + inherit version; src = fetchgit { url = https://pagure.io/volume_key.git; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix index 4f72cc138ac..efd60fe66fb 100644 --- a/pkgs/development/libraries/vrb/default.nix +++ b/pkgs/development/libraries/vrb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "vrb-${version}"; + pname = "vrb"; version = "0.5.1"; src = fetchurl { - url = "http://vrb.sourceforge.net/download/${name}.tar.bz2"; + url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2"; sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f"; }; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index e706c730ddd..fd0e90941b8 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, sqlite }: stdenv.mkDerivation rec { - name = "vsqlite-${version}"; + pname = "vsqlite"; version = "0.3.13"; src = fetchurl { diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index f7c1bf9a65b..4ea8d69a498 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "vulkan-headers-${version}"; - version = "1.1.106"; + pname = "vulkan-headers"; + version = "1.1.114.0"; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd"; + sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index a44e91e1bf5..5631665a691 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -2,29 +2,27 @@ , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let - version = "1.1.106"; + version = "1.1.114.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { - name = "vulkan-loader-${version}"; + pname = "vulkan-loader"; inherit version; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; + sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; }; nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; - patches = [ ./system-search-path.patch ]; - cmakeFlags = [ - "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" + "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/pkgs/development/libraries/vulkan-loader/system-search-path.patch deleted file mode 100644 index 26f83e6d534..00000000000 --- a/pkgs/development/libraries/vulkan-loader/system-search-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ac5ce835..cbdb0ff56 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,12 @@ if(UNIX) - STRING - "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." - ) -+ set( -+ SYSTEM_SEARCH_PATH "" -+ CACHE -+ STRING -+ "Search path to always use, after all other search paths." -+ ) - endif() - - if(UNIX AND NOT APPLE) # i.e.: Linux -@@ -184,6 +190,7 @@ if(UNIX) - add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") - add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") - add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") -+ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}") - - # Make sure /etc is searched by the loader - if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) -diff --git a/loader/loader.c b/loader/loader.c -index 0d3b5a947..abe357004 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e - search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size); - search_path_size += DetermineDataFilePathSize(home_root, rel_size); - } -+ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size); - #endif - } - } -@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e - CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr); - CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr); - } -+ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr); - } - - // Remove the last path separator diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 8af33c10319..f3f87b3ba60 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libiconv, fetchpatch }: stdenv.mkDerivation rec { - name = "wavpack-${version}"; + pname = "wavpack"; version = "5.1.0"; enableParallelBuilding = true; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; src = fetchurl { - url = "http://www.wavpack.com/${name}.tar.bz2"; + url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 3fda417d8e1..7572051b1de 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -7,11 +7,11 @@ assert expat != null; stdenv.mkDerivation rec { - name = "wayland-${version}"; + pname = "wayland"; version = "1.9.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index b14dc03385c..d2af8b084e6 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "wayland-protocols-${version}"; + pname = "wayland-protocols"; version = "1.17"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; }; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 5f9015fa960..b0c8c1edd66 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "6.4"; - name = "wcslib-${version}"; + pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 04758ace7fa..25868cdb886 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage; with stdenv.lib; stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; + pname = "webkitgtk"; version = "2.4.11"; meta = with stdenv.lib; { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 927301589b4..71b30960bac 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; + pname = "webkitgtk"; version = "2.24.3"; meta = { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"; }; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index d84f30aad55..84fbda503ea 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "websocket++-${version}"; + pname = "websocket++"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index bccf4f69e9d..2ebad693de5 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -25,7 +25,7 @@ let optLeveldb = shouldUsePkg leveldb; in stdenv.mkDerivation rec { - name = "wiredtiger-${version}"; + pname = "wiredtiger"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index b85616842ea..4d820bd9519 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,18 +6,17 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"; + sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a"; }; - # $out for the library, $bin for rootston, and $examples for the example - # programs (in examples) AND rootston - outputs = [ "out" "bin" "examples" ]; + # $out for the library and $examples for the example programs (in examples): + outputs = [ "out" "examples" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -32,31 +31,13 @@ stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; - postPatch = '' - # It happens from time to time that the version wasn't updated: - sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build - ''; - postInstall = '' - # Copy the library to $bin and $examples - for output in "$bin" "$examples"; do - mkdir -p $output/lib - cp -P libwlroots* $output/lib/ - done + # Copy the library to $examples + mkdir -p $examples/lib + cp -P libwlroots* $examples/lib/ ''; postFixup = '' - # Install rootston (the reference compositor) to $bin and $examples (this - # has to be done after the fixup phase to prevent broken binaries): - for output in "$bin" "$examples"; do - mkdir -p $output/bin - cp rootston/rootston $output/bin/ - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ - $output/bin/rootston - mkdir $output/etc - cp ../rootston/rootston.ini.example $output/etc/rootston.ini - done # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle # screenshot output-layout multi-pointer rotation tablet touch pointer @@ -65,9 +46,6 @@ stdenv.mkDerivation rec { cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do cp "$binary" "$examples/bin/wlroots-$binary" - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ - "$examples/bin/wlroots-$binary" done ''; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 549e492e944..780d7df47cb 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "wolfssl-${version}"; + pname = "wolfssl"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index ba77189b2a5..60f91176599 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -7,7 +7,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "wt-${version}"; + pname = "wt"; + inherit version; src = fetchFromGitHub { owner = "emweb"; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index ce8e3f0f677..bdc8f8c3435 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "wxSVG-${version}"; + pname = "wxSVG"; srcName = "wxsvg-${version}"; version = "1.5.20"; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 49f12842533..a528166f68a 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -2,7 +2,7 @@ , darwin }: stdenv.mkDerivation rec { - name = "wxsqlite3-${version}"; + pname = "wxsqlite3"; version = "3.3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 998f6a9e5f6..9ca15d4977b 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: stdenv.mkDerivation rec { - name = "wxsqliteplus-${version}"; + pname = "wxsqliteplus"; version = "0.3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index b952e8b1267..38ee4376ac2 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.8.12.1"; - name = "wxGTK-${version}"; + pname = "wxGTK"; src = fetchurl { url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 369d011f9b3..02367e18a95 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -15,7 +15,8 @@ let version = "2.9.4"; in stdenv.mkDerivation { - name = "wxwidgets-${version}"; + pname = "wxwidgets"; + inherit version; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index b33b0b15331..a12447562b8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "3.0.4"; - name = "wxwidgets-${version}"; + pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index cbe8bd8ac5e..5236996199d 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.0.4"; - name = "wxmac-${version}"; + pname = "wxmac"; src = fetchzip { url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index cee967ef2aa..8fe75153de6 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "3.1.2"; - name = "wxwidgets-${version}"; + pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index f2189cb014e..634847941d0 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation rec { - name = "x265-${version}"; + pname = "x265"; version = "3.1.1"; src = fetchurl { diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index aeb741dbae7..92a932a01a4 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -5,7 +5,7 @@ let if stdenv.isDarwin then "macosx" else throw "Unsupported platform"; in stdenv.mkDerivation rec { - name = "xalan-c-${version}"; + pname = "xalan-c"; version = "1.11"; src = fetchurl { diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 271c7adf3d9..362f704a05d 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "xapian-${version}"; + pname = "xapian"; + inherit version; passthru = { inherit version; }; src = fetchurl { diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 1203f19d6c8..6c8eda6358b 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { - name = "xapian-omega-${version}"; + pname = "xapian-omega"; inherit (xapian) version; src = fetchurl { diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 31c31164e01..d7ec3ae9c1e 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - name = "xavs-${version}"; + pname = "xavs"; version = "55"; src = fetchsvn { diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e343c301127..705bd6b87fc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,7 @@ , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; + pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; src = fetchgit { diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 8ad4e6d6a8a..704884c23f3 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xerces-c-${version}"; + pname = "xerces-c"; version = "3.2.2"; src = fetchurl { - url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; + url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx"; }; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 74d263a9417..f4687bd46f8 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -7,7 +7,7 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { - name = "xgboost-${version}"; + pname = "xgboost"; version = "0.90"; # needs submodules diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 718554b20a4..3d1b4ea74db 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { - name = "xlslib-${version}"; + pname = "xlslib"; version = "2.5.0"; src = fetchurl { diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 35ae93e7939..e6ececf8513 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "xml-security-c-${version}"; + pname = "xml-security-c"; version = "2.0.2"; src = fetchurl { - url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; + url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz"; sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3"; }; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index fbe515f6217..d5e1eb08fa4 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xml-tooling-c-${version}"; + pname = "xml-tooling-c"; version = "3.0.4"; src = fetchgit { diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index b19bf000b0d..3e54944a377 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -5,7 +5,8 @@ let version = "1.2.28"; in stdenv.mkDerivation rec { - name = "xmlsec-${version}"; + pname = "xmlsec"; + inherit version; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 051a194af98..5a267bbfe76 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -4,7 +4,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in stdenv.mkDerivation rec { - name = "xsd-${version}"; + pname = "xsd"; version = "4.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 17d7320cb64..5ec96157a79 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "xvidcore-${version}"; + pname = "xvidcore"; version = "1.3.5"; src = fetchurl { - url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; + url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w"; }; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 70701f2d070..51165f47a21 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "xxHash-${version}"; + pname = "xxHash"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index c9c84f4e1d8..155e46c8f8c 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: stdenv.mkDerivation rec { - name = "xylib-${version}"; + pname = "xylib"; version = "1.5"; src = fetchurl { - url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd"; }; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index c5dc775d075..9e3b06453bf 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - configureFlags = [ "--with-session-bus-services-dir=${placeholder ''out''}/share/dbus-1/services" ]; + configureFlags = [ "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index c18223d524f..3f35df66468 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "zeroc-ice-${version}"; + pname = "zeroc-ice"; version = "3.6.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 8a89d2ae1c7..db5d90e2f02 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: stdenv.mkDerivation rec { - name = "zeromq-${version}"; + pname = "zeromq"; version = "4.3.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 9b7a9026628..1b74b8c5388 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzma }: stdenv.mkDerivation rec { - name = "zimlib-${version}"; + pname = "zimlib"; version = "1.4"; src = fetchurl { - url = "http://www.openzim.org/download/${name}.tar.gz"; + url = "http://www.openzim.org/download/${pname}-${version}.tar.gz"; sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq"; }; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 330b91e995d..5c601575742 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.14"; - name = "zlog-${version}"; + pname = "zlog"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5"; }; diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix index f7e849f6a33..98211e6e3eb 100644 --- a/pkgs/development/libraries/zmqpp/default.nix +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: stdenv.mkDerivation rec { - name = "zmqpp-${version}"; + pname = "zmqpp"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 65509d766b9..78983f09543 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zxcvbn-c-${version}"; + pname = "zxcvbn-c"; version = "2.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 010c73336b9..8b199d3e89a 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,7 @@ { docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: stdenv.mkDerivation rec { - name = "zziplib-${version}"; + pname = "zziplib"; version = "0.13.69"; src = fetchurl { diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index b0e97038b7b..46d417fd2aa 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt"; - sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd"; + url = "https://beta.quicklisp.org/dist/quicklisp/2019-07-11/distinfo.txt"; + sha256 = "0r7ga5gkiy6va1v7a01fnj1yp97pifl9v8fnqpvbiv33dwdvbx2w"; }; buildPhase = '' true; ''; postInstall = '' @@ -37,7 +37,7 @@ let lispPackages = rec { }; quicklisp-to-nix-system-info = stdenv.mkDerivation rec { - name = "quicklisp-to-nix-system-info-${version}"; + pname = "quicklisp-to-nix-system-info"; version = "1.0.0"; src = ./quicklisp-to-nix; nativeBuildInputs = [sbcl]; @@ -58,7 +58,7 @@ let lispPackages = rec { }; quicklisp-to-nix = stdenv.mkDerivation rec { - name = "quicklisp-to-nix-${version}"; + pname = "quicklisp-to-nix"; version = "1.0.0"; src = ./quicklisp-to-nix; buildDependencies = [sbcl quicklisp-to-nix-system-info]; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index 1af0947627f..a7d22ac129b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-grovel''; - version = ''cffi_0.20.0''; + version = ''cffi_0.20.1''; description = ''The CFFI Groveller''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; - sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; + url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; + sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; }; packageName = "cffi-grovel"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL - http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 - 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS + 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL + http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 + b8a8337465a7b4c1be05270b777ce14f NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.20.0 SIBLINGS + VERSION cffi_0.20.1 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index c440c72788f..3d246380607 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-toolchain''; - version = ''cffi_0.20.0''; + version = ''cffi_0.20.1''; description = ''The CFFI toolchain''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; - sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; + url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; + sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; }; packageName = "cffi-toolchain"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL - http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 - 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME + 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL + http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 + b8a8337465a7b4c1be05270b777ce14f NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 001c7d9a545..b83b1461197 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi''; - version = ''cffi_0.20.0''; + version = ''cffi_0.20.1''; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; - sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; + url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; + sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; }; packageName = "cffi"; @@ -20,15 +20,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL - http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 - 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS + 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL + http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 + b8a8337465a7b4c1be05270b777ce14f NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.20.0 SIBLINGS + VERSION cffi_0.20.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index a9808173b62..c30c68e53c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chipz''; - version = ''20180328-git''; + version = ''20190202-git''; description = ''A library for decompressing deflate, zlib, and gzip data''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz''; - sha256 = ''0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7''; + url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz''; + sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a''; }; packageName = "chipz"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 - 0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7 URL - http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz - MD5 a548809d6ef705c69356a2057ecd8a52 NAME chipz FILENAME chipz DEPS NIL - DEPENDENCIES NIL VERSION 20180328-git SIBLINGS NIL PARASITES NIL) */ + 1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a URL + http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz + MD5 e3533408ca6899fe996eede390e820c7 NAME chipz FILENAME chipz DEPS NIL + DEPENDENCIES NIL VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index d678fd8e942..d84233c4342 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20190107-git''; + version = ''cl-async-20190307-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; - sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz''; + sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL - http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz - MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-repl FILENAME + 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL + http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz + MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20190107-git SIBLINGS + VERSION cl-async-20190307-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 722e05ed09c..c13b8b70647 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20190107-git''; + version = ''cl-async-20190307-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; - sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz''; + sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL - http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz - MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-ssl FILENAME + 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL + http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz + MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -40,5 +40,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20190107-git SIBLINGS + VERSION cl-async-20190307-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index edb4b01b0d1..363227534a8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20190107-git''; + version = ''20190307-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; - sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz''; + sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL - http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz - MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async FILENAME cl-async DEPS + 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL + http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz + MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -37,5 +37,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20190107-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20190307-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index a1da44a6b89..bdc5fe920cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20190107-git''; + version = ''20190521-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME cl-dbi FILENAME cl-dbi DEPS + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20190107-git SIBLINGS + VERSION 20190521-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 78f70be2f1f..1510495a4cb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-emb''; - version = ''20180228-git''; + version = ''20190521-git''; description = ''A templating system for Common Lisp''; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz''; - sha256 = ''0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw''; + url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz''; + sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d''; }; packageName = "cl-emb"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 - 0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw URL - http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz - MD5 94db80b2a91611e71ada33f500b49d22 NAME cl-emb FILENAME cl-emb DEPS + 1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d URL + http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz + MD5 b27bbe8de2206ab7c461700b58d4d527 NAME cl-emb FILENAME cl-emb DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION - 20180228-git SIBLINGS NIL PARASITES NIL) */ + 20190521-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index c33efa2eb08..6a40d0fa8c9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fuse-meta-fs''; - version = ''20150608-git''; + version = ''20190710-git''; description = ''CFFI bindings to FUSE (Filesystem in user space)''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz''; - sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2''; + url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz''; + sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7''; }; packageName = "cl-fuse-meta-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 - 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL - http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz - MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs FILENAME + 1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7 URL + http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz + MD5 461f7023274fb273e6c759e881bdd636 NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,4 +37,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index d41fe76ca23..de71e2e299a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fuse''; - version = ''20160318-git''; + version = ''20190710-git''; description = ''CFFI bindings to FUSE (Filesystem in user space)''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz''; - sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6''; + url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz''; + sha256 = ''1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li''; }; packageName = "cl-fuse"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) - SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL - http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz - MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse FILENAME cl-fuse DEPS + SHA256 1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li URL + http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz + MD5 5f267e59eb2358b1b6e4e735fb408e6a NAME cl-fuse FILENAME cl-fuse DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8) - VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index d1ce782e7f8..dde2cc31dd0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-html5-parser''; - version = ''20171019-git''; + version = ''20190521-git''; description = ''A HTML5 parser for Common Lisp''; deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz''; - sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98''; + url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz''; + sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p''; }; packageName = "cl-html5-parser"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 - 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL - http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz - MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME + 055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p URL + http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz + MD5 149e5609d0a96c867fac6c22693c5e30 NAME cl-html5-parser FILENAME cl-html5-parser DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME string-case FILENAME string-case) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) - VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) + VERSION 20190521-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index 1f58be6c09e..b0be8c775a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -5,7 +5,7 @@ rec { parasites = [ "cl-interpol-test" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; @@ -19,7 +19,7 @@ rec { asdFilesToKeep = ["cl-interpol.asd"]; overrides = x: x; } -/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 +/* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256 1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 8967b0970c5..b1916c27bfd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -3,7 +3,7 @@ rec { baseName = ''cl-markup''; version = ''20131003-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["cl-markup.asd"]; overrides = x: x; } -/* (SYSTEM cl-markup DESCRIPTION NIL SHA256 +/* (SYSTEM cl-markup DESCRIPTION System lacks description SHA256 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz MD5 3ec36b8e15435933f614959032987848 NAME cl-markup FILENAME cl-markup DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 08b6a492e76..2fad295c7ee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20190107-git''; + version = ''postmodern-20190521-git''; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; - sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz''; + sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5''; }; packageName = "cl-postgres"; @@ -20,14 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL - http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz - MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME cl-postgres FILENAME cl-postgres + SHA256 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL + http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz + MD5 102567f386757cd52aca500c0c348d90 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) - VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date) + VERSION postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date) PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index e65c0a03ddc..27887f12497 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-20180831-git''; + version = ''cl-ppcre-20190521-git''; parasites = [ "cl-ppcre-unicode-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz''; - sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; + sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; }; packageName = "cl-ppcre-unicode"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 - 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL - http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz - MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME + 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL + http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz + MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-test FILENAME cl-ppcre-test) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ + cl-ppcre-20190521-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 3f56cf3dfae..8bb8fb2478d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre''; - version = ''20180831-git''; + version = ''20190521-git''; parasites = [ "cl-ppcre-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz''; - sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; + sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; }; packageName = "cl-ppcre"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library - SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL - http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz - MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS + SHA256 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL + http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz + MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre FILENAME cl-ppcre DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ + VERSION 20190521-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 15fd56107c8..496a0bd4e56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20180831-git''; + version = ''20190521-git''; description = ''Generate a skeleton for modern project''; deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz''; - sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s''; + url = ''http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz''; + sha256 = ''1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf''; }; packageName = "cl-project"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL - http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz - MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project + 1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf URL + http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz + MD5 1468189ff8880f43034c44adc317274f NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre let-plus local-time prove uiop) - VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */ + VERSION 20190521-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 3ca67723925..0d58e11b4d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-smtp''; - version = ''20180131-git''; + version = ''20190710-git''; description = ''Common Lisp smtp client.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; - sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61''; + url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz''; + sha256 = ''1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r''; }; packageName = "cl-smtp"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 - 0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL - http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz - MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS + 1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r URL + http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz + MD5 f55956a4708d0b4fc2ba181063b73e92 NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) @@ -35,4 +35,4 @@ rec { (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index cec8cc2865c..7849acb57c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unicode''; - version = ''20180328-git''; + version = ''20190521-git''; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz''; - sha256 = ''1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln''; + url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz''; + sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc''; }; packageName = "cl-unicode"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 - 1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln URL - http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz - MD5 6030b7833f08f78946ddd44d6c6a9086 NAME cl-unicode FILENAME cl-unicode + 0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc URL + http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz + MD5 04009a1266edbdda4d38902907caba25 NAME cl-unicode FILENAME cl-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180328-git SIBLINGS NIL + DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20190521-git SIBLINGS NIL PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 575e05aa074..3be45384d41 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-who''; - version = ''20171130-git''; + version = ''20190710-git''; parasites = [ "cl-who-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz''; - sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw''; + url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz''; + sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir''; }; packageName = "cl-who"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 - 1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL - http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz - MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS + 0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir URL + http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz + MD5 e5bb2856ed62d76528e4cef7b5e701c0 NAME cl-who FILENAME cl-who DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */ + VERSION 20190710-git SIBLINGS NIL PARASITES (cl-who-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index f329437a75a..f344dbfa2fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,17 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20181018-git''; - - parasites = [ "openssl-1.1.0" ]; + version = ''cl+ssl-20190710-git''; description = ''Common Lisp interface to OpenSSL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz''; - sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz''; + sha256 = ''0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv''; }; packageName = "cl+ssl"; @@ -20,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL - http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz - MD5 45d92813cc134bf04725ee6a1f0c24a7 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv URL + http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz + MD5 fae6e01902964d010ad2565a61a6af2a NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,5 +31,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20181018-git SIBLINGS (cl+ssl.test) PARASITES - (openssl-1.1.0)) */ + VERSION cl+ssl-20190710-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 6de9d3f8fc9..6cfd7842409 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-handler-hunchentoot''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''Clack handler for Hunchentoot.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-handler-hunchentoot"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. - SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot + SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -42,7 +42,7 @@ rec { cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION clack-20181018-git SIBLINGS + VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 745b87a6576..1ac6ccc329c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-socket''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-socket"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION NIL SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-git SIBLINGS + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index c1c80e48cbd..1792d79f1d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-test''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''Testing Clack Applications.''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-test"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -71,7 +71,7 @@ rec { split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20181018-git SIBLINGS + VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 5477fc5cd02..749fce006e4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-v1-compat"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -73,7 +73,7 @@ rec { rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) - VERSION clack-20181018-git SIBLINGS + VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 612e6b5c066..1813844e85f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20181018-git''; + version = ''20190710-git''; description = ''Web application environment for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack FILENAME clack DEPS + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) @@ -31,7 +31,7 @@ rec { DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component lack-middleware-backtrace lack-util nibbles uiop) - VERSION 20181018-git SIBLINGS + VERSION 20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ce078c3196a..ca03207fabd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz''; - sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz''; + sha256 = ''0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL - http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz - MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx URL + http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz + MD5 5ebb554f9f7ba7f0d9dc6584806c8a0e NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index 3866dd6f459..c1b36b6b653 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -3,7 +3,7 @@ rec { baseName = ''closure-common''; version = ''20181018-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["closure-common.asd"]; overrides = x: x; } -/* (SYSTEM closure-common DESCRIPTION NIL SHA256 +/* (SYSTEM closure-common DESCRIPTION System lacks description SHA256 18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 3f6d6ae32ac..2f07706a912 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''A DOM tree searching engine based on CSS selectors.''; deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz''; - sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd''; + url = ''http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz''; + sha256 = ''1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs''; }; packageName = "clss"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL - http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5 - 39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS + SHA256 1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs URL + http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz MD5 + c5a918fe272b71af7c4b6e71a7faad46 NAME clss FILENAME clss DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION - 20180831-git SIBLINGS NIL PARASITES NIL) */ + 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 6f570ce5c8f..6b99f99b7ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20181210-git''; + version = ''20190521-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz''; - sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6''; + url = ''http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz''; + sha256 = ''0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL - http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5 - d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git + 0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs URL + http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz MD5 + afcd581193237d3202a4fbcc1f0622c3 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20190521-git SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index e1fb5965852..1d81acba2dc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''command-line-arguments''; - version = ''20151218-git''; + version = ''20190710-git''; description = ''small library to deal with command-line arguments''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz''; - sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh''; + url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz''; + sha256 = ''1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733''; }; packageName = "command-line-arguments"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 - 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL - http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz - MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME command-line-arguments FILENAME - command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git + 1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733 URL + http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz + MD5 77b361a7f4b3b73a88c3a95c7bbffa98 NAME command-line-arguments FILENAME + command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 74648ba66a8..ebae32962f1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml-stp''; - version = ''20181018-git''; + version = ''20190521-git''; - parasites = [ "cxml-stp-test" ]; + parasites = [ "cxml-stp/test" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz''; - sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77''; + url = ''http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz''; + sha256 = ''1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21''; }; packageName = "cxml-stp"; @@ -19,10 +19,10 @@ rec { asdFilesToKeep = ["cxml-stp.asd"]; overrides = x: x; } -/* (SYSTEM cxml-stp DESCRIPTION NIL SHA256 - 0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL - http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz - MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS +/* (SYSTEM cxml-stp DESCRIPTION System lacks description SHA256 + 1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21 URL + http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz + MD5 9e0c99bd2b547e07b23305a5ff72aff6 NAME cxml-stp FILENAME cxml-stp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre closure-common cxml parse-number puri rt trivial-features trivial-gray-streams xpath xpath/test yacc) - VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */ + VERSION 20190521-git SIBLINGS NIL PARASITES (cxml-stp/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 2f863a627bb..173a31e9f31 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20190107-git''; + version = ''cl-dbi-20190521-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-mysql FILENAME dbd-mysql DEPS + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20190107-git SIBLINGS + VERSION cl-dbi-20190521-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index f76f5e7e561..6668cd4f762 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20190107-git''; + version = ''cl-dbi-20190521-git''; description = ''Database driver for PostgreSQL.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-postgres FILENAME + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,5 +37,5 @@ rec { (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage trivial-types usocket) - VERSION cl-dbi-20190107-git SIBLINGS + VERSION cl-dbi-20190521-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 01acb76767e..9b6fde0ea94 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20190107-git''; + version = ''cl-dbi-20190521-git''; description = ''Database driver for SQLite3.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -33,10 +33,11 @@ rec { (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite - trivial-features trivial-types uiop) - VERSION cl-dbi-20190107-git SIBLINGS + trivial-features trivial-garbage trivial-types uiop) + VERSION cl-dbi-20190521-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 382143eb8fb..26c5306c06a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20190107-git''; + version = ''cl-20190521-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbi FILENAME dbi DEPS + SHA256 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20190107-git SIBLINGS + VERSION cl-20190521-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index c47d9f1a1aa..4d5bc0a2217 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20181018-git''; + version = ''20190521-git''; description = ''Yet another HTTP client for Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz''; - sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc''; + url = ''http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz''; + sha256 = ''15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk''; }; packageName = "dexador"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL - http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz - MD5 268ea459fac563834490247de52a6ce1 NAME dexador FILENAME dexador DEPS + 15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk URL + http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz + MD5 4e405ba1b7721c2d62bc315ec31af0fe NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -48,4 +48,4 @@ rec { fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20190521-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 541f1c6a169..7c25ed9a037 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz''; - sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz''; + sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL - http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz - MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME + 1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3 URL + http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz + MD5 4f45f511ac55008b8b8aa04f7feaa2d4 NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS + DEPENDENCIES (trivial-indent) VERSION 20190710-git SIBLINGS (multilang-documentation-utils) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 95162ffc99a..aa97f8f7cbe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''drakma''; - version = ''v2.0.4''; + version = ''v2.0.5''; description = ''Full-featured http/https client based on usocket''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; - sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga''; + url = ''http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz''; + sha256 = ''14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj''; }; packageName = "drakma"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket - SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL - http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5 - 1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS + SHA256 14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj URL + http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz MD5 + 85316671dd8ada170b85af82ed97ce8e NAME drakma FILENAME drakma DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) @@ -36,4 +36,4 @@ rec { (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 cl-ppcre flexi-streams puri split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */ + VERSION v2.0.5 SIBLINGS (drakma-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 3b2d0225ff9..a024ad3907a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20190107-git''; + version = ''20190521-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz''; - sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs''; + url = ''http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz''; + sha256 = ''0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL - http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz - MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS + 0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q URL + http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz + MD5 401362d64d644f02824de03697435883 NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20190521-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index cec236dc556..0e7f5b79160 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''external-program''; - version = ''20160825-git''; + version = ''20190307-git''; parasites = [ "external-program-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz''; - sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13''; + url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz''; + sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz''; }; packageName = "external-program"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM external-program DESCRIPTION NIL SHA256 - 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL - http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz - MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program FILENAME + 1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL + http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz + MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME external-program DEPS ((NAME fiveam FILENAME fiveam) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (fiveam trivial-features) VERSION 20160825-git SIBLINGS NIL + DEPENDENCIES (fiveam trivial-features) VERSION 20190307-git SIBLINGS NIL PARASITES (external-program-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 87d9fe983ec..39f2af5430f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fiasco''; - version = ''20181210-git''; + version = ''20190307-git''; parasites = [ "fiasco-self-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz''; - sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y''; + url = ''http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz''; + sha256 = ''0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3''; }; packageName = "fiasco"; @@ -21,10 +21,10 @@ rec { } /* (SYSTEM fiasco DESCRIPTION A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL - http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz - MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS + SHA256 0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3 URL + http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz + MD5 7cc0c66f865d44974c8d682346b5f6d5 NAME fiasco FILENAME fiasco DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git + DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20190307-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 4a23cbf51ee..90ce8b83dde 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''A collection of utilities to destructure lambda forms.''; deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz''; - sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz''; + sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl''; }; packageName = "form-fiddle"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 - 013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL - http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz - MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle + 12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl URL + http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz + MD5 2576065de1e3c95751285fb155f5bcf6 NAME form-fiddle FILENAME form-fiddle DEPS ((NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index a74f24f8642..1f2700608e3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20180228-darcs''; + version = ''20190521-darcs''; description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz''; - sha256 = ''19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz''; + sha256 = ''0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn''; }; packageName = "hu.dwim.asdf"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. - SHA256 19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld URL - http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz - MD5 a1f3085cbd7ea77f9212112cc8914e86 NAME hu.dwim.asdf FILENAME + SHA256 0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn URL + http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz + MD5 b359bf05f587196eba172803b5594318 NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) - VERSION 20180228-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ + VERSION 20190521-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 4c3bcbb42b0..2c56b5964f9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.44''; + version = ''v0.46''; parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; - deps = [ args."nibbles" args."rt" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."nibbles" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz''; - sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y''; + url = ''http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz''; + sha256 = ''1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2''; }; packageName = "ironclad"; @@ -21,9 +21,11 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL - http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz - MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS - ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES - (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES - (ironclad/tests)) */ + 1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2 URL + http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz + MD5 23f67c2312723bdaf1ff78898d2354c7 NAME ironclad FILENAME ironclad DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) + DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.46 + SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 81493865b86..702eb2d05b5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20181210-git''; + version = ''20190202-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz''; - sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh''; + url = ''http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz''; + sha256 = ''1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl''; }; packageName = "jonathan"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL - http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz - MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan DEPS + SHA256 1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl URL + http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz + MD5 bf340574fc901706ba2dcdc57e1e78ad NAME jonathan FILENAME jonathan DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) @@ -39,4 +39,4 @@ rec { (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io named-readtables proc-parse static-vectors trivial-features trivial-gray-streams trivial-types) - VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */ + VERSION 20190202-git SIBLINGS (jonathan-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e5cbad3e9e8..e44004a9cf7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -3,7 +3,7 @@ rec { baseName = ''kmrcl''; version = ''20150923-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["kmrcl.asd"]; overrides = x: x; } -/* (SYSTEM kmrcl DESCRIPTION NIL SHA256 +/* (SYSTEM kmrcl DESCRIPTION System lacks description SHA256 0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g URL http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz MD5 0cd15d3ed3e7d56528dd3243d1a5c9b1 NAME kmrcl FILENAME kmrcl DEPS NIL diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index b99f7867a7a..96a831147bb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20181210-git''; + version = ''lack-20190521-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-git SIBLINGS + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20190521-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 7cce4b21294..610633e9af2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20181210-git''; + version = ''lack-20190521-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20181210-git SIBLINGS + (uiop) VERSION lack-20190521-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 6da62f22f65..3607cbedf44 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20181210-git''; + version = ''lack-20190521-git''; description = ''''; - deps = [ args."ironclad" args."nibbles" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack-util"; @@ -18,11 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS - ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-git SIBLINGS + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) + DEPENDENCIES (alexandria bordeaux-threads ironclad nibbles) VERSION + lack-20190521-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index c8ef9a7f670..08095979989 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20181210-git''; + version = ''20190521-git''; description = ''A minimal Clack''; - deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack"; @@ -18,14 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack FILENAME lack DEPS - ((NAME ironclad FILENAME ironclad) + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack FILENAME lack DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20181210-git SIBLINGS + DEPENDENCIES + (alexandria bordeaux-threads ironclad lack-component lack-util nibbles) + VERSION 20190521-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index a3ddc2fd953..1edb65596a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lift''; - version = ''20151031-git''; + version = ''20190521-git''; description = ''LIsp Framework for Testing''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz''; - sha256 = ''1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46''; + url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz''; + sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9''; }; packageName = "lift"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM lift DESCRIPTION LIsp Framework for Testing SHA256 - 1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46 URL - http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz MD5 - b92e97b3d337607743f47bde0889f3ee NAME lift FILENAME lift DEPS NIL - DEPENDENCIES NIL VERSION 20151031-git SIBLINGS + 0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9 URL + http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz MD5 + c03d3fa715792440c7b51a852ad581e3 NAME lift FILENAME lift DEPS NIL + DEPENDENCIES NIL VERSION 20190521-git SIBLINGS (lift-documentation lift-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 1a94c643d8a..5ffa27fcca5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20181210-git''; + version = ''20190710-git''; parasites = [ "local-time/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz''; - sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s''; + url = ''http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz''; + sha256 = ''1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk''; }; packageName = "local-time"; @@ -21,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL - http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz - MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time + SHA256 1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk URL + http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz + MD5 ff315f40d1f955210c78aa0804a117f2 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION - 20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ + 20190710-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index 19382889315..f64e9ee6a33 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz''; - sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r''; + url = ''http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz''; + sha256 = ''17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw''; }; packageName = "lquery"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL - http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz - MD5 295245984aa471d2709dcf926abd82e2 NAME lquery FILENAME lquery DEPS + 17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw URL + http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz + MD5 987e9e505ff230c7bfc425bdf58fb717 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) (NAME documentation-utils FILENAME documentation-utils) (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils clss documentation-utils form-fiddle plump trivial-indent) - VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */ + VERSION 20190710-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index db25e6ae534..8187c99f94a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''map-set''; - version = ''20160628-hg''; + version = ''20190307-hg''; description = ''Set-like data structure.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz''; - sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v''; + url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz''; + sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9''; }; packageName = "map-set"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256 - 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL - http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz - MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set FILENAME map-set DEPS NIL - DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL PARASITES NIL) */ + 1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9 URL + http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz + MD5 866dba36cdf060c943267cb79ccc0532 NAME map-set FILENAME map-set DEPS NIL + DEPENDENCIES NIL VERSION 20190307-hg SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index 93890afd300..fe9ccae2886 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -3,7 +3,7 @@ rec { baseName = ''pcall-queue''; version = ''pcall-0.3''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."bordeaux-threads" ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["pcall-queue.asd"]; overrides = x: x; } -/* (SYSTEM pcall-queue DESCRIPTION NIL SHA256 +/* (SYSTEM pcall-queue DESCRIPTION System lacks description SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall-queue FILENAME pcall-queue DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 9f36a671765..8757c704c8f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz''; - sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3''; + url = ''http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz''; + sha256 = ''1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL - http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz - MD5 5b1a46b83536d5bf1a082a1ef191d3aa NAME plump FILENAME plump DEPS + 1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi URL + http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz + MD5 e3276779e368758274156c9477f0b22a NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20190710-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 589f6917899..3666dda9bf8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''query-fs''; - version = ''20190107-git''; + version = ''20190521-git''; description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz''; - sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4''; + url = ''http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz''; + sha256 = ''1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39''; }; packageName = "query-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries - SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL - http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz - MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs DEPS + SHA256 1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39 URL + http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz + MD5 1108c91b69007c6ab35b42d70d4dd7a2 NAME query-fs FILENAME query-fs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -40,4 +40,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 2f30db52448..f6022cb2a1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''quri''; - version = ''20181210-git''; + version = ''20190521-git''; description = ''Yet another URI library for Common Lisp''; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz''; - sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4''; + url = ''http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz''; + sha256 = ''1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2''; }; packageName = "quri"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL - http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5 - 94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS + 1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2 URL + http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz MD5 + c2e37013c3b8e109aeb009719e9492ac NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20181210-git SIBLINGS (quri-test) PARASITES NIL) */ + 20190521-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 86890d60dc5..33847198bdd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20190107-git''; + version = ''postmodern-20190521-git''; parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; - sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz''; + sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL - http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz - MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date + 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL + http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz + MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date DEPS ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION - postmodern-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + postmodern-20190521-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index f0a21983f16..a22076facd3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''split-sequence''; - version = ''v1.5.0''; + version = ''v2.0.0''; parasites = [ "split-sequence/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz''; - sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g''; + url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz''; + sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba''; }; packageName = "split-sequence"; @@ -23,8 +23,8 @@ rec { /* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences delimited by objects satisfying a test. - SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL - http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz - MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME + SHA256 09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba URL + http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz + MD5 88aadc6c9da23663ebbb39d546991df4 NAME split-sequence FILENAME split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) - VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */ + VERSION v2.0.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index 991791b57d0..57dec7c93ca 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -3,7 +3,7 @@ rec { baseName = ''sqlite''; version = ''cl-20130615-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["sqlite.asd"]; overrides = x: x; } -/* (SYSTEM sqlite DESCRIPTION NIL SHA256 +/* (SYSTEM sqlite DESCRIPTION System lacks description SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite FILENAME sqlite DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index e75cb087f38..e89eb1971d6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz''; - sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz''; + sha256 = ''10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL - http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz - MD5 5634a308f5b40d9bab1f7c066aa6b9df NAME stumpwm FILENAME stumpwm DEPS + 10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w URL + http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz + MD5 7956cf3486c586f137b75f8b8c0e677c NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190710-git SIBLINGS (stumpwm-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 301b12a8998..50b815425dc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.23''; + version = ''slime-v2.24''; - description = ''''; + description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz''; - sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky''; + url = ''http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz''; + sha256 = ''0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6''; }; packageName = "swank"; @@ -17,8 +17,8 @@ rec { asdFilesToKeep = ["swank.asd"]; overrides = x: x; } -/* (SYSTEM swank DESCRIPTION NIL SHA256 - 1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL - http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5 - 726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */ +/* (SYSTEM swank DESCRIPTION System lacks description SHA256 + 0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6 URL + http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz MD5 + 05f421f7a9dffa4ba206c548524ef1c0 NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.24 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 9a4afce3280..683f87357f5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-backtrace''; - version = ''20160531-git''; + version = ''20190710-git''; description = ''trivial-backtrace''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz''; - sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx''; + url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz''; + sha256 = ''01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x''; }; packageName = "trivial-backtrace"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 - 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL - http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz - MD5 a3b41b4ae24e3fde303a2623201aac4d NAME trivial-backtrace FILENAME - trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS + 01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x URL + http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz + MD5 e9035ed00321b24278cbf5449a1aebed NAME trivial-backtrace FILENAME + trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (trivial-backtrace-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 1a562c2288b..82d0e4513ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-features''; - version = ''20161204-git''; + version = ''20190710-git''; description = ''Ensures consistent *FEATURES* across multiple CLs.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz''; - sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2''; + url = ''http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz''; + sha256 = ''04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy''; }; packageName = "trivial-features"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 - 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL - http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz - MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features FILENAME - trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS + 04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy URL + http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz + MD5 3907b044e00a812ebae989134fe57c55 NAME trivial-features FILENAME + trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (trivial-features-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index 5c3c486fb0f..c629bb3548d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-garbage''; - version = ''20181018-git''; + version = ''20190521-git''; - parasites = [ "trivial-garbage-tests" ]; + parasites = [ "trivial-garbage/tests" ]; description = ''Portable finalizers, weak hash-tables and weak pointers.''; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz''; - sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl''; + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz''; + sha256 = ''0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl''; }; packageName = "trivial-garbage"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 - 0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL - http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz - MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME + 0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl URL + http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz + MD5 38fb70797069d4402c6b0fe91f4ca5a8 NAME trivial-garbage FILENAME trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION - 20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */ + 20190521-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index d34913b1656..33eedbaa818 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20181018-git''; + version = ''20190710-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz''; - sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz''; + sha256 = ''00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL - http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz - MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL + 00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx URL + http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz + MD5 a5026ac3d68e02fce100761e546a0d77 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f06c0d7ebf5..f02d9e0dc2c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz''; - sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz''; + sha256 = ''0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL - http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz - MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL + 0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn URL + http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz + MD5 b7fa1cb9382a2a562343c6ca87b1b4ac NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index fdaa07109b4..18f1b74edbd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.3.2''; + version = ''3.3.3''; - description = ''''; + description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz''; - sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5''; + url = ''http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz''; + sha256 = ''1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm''; }; packageName = "uiop"; @@ -17,8 +17,8 @@ rec { asdFilesToKeep = ["uiop.asd"]; overrides = x: x; } -/* (SYSTEM uiop DESCRIPTION NIL SHA256 - 1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL - http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5 - 8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */ +/* (SYSTEM uiop DESCRIPTION System lacks description SHA256 + 1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm URL + http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz MD5 + 64d561117f048ad8621eff7a6173d65e NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.3 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index 6d02b976470..c3928cf0e4c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''usocket''; - version = ''0.7.1''; + version = ''0.8.2''; description = ''Universal socket library for Common Lisp''; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz''; - sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw''; + url = ''http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz''; + sha256 = ''0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm''; }; packageName = "usocket"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 - 18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL - http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5 - fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS + 0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm URL + http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz MD5 + 0218443cd70b675d9b09c1bf09cd9da4 NAME usocket FILENAME usocket DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES - (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test) + (split-sequence) VERSION 0.8.2 SIBLINGS (usocket-server usocket-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 0d8822c2f4f..59a41a7cf9a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20181210-git''; + version = ''20190710-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz''; - sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms''; + url = ''http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz''; + sha256 = ''16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL - http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5 - ecc4d7c194b3a941e381d9e6392d51c9 NAME woo FILENAME woo DEPS + SHA256 16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5 URL + http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz MD5 + f35b65dec09276f08c4ca532d077a7a9 NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -43,4 +43,4 @@ rec { cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq) - VERSION 20181210-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20190710-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 4c88e839bda..9854567fd5b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''xembed''; - version = ''clx-20120909-git''; + version = ''clx-20190307-git''; - description = ''''; + description = ''An implementation of the XEMBED protocol that integrates with CLX.''; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz''; - sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb''; + url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz''; + sha256 = ''1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j''; }; packageName = "xembed"; @@ -17,9 +17,10 @@ rec { asdFilesToKeep = ["xembed.asd"]; overrides = x: x; } -/* (SYSTEM xembed DESCRIPTION NIL SHA256 - 06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL - http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz - MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS - ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git +/* (SYSTEM xembed DESCRIPTION + An implementation of the XEMBED protocol that integrates with CLX. SHA256 + 1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j URL + http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz + MD5 04304f828ea8970b6f5301fe78ed8e10 NAME xembed FILENAME xembed DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20190307-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index ad90b855218..3e14a5ba9f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''xpath''; - version = ''plexippus-20181210-git''; + version = ''plexippus-20190521-git''; parasites = [ "xpath/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz''; - sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn''; + url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz''; + sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa''; }; packageName = "xpath"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM xpath DESCRIPTION An implementation of the XML Path Language (XPath) Version 1.0 SHA256 - 1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL - http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz - MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS + 15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa URL + http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz + MD5 eb9a4c39a7c37aa0338c401713b3f944 NAME xpath FILENAME xpath DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre closure-common cxml parse-number puri trivial-features trivial-gray-streams yacc) - VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */ + VERSION plexippus-20190521-git SIBLINGS NIL PARASITES (xpath/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 3343f22b7b0..2e4ceda31c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -165,4 +165,11 @@ $out/lib/common-lisp/query-fs" meta.broken = true; # 2018-04-10 }; }; + split-sequence = x: { + overrides = y: (x.overrides y) // { + preConfigure = '' + sed -i -e '/:components/i:serial t' split-sequence.asd + ''; + }; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 0de50a17ad6..2e71e0174f6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -590,6 +590,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."lack-util" or (x: {})) (import ./quicklisp-to-nix-output/lack-util.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "nibbles" = quicklisp-to-nix-packages."nibbles"; })); @@ -1352,6 +1354,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."lack" or (x: {})) (import ./quicklisp-to-nix-output/lack.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "lack-component" = quicklisp-to-nix-packages."lack-component"; "lack-util" = quicklisp-to-nix-packages."lack-util"; @@ -1372,6 +1376,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ironclad" or (x: {})) (import ./quicklisp-to-nix-output/ironclad.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "nibbles" = quicklisp-to-nix-packages."nibbles"; "rt" = quicklisp-to-nix-packages."rt"; })); @@ -1683,6 +1689,7 @@ let quicklisp-to-nix-packages = rec { "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "sqlite" = quicklisp-to-nix-packages."sqlite"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; "uiop" = quicklisp-to-nix-packages."uiop"; })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp index 9dd82ce2b2d..6a4c2b4ad1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp @@ -352,7 +352,10 @@ quicklisp-to-nix." (remove name (mapcar 'name ql-sibling-systems) :test 'equal)) (dependencies raw-dependencies) - (description (asdf:system-description (asdf:find-system system))) + (description + (or + (ignore-errors (asdf:system-description (asdf:find-system system))) + "System lacks description")) (release-name (short-description ql-release))) (list :system system diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 348f5ef7529..4b8369456b7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -412,6 +412,26 @@ lgi = buildLuarocksPackage { }; }; }; +ljsyscall = buildLuarocksPackage { + pname = "ljsyscall"; + version = "0.12-1"; + + src = fetchurl { + url = https://luarocks.org/ljsyscall-0.12-1.src.rock; + sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; + }; + disabled = (lua.luaversion != "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "http://www.myriabit.com/ljsyscall/"; + description = "LuaJIT Linux syscall FFI"; + maintainers = with maintainers; [ lblasc ]; + license = { + fullName = "MIT"; + }; + }; +}; lpeg = buildLuarocksPackage { pname = "lpeg"; version = "1.0.2-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index e765118464d..a4c1c7fa324 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -80,6 +80,25 @@ with super; */ }); + ljsyscall = super.ljsyscall.override(rec { + version = "unstable-20180515"; + # package hasn't seen any release for a long time + src = pkgs.fetchFromGitHub { + owner = "justincormack"; + repo = "ljsyscall"; + rev = "e587f8c55aad3955dddab3a4fa6c1968037b5c6e"; + sha256 = "06v52agqyziwnbp2my3r7liv245ddmb217zmyqakh0ldjdsr8lz4"; + }; + knownRockspec = "rockspec/ljsyscall-scm-1.rockspec"; + # actually library works fine with lua 5.2 + preConfigure = '' + sed -i 's/lua == 5.1/lua >= 5.1, < 5.3/' ${knownRockspec} + ''; + disabled = luaOlder "5.1" || luaAtLeast "5.3"; + + propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi; + }); + lgi = super.lgi.override({ nativeBuildInputs = [ pkgs.pkgconfig diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix index 5ef83ed77b3..d16f63152b8 100644 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.0"; - name = "amdadl-sdk-${version}"; + pname = "amdadl-sdk"; src = requireFile { name = "ADL_SDK_6.0.zip"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 79651db23ea..ba6d5559f26 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -36,7 +36,8 @@ let }; in stdenv.mkDerivation rec { - name = "amdapp-sdk-${version}"; + pname = "amdapp-sdk"; + inherit version; src = fetchurl { url = stdenv.lib.getAttrFromPath [version "url"] src_info; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 4527a8700f6..48ea088a73c 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -4,7 +4,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "avr-libc-${version}"; + pname = "avr-libc"; + inherit version; src = fetchurl { url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 0456c8eae76..b84f358cbee 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -3,7 +3,8 @@ let version = "0.25"; in stdenv.mkDerivation { - name = "mspdebug-${version}"; + pname = "mspdebug"; + inherit version; src = fetchFromGitHub { owner = "dlbeer"; repo = "mspdebug"; diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 4230672e12f..df0ef999dd6 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -2,7 +2,8 @@ let version = "3.1.0"; in stdenv.mkDerivation { - name = "newlib-${version}"; + pname = "newlib"; + inherit version; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv"; diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix index 0ec8664dac9..8abe4b2550e 100644 --- a/pkgs/development/misc/qmk_firmware/default.nix +++ b/pkgs/development/misc/qmk_firmware/default.nix @@ -6,7 +6,8 @@ let version = "0.6.144"; in stdenv.mkDerivation { - name = "qmk_firmware-${version}"; + pname = "qmk_firmware"; + inherit version; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index e66bb6fe211..bc806410b1e 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "betaflight-${version}"; + pname = "betaflight"; + inherit version; src = fetchFromGitHub { owner = "betaflight"; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 683883ddbce..5014cdce8f3 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "inav-${version}"; + pname = "inav"; + inherit version; src = fetchFromGitHub { owner = "iNavFlight"; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index a2ddda34347..eed4b43d6a3 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -4,7 +4,8 @@ let version = "0.6"; in stdenv.mkDerivation { - name = "abootimg-${version}"; + pname = "abootimg"; + inherit version; src = fetchFromGitHub { owner = "ggrandou"; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index b6d35051733..8578e51e939 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, python3, platform-tools, makeWrapper }: stdenv.mkDerivation rec { - name = "adb-sync-${version}"; + pname = "adb-sync"; version = "2016-08-31"; src = fetchgit { diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index fffe2fbbcbe..2033fa78ae5 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: stdenv.mkDerivation rec { - name = "adbfs-rootless-${version}"; + pname = "adbfs-rootless"; version = "2016-10-02"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2ddffbf16b7..c75dc334ebc 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) @@ -12,16 +12,16 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.0.beta.1) + cocoapods (1.8.0.beta.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.0.beta.1) + cocoapods-core (= 1.8.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -31,9 +31,10 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.0.beta.1) + cocoapods-core (1.8.0.beta.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) + concurrent-ruby (~> 1.0) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -42,7 +43,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index baa4748fb94..e2d4127ae44 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; claide = { groups = ["default"]; @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54"; + sha256 = "1qsj34czqsy93w2bnwhdhr0cyzjwl7vy3sknmak4syyni6m0rlli"; type = "gem"; }; - version = "1.8.0.beta.1"; + version = "1.8.0.beta.2"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j"; + sha256 = "166pr9m3da9hsra9rviaxz3i4spm7kl003mkn7sn25r9smcvfdj4"; type = "gem"; }; - version = "1.8.0.beta.1"; + version = "1.8.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; + sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; cocoapods-try = { groups = ["default"]; diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index 9cee1c9e5de..706fa2c6599 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, bzip2, openssl, zlib }: stdenv.mkDerivation rec { - name = "imgpatchtools-${version}"; + pname = "imgpatchtools"; version = "0.3"; src = fetchzip { diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix index f149cb622e1..cd58ea4e20c 100644 --- a/pkgs/development/mobile/webos/cmake-modules.nix +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "cmake-modules-webos-${version}"; + pname = "cmake-modules-webos"; version = "19"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 52b50635e33..e7afdb32137 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "novacom-${version}"; + pname = "novacom"; version = "18"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index f82009b0c39..4d62dd305d3 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -4,7 +4,7 @@ webos, cmake, pkgconfig, libusb }: stdenv.mkDerivation rec { - name = "novacomd-${version}"; + pname = "novacomd"; version = "127"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix index 8128dc1cb6f..4606ebd5172 100644 --- a/pkgs/development/ocaml-modules/base64/2.0.nix +++ b/pkgs/development/ocaml-modules/base64/2.0.nix @@ -3,7 +3,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "ocaml-base64-${version}"; + pname = "ocaml-base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 473c30b4345..3b511c7f1cc 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "2.9.0"; in +let version = "2.10.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; - src = fetchzip { - url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "1wianim29kkkf4c31k7injjp3ji69ki5krrp6csq8ycswg791dby"; + src = fetchurl { + url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; + sha256 = "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; propagatedBuildInputs = [ num ]; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07" && !stdenv.isAarch64; + doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64; checkTarget = "test test"; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix new file mode 100644 index 00000000000..6d833b48f26 --- /dev/null +++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "bigarray-compat"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = pname; + rev = "v${version}"; + sha256 = "06j1dwlpisxshdd0nab4n4x266gg1s1n8na16lpgw3fvcznwnimz"; + }; + + meta = { + description = "Compatibility library to use Stdlib.Bigarray when possible"; + inherit (src.meta) homepage; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index a7e591e049e..21897e3bf10 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -5,7 +5,7 @@ then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "camomile-${version}"; + pname = "camomile"; version = "0.8.2"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index 48517036dc6..a30b574f19b 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation rec { - name = "camomile-${version}"; + pname = "camomile"; version = "0.8.5"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 4832f5c39af..2a4d7004faa 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "ocaml-cow-${version}"; + pname = "ocaml-cow"; src = fetchFromGitHub { owner = "mirage"; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7720650ddfc..17da11708c6 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -5,7 +5,7 @@ then throw "cryptgps is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml-cryptgps-${version}"; + pname = "ocaml-cryptgps"; version = "0.2.1"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 41214624427..1811e21cf58 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -18,7 +18,7 @@ let param = in stdenv.mkDerivation rec { - name = "cryptokit-${version}"; + pname = "cryptokit"; inherit (param) version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 37c7f660ca6..01a32fc09a2 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, buildDunePackage, sexplib, ocplib-endian }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "cstruct"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; + url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; + sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a"; }; - propagatedBuildInputs = [ sexplib ocplib-endian ]; - meta = { description = "Access C-like structures directly from OCaml"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/mirage/ocaml-cstruct"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index 78600b78306..b5c39533e73 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -8,8 +8,8 @@ buildDunePackage { pname = "ppx_cstruct"; inherit (cstruct) version src meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.03"; - buildInputs = [ ppx_tools_versioned ]; + buildInputs = [ sexplib ppx_tools_versioned ]; propagatedBuildInputs = [ cstruct ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix new file mode 100644 index 00000000000..9a1ef0dd301 --- /dev/null +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, cstruct, sexplib }: + +if !lib.versionAtLeast (cstruct.version or "1") "3" +then cstruct +else + +buildDunePackage { + pname = "cstruct-sexp"; + inherit (cstruct) version src meta; + + doCheck = true; + buildInputs = [ alcotest ]; + + propagatedBuildInputs = [ cstruct sexplib ]; +} + diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 604ad4fb083..7cb5d665869 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "cstruct-unix"; inherit (cstruct) version src meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.06"; propagatedBuildInputs = [ cstruct ]; } diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index d08259af247..dc6b1751283 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ncurses }: stdenv.mkDerivation rec { - name = "ocaml-curses-${version}"; + pname = "ocaml-curses"; version = "1.0.4"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 31835316833..9239d2543ee 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -3,7 +3,8 @@ let version = "3.0"; in stdenv.mkDerivation { - name = "ocaml-dolog-${version}"; + pname = "ocaml-dolog"; + inherit version; src = fetchzip { url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix new file mode 100644 index 00000000000..cb0105ff46f --- /dev/null +++ b/pkgs/development/ocaml-modules/domain-name/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchurl +, alcotest +, astring, fmt +}: + +buildDunePackage rec { + pname = "domain-name"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz"; + sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ alcotest ]; + + propagatedBuildInputs = [ astring fmt ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/hannesm/domain-name"; + description = "RFC 1035 Internet domain names"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 010df7d8df9..25e75ceeba3 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { pname = "eliom"; version = "6.7.0"; - name = "${pname}-${version}"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 944195fd0a3..35f8f5d52e9 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildDunePackage -, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri , alcotest, mtime, nocrypto }: @@ -15,7 +15,7 @@ buildDunePackage rec { }; buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; + propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix new file mode 100644 index 00000000000..2585dfcaa96 --- /dev/null +++ b/pkgs/development/ocaml-modules/gmap/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fetchurl, alcotest }: + +buildDunePackage rec { + pname = "gmap"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz"; + sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ alcotest ]; + + doCheck = true; + + meta = { + description = "Heterogenous maps over a GADT"; + homepage = "https://github.com/hannesm/gmap"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index e8d9267aa85..93e2b3b8429 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: stdenv.mkDerivation rec { - name = "higlo-${version}"; + pname = "higlo"; version = "0.6"; src = fetchFromGitHub { owner = "zoggy"; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 8a11d22c2c1..40db8246f4a 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -3,7 +3,8 @@ let version = "0.2.4"; in stdenv.mkDerivation { - name = "ocaml-iso8601-${version}"; + pname = "ocaml-iso8601"; + inherit version; src = fetchzip { url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 6b01929db76..38ea45bc297 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,9 +3,9 @@ let param = let check = stdenv.lib.versionAtLeast ocaml.version; in if check "4.06" then { - version = "2.18.6"; - url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz; - sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d"; + version = "2.18.8"; + url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz"; + sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci"; } else if check "3.12" then { version = "2.18.5"; url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; @@ -14,7 +14,7 @@ let param = in stdenv.mkDerivation rec { - name = "lablgtk-${version}"; + pname = "lablgtk"; inherit (param) version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix deleted file mode 100644 index c0532ff0325..00000000000 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }: - -stdenv.mkDerivation rec { - version = "1.6"; - name = "lambda-term-${version}"; - - src = fetchurl { - url = https://github.com/diml/lambda-term/archive/1.6.tar.gz; - sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; - }; - - buildInputs = [ libev ocaml findlib ocamlbuild lwt react ]; - - propagatedBuildInputs = [ camlp4 zed ]; - - createFindlibDestdir = true; - - meta = { description = "Terminal manipulation library for OCaml"; - longDescription = '' - Lambda-term is a cross-platform library for - manipulating the terminal. It provides an abstraction for keys, - mouse events, colors, as well as a set of widgets to write - curses-like applications. - - The main objective of lambda-term is to provide a higher level - functional interface to terminal manipulation than, for example, - ncurses, by providing a native OCaml interface instead of bindings to - a C library. - - Lambda-term integrates with zed to provide text edition facilities in - console applications. - ''; - - homepage = https://github.com/diml/lambda-term; - license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; - branch = "1.6"; - maintainers = [ - stdenv.lib.maintainers.gal_bolle - ]; - }; -} diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 18fe235710f..1b5594d5565 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -2,20 +2,16 @@ buildDunePackage rec { pname = "lambda-term"; - version = "1.13"; - - minimumOCamlVersion = "4.02"; + version = "2.0.2"; src = fetchurl { - url = "https://github.com/diml/${pname}/archive/${version}.tar.gz"; - sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l"; + url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz"; + sha256 = "1p9yczrx78pf5hvhcg1qiqb2vdlmw6bmhhjsm4wiqjq2cc6piaqw"; }; buildInputs = [ libev ]; propagatedBuildInputs = [ zed lwt_log lwt_react ]; - hasSharedObjects = true; - meta = { description = "Terminal manipulation library for OCaml"; longDescription = '' Lambda-term is a cross-platform library for diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 0dd8231dafe..3cebefb33ed 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -3,7 +3,8 @@ let version = stdenv.lib.getVersion llvm; in stdenv.mkDerivation { - name = "ocaml-llvm-${version}"; + pname = "ocaml-llvm"; + inherit version; inherit (llvm) src; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9a8a6259a77..65acbd6cc42 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0"; in stdenv.mkDerivation { - name = "ocaml-magic-mime-${version}"; + pname = "ocaml-magic-mime"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index e69b9dabeab..d767c20f638 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,7 +1,8 @@ { version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { - name = "menhir-${version}"; + pname = "menhir"; + inherit version; inherit src; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 73f84886cc5..f4e3586b43c 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -7,8 +7,8 @@ with lib; let param = if versionAtLeast ocaml.version "4.03" then { - version = "1.1.0"; - sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3"; + version = "1.2.0"; + sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8"; } else { version = "0.8.4"; sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh"; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 813b4d7f7a4..9108fd248c0 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg -, cpuid, ocb-stubblr +, cpuid, ocb-stubblr, sexplib , cstruct, zarith, ppx_sexp_conv , cstruct-lwt ? null }: @@ -33,10 +33,18 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch"; + sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch"; + sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z"; + }) ]; buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; - propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt; + propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index b789b133aaf..11405c0ebe5 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-libvirt-${version}"; + pname = "ocaml-libvirt"; rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 10d8484e3ef..e210ffa1152 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { - name = "ocaml-text-${version}"; + pname = "ocaml-text"; version = "0.8"; src = fetchzip { diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 20b63e3a8ee..27442075064 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: stdenv.mkDerivation rec { - name = "ocamlfuse-${version}"; + pname = "ocamlfuse"; version = "2.7.1_cvs5"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index e005024d222..887dce58689 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, lablgtk}: stdenv.mkDerivation rec { - name = "ocamlgraph-${version}"; + pname = "ocamlgraph"; version = "1.8.8"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index d6d0c3292bb..8063f284728 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -6,7 +6,8 @@ let sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; in stdenv.mkDerivation { - name = "ocaml-make-${version}"; + pname = "ocaml-make"; + inherit version; src = fetchurl { url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 9c4c2e21edd..468e387f8f1 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -4,11 +4,11 @@ assert lib.versionOlder ocaml.version "4"; stdenv.mkDerivation rec { - name = "ocamlnat-${version}"; + pname = "ocamlnat"; version = "0.1.1"; src = fetchurl { - url = "http://benediktmeurer.de/files/source/${name}.tar.bz2"; + url = "http://benediktmeurer.de/files/source/${pname}-${version}.tar.bz2"; sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 6117d30665f..0452b1b7dfe 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -4,7 +4,7 @@ if stdenv.lib.versionOlder ocaml.version "4.03" then throw "ocf not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocf-${version}"; + pname = "ocf"; version = "0.5.0"; src = fetchFromGitHub { owner = "zoggy"; diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix new file mode 100644 index 00000000000..af3341e7e59 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, ocplib-json-typed, js_of_ocaml }: + +buildDunePackage { + pname = "ocplib-json-typed-browser"; + inherit (ocplib-json-typed) version src; + + propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ]; + + meta = { + description = "A Json_repr interface over JavaScript's objects"; + inherit (ocplib-json-typed.meta) homepage license maintainers; + }; +} + diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix new file mode 100644 index 00000000000..350c31a3819 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, ocplib-json-typed, ocplib-endian }: + +buildDunePackage { + pname = "ocplib-json-typed-bson"; + inherit (ocplib-json-typed) version src; + + propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ]; + + meta = { + description = "A Json_repr compatible implementation of the JSON compatible subset of BSON"; + inherit (ocplib-json-typed.meta) homepage license maintainers; + }; +} diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix index cadb65bcbed..6a1b906d7f2 100644 --- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }: +{ lib, buildDunePackage, fetchFromGitHub, uri }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocplib-json-typed-${version}"; - version = "0.5"; +buildDunePackage rec { + pname = "ocplib-json-typed"; + version = "0.7.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocplib-json-typed"; rev = "v${version}"; - sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q"; + sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q"; }; - buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ]; propagatedBuildInputs = [ uri ]; - createFindlibDestdir = true; - meta = { description = "A collection of type-aware JSON utilities for OCaml"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 569f5081355..0263d3284ff 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -17,7 +17,8 @@ in let inherit (param) version; in stdenv.mkDerivation { - name = "ocsigen-deriving-${version}"; + pname = "ocsigen-deriving"; + inherit version; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; inherit (param) sha256; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 147b4200cf6..9499bff84a1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { version = "2.11.0"; - name = "ocsigenserver-${version}"; + pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index bbe38ac8994..83d47fbb3af 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "piqi-ocaml-${version}"; + pname = "piqi-ocaml"; src = fetchurl { url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 6be1595f7c5..fb06820f196 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.14"; - name = "piqi-${version}"; + pname = "piqi"; src = fetchurl { url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 38e1b3c7467..0b3f13bc54f 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }: stdenv.mkDerivation rec { - name = "ocaml-sqlite3-${version}"; + pname = "ocaml-sqlite3"; version = "2.0.9"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 181946802d7..2a29179f4cd 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit +, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; @@ -11,23 +11,24 @@ then throw "tls is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.10.4"; name = "ocaml${ocaml.version}-tls-${version}"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-tls"; rev = "${version}"; - sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31"; + sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; - propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ] + ++ optionals doCheck [ ounit cstruct-unix ]; + propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ optional withLwt lwt; - buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}"; + buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}"; - doCheck = true; + doCheck = versionAtLeast ocaml.version "4.06"; checkPhase = "${topkg.run} test"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index ab6a7d8f523..079e810bfdc 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; - name = "uuidm-${version}"; + pname = "uuidm"; src = fetchurl { url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 8d4bd4c82b3..63ddc6e67bd 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,28 +1,23 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg -, asn1-combinators, astring, nocrypto, ppx_sexp_conv -, ounit, cstruct-unix +{ lib, fetchurl, buildDunePackage, ocaml +, alcotest, cstruct-unix +, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-x509-${version}"; - version = "0.6.1"; +buildDunePackage rec { + pname = "x509"; + version = "0.7.1"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz"; - sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; + url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; + sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; + buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ]; - buildPhase = "${topkg.run} build --tests true"; + doCheck = lib.versionAtLeast ocaml.version "4.06"; - doCheck = true; - checkPhase = "${topkg.run} test"; - - inherit (topkg) installPhase; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; license = licenses.bsd2; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index d9dcf1a5385..9fa42e68c56 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }: let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.6"; - sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"; + version = "2.0.3"; + sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"; buildInputs = [ dune ]; + propagatedBuildInputs = [ charInfo_width ]; extra = { buildPhase = "dune build -p zed"; inherit (dune) installPhase; }; } else { version = "1.4"; sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; - buildInputs = []; + buildInputs = [ ocamlbuild ]; + propagatedBuildInputs = [ camomile ]; extra = { createFindlibDestdir = true; }; } ; in @@ -26,9 +28,9 @@ stdenv.mkDerivation (rec { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; + buildInputs = [ ocaml findlib ] ++ param.buildInputs; - propagatedBuildInputs = [ react camomile ]; + propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs; meta = { description = "Abstract engine for text edition in OCaml"; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 8282c38a1e7..2f633eed7a3 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017.02.28"; - name = "pharo-launcher-${version}"; + pname = "pharo-launcher"; src = fetchurl { url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip"; sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0"; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 3bd72434eb3..ec4168508a7 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "pharo-share-${version}"; + pname = "pharo-share"; dontUnpack = true; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 75fceb7deed..cb0986e1d7f 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"; + sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 5769109f774..049ceb124ea 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -40,14 +40,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; - # Don't error on cryptography deprecation warning - postPatch = '' - substituteInPlace pytest.ini --replace "filterwarnings = error" "" + checkPhase = '' + pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms" ''; - # coroutine 'noop2' was never awaited - doCheck = false; - meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index e21445ab3ec..fab3c0df58c 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchFromGitHub , buildPythonPackage , pycrypto , paramiko @@ -18,11 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.8.2"; + version = "2.8.4"; - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730"; + src = fetchFromGitHub { + owner = "ansible"; + repo = "ansible"; + rev = "v${version}"; + sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki"; }; prePatch = '' diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index a2a026e74d5..22bddb252c8 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { pname = "apipkg"; @@ -19,8 +19,18 @@ buildPythonPackage rec { --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')" ''; - checkPhase = '' - py.test + # Failing tests on Python 3 + # https://github.com/pytest-dev/apipkg/issues/17 + checkPhase = let + disabledTests = stdenv.lib.optionals isPy3k [ + "test_error_loading_one_element" + "test_aliasmodule_proxy_methods" + "test_eagerload_on_bython" + ]; + testExpression = stdenv.lib.optionalString (disabledTests != []) + "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'"; + in '' + py.test ${testExpression} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index de041c0f4c8..12a3529f864 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "augeas"; version = "1.0.3"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 0ccf3da7bec..7d1e365b243 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,17 +1,17 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, six, txaio, twisted, zope_interface, cffi, trollius, futures, - mock, pytest + mock, pytest, cryptography, pynacl }: buildPythonPackage rec { pname = "autobahn"; - version = "19.1.1"; + version = "19.8.1"; src = fetchPypi { inherit pname version; - sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff"; + sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304"; }; - propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ + propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ (lib.optionals (!isPy3k) [ trollius futures ]); checkInputs = [ mock pytest ]; @@ -21,6 +21,10 @@ buildPythonPackage rec { runHook postCheck ''; + # Tests do no seem to be compatible yet with pytest 5.1 + # https://github.com/crossbario/autobahn-python/issues/1235 + doCheck = false; + meta = with lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio."; homepage = "https://crossbar.io/autobahn"; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix new file mode 100644 index 00000000000..ec66124e3c7 --- /dev/null +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.2.4"; + pname = "bids-validator"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg"; + }; + + propagatedBuildInputs = [ ]; + + meta = with lib; { + description = "Validator for the Brain Imaging Data Structure"; + homepage = "https://github.com/bids-standard/bids-validator"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 9bd7e586820..bd19b8eb33e 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -16,7 +16,7 @@ let visualizationSupport = (pyqtgraph != null); in buildPythonPackage rec { - name = "binwalk-${version}"; + pname = "binwalk"; version = "2.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index c2b0db61cbb..7de124267f0 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { substituteInPlace setup.py --replace ",<3dev" "" ''; + # Disable a test + # https://github.com/mozilla/bleach/issues/467 + checkPhase = '' + pytest -k "not test_only_text_is_cleaned" + ''; + meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index fde330d706f..7b67997fa08 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "blockdiag"; version = "1.5.3"; - name = pname + "-" + version; src = fetchurl { url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 158a3d31882..d5337122120 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,74 +1,55 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi +, futures +, isPy3k , isPyPy -, mock -, pytest -, flask , jinja2 -, markupsafe -, werkzeug -, itsdangerous -, dateutil -, requests -, six -, pygments -, pystache -, markdown -, pyyaml -, pyzmq -, tornado -, colorama -, isPy3k -, futures -, websocket_client +, lib +, mock , numpy -, pandas -, greenlet -, python -, bkcharts +, nodejs , pillow +, pytest +, python +, python-dateutil +, pyyaml , selenium +, six +, substituteAll +, tornado }: buildPythonPackage rec { pname = "bokeh"; - version = "1.0.4"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf"; + sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2"; }; - disabled = isPyPy; + patches = [ + (substituteAll { + src = ./hardcode-nodejs-npmjs-paths.patch; + node_bin = "${nodejs}/bin/node"; + npm_bin = "${nodejs}/bin/npm"; + }) + ]; - # Some test that uses tornado fails -# doCheck = false; + disabled = isPyPy; checkInputs = [ mock pytest pillow selenium ]; propagatedBuildInputs = [ pillow - flask jinja2 - markupsafe - werkzeug - itsdangerous - dateutil - requests + python-dateutil six - pygments - pystache - markdown pyyaml - pyzmq tornado - colorama - bkcharts + numpy ] - ++ lib.optionals ( !isPy3k ) [ futures ] - ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ] - ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ]; + ++ lib.optionals ( !isPy3k ) [ futures ]; checkPhase = '' ${python.interpreter} -m unittest discover -s bokeh/tests diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch new file mode 100644 index 00000000000..f8f33c0021f --- /dev/null +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -0,0 +1,15 @@ +diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py +index a752aad7d..8af05ff63 100644 +--- a/bokeh/util/compiler.py ++++ b/bokeh/util/compiler.py +@@ -442,8 +442,8 @@ def _detect_nodejs(): + raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + + '("conda install nodejs" or follow https://nodejs.org/en/download/)') + +-_nodejs = None +-_npmjs = None ++_nodejs = "@node_bin@" ++_npmjs = "@npm_bin@" + + def _nodejs_path(): + global _nodejs diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 203ef9a4355..34178befebe 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.160"; # N.B: if you change this, change botocore too + version = "1.9.205"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f"; + sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e3bbdf22ddf..5c8b00fc6c1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp"; + sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index c4db013ea34..21492dc152c 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "Bottleneck"; version = "1.2.1"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 64510ee5b64..807dafab436 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.6.4"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc"; + sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index 6e2e703dd56..069358a4d6d 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "btchip-python"; version = "0.1.28"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 2c97cbd4a33..7496e7e1fcc 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "0.6"; pname = "cgroup-utils"; - name = pname + "-" + version; buildInputs = [ pep8 nose ]; # Pep8 tests fail... diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 75152d39aeb..6941e1117bd 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, fetchpatch }: buildPythonPackage rec { @@ -16,6 +17,22 @@ buildPythonPackage rec { sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8"; }; + # Remove patches once 96b34df and 14c12d2 + # become part of a release - they're currently only present in master. + # ref: https://github.com/cherrypy/cherrypy/pull/1791 + patches = [ + (fetchpatch { + name = "pytest5-1.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch"; + sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi"; + }) + (fetchpatch { + name = "pytest5-2.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch"; + sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz"; + }) + ]; + propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix new file mode 100644 index 00000000000..7cb01001fac --- /dev/null +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cssmin"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dk723nfm2yf8cp4pj785giqlwv42l0kj8rk40kczvq1hk6g04p0"; + }; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python port of the YUI CSS compression algorithm"; + homepage = http://github.com/zacharyvoase/cssmin; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 67120bf0f3d..234bb46f97b 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "cx_Freeze"; version = "5.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 6862d6447e5..b3d4a40bf66 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "cymem"; version = "2.0.2"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index bb2e65125b7..27665c689c4 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -38,6 +38,9 @@ in buildPythonPackage rec { --ignore datashape/tests/test_user.py ''; + # https://github.com/blaze/datashape/issues/238 + PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'"; + meta = { homepage = https://github.com/ContinuumIO/datashape; description = "A data description language"; diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix new file mode 100644 index 00000000000..3521e8ce129 --- /dev/null +++ b/pkgs/development/python-modules/delegator-py/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, pexpect +, pytest +}: + +buildPythonPackage rec { + version = "0.1.1"; + pname = "delegator.py"; + + src = fetchFromGitHub { + owner = "amitt001"; + repo = "delegator.py"; + rev = "v${version}"; + sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb"; + }; + + propagatedBuildInputs = [ pexpect ]; + + # no tests in github or pypi + doCheck = false; + + meta = with lib; { + description = "Subprocesses for Humans 2.0"; + homepage = "https://github.com/amitt001/delegator.py"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix new file mode 100644 index 00000000000..91cea9b0059 --- /dev/null +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +, django-allauth, mailmanclient, django, mock +}: + +buildPythonPackage rec { + pname = "django-mailman3"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v6c1jhcc212wc2xa314irfcchl05r7nysrcy63dcaan958kmnnx"; + }; + + propagatedBuildInputs = [ + django-gravatar2 django_compressor django-allauth mailmanclient + ]; + checkInputs = [ django mock ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test + ''; + + meta = with stdenv.lib; { + description = "Django library for Mailman UIs"; + homepage = https://gitlab.com/mailman/django-mailman3; + license = licenses.gpl3; + maintainers = with maintainers; [ globin peti ]; + }; +} diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix new file mode 100644 index 00000000000..096215a70ab --- /dev/null +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +, django, python3-openid }: + +buildPythonPackage rec { + pname = "django-paintstore"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "12wxgwv1qbkfq7w5i7bm7aidv655c2sxp0ym73qf8606dxbjcwwg"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Django app that integrates jQuery ColorPicker with the Django admin"; + homepage = https://github.com/gsiegman/django-paintstore; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix new file mode 100644 index 00000000000..f671674ffe2 --- /dev/null +++ b/pkgs/development/python-modules/django-q/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +, blessed, django, future }: + +buildPythonPackage rec { + pname = "django-q"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17mqxiacsp2yszak6j48fm7vx0w44pcg86flc63r9y5yhx490n5r"; + }; + + propagatedBuildInputs = [ + django-picklefield arrow blessed django future + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A multiprocessing distributed task queue for Django"; + homepage = https://django-q.readthedocs.org; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index a459e3c0e10..9baafed4b75 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { - name = "Django-${version}"; + pname = "Django"; version = "1.8.19"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; + url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz"; sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k"; }; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 804267268d7..deeb8ce0642 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -11,6 +11,7 @@ , fetchurl , dbus , xvfb_run +, wrapGAppsHook # , fetchPypi }: @@ -32,8 +33,9 @@ buildPythonPackage rec { ./nix-support.patch ]; - nativeBuildInputs = [ gobject-introspection dbus xvfb_run ]; # for setup hooks + nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; + strictDeps = false; # issue 56943 checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 5c0e57cddc0..6e03a33f29b 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "dyn"; version = "1.8.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index b09bef9fec4..1ad5ea1ab3b 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "edward"; version = "1.3.5"; - name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index 3816a8c42e7..f30dc218379 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -1,32 +1,43 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , rope , flake8 , autopep8 , jedi , importmagic -, isPy27 +, black +, mock +, nose +, yapf +, isPy3k }: buildPythonPackage rec { pname = "elpy"; - version = "1.28.0"; + version = "1.29.1"; - src = fetchPypi { - inherit pname version; - sha256 = "0lx6bf6ajx6wmnns03gva5sh1mmmxahjaqrn735cgwn6j4ikyqfs"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = pname; + rev = version; + sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf"; }; - propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] - ++ stdenv.lib.optionals isPy27 [ rope ]; + propagatedBuildInputs = [ flake8 autopep8 jedi importmagic rope yapf ] + ++ stdenv.lib.optionals isPy3k [ black ]; - doCheck = false; # there are no tests + checkInputs = [ mock nose ]; + + checkPhase = '' + HOME=$(mktemp -d) nosetests -e "test_should_complete_top_level_modules_for_import" + ''; meta = with stdenv.lib; { description = "Backend for the elpy Emacs mode"; homepage = "https://github.com/jorgenschaefer/elpy"; license = licenses.gpl3; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 4e1b78f80be..c7766802e4e 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "execnet"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm"; + sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index 3b91fb717bc..de7342d67ca 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "first"; version = "2.0.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index df39b2ea725..bc7962d4108 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -2,12 +2,12 @@ , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { - version = "1.0.3"; + version = "1.0.4"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3"; + sha256 = "ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix new file mode 100644 index 00000000000..0a2e8dff1b7 --- /dev/null +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -0,0 +1,14 @@ +{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }: + +buildPythonPackage rec { + pname = "flufl.bounce"; + version = "3.0"; + + buildInputs = [ nose2 ]; + propagatedBuildInputs = [ atpublic zope_interface ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2"; + }; +} diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix new file mode 100644 index 00000000000..6e8d77bf4f8 --- /dev/null +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, atpublic }: + +buildPythonPackage rec { + pname = "flufl.i18n"; + version = "2.0.2"; + + propagatedBuildInputs = [ atpublic ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1csgds59nx0ann9v2alqr69lakp1cnc1ikmbgn96l6n23js7c2ah"; + }; +} diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix new file mode 100644 index 00000000000..1be5d9a7c4c --- /dev/null +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, atpublic }: + +buildPythonPackage rec { + pname = "flufl.lock"; + version = "3.2"; + + propagatedBuildInputs = [ atpublic ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8"; + }; +} diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix new file mode 100644 index 00000000000..fa5edc1077c --- /dev/null +++ b/pkgs/development/python-modules/fx2/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, python +, fetchFromGitHub +, sdcc +, libusb1 +, crcmod +}: + +buildPythonPackage { + pname = "fx2"; + version = "unstable-2019-08-27"; + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "libfx2"; + rev = "dd1e42c7b46ff410dbb18beab46111bb5491400c"; + sha256 = "0xvlmx6ym0ylrvnlqzf18d475wa0mfci7wkdbv30gl3hgdhsppjz"; + }; + + nativeBuildInputs = [ sdcc ]; + + propagatedBuildInputs = [ libusb1 crcmod ]; + + preBuild = '' + cd software + ${python.pythonForBuild.interpreter} setup.py build_ext + ''; + + preInstall = '' + mkdir -p $out/share/libfx2 + cp -R ../firmware/library/{.stamp,lib,include,fx2{rules,conf}.mk} \ + $out/share/libfx2 + ''; + + # installCheckPhase tries to run build_ext again and there are no tests + doCheck = false; + + meta = with lib; { + description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers"; + homepage = https://github.com/whitequark/libfx2; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index a9ac85e6248..de313dc1c7d 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "geopandas"; version = "0.5.1"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index dd5d90bb968..0f4bb4ce9c4 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -8,15 +8,15 @@ }: buildPythonPackage rec { - name = "glances-${version}"; - version = "3.1.1"; + pname = "glances"; + version = "3.1.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1x9gw7hzw3p8zki82wdf359yxj0ylfw2096a4y621kj0p4xqsr4q"; + sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix new file mode 100644 index 00000000000..264a13aed5e --- /dev/null +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sdcc +, nmigen +, fx2 +, libusb1 +, aiohttp +, pyvcd +, bitarray +, crcmod +, yosys +, icestorm +, nextpnr +}: + +buildPythonPackage rec { + pname = "glasgow"; + version = "unstable-2019-08-31"; + realVersion = lib.substring 0 7 src.rev; + + src = fetchFromGitHub { + owner = "GlasgowEmbedded"; + repo = "Glasgow"; + rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca"; + sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v"; + }; + + nativeBuildInputs = [ sdcc ]; + + propagatedBuildInputs = [ + nmigen + fx2 + libusb1 + aiohttp + pyvcd + bitarray + crcmod + ]; + + postPatch = '' + substituteInPlace software/setup.py \ + --replace 'versioneer.get_version()' '"${realVersion}"' + ''; + + preBuild = '' + make -C firmware LIBFX2=${fx2}/share/libfx2 + cp firmware/glasgow.ihex software/glasgow + cd software + ''; + + # a couple failing tests and also installCheck tries to build_ext again + doInstallCheck = false; + doCheck = false; + + checkPhase = '' + python -m unittest discover + ''; + + meta = with lib; { + description = "Software for Glasgow, a digital interface multitool"; + homepage = https://github.com/GlasgowEmbedded/Glasgow; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 8bbcaed377a..2a65df18fa5 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "GPy"; version = "1.9.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 85c5c011dfd..58d5c414cf0 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { --replace "coverage>=4.0,<4.4" "coverage" ''; + # Test failures but patch does not apply cleanly + # https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1 + doCheck = false; + meta = with stdenv.lib; { homepage = https://pypi.python.org/pypi/gunicorn; description = "WSGI HTTP Server for UNIX"; diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix new file mode 100644 index 00000000000..9a398080609 --- /dev/null +++ b/pkgs/development/python-modules/handout/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, imageio, imageio-ffmpeg }: + +buildPythonPackage rec { + pname = "handout"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16y1wqx8j4kf6fa94x22njrkdfb2cfi0dvc7a4q2qsa8m3ri0b43"; + }; + + propagatedBuildInputs = [ imageio imageio-ffmpeg ]; + + meta = with stdenv.lib; { + description = "Turn Python scripts into handouts with Markdown and figures"; + homepage = "https://github.com/danijar/handout"; + license = licenses.gpl3; + maintainers = with maintainers; [ averelld ]; + }; +} diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index cfaaa563611..51d42e5c8b7 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "hcs_utils"; version = "2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 9938d405387..32c79b17136 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "hmmlearn"; version = "0.2.2"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; + url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; }; diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index c4afe809cfb..59528723d80 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -16,7 +16,7 @@ let components = { in stdenv.mkDerivation rec { version = "2.3.4"; - name = "hoomd-blue-${version}"; + pname = "hoomd-blue"; src = fetchgit { url = "https://bitbucket.org/glotzer/hoomd-blue"; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index c7f6e5c8219..f89b7ab1ce6 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -4,28 +4,31 @@ , appdirs , dask , holoviews +, hvplot , jinja2 , msgpack-numpy , msgpack-python , numpy , pandas +, panel , python-snappy , requests , ruamel_yaml , six , tornado , pytest -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "intake"; - version = "0.4.4"; - disabled = isPy27; + version = "0.5.3"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3fc1b7c2949c9b4200ecbbfdff17da126981a1d8d95ccb7b7bcca3e3dd849d5e"; + sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7"; }; checkInputs = [ pytest ]; @@ -33,11 +36,13 @@ buildPythonPackage rec { appdirs dask holoviews + hvplot jinja2 msgpack-numpy msgpack-python numpy pandas + panel python-snappy requests ruamel_yaml @@ -45,10 +50,15 @@ buildPythonPackage rec { tornado ]; + postPatch = '' + # Is in setup_requires but not used in setup.py... + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + + # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball + # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball checkPhase = '' - # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball - # test_which assumes python for executable name - PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_filtered_compressed_cache and not test_which" + PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_discover and not test_filtered_compressed_cache" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix new file mode 100644 index 00000000000..759c9689bc9 --- /dev/null +++ b/pkgs/development/python-modules/lazr/config.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, lazr_delegates }: + +buildPythonPackage rec { + pname = "lazr.config"; + version = "2.2.1"; + + propagatedBuildInputs = [ lazr_delegates ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn"; + }; +} diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix new file mode 100644 index 00000000000..40e2e47d517 --- /dev/null +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, fetchPypi, nose, zope_interface }: + +buildPythonPackage rec { + pname = "lazr.delegates"; + version = "2.0.4"; + + propagatedBuildInputs = [ nose zope_interface ]; + + doCheck = false; # cannot import name 'ClassType' from 'types' + + src = fetchPypi { + inherit pname version; + sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + }; +} diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 81301f337e6..e22ab22d5a7 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -2,7 +2,7 @@ , pbr, ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { - name = "ldappool-${version}"; + pname = "ldappool"; version = "2.4.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 6babc6ae014..40a4f6f7429 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.5"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "Theano"; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 745f83fe508..c456d67ac49 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -8,7 +8,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "libsoundtouch"; version = "0.4.0"; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 7f9aa3fa2e4..6a497358404 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "llfuse"; version = "1.3.6"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2"; sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"; }; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix new file mode 100644 index 00000000000..fd89260ab94 --- /dev/null +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }: + +buildPythonPackage rec { + pname = "mailman-hyperkitty"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; + }; + + propagatedBuildInputs = [ mailman ]; + checkInputs = [ mock ]; + + checkPhase = '' + python -m nose2 -v + ''; + doCheck = false; + + meta = with stdenv.lib; { + description = "Mailman archiver plugin for HyperKitty"; + homepage = https://gitlab.com/mailman/mailman-hyperkitty; + license = licenses.gpl3; + maintainers = with maintainers; [ globin peti ]; + }; +} diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix new file mode 100644 index 00000000000..95e9e4fdd3e --- /dev/null +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, httplib2 }: + +buildPythonPackage rec { + pname = "mailmanclient"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xsrzdrsmfhnxv68zwm1g6awk7in08k6yhkyd27ipn0mq1wjm5jd"; + }; + + propagatedBuildInputs = [ six httplib2 ]; + + meta = with stdenv.lib; { + homepage = "http://www.gnu.org/software/mailman/"; + description = "REST client for driving Mailman 3"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ peti globin ]; + }; +} diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 04381d73834..876b57dd01f 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch , aws-xray-sdk , backports_tempfile , boto @@ -26,13 +26,21 @@ buildPythonPackage rec { pname = "moto"; - version = "1.3.10"; + version = "1.3.13"; src = fetchPypi { inherit pname version; - sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj"; + sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m"; }; + # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198. + patches = [ + (fetchpatch { + url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff"; + sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb"; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "jsondiff==1.1.2" "jsondiff~=1.1" diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 76494c70b2e..365f741c57f 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -2,20 +2,20 @@ , buildPythonPackage , fetchPypi , isPy3k -, numpy -, six , bz2file -, nose , mock +, nose +, numpy +, six }: buildPythonPackage rec { pname = "nibabel"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17"; + sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw"; }; propagatedBuildInputs = [ @@ -25,16 +25,8 @@ buildPythonPackage rec { checkInputs = [ nose mock ]; - checkPhase = let - excludeTests = lib.optionals isPy3k [ - # https://github.com/nipy/nibabel/issues/691 - "nibabel.gifti.tests.test_giftiio.test_read_deprecated" - "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays" - "nibabel.tests.test_minc1.test_old_namespace" - ]; - # TODO: Add --with-doctest once all doctests pass - in '' - nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests} + checkPhase = '' + nosetests ''; meta = with lib; { diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index e45a0033c82..2da580abd92 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "nilearn"; version = "0.5.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 42fb2de9dca..5f33a5fe63c 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -16,6 +16,7 @@ , packaging , prov , psutil +, pybids , pydot , pytest , pytest_xdist @@ -44,11 +45,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.9"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016"; + sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5"; }; postPatch = '' @@ -79,6 +80,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pybids codecov glibcLocales mock @@ -89,13 +91,11 @@ buildPythonPackage rec { which ]; + # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v --doctest-modules nipype + LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' ''; - # See: https://github.com/nipy/nipype/issues/2839 - doCheck = false; - meta = with stdenv.lib; { homepage = https://nipy.org/nipype/; description = "Neuroimaging in Python: Pipelines and Interfaces"; diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix new file mode 100644 index 00000000000..4151d08b60f --- /dev/null +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nmigen +}: + +buildPythonPackage rec { + pname = "nmigen-boards"; + version = "unstable-2019-08-30"; + realVersion = lib.substring 0 7 src.rev; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "nmigen-boards"; + rev = "3b80b3a3749ae8f123ff258a25e81bd21412aed4"; + sha256 = "01qynxip8bq23jfjc5wjd97vxfvhld2zb8sxphwf0zixrmmyaspi"; + }; + + propagatedBuildInputs = [ nmigen ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'versioneer.get_version()' '"${realVersion}"' + ''; + + meta = with lib; { + description = "Board and connector definitions for nMigen"; + homepage = https://github.com/m-labs/nmigen-boards; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix new file mode 100644 index 00000000000..7375eda4327 --- /dev/null +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pyvcd +, bitarray +, jinja2 + +# nmigen.{test,build} call out to these +, yosys +, symbiyosys +, nextpnr ? null +, icestorm ? null +, trellis ? null + +# for tests +, yices +}: + +buildPythonPackage rec { + pname = "nmigen"; + version = "unstable-2019-08-31"; + realVersion = lib.substring 0 7 src.rev; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "nmigen"; + rev = "2e206220462c67aa6ae97f7515a2191440fd61b3"; + sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa"; + }; + + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ pyvcd bitarray jinja2 ]; + + checkInputs = [ yosys yices ]; + + postPatch = let + tool = pkg: name: + if pkg == null then {} else { "${name}" = "${pkg}/bin/${name}"; }; + + # Only FOSS toolchain supported out of the box, sorry! + toolchainOverrides = + tool yosys "yosys" // + tool symbiyosys "sby" // + tool nextpnr "nextpnr-ice40" // + tool nextpnr "nextpnr-ecp5" // + tool icestorm "icepack" // + tool trellis "ecppack"; + in '' + substituteInPlace setup.py \ + --replace 'versioneer.get_version()' '"${realVersion}"' + + substituteInPlace nmigen/_toolchain.py \ + --replace 'overrides = {}' \ + 'overrides = ${builtins.toJSON toolchainOverrides}' + ''; + + meta = with lib; { + description = "A refreshed Python toolbox for building complex digital hardware"; + homepage = https://github.com/m-labs/nmigen; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index 5dd95380891..6aadd7f4533 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "python-notify-${version}"; + pname = "python-notify"; version = "0.1.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix new file mode 100644 index 00000000000..bce4c0426e4 --- /dev/null +++ b/pkgs/development/python-modules/num2words/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, lib +, fetchPypi +, docopt +, delegator-py +, pytest +}: + +buildPythonPackage rec { + version = "0.5.10"; + pname = "num2words"; + + src = fetchPypi { + inherit pname version; + sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; + }; + + propagatedBuildInputs = [ docopt ]; + + checkInputs = [ delegator-py pytest ]; + + checkPhase = '' + pytest -k 'not cli_with_lang' + ''; + + meta = with lib; { + description = "Modules to convert numbers to words. 42 --> forty-two"; + homepage = "https://github.com/savoirfairelinux/num2words"; + license = licenses.lgpl21; + maintainers = with maintainers; [ jonringer ]; + + longDescription = + "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second"; + }; +} diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 7fb1de53dbd..7e34f3897bc 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "nwdiag"; version = "1.0.4"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; + url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz"; sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa"; }; diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix new file mode 100644 index 00000000000..eac2751ce3e --- /dev/null +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -0,0 +1,17 @@ +{ stdenv +, fetchFromGitHub +}: rec { + version = "2.6.0"; + src = fetchFromGitHub { + owner = "openrazer"; + repo = "openrazer"; + rev = "v${version}"; + sha256 = "1s5irs3avrlp891mxan3z8p55ias9rq26rqp2qrlcc6i4vl29di0"; + }; + meta = with stdenv.lib; { + homepage = https://openrazer.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ roelvandijk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix new file mode 100644 index 00000000000..6e3ab1e7833 --- /dev/null +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -0,0 +1,45 @@ +{ buildPythonApplication +, daemonize +, dbus-python +, fetchFromGitHub +, fetchpatch +, gobject-introspection +, gtk3 +, makeWrapper +, pygobject3 +, pyudev +, setproctitle +, stdenv +, wrapGAppsHook +}: + +let + common = import ./common.nix { inherit stdenv fetchFromGitHub; }; +in +buildPythonApplication (common // rec { + pname = "openrazer_daemon"; + + sourceRoot = "source/daemon"; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + propagatedBuildInputs = [ + daemonize + dbus-python + gobject-introspection + gtk3 + pygobject3 + pyudev + setproctitle + ]; + + postBuild = '' + DESTDIR="$out" PREFIX="" make install manpages + ''; + + meta = common.meta // { + description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux"; + }; +}) diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix new file mode 100644 index 00000000000..2f9ff467b2d --- /dev/null +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, dbus-python +, fetchFromGitHub +, numpy +, stdenv +, openrazer-daemon +}: + +let + common = import ./common.nix { inherit stdenv fetchFromGitHub; }; +in +buildPythonPackage (common // rec { + pname = "openrazer"; + + sourceRoot = "source/pylib"; + + propagatedBuildInputs = [ + dbus-python + numpy + openrazer-daemon + ]; + + meta = common.meta // { + description = "An entirely open source Python library that allows you to manage your Razer peripherals on GNU/Linux"; + }; +}) diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 73230b2e8fb..4c0d4346ee7 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 # This is not the "released" 3.0.0 just a commit version = "3.0.0"; - name = "ovito-${version}"; + pname = "ovito"; src = fetchgit { url = "https://gitlab.com/stuko/ovito"; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index fccd46c605d..4c88f0e1e4b 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -11,18 +11,13 @@ buildPythonPackage rec { pname = "panel"; - version = "0.4.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98"; + sha256 = "04w8jjlf7yz3k84xnacahczc9mmddqyp756rj3n8hclks9c1ww40"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "testpath<0.4" "testpath" - ''; - propagatedBuildInputs = [ bokeh param diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 69a2e61e269..cb27fdb64e5 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.8.2"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01"; + sha256 = "1dbnviszdq3d2k3dfwpimb0adf27yzwm4iyv42rk8xvd8c6p9gdi"; }; checkInputs = [ flake8 nose ]; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 0183379ac00..029ce4a1712 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "paramz"; version = "0.9.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 24539c7bbce..6f82c446a1f 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "passlib"; version = "1.7.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix new file mode 100644 index 00000000000..318642a393a --- /dev/null +++ b/pkgs/development/python-modules/path.py/2.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-flake8 +, glibcLocales +, packaging +, isPy27 +, backports_os +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "path.py"; + version = "11.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; + }; + + checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + importlib-metadata + ] ++ lib.optional isPy27 backports_os + ; + + LC_ALL = "en_US.UTF-8"; + + meta = { + description = "A module wrapper for os.path"; + homepage = https://github.com/jaraco/path.py; + license = lib.licenses.mit; + }; + + checkPhase = '' + # ignore performance test which may fail when the system is under load + py.test -v -k 'not TestPerformance' + ''; +} diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 318642a393a..d3c3206faba 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -9,15 +9,16 @@ , isPy27 , backports_os , importlib-metadata +, fetchpatch }: buildPythonPackage rec { pname = "path.py"; - version = "11.5.2"; + version = "12.0.1"; src = fetchPypi { inherit pname version; - sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; + sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f"; }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; @@ -39,4 +40,12 @@ buildPythonPackage rec { # ignore performance test which may fail when the system is under load py.test -v -k 'not TestPerformance' ''; + + patches = [ + (fetchpatch { + url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch; + sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; + }) + ]; + } diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 39a2789a360..8fb6259c574 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "pathspec"; version = "0.5.9"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index b9c4a62f0de..6d2e8169eb7 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.16"; + version = "8.10.17"; src = fetchPypi { inherit pname version; - sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b"; + sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9"; }; meta = { diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c2662915b12..025b17d19ae 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.1.0"; + version = "1.6.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z"; }; buildInputs = [ @@ -55,8 +55,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml lxml ]; postPatch = '' - substituteInPlace requirements/test.txt \ - --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + sed -i \ + -e 's/^pytest .*/pytest/g' \ + -e 's/^attrs .*/attrs/g' \ + -e 's/^hypothesis .*/hypothesis/g' \ + requirements/test.txt ''; preBuild = '' @@ -70,4 +73,3 @@ buildPythonPackage rec { maintainers = [ maintainers.kiwi ]; }; } - diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index b35c9de19dc..f8db636520f 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -11,11 +11,10 @@ buildPythonPackage rec { version = "2.7"; pname = "powerline"; - name = pname + "-" + version; src = fetchurl { url = "https://github.com/powerline/powerline/archive/${version}.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5"; }; diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 6b65af073f4..7b5377cc15a 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -14,12 +14,12 @@ buildPythonApplication rec { pname = "pre-commit"; - version = "1.18.1"; + version = "1.18.2"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp"; + sha256 = "1y6gd6nq8mfyjxknrgdryvn1bj5arvwaz2r00h41g054lfg3iki1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 20d3eb31b0f..e54fd1521b3 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: + buildPythonPackage rec { pname = "py"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694"; + sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix new file mode 100644 index 00000000000..8779ad36ca2 --- /dev/null +++ b/pkgs/development/python-modules/pybids/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, lib +, fetchPypi +, isPy27 +, num2words +, numpy +, scipy +, pandas +, nibabel +, patsy +, bids-validator +, sqlalchemy +, pytest +, pathlib +}: + +buildPythonPackage rec { + version = "0.9.2"; + pname = "pybids"; + + src = fetchPypi { + inherit pname version; + sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs"; + }; + + propagatedBuildInputs = [ + num2words + numpy + scipy + pandas + nibabel + patsy + bids-validator + sqlalchemy + ]; + + checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python tools for querying and manipulating BIDS datasets"; + homepage = https://github.com/bids-standard/pybids; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index f49c50185db..1b89cb5ada7 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4"; + sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr"; }; patches = [ diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index eb6de23e0ea..1cd95c83fa2 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "pyblock-${version}"; + pname = "pyblock"; version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = pkgs.fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix index 192d60cec46..c441cea5f45 100644 --- a/pkgs/development/python-modules/pycuda/compyte.nix +++ b/pkgs/development/python-modules/pycuda/compyte.nix @@ -5,7 +5,6 @@ mkDerivation rec { pname = "compyte"; version = "git-20150817"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "inducer"; diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix index e393265ae37..b5ca0c7ef6c 100644 --- a/pkgs/development/python-modules/pyev/default.nix +++ b/pkgs/development/python-modules/pyev/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "pyev"; version = "0.9.0"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/p/pyev/${name}.tar.gz"; + url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz"; sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; }; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 2b20ba95600..bf92f7360dd 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -12,11 +12,10 @@ in buildPythonPackage rec { pname = "pyftgl"; version = "0.4b"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "umlaeute"; - repo = name; + repo = "${pname}-${version}"; rev = version; sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 4826db3a8c0..d685e3541f9 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { pname = "pygobject"; version = "2.28.6"; format = "other"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; + url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; @@ -31,7 +30,7 @@ buildPythonPackage rec { # used to select a specific version, in our setup it should have no # effect, but we leave it in case somebody expects and calls it. postInstall = '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth} + mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} # Prevent wrapping of codegen files as these are meant to be # executed by the python program diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index a03be0ac04d..947b5733a7e 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pygtksourceview"; format = "other"; version = "2.10.1"; - name = pname + "-" + version; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index c02c0361cf2..10bfb0d72b6 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytestcov pytest ]; + postPatch = '' + substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" + ''; + meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix index 0770520ceee..4a5a5c5e1f9 100644 --- a/pkgs/development/python-modules/pykde4/default.nix +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -1,8 +1,10 @@ -{ pyqt4, - stdenv, callPackage, fetchurl, cmake, automoc4, sip }: +{ pyqt4, openssl_1_0_2 +, stdenv, callPackage, fetchurl, cmake, automoc4, sip }: let - kdelibs = callPackage ./kdelibs.nix {}; + kdelibs = callPackage ./kdelibs.nix { + openssl = openssl_1_0_2; + }; sip4_19_3 = sip.overrideAttrs (oldAttrs: rec { src = fetchurl { url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz"; @@ -14,10 +16,10 @@ let }); in stdenv.mkDerivation rec { version = "4.14.3"; - name = "pykde4-${version}"; + pname = "pykde4"; src = fetchurl { - url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz"; + url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz"; sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz"; }; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index c5e148d1500..9803e7800c3 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -2,14 +2,14 @@ stdenv, fetchurl, automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, attica, docbook_xml_dtd_42, docbook_xsl, giflib, - libdbusmenu_qt, libjpeg, phonon, qt4 + libdbusmenu_qt, libjpeg, phonon, qt4, openssl }: stdenv.mkDerivation rec { version = "4.14.38"; - name = "kdelibs-${version}"; + pname = "kdelibs"; src = fetchurl { - url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz"; + url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz"; sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info ]; buildInputs = [ - attica giflib libdbusmenu_qt libjpeg + attica giflib libdbusmenu_qt libjpeg openssl ]; propagatedBuildInputs = [ qt4 phonon ]; diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index 97fbe28e50d..f366f6e57f6 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pylibacl"; version = "0.5.3"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index fb2e9abe065..1561c3c4d6d 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/pyca/pynacl/issues/550 + PYTEST_ADDOPTS = "-k 'not test_wrong_types'"; + meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 47a73c9c80a..ca606767f4d 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "pyocr"; version = "0.5.3"; - name = pname + "-" + version; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 1a477ab2328..3defe979d37 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - name = "pyparted-${version}"; + pname = "pyparted"; version = "3.10.7"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index 76503122a1b..0313632e6fd 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -2,7 +2,7 @@ , isPy3k, isPyPy }: buildPythonPackage rec { - name = "pypillowfight-${version}"; + pname = "pypillowfight"; version = "0.2.4"; src = fetchFromGitLab { diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 7d745aa9e10..b48f21b9e78 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, pythonPackages, pkgconfig , qmake, qtbase, qtsvg, qtwebengine +, wrapQtAppsHook }: let @@ -77,9 +78,12 @@ in buildPythonPackage rec { doCheck = true; - enableParallelBuilding = true; + passthru = { + inherit wrapQtAppsHook; + }; + meta = with lib; { description = "Python bindings for Qt5"; homepage = http://www.riverbankcomputing.co.uk; diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 65ff765a584..8851b046414 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -13,8 +13,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "Pyro4"; version = "4.75"; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index a2b614ba3b8..cabb96d2256 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.11"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"; + sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index bab8e502b9c..06e2690c111 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,5 +1,13 @@ { stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: +let + # Package does not support configuring the pcsc library. + withApplePCSC = stdenv.isDarwin; + + inherit (stdenv.lib) getLib getDev optionalString optionals; + inherit (stdenv.hostPlatform.extensions) sharedLibrary; +in + buildPythonPackage rec { version = "1.9.8"; pname = "pyscard"; @@ -9,24 +17,28 @@ buildPythonPackage rec { sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm"; }; - postPatch = '' - sed -e 's!"libpcsclite\.so\.1"!"${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1"!' \ - -i smartcard/scard/winscarddll.c + postPatch = if withApplePCSC then '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' else '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "libpcsclite.so.1" \ + "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}" ''; - NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; + NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) + "-I ${getDev pcsclite}/include/PCSC"; - patches = [ - # Fixes darwin tests - # See: https://github.com/LudovicRousseau/pyscard/issues/77 - (fetchpatch { - url = "https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7.patch"; - sha256 = "1lr55npcpc8j750vf7vaisqyk18d5f00l7nii2lvawg4sssjaaf7"; - }) - ]; + # The error message differs depending on the macOS host version. + # Since Nix reports a constant host version, but proxies to the + # underlying library, it's not possible to determine the correct + # expected error message. This patch allows both errors to be + # accepted. + # See: https://github.com/LudovicRousseau/pyscard/issues/77 + patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ]; - propagatedBuildInputs = [ pcsclite ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC; + propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; nativeBuildInputs = [ swig ]; meta = { diff --git a/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch b/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch new file mode 100644 index 00000000000..62b20477c9f --- /dev/null +++ b/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch @@ -0,0 +1,22 @@ +diff --git a/test/test_SCardGetErrorMessage.py b/test/test_SCardGetErrorMessage.py +old mode 100644 +new mode 100755 +index c6fe755..c1217f5 +--- a/test/test_SCardGetErrorMessage.py ++++ b/test/test_SCardGetErrorMessage.py +@@ -29,12 +29,10 @@ class TestError(unittest.TestCase): + self.assertEqual(res, expected) + + res = SCardGetErrorMessage(1) ++ expected = "Unknown error: 0x00000001" + # macOS bug not yet fixed +- if get_platform().startswith('macosx-') and get_platform() < 'macosx-10.13': +- expected = "Unkown error: 0x00000001" +- else: +- expected = "Unknown error: 0x00000001" +- self.assertEqual(res, expected) ++ macos_bug_expected = "Unkown error: 0x00000001" ++ self.assertIn(res, [expected, macos_bug_expected]) + + + if __name__ == '__main__': diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 3085ee06e87..0ef79cd0989 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ansible , pytest , mock @@ -8,11 +8,13 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "2.0.2"; + version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f"; + src = fetchFromGitHub { + owner = "ansible"; + repo = "pytest-ansible"; + rev = "v${version}"; + sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0"; }; patchPhase = '' @@ -24,11 +26,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; propagatedBuildInputs = [ ansible pytest ]; - # tests not included with release + # tests not included with release, even on github doCheck = false; checkPhase = '' - pytest + HOME=$TMPDIR pytest tests/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix new file mode 100644 index 00000000000..088f8702436 --- /dev/null +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +}: + +buildPythonPackage rec { + version = "1.0.4"; + pname = "pytest-random-order"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ pytest ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jbasko/pytest-random-order"; + description = "Randomise the order of tests with some control over the randomness"; + license = licenses.mit; + maintainers = [ maintainers.prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b61bc8d5fa5..a2796fba5d8 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +, setuptools_scm, pytest-forked, filelock, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; @@ -13,6 +14,10 @@ buildPythonPackage rec { checkInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked six ]; + # Encountered a memory leak + # https://github.com/pytest-dev/pytest-xdist/issues/462 + doCheck = !isPy3k; + checkPhase = '' # Excluded tests access file system py.test testing -k "not test_distribution_rsyncdirs_example \ diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/2.nix index 2b4dd41bc2e..7a43a2e2517 100644 --- a/pkgs/development/python-modules/pytest/3.10.nix +++ b/pkgs/development/python-modules/pytest/2.nix @@ -1,9 +1,9 @@ { stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2 +, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "3.10.1"; + version = "4.6.5"; pname = "pytest"; preCheck = '' @@ -13,18 +13,19 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"; + sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; }; checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 96001a2d952..7866454a62f 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.3"; + version = "5.1.0"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45"; + sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031"; }; checkInputs = [ hypothesis mock ]; @@ -23,9 +23,10 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py runHook postCheck ''; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 47e269c2ff5..beb57ac491a 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -3,11 +3,11 @@ # Should be bumped along with EFL! buildPythonPackage rec { - name = "python-efl-${version}"; + pname = "python-efl"; version = "1.22.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63"; }; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 4eb2daaf26d..a9377c4a1c2 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -25,6 +25,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/mpdavis/python-jose/issues/149 + PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'"; + propagatedBuildInputs = [ future six ecdsa rsa ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index c7709c4886d..e967ba9934d 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.6"; + version = "2.1.10"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1gx228946c2w645sh190m7ixfd0zfkdl3i8ybga77jz2sn1chzdi"; + sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; }; buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix new file mode 100644 index 00000000000..e21f01d5cd6 --- /dev/null +++ b/pkgs/development/python-modules/python-pipedrive/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, httplib2 +}: + +buildPythonPackage rec { + pname = "python-pipedrive"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f8qiyl82bpwxwjw2746vdvkps2010mvn1x9b6j6ppmifff2d4pl"; + }; + + propagatedBuildInputs = [ httplib2 ]; + + doCheck = false; # Tests are not provided. + + meta = with stdenv.lib; { + description = "Python library for interacting with the pipedrive.com API"; + homepage = "https://github.com/jscott1989/python-pipedrive"; + license = licenses.unfree; + maintainers = with maintainers; [ mrmebelman ]; + }; +} diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 1ff1f651264..24f56ae53b2 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "python-fedora"; version = "0.10.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index f667e09892c..7a137f5204c 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pyxattr"; version = "0.6.1"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 91c2009744f..06010b40ed9 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -11,7 +11,7 @@ disabledIf (isPy3k || isPyPy) (buildPythonPackage rec { # TODO: Qt5 support - name = "qscintilla-${version}"; + pname = "qscintilla"; version = pkgs.qscintilla.version; format = "other"; diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index aaa095c5398..9644055b007 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "python-recursive-pth-loader"; version = "1.0"; - name = pname + "-" + version; dontUnpack = true; diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix new file mode 100644 index 00000000000..81428b44ad9 --- /dev/null +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "robot-detection"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx"; + }; + + propagatedBuildInputs = [ six ]; + + # no tests in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for detecting if a HTTP User Agent header is likely to be a bot"; + homepage = https://github.com/rory/robot-detection; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 8bac32ba911..4db1db04acc 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { version = "1.2.3"; pname = "robotframework-ride"; disabled = isPy3k; - name = pname + "-" + version; src = fetchurl { - url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz"; sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; }; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index d0e5b13ddbe..b5ca464938b 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.4.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "fc5b5db63cf63a937bd4ada1a8b7508ec8a75d9454fa75e6410cbe72fd718de9"; + sha256 = "21fa0183776e6061366f517765db479aaa634b707f3dd9d90ef6972adae6a755"; }; # unit tests are impure diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 3164be5aa86..bbe20fd1e82 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -4,12 +4,11 @@ buildPythonPackage rec { pname = "rpkg"; version = "1.50"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { - url = "https://releases.pagure.org/rpkg/${name}.tar.gz"; + url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz"; sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv"; }; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index a69ab0d27a3..93488917017 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a"; + sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 079e88378c0..7bb66be3096 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -6,8 +6,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "selectors34"; version = "1.2"; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 158d9a054df..1f6307f2cbb 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "seqdiag"; version = "0.9.6"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; + url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; }; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 5ea59eb6a2a..887d0c54424 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -9,8 +9,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "serpent"; version = "1.27"; diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix index ac625cf1fa0..514a3005725 100644 --- a/pkgs/development/python-modules/smugline/default.nix +++ b/pkgs/development/python-modules/smugline/default.nix @@ -8,7 +8,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "smugline"; version = "20160106"; diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix index 5eb8d77a244..c2028228c31 100644 --- a/pkgs/development/python-modules/smugpy/default.nix +++ b/pkgs/development/python-modules/smugpy/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - name = pname + "-" + version; pname = "smugpy"; version = "20131218"; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 3309f1e9978..f1455f945a9 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "sphfile"; version = "1.0.1"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/s/sphfile/${name}.tar.gz"; + url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz"; sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8"; }; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 9a414e31360..70471aedbd7 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "spotipy"; version = "2.4.4"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index c7ff2e56f02..beb19b64f5f 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,41 +1,29 @@ -{ lib -, fetchPypi -, fetchpatch -, buildPythonPackage -, pytest +{ lib, fetchPypi, buildPythonPackage, isPy3k , mock -, isPy3k , pysqlite +, pytest }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.2.14"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04"; + sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1"; }; - patches = [ - # fix for failing doc tests - # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail - (fetchpatch { - name = "doc-test-fixes.patch"; - url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw; - sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri"; - }) - ]; - checkInputs = [ pytest mock -# Disable pytest_xdist tests for now, because our version seems to be too new. -# pytest_xdist ] ++ lib.optional (!isPy3k) pysqlite; + postInstall = '' + sed -e 's:--max-worker-restart=5::g' -i setup.cfg + ''; + checkPhase = '' - py.test -k "not test_round_trip_direct_type_affinity" + pytest test ''; meta = with lib; { diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 51c80e0fa91..7821c7b3d74 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -8,11 +8,10 @@ buildPythonPackage rec { pname = "python-sybase"; version = "0.40pre2"; - name = pname + "-" + version; disabled = isPy3k; src = fetchurl { - url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j"; }; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index ec5b3b325dd..cbe2a213191 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "systemd"; version = "234"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "systemd"; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index 318c47d2160..4eff644a161 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { version = "0.5.3-2016-09-28"; - name = "tempita-${version}"; + pname = "tempita"; src = fetchFromGitHub { owner = "gjhiggins"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 70488a0d9dc..5f808bafe6f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -58,8 +58,23 @@ let variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; - # TODO: remove after there's support for setupPyDistFlags - setuppy = ../../../development/interpreters/python/run_setup.py; + pythonEnv = python.withPackages (_: + [ # python deps needed during wheel build time + numpy + keras-preprocessing + protobuf + wrapt + gast + astor + absl-py + termcolor + keras-applications + setuptools + wheel + ] ++ lib.optionals (!isPy3k) + [ future + mock + ]); bazel-build = buildBazelPackage rec { name = "${pname}-${version}"; @@ -96,29 +111,17 @@ let # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - swig which cython + swig which pythonEnv ]; buildInputs = [ - python jemalloc openmpi glibcLocales git - # python deps needed during wheel build time - numpy - keras-preprocessing - protobuf - wrapt - gast - astor - absl-py - termcolor - keras-applications - # libs taken from system through the TF_SYS_LIBS mechanism - grpc + # grpc sqlite openssl jsoncpp @@ -133,20 +136,12 @@ let giflib re2 pkgs.lmdb - - # for building the wheel - setuptools - wheel - ] ++ lib.optionals (!isPy3k) [ - future - mock ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn nvidia_x11 ]; - # arbitrarily set to the current latest bazel version, overly careful TF_IGNORE_MAX_BAZEL_VERSION = true; @@ -169,7 +164,8 @@ let "flatbuffers" "gast_archive" "gif_archive" - "grpc" + # Lots of errors, requires an older version + # "grpc" "hwloc" "icu" "jpeg" @@ -193,8 +189,8 @@ let INCLUDEDIR = "${includes_joined}/include"; - PYTHON_BIN_PATH = python.interpreter; - + PYTHON_BIN_PATH = pythonEnv.interpreter; + TF_NEED_GCP = true; TF_NEED_HDFS = true; TF_ENABLE_XLA = tfFeature xlaSupport; @@ -236,6 +232,9 @@ let export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages" export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}" mkdir -p "$PYTHON_LIB_PATH" + + # To avoid mixing Python 2 and Python 3 + unset PYTHONPATH ''; configurePhase = '' @@ -245,8 +244,7 @@ let ''; # FIXME: Tensorflow uses dlopen() for CUDA libraries. - # No idea why gpr isn't linked properly; perhaps Tensorflow expects a static library? - NIX_LDFLAGS = [ "-lgpr" ] ++ lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; + NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; hardeningDisable = [ "format" ]; @@ -261,15 +259,14 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; fetchAttrs = { - preInstall = '' - rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} - ''; + # So that checksums don't depend on these. + TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "19ll3f1i5qzd7ngz3m2jbxzgcrdjx5sv6kv2j5mcb8g3xsws8j5x" + "196pm3ynfafqlcxah07hkvphf536hpix1ydgsynr1yg08aynlvvx" else - "0y9kw3k4yvrxwdy7zry7nip9mdiwyv35r6mx65g4w7qajiypfc7i"; + "138r85n27ijzwxfwb5pcfyb79v14368jpckw0vmciz6pwf11bd9g"; }; buildAttrs = { @@ -314,13 +311,7 @@ in buildPythonPackage rec { rm $out/bin/tensorboard ''; - # TODO: remove after there's support for setupPyDistFlags - buildPhase = '' - runHook preBuild - cp ${setuppy} nix_run_setup - ${python.interpreter} nix_run_setup --project_name ${pname} bdist_wheel - runHook postBuild - ''; + setupPyGlobalFlags = [ "--project_name ${pname}" ]; # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index cd4a30f656a..f4c498bed95 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.9"; + version = "3.9.10"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380"; + sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 0915bc300c5..0413fd33f6f 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { version = "0.2.1"; pname = "torchvision"; - name = "${pname}-${version}"; format = "wheel"; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 47aa23ca114..9b7dc424ddc 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -26,9 +26,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic ]; - # build requires UTF-8 locale - LANG = "en_US.UTF-8"; - checkInputs = [ pytest ]; @@ -36,7 +33,7 @@ buildPythonPackage rec { # disable test_tx_api.py as it requires being online checkPhase = '' runHook preCheck - ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py + ${python.interpreter} -m pytest --pyargs trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py runHook postCheck ''; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 5c5ecd8949a..51e634d2439 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -5,11 +5,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.6.6"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d"; + sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk"; }; # Error for Python3.6: ImportError: cannot import name 'ann_module' diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index 416c857bdc6..95c0d628697 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { pname = "umemcache"; version = "1.6.3"; disabled = isPy3k; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/u/umemcache/${name}.zip"; + url = "mirror://pypi/u/umemcache/${pname}-${version}.zip"; sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; }; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 35afe10f8d2..dcb8eca187e 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPackages, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "unicorn"; version = "1.0.1"; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 6835f8c48e0..cf3d36c3e5d 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "uritools"; version = "2.2.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index ffd99734f93..31e6e6a066a 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "urlgrabber"; version = "4.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index bcbaa0b728c..8b397d3c42c 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "usbtmc"; version = "0.8"; - name = pname + "-" + version; src = fetchurl { url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 9c3dae74a79..2093f4d7053 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -1,23 +1,33 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pyopenssl , libuv , psutil , isPy27 +, CoreServices +, ApplicationServices }: buildPythonPackage rec { pname = "uvloop"; - version = "0.12.2"; + version = "0.13.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f"; + sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l"; }; - buildInputs = [ libuv ]; + buildInputs = [ + libuv + ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + + postPatch = '' + # Removing code linting tests, which we don't care about + rm tests/test_sourcecode.py + ''; checkInputs = [ pyopenssl psutil ]; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index cbf82ca7ca3..b3d397b97b4 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.4"; + version = "0.15.5"; src = fetchPypi { inherit pname version; - sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6"; + sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6"; }; propagatedBuildInputs = [ itsdangerous ]; diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 584200ff2b0..8b30cc6be87 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -21,7 +21,6 @@ assert wxGTK.unicode; buildPythonPackage rec { pname = "wxPython"; version = "3.0.2.0"; - name = pname + "-" + version; disabled = isPy3k || isPyPy; doCheck = false; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e813e550f6e..995f13853a2 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -308,7 +308,7 @@ let RcppGSL = [ pkgs.gsl_1 ]; RcppZiggurat = [ pkgs.gsl_1 ]; reprex = [ pkgs.which ]; - rgdal = [ pkgs.proj pkgs.gdal ]; + rgdal = [ pkgs.proj.dev pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ]; @@ -420,7 +420,7 @@ let odbc = [ pkgs.pkgconfig ]; openssl = [ pkgs.pkgconfig ]; pdftools = [ pkgs.pkgconfig ]; - sf = [ pkgs.pkgconfig ]; + sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ]; showtext = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 58e72e4a9f4..f0727b3c170 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -36,7 +36,7 @@ let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // { + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" ] // { inherit preferLocalBuild allowSubstitutes; # pass the defaults buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8656a3c0ef0..68c2011205a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -19,13 +19,13 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick -, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi +, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz -, bison, flex, pango, python3, patchelf -, libselinux ? null, libsepol ? null +, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk +, bundler, libsass, libselinux ? null, libsepol ? null }@args: let @@ -42,8 +42,9 @@ in { atk = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre rake ]; + dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; + nativeBuildInputs = [ rake bundler pkgconfig ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ]; }; bundler = attrs: @@ -85,6 +86,38 @@ in buildInputs = [ protobuf ]; }; + cocoapods-acknowledgements = attrs: { + dependencies = attrs.dependencies ++ [ "cocoapods" ]; + }; + + cocoapods-deploy = attrs: { + dependencies = [ "cocoapods" ]; + }; + + cocoapods-disable-podfile-validations = attrs: { + dependencies = [ "cocoapods" ]; + }; + + cocoapods-generate = attrs: { + dependencies = attrs.dependencies ++ [ "cocoapods" ]; + }; + + cocoapods-git_url_rewriter = attrs: { + dependencies = [ "cocoapods" ]; + }; + + cocoapods-keys = attrs: { + dependencies = attrs.dependencies ++ [ "cocoapods" ]; + }; + + cocoapods-open = attrs: { + dependencies = [ "cocoapods" ]; + }; + + cocoapods-try-release-fix = attrs: { + dependencies = [ "cocoapods" ]; + }; + curb = attrs: { buildInputs = [ curl ]; }; @@ -113,12 +146,13 @@ in ''; }; - fog-dnsimple = attrs: { - postInstall = '' - cd $(cat $out/nix-support/gem-meta/install-path) - rm {$out/bin,bin,../../bin}/{setup,console} - ''; - }; + fog-dnsimple = attrs: + lib.optionalAttrs (lib.versionOlder attrs.version "1.0.1") { + postInstall = '' + cd $(cat $out/nix-support/gem-meta/install-path) + rm {$out/bin,bin,../../bin}/{setup,console} + ''; + }; redis-rack = attrs: { dontBuild = false; @@ -158,8 +192,8 @@ in }; gdk_pixbuf2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rake gdk-pixbuf ]; + nativeBuildInputs = [ pkgconfig bundler rake ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; }; gpgme = attrs: { @@ -179,8 +213,14 @@ in }; gtk2 = attrs: { - nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ]; - buildInputs = [ + nativeBuildInputs = [ + binutils pkgconfig + ] ++ lib.optionals stdenv.isLinux [ + utillinux libselinux libsepol + ]; + propagatedBuildInputs = [ + atk + gdk-pixbuf fribidi gobject-introspection gtk2 @@ -194,8 +234,8 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobject-introspection gtk2 pcre ]; + nativeBuildInputs = [ pkgconfig pcre ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; grpc = attrs: { @@ -252,6 +292,10 @@ in buildFlags = [ "--with-system-v8=true" ]; }; + execjs = attrs: { + propagatedBuildInputs = [ v8 ]; + }; + libxml-ruby = attrs: { buildFlags = [ "--with-xml2-lib=${libxml2.out}/lib" @@ -346,16 +390,15 @@ in }; pango = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ + pkgconfig fribidi - gobject-introspection - gtk2 harfbuzz pcre xorg.libpthreadstubs xorg.libXdmcp ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ]; }; patron = attrs: { @@ -393,7 +436,12 @@ in " ''; } else { - buildInputs = [ libsodium ]; + dontBuild = false; + postPatch = '' + substituteInPlace lib/rbnacl/sodium.rb \ + --replace 'ffi_lib ["sodium"' \ + 'ffi_lib ["${libsodium}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; }; re2 = attrs: { @@ -452,6 +500,12 @@ in sassc = attrs: { nativeBuildInputs = [ rake ]; + dontBuild = false; + SASS_LIBSASS_PATH = "${libsass}"; + postPatch = '' + substituteInPlace lib/sassc/native.rb \ + --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' + ''; }; scrypt = attrs: @@ -484,7 +538,7 @@ in sup = attrs: { dontBuild = false; # prevent sup from trying to dynamically install `xapian-ruby`. - nativeBuildInputs = [ rake ]; + nativeBuildInputs = [ bundler rake ]; postPatch = '' cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb @@ -519,6 +573,7 @@ in tiny_tds = attrs: { nativeBuildInputs = [ pkgconfig openssl ]; + buildInputs = [ freetds ]; }; therubyracer = attrs: { @@ -554,13 +609,13 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - nativeBuildInputs = [ rake pkgconfig ]; - buildInputs = [ xapian_1_2_22 zlib ]; + nativeBuildInputs = [ rake pkgconfig bundler ]; + buildInputs = [ xapian zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile ''; preInstall = '' - export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config + export XAPIAN_CONFIG=${xapian}/bin/xapian-config ''; }; diff --git a/pkgs/development/ruby-modules/gem/gem-post-build.rb b/pkgs/development/ruby-modules/gem/gem-post-build.rb index f0322b67f61..b754f945986 100644 --- a/pkgs/development/ruby-modules/gem/gem-post-build.rb +++ b/pkgs/development/ruby-modules/gem/gem-post-build.rb @@ -7,7 +7,7 @@ ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name']) out = ENV["out"] bin_path = File.join(ENV["out"], "bin") gem_home = ENV["GEM_HOME"] -gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR) +gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR).uniq install_path = Dir.glob("#{gem_home}/gems/*").first gemspec_path = ARGV[0] diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile new file mode 100644 index 00000000000..0cd04f07b94 --- /dev/null +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -0,0 +1,159 @@ +source 'https://rubygems.org' do + gem 'addressable' + gem 'atk' + gem 'awesome_print' + gem 'bacon' + # gem 'bundler' already got a package for that + gem 'byebug' + gem 'cairo' + gem 'cairo-gobject' + gem 'camping' + # gem 'capybara-webkit' takes too long to build right now since webkit depends on ruby + gem 'charlock_holmes' + gem 'cld3' + gem 'cocoapods' + gem 'cocoapods-acknowledgements' + gem 'cocoapods-art' + gem 'cocoapods-bin' + gem 'cocoapods-browser' + gem 'cocoapods-bugsnag' + gem 'cocoapods-check' + gem 'cocoapods-clean' + gem 'cocoapods-clean_build_phases_scripts' + gem 'cocoapods-core' + gem 'cocoapods-coverage' + gem 'cocoapods-deintegrate' + gem 'cocoapods-dependencies' + gem 'cocoapods-deploy' + gem 'cocoapods-downloader' + gem 'cocoapods-expert-difficulty' + gem 'cocoapods-fix-react-native' + gem 'cocoapods-generate' + gem 'cocoapods-git_url_rewriter' + gem 'cocoapods-keys' + gem 'cocoapods-no-dev-schemes' + gem 'cocoapods-open' + gem 'cocoapods-packager' + gem 'cocoapods-playgrounds' + gem 'cocoapods-plugins' + gem 'cocoapods-prune-localizations' + gem 'cocoapods-rome' + gem 'cocoapods-search' + gem 'cocoapods-sorted-search' + gem 'cocoapods-static-swift-framework' + gem 'cocoapods-stats' + gem 'cocoapods-tdfire-binary' + gem 'cocoapods-testing' + gem 'cocoapods-trunk' + gem 'cocoapods-try' + gem 'cocoapods-try-release-fix' + gem 'cocoapods-update-if-you-dare' + gem 'cocoapods-whitelist' + gem 'cocoapods-wholemodule' + gem 'coderay' + gem 'concurrent-ruby' + gem 'curb' + gem 'curses' + gem 'daemons' + gem 'dep-selector-libgecode' + gem 'digest-sha3' + gem 'domain_name' + gem 'do_sqlite3' + gem 'ethon' + gem 'eventmachine' + gem 'excon' + gem 'faraday' + gem 'ffi' + gem 'ffi-rzmq-core' + gem 'fog-dnsimple' + gem 'gdk_pixbuf2' + gem 'gio2' + gem 'gitlab-markup' + gem 'glib2' + # gem 'gobject-introspection' fails on require + gem 'gpgme' + # gem 'grpc' fails to build + gem 'gtk2' + gem 'hashie' + gem 'highline' + gem 'hike' + gem 'hitimes' + gem 'hpricot' + gem 'httpclient' + gem 'http-cookie' + gem 'iconv' + gem 'idn-ruby' + gem 'jbuilder' + gem 'jekyll' + gem 'jmespath' + gem 'jwt' + gem 'libv8' + gem 'libxml-ruby' + gem 'magic' + gem 'markaby' + gem 'method_source' + gem 'mini_magick' + gem 'msgpack' + gem 'mysql2' + # gem 'mysql' deprecated + gem 'ncursesw' + gem 'netrc' + gem 'net-scp' + gem 'net-ssh' + gem 'nokogiri' + gem 'opus-ruby' + gem 'ovirt-engine-sdk' + gem 'pango' + gem 'patron' + gem 'pcaprub' + gem 'pg' + gem 'pry' + gem 'pry-byebug' + gem 'pry-doc' + gem 'public_suffix' + gem 'puma' + gem 'rails' + gem 'rainbow' + # gem 'rbczmq' deprecated + gem 'rbnacl' + gem 'rb-readline' + gem 're2' + gem 'redis' + gem 'redis-rack' + gem 'rest-client' + gem 'rmagick' + gem 'rpam2' + gem 'rspec' + gem 'rubocop' + gem 'rubocop-performance' + gem 'ruby-libvirt' + gem 'ruby-lxc' + gem 'ruby-progressbar' + gem 'ruby-terminfo' + gem 'ruby-vips' + gem 'rubyzip' + gem 'rugged' + gem 'sassc' + gem 'scrypt' + gem 'semian' + gem 'sequel' + gem 'sequel_pg' + gem 'simplecov' + gem 'sinatra' + gem 'slop' + gem 'snappy' + gem 'sqlite3' + gem 'taglib-ruby' + gem 'therubyracer' + gem 'thrift' + gem 'tilt' + gem 'tiny_tds' + gem 'treetop' + gem 'typhoeus' + gem 'tzinfo' + gem 'unf_ext' + gem 'uuid4r' + gem 'whois' + # gem 'xapian-ruby' doesn't contain ruby code + gem 'zookeeper' +end diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix new file mode 100644 index 00000000000..ac0a33f4561 --- /dev/null +++ b/pkgs/development/ruby-modules/with-packages/default.nix @@ -0,0 +1,75 @@ +{ stdenv, lib, buildEnv, buildRubyGem, ruby, gemConfig, makeWrapper }: + +/* +Example usage: +nix-shell -E "(import <nixpkgs> {}).ruby.withPackages (pkgs: with pkgs; [ pry nokogiri ])" + +You can also use this for writing ruby scripts that run anywhere that has nix +using a nix-shell shebang: + #!/usr/bin/env nix-shell + #!nix-shell -i ruby -p "ruby.withPackages (pkgs: with pkgs; [ pry nokogiri ])" + + +Run the following in the nixpkgs root directory to update the ruby-packages.nix: +./maintainers/scripts/update-ruby-packages +*/ + +let + functions = import ../bundled-common/functions.nix { inherit lib gemConfig; }; + + buildGems = gemset: + let + realGemset = if builtins.isAttrs gemset then gemset else import gemset; + builtGems = + lib.mapAttrs (name: initialAttrs: + let + attrs = functions.applyGemConfigs ({ inherit ruby; gemName = name; } // initialAttrs); + in + buildRubyGem (functions.composeGemAttrs ruby builtGems name attrs) + ) realGemset; + in builtGems; + + gems = buildGems (import ../../../top-level/ruby-packages.nix); + + withPackages = selector: + let + selected = selector gems; + + gemEnv = buildEnv { + name = "ruby-gems"; + paths = selected; + pathsToLink = [ "/lib" "/bin" "/nix-support" ]; + }; + + wrappedRuby = stdenv.mkDerivation { + name = "wrapped-${ruby.name}"; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + for i in ${ruby}/bin/*; do + makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath} + done + ''; + }; + + in stdenv.mkDerivation { + name = "${ruby.name}-with-packages"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ selected ruby ]; + + unpackPhase = ":"; + + installPhase = '' + for i in ${ruby}/bin/* ${gemEnv}/bin/*; do + rm -f $out/bin/$(basename "$i") + makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath} + done + ''; + + passthru = { + inherit wrappedRuby; + gems = selected; + }; + }; + +in { inherit withPackages gems buildGems; } diff --git a/pkgs/development/ruby-modules/with-packages/require_exceptions.nix b/pkgs/development/ruby-modules/with-packages/require_exceptions.nix new file mode 100644 index 00000000000..e6ae3b5013f --- /dev/null +++ b/pkgs/development/ruby-modules/with-packages/require_exceptions.nix @@ -0,0 +1,84 @@ +let + cocoapod-plugin = name: '' + require "cocoapods" + require "#{Gem::Specification.find_by_name(%(${name})).gem_dir}/lib/cocoapods_plugin" + ''; +in { + actioncable = [ "action_cable" ]; + actionmailer = [ "action_mailer" ]; + actionpack = [ "action_pack" ]; + actionview = [ "action_view" ]; + activejob = [ "active_job" ]; + activemodel = [ "active_model" ]; + activerecord = [ "active_record" ]; + activestorage = [ "active_storage" ]; + activesupport = [ "active_support" ]; + atk = [ "atk" ]; + CFPropertyList = [ "cfpropertylist" ]; + cocoapods-acknowledgements = [ "cocoapods" "cocoapods_acknowledgements" ]; + cocoapods-art = [ "cocoapods_art" ]; + cocoapods-browser = [ "cocoapods" "cocoapods_plugin" ]; + cocoapods-bugsnag = cocoapod-plugin "cocoapods-bugsnag"; + cocoapods-clean = [ "cocoapods_clean" ]; + cocoapods-coverage = [ "cocoapods_coverage" ]; + cocoapods-deintegrate = [ ]; # used by cocoapods + cocoapods-dependencies = [ "cocoapods_dependencies" ]; + cocoapods-deploy = cocoapod-plugin "cocoapods-deploy"; + cocoapods-generate = cocoapod-plugin "cocoapods-generate"; + cocoapods-git_url_rewriter = cocoapod-plugin "cocoapods-git_url_rewriter"; + cocoapods-keys = []; # osx only cocoapod-plugin "cocoapods-keys"; + cocoapods-open = [ "cocoapods" "cocoapods_plugin" ]; + cocoapods-packager = [ "cocoapods_packager" ]; + cocoapods-packager-pro = [ ]; # requires osx + cocoapods-plugins = [ "cocoapods_plugins" ]; + cocoapods-sorted-search = [ ]; # requires osx + cocoapods-check = cocoapod-plugin "cocoapods-check"; + cocoapods-disable-podfile-validations = cocoapod-plugin "cocoapods-disable-podfile-validations"; + cocoapods-stats = [ "cocoapods_stats" ]; + cocoapods-testing = [ "cocoapods_testing" ]; + cocoapods-trunk = [ "cocoapods_trunk" ]; + cocoapods-try = [ "cocoapods_try" ]; + cocoapods-try-release-fix = cocoapod-plugin "cocoapods-try-release-fix"; + digest-sha3 = [ "digest/sha3" ]; + ffi-compiler = [ "ffi-compiler/loader" ]; + fog-core = [ "fog/core" ]; + fog-dnsimple = [ "fog/dnsimple" ]; + fog-json = [ "fog/json" ]; + forwardable-extended = [ "forwardable/extended" ]; + gdk_pixbuf2 = [ "gdk_pixbuf2" ]; + gitlab-markup = [ "github/markup" ]; + gobject-introspection = [ "gobject-introspection" ]; + gtk2 = [ ]; # requires display + idn-ruby = [ "idn" ]; + jekyll-sass-converter = []; # tested through jekyll + libxml-ruby = [ "libxml" ]; + multipart-post = [ "multipart_post" ]; + unicode-display_width = [ "unicode/display_width" ]; + nap = [ "rest" ]; + net-scp = [ "net/scp" ]; + net-ssh = [ "net/ssh" ]; + nio4r = [ "nio" ]; + osx_keychain = [ ]; # requires osx + ovirt-engine-sdk = [ "ovirtsdk4" ]; + pango = [ "pango" ]; + rack-test = [ "rack/test" ]; + railties = [ "rails" ]; + rspec-core = [ "rspec/core" ]; + rspec-expectations = [ "rspec/expectations" ]; + rspec-mocks = [ "rspec/mocks" ]; + rspec-support = [ "rspec/support" ]; + RubyInline = [ "inline" ]; + ruby-libvirt = [ "libvirt" ]; + ruby-lxc = [ "lxc" ]; + ruby-macho = [ "macho" ]; + ruby-terminfo = [ "terminfo" ]; + rubyzip = [ "zip" ]; + sequel_pg = [ "pg" "sequel" "sequel/adapters/postgresql" "sequel_pg" ]; + simplecov-html = [ ]; # tested through simplecov + sinatra = [ "sinatra/base" ]; + sprockets-rails = [ "sprockets/rails" ]; + taglib-ruby = [ "taglib" ]; + websocket-driver = [ "websocket/driver" ]; + websocket-extensions = [ "websocket/extensions" ]; + ZenTest = [ "zentest" ]; +} diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix new file mode 100644 index 00000000000..92ded1004e3 --- /dev/null +++ b/pkgs/development/ruby-modules/with-packages/test.nix @@ -0,0 +1,48 @@ +# a generic test suite for all gems for all ruby versions. +# use via nix-build. +let + pkgs = import ../../../.. {}; + lib = pkgs.lib; + stdenv = pkgs.stdenv; + + rubyVersions = with pkgs; [ + ruby_2_4 + ruby_2_5 + ruby_2_6 + ]; + + gemTests = + (lib.mapAttrs + (name: gem: [ name ]) + pkgs.ruby.gems) // + (import ./require_exceptions.nix); + + tests = ruby: + lib.mapAttrs (name: gem: + let + test = + if builtins.isList gemTests."${name}" + then pkgs.writeText "${name}.rb" '' + puts "${name} GEM_HOME: #{ENV['GEM_HOME']}" + ${lib.concatStringsSep "\n" (map (n: "require '${n}'") gemTests."${name}")} + '' + else pkgs.writeText "${name}.rb" gemTests."${name}"; + + deps = ruby.withPackages (g: [ g."${name}" ]); + in stdenv.mkDerivation { + name = "test-gem-${ruby.name}-${name}"; + buildInputs = [ deps ]; + buildCommand = '' + INLINEDIR=$PWD ruby ${test} + touch $out + ''; + } + ) ruby.gems; +in + stdenv.mkDerivation { + name = "test-all-ruby-gems"; + buildInputs = builtins.foldl' (sum: ruby: sum ++ ( builtins.attrValues (tests ruby) )) [] rubyVersions; + buildCommand = '' + touch $out + ''; + } diff --git a/pkgs/development/ruby-modules/with-packages/test.rb b/pkgs/development/ruby-modules/with-packages/test.rb new file mode 100755 index 00000000000..760402d070c --- /dev/null +++ b/pkgs/development/ruby-modules/with-packages/test.rb @@ -0,0 +1,76 @@ +#!/usr/bin/env ruby + +# this is a quick and dirty test suite for easier analyzing of breakages in a +# manual testing. +# For automated testing use the test.nix + +require 'fileutils' + +class FakeGemfile + attr_reader :gems + + def initialize + @gems = [] + end + + def source(_source, &block) + instance_exec(&block) + end + + def gem(name) + @gems << name + end +end + +gemfile = File.expand_path(File.join(__dir__, 'Gemfile')) +packages = FakeGemfile.new.instance_eval(File.read(gemfile), gemfile) + +test_cases = packages.map { |pkg| [pkg, "require '#{pkg}'"] }.to_h + +test_cases.merge!( + 'digest-sha3' => "require 'digest/sha3'", + 'gitlab-markup' => "require 'github/markup'", + 'idn-ruby' => "require 'idn'", + 'net-scp' => "require 'net/scp'", + 'taglib-ruby' => "require 'taglib'", + 'net-ssh' => "require 'net/ssh'", + 'ruby-libvirt' => "require 'libvirt'", + 'ruby-lxc' => "require 'lxc'", + 'rubyzip' => "require 'zip'", + 'sinatra' => "require 'sinatra/base'", + 'libxml-ruby' => "require 'libxml'", + 'ruby-terminfo' => "require 'terminfo'", + 'ovirt-engine-sdk' => "require 'ovirtsdk4'", + 'fog-dnsimple' => "require 'fog/dnsimple'" +) + +test_cases['sequel_pg'] = <<~TEST + require 'pg' + require 'sequel' + require 'sequel/adapters/postgresql' + require 'sequel_pg' +TEST + +tmpdir = File.expand_path(File.join(__dir__, 'tests')) +FileUtils.rm_rf(tmpdir) +FileUtils.mkdir_p(tmpdir) + +failing = test_cases.reject do |name, test_case| + test_case = <<~SHELL + #!/usr/bin/env nix-shell + #!nix-shell -i ruby -E "(import ../../../.. {}).ruby.withPackages (r: [ r.#{name} ] )" + #{test_case} + SHELL + + file = File.join(tmpdir, "#{name}_test.rb") + File.write(file, test_case) + FileUtils.chmod('u=wrx', file) + + system(file) && FileUtils.rm(file) +end + +exit if failing.empty? + +puts "Following gems failed: #{failing.keys.join(' ')}" +puts "tests for failing gems remain in #{tmpdir}" +exit 1 diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 4bd95a8d745..8b44203a7d2 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ammonite-${version}"; + pname = "ammonite"; version = "1.6.9"; scalaVersion = "2.12"; diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index a8b8a965256..16b4be47d8b 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -4,7 +4,6 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; version = "1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 95f5a418a61..ac2c6795a42 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.23"; - name = "checkstyle-${version}"; + pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 2e01e4d8f28..6b0c1b401f6 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "clang-analyzer-${version}"; + pname = "clang-analyzer"; version = "3.4"; src = fetchurl { diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 2b4a87ffcb8..951c46e2166 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.0.1"; - name = "coan-${version}"; + pname = "coan"; src = fetchurl { - url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz"; sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44"; }; diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index bd0a4ee5e40..bd8c5c37c86 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/pkgs/development/tools/analysis/cov-build/default.nix @@ -7,7 +7,7 @@ let ''; in stdenv.mkDerivation rec { - name = "cov-build-${version}"; + pname = "cov-build"; version = "7.0.2"; src = diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 09901afdd20..8b6eb71f90f 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "cppcheck"; version = "1.88"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv"; }; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index 00c020e3f40..ed338a6e0d9 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, which, openssl, readline }: stdenv.mkDerivation rec { - name = "eresi-${version}"; + pname = "eresi"; version = "0.83-a3-phoenix"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 77bfa548068..36fa7bb1f16 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "evmdis-unstable-${version}"; + pname = "evmdis-unstable"; version = "2018-03-23"; goPackagePath = "github.com/Arachnid/evmdis"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 5f6b894f984..8f170993370 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "frama-c-${version}"; + pname = "frama-c"; version = "19.0"; slang = "Potassium"; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 4222f72248a..c05d47e396c 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, llvmPackages, python2 }: stdenv.mkDerivation rec { - name = "include-what-you-use-${version}"; + pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.10"; + version = "0.12"; src = fetchurl { - sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s"; - url = "${meta.homepage}/downloads/${name}.src.tar.gz"; + sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5"; + url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ - --replace "['include-what-you-use']" "['$out/bin/include-what-you-use']" + --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 939ae10c089..455ff7722fa 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { - name = "jdepend-${version}"; + pname = "jdepend"; version = "2.9.1"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share - install dist/${name}.jar $out/share + install dist/${pname}-${version}.jar $out/share cat > "$out/bin/jdepend" <<EOF #!${runtimeShell} diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index af20165d155..b5bc31ad5e9 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { - name = "kcov-${version}"; + pname = "kcov"; version = "36"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index a9793e04883..c2f0236ed0b 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { - name = "massif-visualizer-${version}"; + pname = "massif-visualizer"; version = "0.7.0"; src = fetchurl { - url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/massif-visualizer/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 39cd6417542..2db6b821b4e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -32,7 +32,8 @@ let cs_sha256 }: stdenv.mkDerivation rec { - name = "radare2-${version}"; + pname = "radare2"; + inherit version; src = fetchFromGitHub { owner = "radare"; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 4fc85c30166..e8e3168e937 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.1.5"; - name = "randoop-${version}"; + pname = "randoop"; src = fetchurl { - url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip"; + url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx"; }; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index fec127178f9..475d1950bb2 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -124,7 +124,7 @@ let ''; in stdenv.mkDerivation rec { - name = "retdec-${version}"; + pname = "retdec"; # If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions. diff --git a/pkgs/development/tools/analysis/retdec/yaracpp.nix b/pkgs/development/tools/analysis/retdec/yaracpp.nix index cc857b86145..c8bc4ed747b 100644 --- a/pkgs/development/tools/analysis/retdec/yaracpp.nix +++ b/pkgs/development/tools/analysis/retdec/yaracpp.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { # only fetches the yaracpp source patched to work with a local yara clone, # does not build anything - name = "yaracpp-src-${version}"; + pname = "yaracpp-src"; version = "2018-10-09"; rev = "b92bde0e59e3b75bc445227e04b71105771dee8b"; # as specified in retdec/deps/yaracpp/CMakeLists.txt diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index cd2fb21209c..844fd38d9be 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.2.0"; - name = "rr-${version}"; + pname = "rr"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index e965acc746c..f8f2f55c5aa 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, qtbase }: stdenv.mkDerivation rec { - name = "snowman-${version}"; + pname = "snowman"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index fbb7eca0ef5..26598bb36cd 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -6,7 +6,7 @@ let ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ]; in stdenv.mkDerivation rec { - name = "spin-${version}"; + pname = "spin"; version = "6.4.9"; url-version = stdenv.lib.replaceChars ["."] [""] version; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 24ad463439a..5099505cc5b 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "0x9kh0bvbil6z09v41gzk5sdiprqg288jfcjw1n2x809sj7c6vhf"; + sha256 = "1p4w1ddgb4nqibbrvix0p0gdlj6ann5lkyvlcsbkn25z8ha3qa39"; }; - modSha256 = "0wig41m81kmy7l6sj6kk4ryc3m1b18n2vlf80x0bbhn46kyfnbgr"; + modSha256 = "1snanz4cpqkfgxp8k52w3x4i49k6d5jffcffrcx8xya8yvx2wxy3"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index d9d70f64d73..56f9f98856c 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre, build-tools }: stdenv.mkDerivation rec { - name = "apktool-${version}"; + pname = "apktool"; version = "2.4.0"; src = fetchurl { diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index d2cb7e807b5..04cb6f808df 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -5,7 +5,7 @@ }: buildGoPackage rec { - name = "asmfmt-${version}"; + pname = "asmfmt"; version = "1.1"; goPackagePath = "github.com/klauspost/asmfmt"; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 2089142a1de..403d0ab745a 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "azure-storage-azcopy-${version}"; + pname = "azure-storage-azcopy"; version = "10.0.1-pre"; revision = "10.0.1"; goPackagePath = "github.com/Azure/azure-storage-azcopy"; diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index f66c8414264..9a12a7afc62 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "bloaty-${version}"; + pname = "bloaty"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 7b539172542..2623787993c 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { - name = "boomerang-${version}"; + pname = "boomerang"; version = "0.4.0-alpha-2018-07-03"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 89c1b560eac..f392475f618 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "boost-build-${version}"; + pname = "boost-build"; version = "2016.03"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 8816a005ca0..0a86aaeb6ca 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -3,7 +3,8 @@ let version = "1.9.6"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index b6c2702485b..8d1e09eeb33 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -3,7 +3,8 @@ let version = "1.10.2"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index cde6ea2f7a8..ef339e658c1 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,12 +4,13 @@ assert jdk != null; let version = "3.6.1"; in stdenv.mkDerivation rec { - name = "apache-maven-${version}"; + pname = "apache-maven"; + inherit version; builder = ./builder.sh; src = fetchurl { - url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15"; }; diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 0aec7491e4a..16eb5e3ec74 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "arpa2cm"; version = "0.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4"; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index 62482161346..969cd987974 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lua5_3, python }: stdenv.mkDerivation rec { - name = "bam-${version}"; + pname = "bam"; version = "0.5.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 1018abd6ee9..334d0962253 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { broken = true; # 2018-08-07 }; - name = "bazel-${version}"; + pname = "bazel"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix index 898640a84fe..cd0c5f6c081 100644 --- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -1,4 +1,4 @@ -{ writeText, bazel, runLocal, bazelTest }: +{ writeText, bazel, runLocal, bazelTest, distDir }: # Tests that certain executables are available in bazel-executed bash shells. @@ -35,7 +35,7 @@ let inherit workspaceDir; bazelScript = '' - ${bazel}/bin/bazel build :tool_usage + ${bazel}/bin/bazel build :tool_usage --distdir=${distDir} cp bazel-genfiles/output.txt $out echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" ''; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index f7b0184f836..b606e547036 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "bazel-buildtools-${version}"; + pname = "bazel-buildtools"; version = "0.28.0"; rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052"; diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 2b59bd3c433..f4e03abdbc9 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -8,6 +8,7 @@ , runtimeShell , writeScript , writeText +, distDir }: let @@ -42,6 +43,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ build --verbose_failures \ + --distdir=${distDir} \ //... ''; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1007f4df8ca..e06965b6f09 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -22,11 +22,11 @@ }: let - version = "0.28.1"; + version = "0.29.0"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0503fax70w7h6v00mkrrrgf1m5n0vkjqs76lyg95alhzc4yldsic"; + sha256 = "01cb6f2e808bd016cf0e217e12373c9efb808123e58b37885be8364458d3a40a"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -46,11 +46,15 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs.${"java_tools_javac11_darwin-v2.0.zip"} - else srcs.${"java_tools_javac11_linux-v2.0.zip"}) + then srcs.${"java_tools_javac11_darwin-v4.0.zip"} + else srcs.${"java_tools_javac11_linux-v4.0.zip"}) srcs.${"coverage_output_generator-v1.0.zip"} srcs.build_bazel_rules_nodejs - srcs.${"android_tools_pkg-0.7.tar.gz"} + srcs.${"android_tools_pkg-0.8.tar.gz"} + srcs.${"0.27.1.tar.gz"} + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java ]); distDir = runCommand "bazel-deps" {} '' @@ -102,7 +106,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v2.0.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -121,7 +125,8 @@ let in stdenv.mkDerivation rec { - name = "bazel-${version}"; + pname = "bazel"; + inherit version; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -217,18 +222,18 @@ stdenv.mkDerivation rec { }; in { - bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; }; - cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; }; - java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; }; + bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually @@ -462,6 +467,7 @@ stdenv.mkDerivation rec { # the reference to .name mkdir $out/etc echo "build --override_repository=${remote_java_tools.name}=${remote_java_tools}" > $out/etc/bazelrc + echo "build --distdir=${distDir}" >> $out/etc/bazelrc # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions @@ -511,6 +517,8 @@ stdenv.mkDerivation rec { # The templates get tar’d up into a .jar, # so nix can’t detect python is needed in the runtime closure echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index 5f780a795e3..30b957eb5e3 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -9,6 +9,7 @@ , runtimeShell , writeScript , writeText +, distDir }: let @@ -44,6 +45,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ run \ + --distdir=${distDir} \ --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 90065be67bc..0784de4cfd3 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -10,6 +10,7 @@ , runtimeShell , writeScript , writeText +, distDir }: let @@ -141,6 +142,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ build \ + --distdir=${distDir} \ --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index ff921b395da..c02547c08e0 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -1,4 +1,4 @@ -{ writeText, bazel, bazelTest, runLocal }: +{ writeText, bazel, bazelTest, runLocal, distDir }: let WORKSPACE = writeText "WORKSPACE" '' @@ -45,6 +45,7 @@ let bazelScript = '' ${bazel}/bin/bazel \ run \ + --distdir=${distDir} \ //python:bin ''; }; diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json index fc3fe13f580..f93794249ec 100644 --- a/pkgs/development/tools/build-managers/bazel/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/src-deps.json @@ -7,12 +7,28 @@ "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" ] }, - "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": { - "name": "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", - "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534", + "0.27.1.tar.gz": { + "name": "0.27.1.tar.gz", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" + ] + }, + "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { + "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": { + "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" ] }, "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { @@ -23,6 +39,14 @@ "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" ] }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", @@ -31,29 +55,28 @@ "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" ] }, - "android_tools_pkg-0.7.tar.gz": { - "name": "android_tools_pkg-0.7.tar.gz", - "sha256": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", + "android_tools_pkg-0.8.tar.gz": { + "name": "android_tools_pkg-0.8.tar.gz", + "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz" ] }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "a36bac432d0dbd8c98249e484b2b69dd5720afa4abb58711a3c3def1c0bfa21d", - "strip_prefix": "j2objc-2.0.3", + "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": { + "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", "urls": [ - "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip", - "https://github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip" + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" ] }, - "bazel_rbe_toolchains": { - "name": "bazel_rbe_toolchains", - "sha256": "e2b8644caa15235a488e831264e5dcb014e2cdf3b697319bc1e9d6b0fff0b4b9", - "strip_prefix": "bazel_rbe_toolchains-01529a65d21abdf71635ff0c2472043a567ecded", + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", "urls": [ - "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz", - "https://github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz" + "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" ] }, "bazel_skylib": { @@ -67,11 +90,11 @@ }, "bazel_toolchains": { "name": "bazel_toolchains", - "sha256": "67335b3563d9b67dc2550b8f27cc689b64fadac491e69ce78763d9ba894cc5cc", - "strip_prefix": "bazel-toolchains-cddc376d428ada2927ad359211c3e356bd9c9fbb", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", + "strip_prefix": "bazel-toolchains-0.27.1", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" ] }, "build_bazel_rules_nodejs": { @@ -135,46 +158,46 @@ }, "io_bazel_skydoc": { "name": "io_bazel_skydoc", - "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534", - "strip_prefix": "skydoc-1ca560df1cf6e280f987af2f8d08a5edc7ac6b54", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" ] }, - "java_tools_javac11_darwin-v2.0.zip": { - "name": "java_tools_javac11_darwin-v2.0.zip", - "sha256": "0ceb0c9ff91256fe33508306bc9cd9e188dcca38df78e70839d426bdaef67a38", + "java_tools_javac11_darwin-v4.0.zip": { + "name": "java_tools_javac11_darwin-v4.0.zip", + "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_darwin-v2.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip" ] }, - "java_tools_javac11_linux-v2.0.zip": { - "name": "java_tools_javac11_linux-v2.0.zip", - "sha256": "074d624fb34441df369afdfd454e75dba821d5d54932fcfee5ba598d17dc1b99", + "java_tools_javac11_linux-v4.0.zip": { + "name": "java_tools_javac11_linux-v4.0.zip", + "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_linux-v2.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip" ] }, - "java_tools_javac11_windows-v2.0.zip": { - "name": "java_tools_javac11_windows-v2.0.zip", - "sha256": "2c3fc0ce7d30d60e26f4b8a36e2eadcf9e6a9d5a51b667d3d13b78db53b24251", + "java_tools_javac11_windows-v4.0.zip": { + "name": "java_tools_javac11_windows-v4.0.zip", + "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_windows-v2.0.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip" ] }, "java_tools_langtools_javac10": { "name": "java_tools_langtools_javac10", - "sha256": "e379c71e051eb83e3fc9a08c9b404712707d8920ffcf1e8fd59c844965f0b0dd", + "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip" + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" ] }, "java_tools_langtools_javac11": { "name": "java_tools_langtools_javac11", - "sha256": "128a63f39d3f828a761f6afcfe3c6115279336a72ea77f60d7b3acf1841c9acb", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip" + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" ] }, "java_tools_langtools_javac12": { @@ -186,9 +209,9 @@ }, "java_tools_langtools_javac9": { "name": "java_tools_langtools_javac9", - "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864", + "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9.zip" + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" ] }, "jdk10-server-release-1804.tar.xz": { @@ -346,6 +369,49 @@ "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" ] }, + "rules_cc": { + "name": "rules_cc", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_pkg-0.2.0.tar.gz": { + "name": "rules_pkg-0.2.0.tar.gz", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", + "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" + ] + }, "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py index 7fd1e5e2b04..504a227b958 100755 --- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py +++ b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py @@ -40,6 +40,11 @@ def rules_sass_dependencies(**kw): pass def node_repositories(**kw): pass def sass_repositories(**kw): pass def register_execution_platforms(*args): pass +def rbe_autoconfig(*args, **kw): pass +def rules_pkg_dependencies(*args, **kw): pass +def winsdk_configure(*args, **kw): pass +def register_local_rc_exe_toolchains(*args, **kw): pass +def register_toolchains(*args, **kw): pass # execute the WORKSPACE like it was python code in this module, # using all the function stubs from above. diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index ea8ee1f8496..c095f8c695c 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { - name = "bear-${version}"; + pname = "bear"; version = "2.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index f71b877c8c5..d895261c4b5 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bmake-${version}"; + pname = "bmake"; version = "20181221"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz"; + url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; }; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 380ba4803bd..3f086c912c1 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.7.2"; - name = "boot-${version}"; + pname = "boot"; src = fetchurl { url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4761d8dc5b1..5bad0100a03 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.14.5"; + version = "3.15.1"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; + sha256 = "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 9f4cb366e23..60a011a49d0 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, perl}: stdenv.mkDerivation rec { - name = "colormake-${version}"; + pname = "colormake"; version = "2.1.0"; buildInputs = [perl]; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 7b882926e1f..ef2b155482f 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: stdenv.mkDerivation rec { - name = "dub-${version}"; + pname = "dub"; version = "1.14.0"; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 34d19b61694..24df6fa6ff3 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "gn-${version}"; + pname = "gn"; version = "20190403"; src = fetchgit { diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 47f800c67be..b543565758c 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -6,7 +6,8 @@ let version = "4.2.1"; in stdenv.mkDerivation { - name = "gnumake-${version}"; + pname = "gnumake"; + inherit version; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 0ec57cc8b82..902c74a08b4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_5_3; + gradle_latest = gradle_5_6; - gradle_5_3 = gradleGen rec { - name = "gradle-5.3.1"; - nativeVersion = "0.17"; + gradle_5_6 = gradleGen rec { + name = "gradle-5.6.1"; + nativeVersion = "0.18"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w"; + sha256 = "04pccfcry5c59xwm6rr4r3baanwbfr5yrwhxv4r5v8z4414291h9"; }; }; diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index baa658b522a..30c4d4ec4de 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { rev = "version-0.7.0"; sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; }; - name = "gup-${version}"; + pname = "gup"; buildInputs = lib.remove null [ python which pychecker ]; SKIP_PYCHECKER = pychecker == null; buildPhase = "make python"; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index c5ab3fafc5e..1d1bee9c04f 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: stdenv.mkDerivation rec { - name = "icmake-${version}"; + pname = "icmake"; version = "9.02.08"; src = fetchFromGitLab { diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index 8a72847be77..03cc0518ab5 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv }: stdenv.mkDerivation rec { - name = "kati-unstable-${version}"; + pname = "kati-unstable"; version = "2017-05-23"; rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index d73683287a1..9538171474d 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "leiningen"; version = "2.9.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues - url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; + url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a"; }; - JARNAME = "${name}-standalone.jar"; + JARNAME = "${pname}-${version}-standalone.jar"; dontUnpack = true; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index f929d310585..b7e6e08cb04 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "mill-${version}"; + pname = "mill"; version = "0.5.0"; src = fetchurl { diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix new file mode 100644 index 00000000000..e9bb3c27df9 --- /dev/null +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -0,0 +1,133 @@ +{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: + +let + + xplat = fetchurl { + url = "https://github.com/mono/msbuild/releases/download/0.07/mono_msbuild_xplat-master-8f608e49.zip"; + sha256 = "1jxq3fk9a6q2a8i9zacxaz3fkvc22i9qvzlpa7wbb95h42g0ffhq"; + }; + + deps = import ./nuget.nix { inherit fetchurl; }; + +in + +stdenv.mkDerivation rec { + pname = "msbuild"; + version = "16.3+xamarinxplat.2019.07.26.14.57"; + + src = fetchurl { + url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz"; + sha256 = "1zcdfx4xsh62wj3g1jc2an0lppsfs691lz4dv05xbgi01aq1hk6a"; + }; + + nativeBuildInputs = [ + dotnet-sdk + mono + ]; + + buildInputs = [ + dotnetPackages.Nuget + glibcLocales + makeWrapper + unzip + ]; + + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild + phases = ["unpackPhase" "buildPhase" "installPhase" "installCheckPhase"]; + + # https://github.com/NixOS/nixpkgs/issues/38991 + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${glibcLocales}/lib/locale/locale-archive"; + + buildPhase = '' + # nuget would otherwise try to base itself in /homeless-shelter + export HOME=$(pwd)/fake-home + + for package in ${toString deps}; do + nuget add $package -Source nixos + done + + nuget sources Disable -Name "nuget.org" + nuget sources Add -Name nixos -Source $(pwd)/nixos + + # license check is case sensitive + mv LICENSE license + + mkdir -p artifacts + unzip ${xplat} -d artifacts + mv artifacts/msbuild artifacts/mono-msbuild + chmod +x artifacts/mono-msbuild/MSBuild.dll + + ln -s $(find ${dotnet-sdk} -name libhostfxr.so) artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/ + + # overwrite the file + echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh + + # msbuild response files to use only the nixos source + echo "/p:RestoreSources=nixos" > artifacts/mono-msbuild/MSBuild.rsp + echo "/p:RestoreSources=nixos" > src/MSBuild/MSBuild.rsp + + # not patchShebangs, there is /bin/bash in the body of the script as well + substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell} + + # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa + # TODO there are some (many?) failing tests + ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true + ''; + + installPhase = '' + mono artifacts/mono-msbuild/MSBuild.dll mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO + + ln -s ${mono}/lib/mono/msbuild/Current/bin/Roslyn $out/lib/mono/msbuild/Current/bin/Roslyn + + makeWrapper ${mono}/bin/mono $out/bin/msbuild \ + --set MSBuildExtensionsPath $out/lib/mono/xbuild \ + --set-default MONO_GC_PARAMS "nursery-size=64m" \ + --add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll" + ''; + + doInstallCheck = true; + + # https://docs.microsoft.com/cs-cz/visualstudio/msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch?view=vs-2019 + installCheckPhase = '' + cat > Helloworld.cs <<EOF +using System; + +class HelloWorld +{ + static void Main() + { +#if DebugConfig + Console.WriteLine("WE ARE IN THE DEBUG CONFIGURATION"); +#endif + + Console.WriteLine("Hello, world!"); + } +} +EOF + + cat > Helloworld.csproj <<EOF +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Compile Include="Helloworld.cs" /> + </ItemGroup> + <Target Name="Build"> + <Csc Sources="@(Compile)"/> + </Target> +</Project> +EOF + + $out/bin/msbuild Helloworld.csproj -t:Build + ${mono}/bin/mono Helloworld.exe | grep "Hello, world!" + ''; + + meta = with stdenv.lib; { + description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; + homepage = https://github.com/mono/msbuild; + license = licenses.mit; + maintainers = with maintainers; [ jdanek ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/development/tools/build-managers/msbuild/nuget.nix b/pkgs/development/tools/build-managers/msbuild/nuget.nix new file mode 100644 index 00000000000..0aae3840752 --- /dev/null +++ b/pkgs/development/tools/build-managers/msbuild/nuget.nix @@ -0,0 +1,1130 @@ +{ fetchurl }: let + + fetchNuGet = { url, name, version, sha256 }: fetchurl { + inherit name url sha256; + }; + +in [ +(fetchNuGet { + name = "microsoft.build"; + version = "14.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.build/14.3.0"; + sha256 = "1zamn3p8xxi0wsjlpln0y71ncb977f3fp08mvaz4wmbmi76nr0rz"; + }) +(fetchNuGet { + name = "system.io"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.io/4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) +(fetchNuGet { + name = "system.io"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io/4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) +(fetchNuGet { + name = "system.xml.xpath"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xpath/4.3.0"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }) +(fetchNuGet { + name = "microsoft.net.compilers.toolset"; + version = "3.3.0-beta2-19367-02"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.compilers.toolset/3.3.0-beta2-19367-02/microsoft.net.compilers.toolset.3.3.0-beta2-19367-02.nupkg"; + sha256 = "1v9lz2fmfprhql0klqa8iipiiz3wcflvlgr3a86pcjjk7x0y84sl"; + }) +(fetchNuGet { + name = "system.io.filesystem"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) +(fetchNuGet { + name = "system.io.filesystem"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) +(fetchNuGet { + name = "largeaddressaware"; + version = "1.0.3"; + url = "https://www.nuget.org/api/v2/package/largeaddressaware/1.0.3"; + sha256 = "1ppss9bgj0hf5s8307bnm2a4qm10mrymp0v12m28a5q81zjz0fr5"; + }) +(fetchNuGet { + name = "nuget.protocol"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.protocol/5.2.0-rtm.6067"; + sha256 = "0fm3qgcdsy6dy6fih0n9a4w39mzdha4cz51gr9pp9g4nag34za2a"; + }) +(fetchNuGet { + name = "runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) +(fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) +(fetchNuGet { + name = "system.buffers"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.buffers/4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) +(fetchNuGet { + name = "system.buffers"; + version = "4.4.0"; + url = "https://www.nuget.org/api/v2/package/system.buffers/4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) +(fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.core/2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) +(fetchNuGet { + name = "system.io.filesystem.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) +(fetchNuGet { + name = "system.io.filesystem.primitives"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) +(fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) +(fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) +(fetchNuGet { + name = "microsoft.build.framework"; + version = "15.5.180"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/15.5.180"; + sha256 = "064y3a711ikx9pm9d2wyms4i3k4f9hfvn3vymhwygg7yv7gcj92z"; + }) +(fetchNuGet { + name = "microsoft.build.framework"; + version = "14.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/14.3.0"; + sha256 = "0r7y1i7dbr3pb53fdrh268hyi627w85nzv2iblwyg8dzkfxraafd"; + }) +(fetchNuGet { + name = "system.globalization"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.globalization/4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) +(fetchNuGet { + name = "system.globalization"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.globalization/4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) +(fetchNuGet { + name = "microsoft.dotnet.signtool"; + version = "1.0.0-beta.19372.10"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.signtool/1.0.0-beta.19372.10/microsoft.dotnet.signtool.1.0.0-beta.19372.10.nupkg"; + sha256 = "1f2im2lilw10zslfclxh49knr542jy7q09p009flxsgn68riy0j6"; + }) +(fetchNuGet { + name = "system.runtime.handles"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) +(fetchNuGet { + name = "system.runtime.handles"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.common"; + version = "3.0.0-beta1-61516-01"; + url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.common/3.0.0-beta1-61516-01"; + sha256 = "1qfm61yrsmihhir7n3hb5ccn1r50i39rv1g74880ma7ihjl1hz54"; + }) +(fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) +(fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) +(fetchNuGet { + name = "system.reflection.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) +(fetchNuGet { + name = "system.reflection.primitives"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) +(fetchNuGet { + name = "microbuild.core"; + version = "0.2.0"; + url = "https://www.nuget.org/api/v2/package/microbuild.core/0.2.0"; + sha256 = "0q4s45jskbyxfx4ay6znnvv94zma2wd85b8rwmwszd2nb0xl3194"; + }) +(fetchNuGet { + name = "system.diagnostics.tracesource"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracesource/4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) +(fetchNuGet { + name = "system.runtime.numerics"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.numerics/4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) +(fetchNuGet { + name = "system.threading.tasks.parallel"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.3.0"; + sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; + }) +(fetchNuGet { + name = "system.threading.tasks.parallel"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.0.1"; + sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75"; + }) +(fetchNuGet { + name = "nuget.credentials"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.credentials/5.2.0-rtm.6067"; + sha256 = "07g2na590sph9li5igww74i3gqyrj5cb6gsgjh54f1f4bs4x1c4k"; + }) +(fetchNuGet { + name = "system.objectmodel"; + version = "4.0.12"; + url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) +(fetchNuGet { + name = "system.objectmodel"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) +(fetchNuGet { + name = "system.xml.xmlserializer"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.xml.xmlserializer/4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.build.tasks"; + version = "3.0.0-beta1-61516-01"; + url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.build.tasks/3.0.0-beta1-61516-01"; + sha256 = "1cjpqbd4i0gxhh86nvamlpkisd1krcrya6riwjhghvpjph6115vp"; + }) +(fetchNuGet { + name = "system.private.datacontractserialization"; + version = "4.1.1"; + url = "https://www.nuget.org/api/v2/package/system.private.datacontractserialization/4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) +(fetchNuGet { + name = "system.numerics.vectors"; + version = "4.4.0"; + url = "https://www.nuget.org/api/v2/package/system.numerics.vectors/4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) +(fetchNuGet { + name = "microsoft.build.centralpackageversions"; + version = "2.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.centralpackageversions/2.0.1"; + sha256 = "17cjiaj2b98q8s89168g42jb8rhwm6062jcbv57rbkdiiwdsn55k"; + }) +(fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) +(fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) +(fetchNuGet { + name = "microsoft.visualstudio.sdk.embedinteroptypes"; + version = "15.0.15"; + url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15"; + sha256 = "0chr3slzzcanwcyd9isx4gichqzmfh4zd3h83piw0r4xsww1wmpd"; + }) +(fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) +(fetchNuGet { + name = "system.runtime.extensions"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) +(fetchNuGet { + name = "system.runtime.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) +(fetchNuGet { + name = "system.resources.extensions"; + version = "4.6.0-preview8.19364.1"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.extensions/4.6.0-preview8.19364.1/system.resources.extensions.4.6.0-preview8.19364.1.nupkg"; + sha256 = "0jh9ilbicmsngv77a4ayzs0n7s440ycdf726nbljw029gq4rzvqf"; + }) +(fetchNuGet { + name = "nuget.frameworks"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.frameworks/5.2.0-rtm.6067"; + sha256 = "1g1kcfqhxr1bhl3ksbdmz3rb9nq1qmkac1sijf9ng4gmr9fmprdm"; + }) +(fetchNuGet { + name = "system.diagnostics.diagnosticsource"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.diagnosticsource/4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) +(fetchNuGet { + name = "system.security.claims"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.claims/4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) +(fetchNuGet { + name = "system.linq.expressions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.linq.expressions/4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) +(fetchNuGet { + name = "system.diagnostics.stacktrace"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.stacktrace/4.3.0"; + sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; + }) +(fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) +(fetchNuGet { + name = "system.diagnostics.tracing"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) +(fetchNuGet { + name = "system.diagnostics.tracing"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) +(fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + url = "https://www.nuget.org/api/v2/package/xunit.analyzers/0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) +(fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.assert/2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) +(fetchNuGet { + name = "system.appcontext"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.appcontext/4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) +(fetchNuGet { + name = "system.appcontext"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.appcontext/4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) +(fetchNuGet { + name = "system.text.encoding.codepages"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.3.0"; + sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; + }) +(fetchNuGet { + name = "system.text.encoding.codepages"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.0.1"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }) +(fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.csharp"; + version = "3.0.0-beta1-61516-01"; + url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.csharp/3.0.0-beta1-61516-01"; + sha256 = "0a7npkdw6s5jczw1lkm63x2bpz1z3ccid20h5nm6k78cv7sihm4h"; + }) +(fetchNuGet { + name = "system.console"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.console/4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) +(fetchNuGet { + name = "system.console"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.console/4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) +(fetchNuGet { + name = "system.reflection.typeextensions"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.typeextensions/4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) +(fetchNuGet { + name = "system.runtime.compilerservices.unsafe"; + version = "4.5.2"; + url = "https://www.nuget.org/api/v2/package/system.runtime.compilerservices.unsafe/4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) +(fetchNuGet { + name = "system.threading.tasks"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) +(fetchNuGet { + name = "system.threading.tasks"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) +(fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + url = "https://www.nuget.org/api/v2/package/xunit.abstractions/2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) +(fetchNuGet { + name = "microsoft.build.utilities.core"; + version = "15.5.180"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/15.5.180"; + sha256 = "0c4bjhaqgc98bchln8p5d2p1vyn8qrha2b8gpn2l7bnznbcrd630"; + }) +(fetchNuGet { + name = "microsoft.build.utilities.core"; + version = "14.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/14.3.0"; + sha256 = "0351nsnx12nzkss6vaqwwh7d7car7hrgyh0vyd4bl83c4x3ls1kb"; + }) +(fetchNuGet { + name = "system.reflection.emit"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.emit/4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) +(fetchNuGet { + name = "microsoft.visualstudio.setup.configuration.interop"; + version = "1.16.30"; + url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.setup.configuration.interop/1.16.30"; + sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; + }) +(fetchNuGet { + name = "system.net.sockets"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.net.sockets/4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) +(fetchNuGet { + name = "microsoft.dotnet.arcade.sdk"; + version = "1.0.0-beta.19372.10"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.arcade.sdk/1.0.0-beta.19372.10/microsoft.dotnet.arcade.sdk.1.0.0-beta.19372.10.nupkg"; + sha256 = "1lii0yg4fbsma80mmvw2zwplc26abb46q6gkxwbsbkyszkw128hv"; + }) +(fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) +(fetchNuGet { + name = "runtime.native.system.io.compression"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system.io.compression/4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) +(fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) +(fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) +(fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) +(fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) +(fetchNuGet { + name = "system.threading.timer"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) +(fetchNuGet { + name = "system.threading.timer"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) +(fetchNuGet { + name = "system.reflection.metadata"; + version = "1.4.2"; + url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.4.2"; + sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; + }) +(fetchNuGet { + name = "system.reflection.metadata"; + version = "1.6.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) +(fetchNuGet { + name = "system.xml.xdocument"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xdocument/4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) +(fetchNuGet { + name = "system.linq"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.linq/4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) +(fetchNuGet { + name = "system.linq"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.linq/4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) +(fetchNuGet { + name = "nuget.librarymodel"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.librarymodel/5.2.0-rtm.6067"; + sha256 = "0dxvnspgkc1lcmilb67kkipg39ih34cmifs6jwk9kbrwf96z51q9"; + }) +(fetchNuGet { + name = "xlifftasks"; + version = "1.0.0-beta.19252.1"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/xlifftasks/1.0.0-beta.19252.1/xlifftasks.1.0.0-beta.19252.1.nupkg"; + sha256 = "0249sfb30y9dgsfryaj8644qw3yc1xp2xzc08lsrwvmm8vjcvkri"; + }) +(fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) +(fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) +(fetchNuGet { + name = "system.security.accesscontrol"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.accesscontrol/4.3.0"; + sha256 = "1gakrskmlmwhzmjc1c2mrwk0fml615rsk31dw0kbjnn9yqnnrjbi"; + }) +(fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.runner.visualstudio/2.4.1"; + sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; + }) +(fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) +(fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) +(fetchNuGet { + name = "nuget.projectmodel"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.projectmodel/5.2.0-rtm.6067"; + sha256 = "1s5950nbcsnfrpbaxdnl6cv1xbsa57fln04lhyrki536476a6wcn"; + }) +(fetchNuGet { + name = "nuget.versioning"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.versioning/5.2.0-rtm.6067"; + sha256 = "04rr31ms95h7ymqxlalpv3xs48j8ng4ljfz5lmrfw7547rhcrj2h"; + }) +(fetchNuGet { + name = "system.memory"; + version = "4.5.3"; + url = "https://www.nuget.org/api/v2/package/system.memory/4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) +(fetchNuGet { + name = "system.resources.reader"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.resources.reader/4.0.0"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; + }) +(fetchNuGet { + name = "nuget.common"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.common/5.2.0-rtm.6067"; + sha256 = "1ff5dhkv8v04n2kr5gyjjvki4mqsp1w4dwsgj7cvdcfcm8alba0m"; + }) +(fetchNuGet { + name = "runtime.native.system"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) +(fetchNuGet { + name = "runtime.native.system"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) +(fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) +(fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) +(fetchNuGet { + name = "microbuild.core.sentinel"; + version = "1.0.0"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; + sha256 = "035kqx5fkapql108n222lz8psvxk04mv3dy1qg3h08i4b8j3dy8i"; + }) +(fetchNuGet { + name = "sn"; + version = "1.0.0"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/sn/1.0.0/sn.1.0.0.nupkg"; + sha256 = "1012fcdc6vq2355v86h434s6p2nnqgpdapb7p25l4h39g5q8p1qs"; + }) +(fetchNuGet { + name = "system.text.encoding"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) +(fetchNuGet { + name = "system.text.encoding"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) +(fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) +(fetchNuGet { + name = "system.reflection.emit.lightweight"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.emit.lightweight/4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) +(fetchNuGet { + name = "microsoft.net.test.sdk"; + version = "15.9.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.net.test.sdk/15.9.0"; + sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; + }) +(fetchNuGet { + name = "system.io.compression"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.compression/4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) +(fetchNuGet { + name = "system.runtime.serialization.primitives"; + version = "4.1.1"; + url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.primitives/4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) +(fetchNuGet { + name = "system.diagnostics.fileversioninfo"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.fileversioninfo/4.3.0"; + sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; + }) +(fetchNuGet { + name = "system.xml.xpath.xdocument"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xpath.xdocument/4.3.0"; + sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; + }) +(fetchNuGet { + name = "system.security.principal.windows"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.principal.windows/4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) +(fetchNuGet { + name = "vswhere"; + version = "2.6.7"; + url = "https://www.nuget.org/api/v2/package/vswhere/2.6.7"; + sha256 = "0h4k5i96p7633zzf4xsv7615f9x72rr5qr7b9934ri2y6gshfcwk"; + }) +(fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) +(fetchNuGet { + name = "xunit.runner.console"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.runner.console/2.4.1"; + sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13"; + }) +(fetchNuGet { + name = "system.threading"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.threading/4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) +(fetchNuGet { + name = "system.threading"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading/4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) +(fetchNuGet { + name = "system.threading.tasks.dataflow"; + version = "4.5.24"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.dataflow/4.5.24"; + sha256 = "0wahbfdb0jxx3hi04xggfms8wgf68wmvv68m2vfp8v2kiqr5mr2r"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.analyzers"; + version = "1.1.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.codeanalysis.analyzers/1.1.0"; + sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; + }) +(fetchNuGet { + name = "system.dynamic.runtime"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.dynamic.runtime/4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) +(fetchNuGet { + name = "system.io.pipes"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.pipes/4.3.0"; + sha256 = "1ygv16gzpi9cnlzcqwijpv7055qc50ynwg3vw29vj1q3iha3h06r"; + }) +(fetchNuGet { + name = "system.net.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.net.primitives/4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) +(fetchNuGet { + name = "system.runtime.serialization.xml"; + version = "4.1.1"; + url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.xml/4.1.1"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + }) +(fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.encoding/4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) +(fetchNuGet { + name = "system.collections.nongeneric"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.collections.nongeneric/4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) +(fetchNuGet { + name = "system.diagnostics.tools"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tools/4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) +(fetchNuGet { + name = "microsoft.netframework.referenceassemblies"; + version = "1.0.0-alpha-004"; + url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies/1.0.0-alpha-004"; + sha256 = "1qrpxhcx11v92lqwvrih88mlyfw2rkrsjqh7gl8c1h71vyppr3bp"; + }) +(fetchNuGet { + name = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.emit.ilgeneration/4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) +(fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.extensibility.execution/2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) +(fetchNuGet { + name = "microsoft.codecoverage"; + version = "15.9.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.codecoverage/15.9.0"; + sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg"; + }) +(fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.extensibility.core/2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) +(fetchNuGet { + name = "system.collections.concurrent"; + version = "4.0.12"; + url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) +(fetchNuGet { + name = "system.collections.concurrent"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) +(fetchNuGet { + name = "system.collections"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.collections/4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) +(fetchNuGet { + name = "system.collections"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.collections/4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) +(fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) +(fetchNuGet { + name = "microsoft.build.nugetsdkresolver"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/microsoft.build.nugetsdkresolver/5.2.0-rtm.6067"; + sha256 = "1rz2i4md7b8rlybb9s7416l0pr357f3ar149s6ipfq0xijn3xgmh"; + }) +(fetchNuGet { + name = "system.reflection"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection/4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) +(fetchNuGet { + name = "system.reflection"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection/4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) +(fetchNuGet { + name = "nuget.configuration"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.configuration/5.2.0-rtm.6067"; + sha256 = "075mypb32i0d0x73rcr0di6pb0bhlp0izv3633ky64kddriajma1"; + }) +(fetchNuGet { + name = "system.net.http"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.net.http/4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) +(fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) +(fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.x509certificates/4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) +(fetchNuGet { + name = "nuget.packaging"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.packaging/5.2.0-rtm.6067"; + sha256 = "16p5glvvpp5rw10ycbpyg39k4prir450l12r5frpm8qz0rdp3xig"; + }) +(fetchNuGet { + name = "nuget.commands"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.commands/5.2.0-rtm.6067"; + sha256 = "06vnphsmwnvcigwj37hy5abipjzwhnq61zw66cclwd6jjibb1kh9"; + }) +(fetchNuGet { + name = "system.runtime"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime/4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) +(fetchNuGet { + name = "system.runtime"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime/4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) +(fetchNuGet { + name = "microsoft.win32.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) +(fetchNuGet { + name = "microsoft.win32.primitives"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) +(fetchNuGet { + name = "system.collections.immutable"; + version = "1.2.0"; + url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.2.0"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; + }) +(fetchNuGet { + name = "system.collections.immutable"; + version = "1.3.1"; + url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.3.1"; + sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; + }) +(fetchNuGet { + name = "system.collections.immutable"; + version = "1.5.0"; + url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) +(fetchNuGet { + name = "nuget.dependencyresolver.core"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.dependencyresolver.core/5.2.0-rtm.6067"; + sha256 = "0iw1z2lascjjmdkk9nf2wqm5sj5nqjv4611xx29vlmp6cyhnpq4i"; + }) +(fetchNuGet { + name = "netstandard.library"; + version = "1.6.1"; + url = "https://www.nuget.org/api/v2/package/netstandard.library/1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) +(fetchNuGet { + name = "shouldly"; + version = "3.0.0"; + url = "https://www.nuget.org/api/v2/package/shouldly/3.0.0"; + sha256 = "1hg28w898kl84rx57sclb2z9b76v5hxlwxig1xnb6fr81aahzlw3"; + }) +(fetchNuGet { + name = "microsoft.diasymreader.pdb2pdb"; + version = "1.1.0-beta1-62506-02"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.diasymreader.pdb2pdb/1.1.0-beta1-62506-02/microsoft.diasymreader.pdb2pdb.1.1.0-beta1-62506-02.nupkg"; + sha256 = "1dkhpmq5aw34nndvb4xc370866vf33x70zrjhgvnpwwspb6vb0zh"; + }) +(fetchNuGet { + name = "system.globalization.calendars"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.globalization.calendars/4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) +(fetchNuGet { + name = "system.io.compression.zipfile"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.compression.zipfile/4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) +(fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) +(fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) +(fetchNuGet { + name = "system.io.filesystem.driveinfo"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem.driveinfo/4.3.0"; + sha256 = "0j67khc75lwdf7d5i3z41cks7zhac4zdccgvk2xmq6wm1l08xnlh"; + }) +(fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) +(fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) +(fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) +(fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) +(fetchNuGet { + name = "system.reflection.extensions"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) +(fetchNuGet { + name = "system.reflection.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) +(fetchNuGet { + name = "system.diagnostics.process"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.1.0"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + }) +(fetchNuGet { + name = "system.diagnostics.process"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.3.0"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }) +(fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.primitives/4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) +(fetchNuGet { + name = "system.threading.thread"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) +(fetchNuGet { + name = "system.threading.thread"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) +(fetchNuGet { + name = "newtonsoft.json"; + version = "9.0.1"; + url = "https://www.nuget.org/api/v2/package/newtonsoft.json/9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) +(fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) +(fetchNuGet { + name = "xunit"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit/2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) +(fetchNuGet { + name = "system.valuetuple"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.valuetuple/4.3.0"; + sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; + }) +(fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net472"; + version = "1.0.0-alpha-004"; + url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies.net472/1.0.0-alpha-004"; + sha256 = "08wa54dm7yskayzxivnwbm8sg1pf6ai8ccr64ixf9lyz3yw6y0nc"; + }) +(fetchNuGet { + name = "system.security.cryptography.algorithms"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.algorithms/4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) +] diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 796747bf6e9..1c90bcc3a9f 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ninja-${version}"; + pname = "ninja"; version = "1.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 266dff8cf6c..3d2759f025c 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: stdenv.mkDerivation rec { - name = "qbs-${version}"; + pname = "qbs"; version = "1.13.1"; diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 98cd7e136d2..0b858f6f20d 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -5,7 +5,8 @@ let version = "2.5.1"; in stdenv.mkDerivation { - name = "rebar-${version}"; + pname = "rebar"; + inherit version; src = fetchurl { url = "https://github.com/rebar/rebar/archive/${version}.tar.gz"; diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 767cd70abcd..28697f4c69c 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, python2, which}: stdenv.mkDerivation rec { - name = "redo-apenwarr-${version}"; + pname = "redo-apenwarr"; version = "unstable-2019-06-21"; diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 3036ef23584..612dd5c7810 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.3"; - name = "redo-sh-${version}"; + pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 3eca6f02e45..4d43812ebe6 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "remake-${version}"; + pname = "remake"; remakeVersion = "4.1"; dbgVersion = "1.1"; version = "${remakeVersion}+dbg-${dbgVersion}"; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index ba00a7078fc..d32eba51ce1 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "sbt-${version}"; + pname = "sbt"; version = "1.2.8"; src = fetchurl { urls = [ - "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz" + "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 08644def517..1655c154d4e 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.1.0"; - sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; + version = "3.1.1"; + sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc"; }; } diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 00345179131..7f0cc8100ac 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }: stdenv.mkDerivation rec { - name = "shards-${version}"; + pname = "shards"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 19256e39c33..9b44b30d777 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }: stdenv.mkDerivation rec { - name = "tup-${version}"; + pname = "tup"; version = "0.7.8"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index c3346ad7e99..6f50907665f 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -7,13 +7,13 @@ let optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\""; in stdenv.mkDerivation rec { - name = "waf-${version}"; + pname = "waf"; version = "2.0.15"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz"; }; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3ef3c75ca4e..317186ea3e0 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -15,7 +15,8 @@ let goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { - name = "buildah-${version}"; + pname = "buildah"; + inherit version; inherit src; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index fa45ba689df..7ed75d3f6e6 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-web"; - version = "0.6.25"; + version = "0.6.26"; src = fetchFromGitHub { owner = "koute"; repo = pname; rev = version; - sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf"; + sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; - cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; + cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5"; nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ maintainers.kevincox ]; + maintainers = with maintainers; [ kevincox ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index e33761a67e0..8ec2552aeff 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, python, emacsPackagesNg }: +{ stdenv, fetchurl, python, emacsPackages }: stdenv.mkDerivation rec { - name = "cask-${version}"; + pname = "cask"; version = "0.8.4"; src = fetchurl { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; doCheck = true; - buildInputs = with emacsPackagesNg; [ + buildInputs = with emacsPackages; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ]; @@ -44,5 +44,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.flexw ]; }; - nativeBuildInputs = [ emacsPackagesNg.emacs python ]; + nativeBuildInputs = [ emacsPackages.emacs python ]; } diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index e07b3cd9db7..001f87b3b27 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "casperjs-${version}"; + pname = "casperjs"; + inherit version; src = fetchFromGitHub { owner = "casperjs"; diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index dfa164e6755..9ae1026c858 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "check-unstable-${version}"; + pname = "check-unstable"; version = "2018-09-12"; rev = "88db195993f8e991ad402754accd0635490769f9"; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 93809551f1d..be39f6e3667 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cloudfoundry-cli-${version}"; + pname = "cloudfoundry-cli"; version = "6.46.1"; goPackagePath = "code.cloudfoundry.org/cli"; diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index db7df2af700..24aca0dada7 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "compile-daemon-unstable-${version}"; + pname = "compile-daemon-unstable"; version = "2017-03-08"; rev = "d447e567232bcb84cedd3b2be012c7127f31f469"; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index b2b903b095c..9aaf886ef06 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "ct-${version}"; + pname = "ct"; version = "0.7.0"; goPackagePath = "github.com/coreos/container-linux-config-transpiler"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index ba0be89abf3..d9f7237d289 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -5,7 +5,8 @@ let goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { - name = "buildkite-agent-${version}"; + pname = "buildkite-agent"; + inherit version; inherit goPackagePath src postPatch; diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix index fe83a9aa170..75f175aae9c 100644 --- a/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/pkgs/development/tools/continuous-integration/cide/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }: stdenv.mkDerivation rec { - name = "cide-${version}"; + pname = "cide"; version = "0.9.0"; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; gemdir = ./.; }; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 4a4708df32d..b20d5cfbeee 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "drone-cli-${version}"; + pname = "drone-cli"; version = "0.8.6"; revision = "v${version}"; goPackagePath = "github.com/drone/drone-cli"; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 81dbc54cece..53ad6f4c2f6 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }: buildGoPackage rec { - name = "drone.io-${version}"; + pname = "drone.io"; version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}"; revision = "c48150767c2700d35dcc29b110a81c8b5969175e"; goPackagePath = "github.com/drone/drone"; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 47af70b3702..3f394472c40 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "06ns98k47nafhkkj7gkmxp7msn4ssypyss6ll0fm6380vq2cavnj"; + sha256 = "15lkhdvxqcryn5k7qflkby666ddj66gpqzga13yxjgjjp7zx2mi3"; }; - modSha256 = "11rnlmn5hp9nsgkmd716dsjmkr273035j9gzfhjxjsfpiax60i0a"; + modSha256 = "0wz0v7w2di23cvqpg35zzqs2hvsbjgcrl7pr90ymmpsspq97fkf7"; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 62c682a1608..d8b18fcd121 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -15,7 +15,7 @@ let in buildGoPackage rec { inherit version; - name = "gitlab-runner-${version}"; + pname = "gitlab-runner"; goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; commonPackagePath = "${goPackagePath}/common"; buildFlagsArray = '' diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 04352660a76..26647370821 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jenkins-${version}"; - version = "2.176.2"; + pname = "jenkins"; + version = "2.176.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "19chl7dq25hjn73qgx5cd4azs68kg16r30zx563rrppq3hbc79ik"; + sha256 = "18wsggb4fhlacpxpxkd04zwj56gqjccrbkhs35vkyixwwazcf1ll"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 5554455b889..09e6513d2b1 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "coursier-${version}"; + pname = "coursier"; version = "2.0.0-RC3-3"; src = fetchurl { diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index 553d622a83c..47f62573675 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -16,7 +16,8 @@ let }; in stdenv.mkDerivation { - name = "cdb-${version}"; + pname = "cdb"; + inherit version; src = fetchurl { url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 7eb34aa29ba..11b84648632 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dbmate-${version}"; + pname = "dbmate"; version = "1.4.1"; goPackagePath = "github.com/amacneil/dbmate"; diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index e136b180d78..8feca8c62ca 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "ephemeralpg-${version}"; + pname = "ephemeralpg"; version = "2.5"; src = fetchurl { - url = "http://ephemeralpg.org/code/${name}.tar.gz"; + url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 4589e6ff4e5..637519bcf3f 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -21,12 +21,11 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liquibase"; version = "3.6.2"; src = fetchurl { - url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; + url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz"; sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx"; }; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { cp ${logback-core} ${logback-classic} ${slf4j} $out/lib # Clean up documentation. - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} mv $out/LICENSE.txt \ $out/README.txt \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} # Remove silly files. rm $out/liquibase.bat $out/liquibase.spec diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 128921a67d7..d4e57adc140 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.0.0-rc2"; - name = "schemaspy-${version}"; + pname = "schemaspy"; src = fetchurl { - url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar"; + url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; }; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D ${src} "$out/share/java/${name}.jar" + install -D ${src} "$out/share/java/${pname}-${version}.jar" makeWrapper ${jre}/bin/java $out/bin/schemaspy \ - --add-flags "-jar $out/share/java/${name}.jar" \ + --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ --prefix PATH : "$wrappedPath" ''; diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index f6534788938..2ba38905af9 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "shmig-${version}"; + pname = "shmig"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 867aa0b98ec..33b2abce277 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/pkgs/development/tools/database/sqlcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "sqlcheck-${version}"; + pname = "sqlcheck"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix index adb22f45c8e..ca87395b917 100644 --- a/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sqldeveloper-${version}"; + pname = "sqldeveloper"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 45e8ba4f7c0..461acacf4e9 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sqldeveloper-${version}"; + pname = "sqldeveloper"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 5eb7651f199..ca04d209fab 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -7,7 +7,8 @@ let version = "3.9.1"; in stdenv.mkDerivation rec { - name = "squirrel-sql-${version}"; + pname = "squirrel-sql"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index f9ca826cd62..685b9d2f13d 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "dcadec"; version = "0.2.0"; diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix index fbed4e905cf..7d106e5a251 100644 --- a/pkgs/development/tools/deadcode/default.nix +++ b/pkgs/development/tools/deadcode/default.nix @@ -6,7 +6,7 @@ # TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of # the standalone extract of deadcode from it? buildGoPackage rec { - name = "deadcode-unstable-${version}"; + pname = "deadcode-unstable"; version = "2016-07-24"; rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab"; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 172e81e1369..db232561add 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "deis-${version}"; + pname = "deis"; version = "1.13.4"; rev = "v${version}"; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 4285a674559..a344bcf91d8 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "deis-${version}"; + pname = "deis"; version = "1.13.3"; rev = "v${version}"; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index a0bd4e12063..fc38f3edb47 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "delve-${version}"; + pname = "delve"; version = "1.2.0"; goPackagePath = "github.com/go-delve/delve"; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index a486d786c37..456948a9795 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dep-${version}"; + pname = "dep"; version = "0.5.1"; rev = "v${version}"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index b23745a7b49..3108ffdcbba 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -7,7 +7,6 @@ } : pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "devpi-client"; version = "4.1.0"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index d883af1b068..d4215288267 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,20 +1,21 @@ - { stdenv, python3Packages, nginx }: +{ stdenv, python3Packages, nginx }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "devpi-server"; - version = "4.9.0"; + version = "5.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9"; + sha256 = "254fceee846532a5fec4e6bf52a59eb8f236efc657678a542b5200da4bb3abbc"; }; propagatedBuildInputs = with python3Packages; [ + py appdirs devpi-common execnet itsdangerous + repoze_lru passlib pluggy pyramid @@ -24,13 +25,12 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ beautifulsoup4 - mock nginx pytest - pytest-flakes + pytest-flake8 pytestpep8 webtest - ]; + ] ++ stdenv.lib.optionals isPy27 [ mock ]; # test_genconfig.py needs devpi-server on PATH checkPhase = '' diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index dcaa4315669..b3134b0d0ad 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, ncurses }: stdenv.mkDerivation rec { - name = "devtodo-${version}"; + pname = "devtodo"; version = "0.1.20"; src = fetchurl { - url = "https://swapoff.org/files/devtodo/${name}.tar.gz"; + url = "https://swapoff.org/files/devtodo/${pname}-${version}.tar.gz"; sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; }; diff --git a/pkgs/development/tools/diesel-cli/allow-warnings.patch b/pkgs/development/tools/diesel-cli/allow-warnings.patch new file mode 100644 index 00000000000..342ac1baa10 --- /dev/null +++ b/pkgs/development/tools/diesel-cli/allow-warnings.patch @@ -0,0 +1,88 @@ +diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs +index 4e743eb4..97c53ed8 100644 +--- a/diesel/src/lib.rs ++++ b/diesel/src/lib.rs +@@ -131,7 +131,6 @@ + #![cfg_attr(feature = "unstable", feature(specialization, try_from))] + // Built-in Lints + #![deny( +- warnings, + missing_debug_implementations, + missing_copy_implementations, + missing_docs +diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs +index 741ca003..cf93bb8f 100644 +--- a/diesel_cli/src/main.rs ++++ b/diesel_cli/src/main.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_copy_implementations)] ++#![deny(missing_copy_implementations)] + // Clippy lints + #![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)] + #![warn( +diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs +index 2edee846..c96917c4 100644 +--- a/diesel_cli/tests/tests.rs ++++ b/diesel_cli/tests/tests.rs +@@ -1,5 +1,3 @@ +-#![deny(warnings)] +- + extern crate chrono; + extern crate diesel; + #[macro_use] +diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs +index 2c43b2a3..44dcf3f9 100644 +--- a/diesel_derives/src/lib.rs ++++ b/diesel_derives/src/lib.rs +@@ -1,6 +1,6 @@ + #![recursion_limit = "1024"] + // Built-in Lints +-#![deny(warnings, missing_copy_implementations)] ++#![deny(missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::needless_pass_by_value, +diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs +index 636fea66..f86f3dcc 100644 +--- a/diesel_derives/tests/tests.rs ++++ b/diesel_derives/tests/tests.rs +@@ -1,5 +1,3 @@ +-#![deny(warnings)] +- + #[macro_use] + extern crate cfg_if; + #[macro_use] +diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs +index 933e21a8..7c4d0222 100644 +--- a/diesel_migrations/migrations_internals/src/lib.rs ++++ b/diesel_migrations/migrations_internals/src/lib.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)] ++#![deny(missing_debug_implementations, missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::option_map_unwrap_or_else, +diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs +index 0a83234e..2f509c04 100644 +--- a/diesel_migrations/migrations_macros/src/lib.rs ++++ b/diesel_migrations/migrations_macros/src/lib.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)] ++#![deny(missing_debug_implementations, missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::option_map_unwrap_or_else, +diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs +index c85414e5..f025f237 100644 +--- a/diesel_migrations/src/lib.rs ++++ b/diesel_migrations/src/lib.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_copy_implementations)] ++#![deny(missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::needless_pass_by_value, diff --git a/pkgs/development/tools/diesel-cli/cargo-lock.patch b/pkgs/development/tools/diesel-cli/cargo-lock.patch new file mode 100644 index 00000000000..26d583f9a11 --- /dev/null +++ b/pkgs/development/tools/diesel-cli/cargo-lock.patch @@ -0,0 +1,1589 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..f20a5bf +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1583 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "advanced-blog-cli" ++version = "0.1.0" ++dependencies = [ ++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_inserts" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_inserts_mysql" ++version = "0.1.0" ++dependencies = [ ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_inserts_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_updates" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "assert_matches" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "atty" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "barrel" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bcrypt" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bigdecimal" ++version = "0.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bumpalo" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "derive-error-chain" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel" ++version = "1.4.0" ++dependencies = [ ++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_cli" ++version = "1.4.0" ++dependencies = [ ++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_1_mysql" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_1_pg" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_1_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_2_mysql" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_2_pg" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_2_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_3_mysql" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_3_pg" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_3_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_derives" ++version = "1.4.0" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_derives" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "diesel_derives 1.4.0" ++ ++[[package]] ++name = "diesel_infer_schema" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_migrations" ++version = "1.4.0" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_migrations" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "diesel_migrations 1.4.0" ++ ++[[package]] ++name = "diesel_tests" ++version = "0.1.0" ++dependencies = [ ++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.0", ++ "diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "difference" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "dotenv" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gcc" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "infer_schema_internals" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "infer_schema_macros" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ipnetwork" ++version = "0.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.62" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libsqlite3-sys" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "migrations_internals" ++version = "1.4.0" ++dependencies = [ ++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "migrations_internals" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "migrations_internals 1.4.0" ++ ++[[package]] ++name = "migrations_macros" ++version = "1.4.0" ++dependencies = [ ++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "migrations_macros" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "migrations_macros 1.4.0" ++ ++[[package]] ++name = "mysqlclient-sys" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pq-sys" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quickcheck" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "r2d2" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.3.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex" ++version = "0.1.80" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex-syntax" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust-crypto" ++version = "0.2.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc-serialize" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "safemem" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scheduled-thread-pool" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "structopt" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.11.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synom" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread-id" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "uuid" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wasi" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" ++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" ++"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55" ++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" ++"checksum barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2016bcea86b2a1a807753dc2b6ba682fa24e14e50c7474f4b1a0330949c86fb" ++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" ++"checksum bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6f09cde06fb2cd52a77123c36bfd1e8e60cf13a8bac6ba8f451dabff4644c8" ++"checksum bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "679e21a6734fdfc63378aea80c2bf31e6ac8ced21ed33e1ee37f8f7bf33c2056" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" ++"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a" ++"checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7" ++"checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4" ++"checksum diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680" ++"checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" ++"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" ++"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3" ++"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" ++"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64" ++"checksum infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6" ++"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" ++"checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1" ++"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" ++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" ++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9" ++"checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe" ++"checksum mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85" ++"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718" ++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" ++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" ++"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" ++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" ++"checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95" ++"checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406" ++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" ++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bc42ce75d9f4447fb2a04bbe1ed5d18dd949104572850ec19b164e274919f81b" ++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" ++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" ++"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" ++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" ++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" ++"checksum scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd07742e081ff6c077f5f6b283f12f32b9e7cc765b316160d66289b74546fbb3" ++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f" ++"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425" ++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f" ++"checksum structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c" ++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" ++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" ++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" ++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" ++"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" ++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" ++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" ++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" ++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" ++"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc" ++"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0" ++"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9" ++"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e" ++"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix new file mode 100644 index 00000000000..f6a67b05114 --- /dev/null +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security +, sqliteSupport ? true, sqlite +, postgresqlSupport ? true, postgresql +, mysqlSupport ? true, mysql, zlib, libiconv +}: + +assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true) + "support for at least one database must be enabled"; + +let + inherit (stdenv.lib) optional optionals optionalString; + features = '' + ${optionalString sqliteSupport "sqlite"} \ + ${optionalString postgresqlSupport "postgres"} \ + ${optionalString mysqlSupport "mysql"} \ + ''; +in + +rustPlatform.buildRustPackage rec { + pname = "diesel-cli"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "diesel-rs"; + repo = "diesel"; + rev = "v${version}"; + sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb"; + }; + + patches = [ + # Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated` + # + # Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c + # is in a release. + ./allow-warnings.patch + ]; + + cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ optional stdenv.isDarwin Security + ++ optional (stdenv.isDarwin && mysqlSupport) libiconv + ++ optional sqliteSupport sqlite + ++ optional postgresqlSupport postgresql + ++ optionals mysqlSupport [ mysql zlib ]; + + # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build + # because --features fails to apply to the package: + # https://github.com/rust-lang/cargo/issues/5015 + # https://github.com/rust-lang/cargo/issues/4753 + preBuild = "cd diesel_cli"; + postBuild = "cd .."; + + checkPhase = optionalString sqliteSupport '' + (cd diesel_cli && cargo check --features sqlite) + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/diesel --version + ''; + + # Fix the build with mariadb, which otherwise shows "error adding symbols: + # DSO missing from command line" errors for libz and libssl. + NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto"; + + meta = with lib; { + description = "Database tool for working with Rust projects that use Diesel"; + homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli; + license = with licenses; [ mit asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ ivan ]; + }; +} diff --git a/pkgs/development/tools/diesel-cli/update-cargo-lock.sh b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh new file mode 100755 index 00000000000..bd2e033e687 --- /dev/null +++ b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# This updates cargo-lock.patch for the diesel version listed in default.nix. + +set -eu -o verbose + +here=$PWD +version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) +git clone -b "v$version" --depth=1 https://github.com/diesel-rs/diesel "$checkout" +cd "$checkout" + +rm -f rust-toolchain +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index b599ccf1364..5ce57ee8055 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dive"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "wagoodman"; repo = pname; rev = "v${version}"; - sha256 = "0az9b800zwk5sd90s8ssg8amf0a4dl7nrglkirp51d8hh3rs6nzl"; + sha256 = "1pyrdff5qqc0l3h4nssa9a7qnfqwy2p6ywc8nbwyc7wvzgdiczb8"; }; - modSha256 = "1rc9nqri66kgjpxqcgwllyd0qmk46gs3wmsfdj1w43p6ybnaf3qw"; + modSha256 = "1fk9z7a6wghrs15pc28g5ri7rkbb1ifjb91rscwqsmh10r2wik4w"; meta = with lib; { description = "A tool for exploring each layer in a docker image"; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index d7604f4de9d..86954ea9d7e 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "doctl-${version}"; + pname = "doctl"; version = "${major}.${minor}.${patch}"; major = "1"; minor = "18"; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index 17aa94ebf36..1b559df8ef6 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, jdk, which, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "drip"; version = "0.2.4"; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index c223a8dc54a..5f359757eac 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchFromGitHub, dmd, curl}: stdenv.mkDerivation rec { - name = "dtools-${version}"; + pname = "dtools"; version = "2.085.1"; srcs = [ diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index 19ee4c6391b..bc46f0776a6 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -7,7 +7,7 @@ let inherit ruby; }; in buildGoPackage rec { - name = "ejson-${version}"; + pname = "ejson"; version = "1.2.1"; rev = "v${version}"; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index e67b417226f..736640eba8e 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -2,7 +2,7 @@ , z3, python }: stdenv.mkDerivation rec { - name = "cuter-${version}"; + pname = "cuter"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index 1ce49a4cbb9..f65dfe6565b 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "errcheck-${version}"; + pname = "errcheck"; version = "1.1.0"; goPackagePath = "github.com/kisielk/errcheck"; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 18367d14f6e..331c86ad88c 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { - name = "fac-${version}"; + pname = "fac"; version = "2.0.0"; goPackagePath = "github.com/mkchoi212/fac"; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 7eb05765428..d190ee32fca 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -45,12 +45,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; version = "1.0.8"; in stdenv.mkDerivation rec { - name = "flatpak-builder-${version}"; + pname = "flatpak-builder"; + inherit version; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912"; }; diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix index ac145fae7ef..a6ba410ec71 100644 --- a/pkgs/development/tools/flock/default.nix +++ b/pkgs/development/tools/flock/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "flock"; - name = "${pname}-${version}"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 4ad04ae0e43..b57c9841978 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -3,7 +3,8 @@ version = "5.2.4"; in stdenv.mkDerivation { - name = "flyway-${version}"; + pname = "flyway"; + inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc"; diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 11880213bad..3100daae389 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { version = "0.39"; - name = "fMBT-${version}"; + pname = "fMBT"; src = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 292c0dc3a4e..eb6f937800a 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -7,7 +7,7 @@ } : stdenv.mkDerivation rec { - name = "fusee-launcher-${version}"; + pname = "fusee-launcher"; version = "unstable-2018-07-14"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index fac1a3958d3..15129bbebff 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "galen"; version = "2.4.4"; - name = "${pname}-${version}"; inherit jre8; diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index 0857a3d4a7c..872c8fae527 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ libtool, freeimage, mesa }: stdenv.mkDerivation rec { version = "v1.0.2"; - name = "gamecube-tools-${version}"; + pname = "gamecube-tools"; nativeBuildInputs = [ which autoconf automake libtool ]; buildInputs = [ freeimage mesa ]; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index c750b553791..b284b7e7a04 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gauge-${version}"; + pname = "gauge"; version = "1.0.4"; goPackagePath = "github.com/getgauge/gauge"; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 35328fdf66c..9cfa2f02c6e 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gdm-${version}"; + pname = "gdm"; version = "1.4"; goPackagePath = "github.com/sparrc/gdm"; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 2d61b27e2c2..b0a59e632f1 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { - name = "git-ftp-${version}"; + pname = "git-ftp"; version = "1.5.2"; src = fetchFromGitHub { owner = "git-ftp"; diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 3408b960889..d13c75be9b7 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "git-quick-stats-${version}"; + pname = "git-quick-stats"; version = "2.0.8"; src = fetchFromGitHub { repo = "git-quick-stats"; diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 6a336b7015a..1bad76b246a 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: buildPythonApplication rec { - name = "cligh-${version}"; + pname = "cligh"; version = "0.3"; doCheck = false; # no tests diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index bd83a63e5d6..93004348981 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "glide-${version}"; + pname = "glide"; version = "0.12.3"; goPackagePath = "github.com/Masterminds/glide"; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index b581e71129c..dfc5ed843e7 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gllvm-${version}"; + pname = "gllvm"; version = "1.2.3"; goPackagePath = "github.com/SRI-CSL/gllvm"; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 361740def11..7341dfc90c4 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "global-platform-pro"; version = "18.09.14"; GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "martinpaljak"; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { }; deps = stdenv.mkDerivation { - name = "${name}-deps"; + name = "${pname}-${version}-deps"; inherit src; nativeBuildInputs = [ jdk maven ]; installPhase = '' diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index 35f7a2bfdea..d0e9cc9e2d3 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "glock-${version}"; + pname = "glock"; version = "20160816-${stdenv.lib.strings.substring 0 7 rev}"; rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index d85060add5e..20d1f7c0f1e 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "glslviewer-${version}"; + pname = "glslviewer"; version = "2019-04-22"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 70b426dc594..8f9b9ddf0b5 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018.1"; - name = "gnome-desktop-testing-${version}"; + pname = "gnome-desktop-testing"; src = fetchgit { url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git; diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index 249fc21cdfe..ffdb2a092a0 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-bindata-assetfs-${version}"; + pname = "go-bindata-assetfs"; version = "20160814-${rev}"; rev = "e1a2a7e"; goPackagePath = "github.com/elazarl/go-bindata-assetfs"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 9a783deecee..4d07939bd7c 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-bindata-${version}"; + pname = "go-bindata"; version = "20151023-${stdenv.lib.strings.substring 0 7 rev}"; rev = "a0ff2567cfb70903282db057e799fd826784d41d"; diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index 5e1a69a1692..3c6cf7e3d83 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-junit-report-unstable-${version}"; + pname = "go-junit-report-unstable"; version = "2018-06-14"; rev = "385fac0ced9acaae6dc5b39144194008ded00697"; diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 62e276f2f42..52b2962a23d 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "motion-unstable-${version}"; + pname = "motion-unstable"; version = "2018-04-09"; rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index 4df506f908f..5f6088363f1 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-outline-${version}"; + pname = "go-outline"; version = "unstable-2018-11-22"; rev = "7182a932836a71948db4a81991a494751eccfe77"; diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index f818569dd00..febf71657eb 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "go-protobuf-${version}"; + pname = "go-protobuf"; version = "1.3.2"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 52cd37f9885..7fcec1937c7 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-repo-root-${version}"; + pname = "go-repo-root"; version = "20140911-${stdenv.lib.strings.substring 0 7 rev}"; rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index dfeb6d52e72..e774ed71664 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-symbols-${version}"; + pname = "go-symbols"; version = "0.1.1"; goPackagePath = "github.com/acroca/go-symbols"; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 36634423fdb..26458a3ca2e 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -2,7 +2,7 @@ fetchFromGitHub }: buildGoPackage rec { - name = "go2nix-${version}"; + pname = "go2nix"; version = "1.3.0"; rev = "v${version}"; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 53d4bfaa483..24a21c8279c 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goa-${version}"; + pname = "goa"; version = "1.4.1"; goPackagePath = "github.com/goadesign/goa"; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index f93bd9d28c8..1524984756f 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-gomod-unstable-${version}"; + pname = "gocode-gomod-unstable"; version = "2019-03-27"; rev = "81059208699789f992bb4a4a3fedd734e335468d"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 3351c0e986b..b67f8929e48 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-unstable-${version}"; + pname = "gocode-unstable"; version = "2018-11-05"; rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898"; diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 9ef94ffdc7f..0ee889d0265 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "goconst-${version}"; + pname = "goconst"; version = "1.1.0"; goPackagePath = "github.com/jgautheron/goconst"; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index fcdb56460e1..1c4dd00b95e 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goconvey-${version}"; + pname = "goconvey"; version = "1.6.3"; goPackagePath = "github.com/smartystreets/goconvey"; diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index 91ebaff803e..f446b728908 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gocyclo-unstable-${version}"; + pname = "gocyclo-unstable"; version = "2015-02-08"; rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 993305bd98f..ce6c77b2cc3 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "godef-${version}"; + pname = "godef"; version = "1.1.1"; rev = "v${version}"; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 7fd6fe62374..20c031ead4a 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -9,7 +9,7 @@ let pulseaudio = false; }; in stdenv.mkDerivation rec { - name = "godot-${version}"; + pname = "godot"; version = "3.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix new file mode 100644 index 00000000000..221058a461e --- /dev/null +++ b/pkgs/development/tools/gofumpt/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gofumpt"; + version = "2019-07-29"; + + src = fetchFromGitHub { + owner = "mvdan"; + repo = pname; + rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b"; + sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf"; + }; + + modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g"; + + meta = with lib; { + description = "A stricter gofmt"; + homepage = https://github.com/mvdan/gofumpt; + license = licenses.bsd3; + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 7724ee49465..61d0e7a73db 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gogetdoc-unstable-${version}"; + pname = "gogetdoc-unstable"; version = "2018-10-25"; rev = "9098cf5fc236a5e25060730544af2ba6d65cd968"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index ae7f24a62a5..7a3d7882715 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "golangci-lint-${version}"; + pname = "golangci-lint"; version = "1.17.1"; goPackagePath = "github.com/golangci/golangci-lint"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 9d404546d00..bd66f35e471 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "lint-${version}"; + pname = "lint"; version = "20181026-${stdenv.lib.strings.substring 0 7 rev}"; rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix index f63d33138fc..c2f2a8a597a 100644 --- a/pkgs/development/tools/gometalinter/default.nix +++ b/pkgs/development/tools/gometalinter/default.nix @@ -39,7 +39,7 @@ let ]; in buildGoPackage rec { - name = "gometalinter-${version}"; + pname = "gometalinter"; version = "3.0.0"; goPackagePath = "github.com/alecthomas/gometalinter"; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 112e1769f21..4d97415bc56 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gomodifytags-unstable-${version}"; + pname = "gomodifytags-unstable"; version = "2018-09-14"; rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d"; diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index ba4f4bb3f51..df3310893a4 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -3,7 +3,7 @@ with python27Packages; stdenv.mkDerivation rec { - name = "google-app-engine-go-sdk-${version}"; + pname = "google-app-engine-go-sdk"; version = "1.9.61"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 89a1da77270..778ed562637 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gopkgs-${version}"; + pname = "gopkgs"; version = "2.0.1"; goPackagePath = "github.com/uudashr/gopkgs"; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 7ee87b8f848..cc2106cdc08 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gosec-${version}"; + pname = "gosec"; version = "1.2.0"; goPackagePath = "github.com/securego/gosec"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index b8230561fb4..881ae7e24d4 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gotags-${version}"; + pname = "gotags"; version = "20150803-${stdenv.lib.strings.substring 0 7 rev}"; rev = "be986a34e20634775ac73e11a5b55916085c48e7"; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index 8eb65281b3f..e74b6c27b2b 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gotests-${version}"; + pname = "gotests"; version = "1.5.3"; rev = "v${version}"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix new file mode 100644 index 00000000000..36e41bddf25 --- /dev/null +++ b/pkgs/development/tools/gotestsum/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gotestsum"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "gotestyourself"; + repo = "gotestsum"; + rev = "v${version}"; + sha256 = "1d4sbvk9wqzl3g3da8inqdkvd43rkwvmq969jlgl1k1agv5xjxqv"; + }; + + modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn"; + + meta = with stdenv.lib; { + homepage = "https://github.com/gotestyourself/gotestsum"; + description = "A human friendly `go test` runner"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ endocrimes ]; + }; +} diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index d83f0ec4014..be7db5e8b8a 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoModule, fetchgit }: buildGoModule rec { - name = "gotools-unstable-${version}"; + pname = "gotools-unstable"; version = "2019-07-06"; rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix index 2030c8ba444..804a9bf043e 100644 --- a/pkgs/development/tools/govendor/default.nix +++ b/pkgs/development/tools/govendor/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "govendor-${version}"; + pname = "govendor"; version = "1.0.9"; goPackagePath = "github.com/kardianos/govendor"; diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index 152b619966c..ebce368ea9f 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "govers-${version}"; + pname = "govers"; version = "20160623-${stdenv.lib.strings.substring 0 7 rev}"; rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index b28bf24892c..25b80d9cf69 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gox-${version}"; + pname = "gox"; version = "20181025"; goPackagePath = "github.com/mitchellh/gox"; diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix index 461110b63d7..009f475bb7d 100644 --- a/pkgs/development/tools/gpp/default.nix +++ b/pkgs/development/tools/gpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "gpp-${version}"; + pname = "gpp"; version = "2.25"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index ebe76197ef4..e0d2d3d1498 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gron-${version}"; + pname = "gron"; version = "0.6.0"; owner = "tomnomnom"; diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index 833b41ae985..27ca714b73a 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gtk-mac-bundler-${version}"; + pname = "gtk-mac-bundler"; version = "0.7.4"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 78f2e967123..15233979e15 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,12 +1,11 @@ { fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "g-wrap"; version = "1.9.15"; src = fetchurl { - url = "mirror://savannah/${pname}/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index fd9347a4007..b8efb30f5f1 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, guile }: stdenv.mkDerivation rec { - name = "guile-lint-${version}"; + pname = "guile-lint"; version = "14"; src = fetchurl { - url = "https://download.tuxfamily.org/user42/${name}.tar.bz2"; + url = "https://download.tuxfamily.org/user42/${pname}-${version}.tar.bz2"; sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v"; }; buildInputs = [ guile ]; - unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; + unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${pname}-${version}"''; prePatch = '' substituteInPlace guile-lint.in --replace \ diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 3b52c262c0c..7d99a5e9a57 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -5,7 +5,7 @@ let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); in stdenv.mkDerivation rec { - name = "hyper-haskell-${version}"; + pname = "hyper-haskell"; version = "0.1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 905580482d4..c97e35583b6 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "hexio"; - name = "${pname}-${version}"; version = "1.0-RC1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 2bac1540303..b3ce4f8f6a7 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, libftdi +, pkgconfig, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2019.08.15"; + version = "2019.08.31"; pythonPkg = if usePyPy then pypy3 else python3; pythonInterp = pythonPkg.interpreter; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "95949315364f8d9b0c693386aefadf44b28e2cf6"; - sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2"; + rev = "04f1eb78ed8fd50516aee50102675041a8fd40cd"; + sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pythonPkg libftdi ]; + buildInputs = [ pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix index e2aebe9b2dc..5874d1eeed3 100644 --- a/pkgs/development/tools/iferr/default.nix +++ b/pkgs/development/tools/iferr/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "iferr-unstable-${version}"; + pname = "iferr-unstable"; version = "2018-06-15"; rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88"; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 62f33a2d251..b394e9e71fb 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pcre } : stdenv.mkDerivation rec { - name = "imatix_gsl-${version}"; + pname = "imatix_gsl"; version = "4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 69bbf8afe5a..8d368ba528a 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "impl-unstable-${version}"; + pname = "impl-unstable"; version = "2018-02-27"; rev = "3d0f908298c49598b6aa84f101c69670e15d1d03"; diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 10e5c61025a..06831e3a43c 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "ineffassign-unstable-${version}"; + pname = "ineffassign-unstable"; version = "2018-09-09"; rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index 274ced0b37c..2f505ef1c67 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "interfacer-unstable-${version}"; + pname = "interfacer-unstable"; version = "2018-08-31"; rev = "c20040233aedb03da82d460eca6130fcd91c629a"; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index b6a78071bc8..035964dafc0 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation rec { - name = "irony-server-${version}"; + pname = "irony-server"; inherit (irony) version; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 1f0d8f28609..382ef28c014 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, fetchurl, jre }: stdenv.mkDerivation rec { - name = "cfr-${version}"; + pname = "cfr"; version = "0.146"; src = fetchurl { diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 403bfeabfd0..9791cd56ea1 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -2,7 +2,8 @@ let version = "0.98"; in stdenv.mkDerivation { - name = "fastjar-${version}"; + pname = "fastjar"; + inherit version; src = fetchurl { url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index 4577de0cde4..dae39453495 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "jhiccup-${version}"; + pname = "jhiccup"; version = "2.0.10"; src = fetchzip { diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 9682ceb93c7..04d5a0b2e76 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.3"; - name = "visualvm-${version}"; + pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index dbda476171a..79054c7f667 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.4"; - name = "jbake-${version}"; + pname = "jbake"; src = fetchzip { - url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; + url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip"; sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; }; diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix index 3fe55de2ec8..b03fd7a0028 100644 --- a/pkgs/development/tools/jd/default.nix +++ b/pkgs/development/tools/jd/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "jd-${version}"; + pname = "jd"; version = "0.3.1"; rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index 4833755b3ee..cd0e125564f 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "jid-${version}"; + pname = "jid"; version = "0.7.2"; goPackagePath = "github.com/simeji/jid"; diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index c53d6608efd..300c52961f3 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "jmespath-${version}"; + pname = "jmespath"; version = "0.2.2"; rev = "${version}"; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index e8e8acd6a9a..e9ba5a7ddd7 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "jp-${version}"; + pname = "jp"; version = "0.1.2"; rev = "${version}"; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index e7c5955ef41..8605ef398a1 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, oniguruma }: stdenv.mkDerivation rec { - name = "jq-${version}"; + pname = "jq"; version="1.6"; src = fetchurl { diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index dc8e618910c..11a96bc22fe 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "jsduck"; - name = "${pname}-${version}"; version = (import ./gemset.nix).jsduck.version; env = bundlerEnv { diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix index 694428f55a6..4fe4e4c7eab 100644 --- a/pkgs/development/tools/json2hcl/default.nix +++ b/pkgs/development/tools/json2hcl/default.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "json2hcl"; - name = "${pname}-${version}"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 4a837bcef65..d1da88f60bd 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { - name = "kafkacat-${version}"; + pname = "kafkacat"; version = "1.4.0"; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 3a2040e712a..5246a51aabb 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "kind-${version}"; + pname = "kind"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 202c57f9106..c98d397953e 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "ktlint-${version}"; + pname = "ktlint"; version = "0.34.2"; src = fetchurl { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jre ]; unpackCmd = '' - mkdir -p ${name} - cp $curSrc ${name}/ktlint + mkdir -p ${pname}-${version} + cp $curSrc ${pname}-${version}/ktlint ''; installPhase = '' diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index af5c0e9c2f9..6083c03ebc9 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "kube-aws-${version}"; + pname = "kube-aws"; version = "0.9.4"; goPackagePath = "github.com/coreos/kube-aws"; diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix index 20a26824e5e..8e6ca8e221e 100644 --- a/pkgs/development/tools/kube-prompt/default.nix +++ b/pkgs/development/tools/kube-prompt/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kube-prompt-${version}"; + pname = "kube-prompt"; version = "1.0.5"; rev = "v${version}"; diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index a63de550747..104b11c1ce1 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/pkgs/development/tools/kubicorn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "kubicorn-${version}"; + pname = "kubicorn"; version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4c7f3623e9188fba43778271afe161a4facfb657"; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index be964cf4d30..a2a35c7fd1d 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "leaps-${version}"; + pname = "leaps"; version = "0.9.0"; goPackagePath = "github.com/Jeffail/leaps"; diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix index 58f50dd2f7e..7f40824c472 100644 --- a/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "librarian-puppet-go-${version}"; + pname = "librarian-puppet-go"; version = "0.3.9"; goPackagePath = "github.com/tmtk75/librarian-puppet-go"; diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 00397978054..41c4b25c8b1 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ - name = "nuweb-${version}"; + pname = "nuweb"; version = "1.58"; src = fetchurl { - url = "mirror://sourceforge/project/nuweb/${name}.tar.gz"; + url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz"; sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y"; }; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec{ make nuweb.pdf nuwebdoc.pdf all ''; installPhase = '' - install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp + install -d $out/bin $out/share/man/man1 $out/share/doc/${pname}-${version} $out/share/emacs/site-lisp cp nuweb $out/bin cp nuweb.el $out/share/emacs/site-lisp gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz - cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name} + cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index 404f3758ced..573e2aefb80 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "makerpm-${version}"; + pname = "makerpm"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 7e5cbaddd8b..3029ee38518 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "maligned-unstable-${version}"; + pname = "maligned-unstable"; version = "2018-07-07"; rev = "6e39bd26a8c8b58c5a22129593044655a9e25959"; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 14f42ed9d40..53e2920c68d 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -3,7 +3,8 @@ let version = "2.2.3"; in stdenv.mkDerivation { - name = "minizinc-${version}"; + pname = "minizinc"; + inherit version; buildInputs = [ cmake flex bison ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 799623d34cc..284ad4a5a67 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "minizinc-ide-${version}"; + pname = "minizinc-ide"; + inherit version; nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix index db0e41d27ab..37d49b1f35b 100644 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: stdenv.mkDerivation rec { - name = "abi-compliance-checker-${version}"; + pname = "abi-compliance-checker"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix index 047cd466baa..ca59bf28b1e 100644 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/pkgs/development/tools/misc/abi-dumper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: stdenv.mkDerivation rec { - name = "abi-dumper-${version}"; + pname = "abi-dumper"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 7810ba6349c..664e7d28d79 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -15,7 +15,7 @@ let }; in stdenv.mkDerivation rec { - name = "arcanist-${version}"; + pname = "arcanist"; version = "20180916"; src = [ arcanist libphutil ]; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index e66d92e34d6..66e972826cb 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl, cmake }: -let - name = "astyle"; +stdenv.mkDerivation rec { + pname = "astyle"; version = "3.1"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz"; sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; }; - sourceRoot = if stdenv.cc.isClang - then "astyle/build/clang" - else "astyle/build/gcc"; + # lots of hardcoded references to /usr + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace ' /usr/' " $out/" + ''; - # -s option is obsolete on Darwin and breaks build - postPatch = if stdenv.isDarwin then '' - substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr =" - '' else null; + nativeBuildInputs = [ cmake ]; - installFlags = "INSTALL=install prefix=$$out"; - - meta = { - homepage = http://astyle.sourceforge.net/; + meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + homepage = "https://astyle.sourceforge.net/"; + license = licenses.lgpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index d7cea5c3d4e..9901e46d578 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "autoconf-archive-${version}"; + pname = "autoconf-archive"; version = "2019.01.06"; src = fetchurl { diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index ff5ce659d2e..dc719789719 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { - name = "autogen-${version}"; + pname = "autogen"; version = "5.18.12"; src = fetchurl { diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index 38d2194dab8..8892142ad77 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "awf-${version}"; + pname = "awf"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 16182d26db3..72848d04930 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python3Packages }: stdenv.mkDerivation rec { - name = "bashdb-${version}"; + pname = "bashdb"; version = "4.4-1.0.0"; src = fetchurl { - url = "mirror://sourceforge/bashdb/${name}.tar.bz2"; + url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2"; sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml"; }; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index ac7eb557f2e..ea9b340fb0b 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf, txt2man }: stdenv.mkDerivation rec { - name = "bin_replace_string-${version}"; + pname = "bin_replace_string"; version = "0.2"; src = fetchurl { diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 359ab125be9..dd84e3830c4 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: stdenv.mkDerivation rec { - name = "bsdbuild-${version}"; + pname = "bsdbuild"; version = "3.1"; src = fetchurl { - url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz"; + url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz"; sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; }; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ae7ecad7ea1..0577165bcff 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { - name = "ccache-${version}"; + pname = "ccache"; version = "3.4.1"; src = fetchurl { sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; - url = "mirror://samba/ccache/${name}.tar.xz"; + url = "mirror://samba/ccache/${pname}-${version}.tar.xz"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index f643ecab69d..008701615e7 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -2,7 +2,7 @@ , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { - name = "ccls-${version}"; + pname = "ccls"; version = "0.20190314.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 6de69a34b29..f823519fb34 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, readline, flex, texinfo }: stdenv.mkDerivation rec { - name = "cgdb-${version}"; + pname = "cgdb"; version = "0.7.1"; src = fetchurl { - url = "https://cgdb.me/files/${name}.tar.gz"; + url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 5f98df54c0a..887a0f16ec1 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "2.0.0.2"; - name = "checkbashisms-${version}"; + pname = "checkbashisms"; src = fetchurl { url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index ed96befca5e..1aac0bd651c 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -8,7 +8,7 @@ let ''; in stdenv.mkDerivation rec { - name = "chruby-${version}"; + pname = "chruby"; version = "0.3.9"; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 4040eda141f..861a6eff164 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: stdenv.mkDerivation rec { - name = "coccinelle-${version}"; + pname = "coccinelle"; version = "1.0.6"; src = fetchurl { - url = "http://coccinelle.lip6.fr/distrib/${name}.tgz"; + url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz"; sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4"; }; diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index d95c67fea6d..a2a39b81055 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autogen }: stdenv.mkDerivation rec { - name = "complexity-${version}"; + pname = "complexity"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/complexity/${name}.tar.gz"; + url = "mirror://gnu/complexity/${pname}-${version}.tar.gz"; sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522"; }; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index 8a0cb095d44..973caee64e8 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "cproto-${version}"; + pname = "cproto"; version = "4.7o"; src = fetchurl { diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 54ad7ca7071..02d480cf2cd 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "cquery-${version}"; + pname = "cquery"; version = "2018-10-14"; inherit src; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index eff1af8cdb4..34cbadb38af 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: stdenv.mkDerivation rec { - name = "csmith-${version}"; + pname = "csmith"; version = "2.3.0"; src = fetchurl { - url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz"; sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ - --replace '$CSMITH_HOME/runtime' $out/include/${name} \ - --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \ + --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \ + --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \ --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith substituteInPlace $out/bin/launchn.pl \ diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index d8deb75d2d4..3a54a17a93a 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, tie }: stdenv.mkDerivation rec { - name = "cwebbin-${version}"; + pname = "cwebbin"; version = "22p"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index ba95889b5a8..1dd53f62cec 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -3,12 +3,13 @@ let version = "0.7.2"; in stdenv.mkDerivation rec { - name="dfu-programmer-${version}"; + pname = "dfu-programmer"; + inherit version; buildInputs = [ libusb ]; src = fetchurl { - url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 2657e570106..bf1effbe71a 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name="dfu-util-${version}"; + pname = "dfu-util"; version = "0.9"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; }; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index efb850d5ade..378cc4683b4 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -8,13 +8,13 @@ assert withLibrary -> libtool != null; assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { - name = "dialog-${version}"; + pname = "dialog"; version = "1.3-20190211"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/dialog/${name}.tgz" - "https://invisible-mirror.net/archives/dialog/${name}.tgz" + "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz" ]; sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"; }; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 51a5f52d375..23c01338f60 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "elfinfo-${version}"; + pname = "elfinfo"; version = "0.7.5"; goPackagePath = "github.com/xyproto/elfinfo"; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 905fa0d4093..c7eaafd9c7a 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "elfkickers-${version}"; + pname = "elfkickers"; version = "3.1"; src = fetchurl { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 424032e21af..7a3579f0635 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -2,11 +2,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { - name = "elfutils-${version}"; + pname = "elfutils"; version = "0.176"; src = fetchurl { - url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; + url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"; }; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index f58d0659965..b449c0a2d01 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { - name = "epm-${version}"; + pname = "epm"; version = "4.4"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index e84aa0ef555..152792dcee2 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fsatrace-${version}"; + pname = "fsatrace"; version = "0.0.1-160"; src = fetchFromGitHub { @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; preConfigure = '' - mkdir -p $out/libexec/${name} - export makeFlags=INSTALLDIR=$out/libexec/${name} + mkdir -p $out/libexec/${pname}-${version} + export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version} ''; postInstall = '' mkdir -p $out/bin - ln -s $out/libexec/${name}/fsatrace $out/bin/ + ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 73de8eb8cb6..a5c32bd3dc1 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "fswatch-${version}"; + pname = "fswatch"; version = "1.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 70a157bc084..1484e54289e 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { - name = "gede-${version}"; + pname = "gede"; version = "2.14.1"; src = fetchurl { - url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; + url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9"; }; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index b2c71388fc5..2d756a655a4 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-${version}"; + pname = "global"; version = "6.6.3"; src = fetchurl { - url = "mirror://gnu/global/${name}.tar.gz"; + url = "mirror://gnu/global/${pname}-${version}.tar.gz"; sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb"; }; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 25043f89463..108d6190cb7 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gpshell-${version}"; + pname = "gpshell"; version = "1.4.4"; src = fetchurl { diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix index aaaee20b81a..37a7a8c931c 100644 --- a/pkgs/development/tools/misc/gputils/default.nix +++ b/pkgs/development/tools/misc/gputils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gputils-${version}"; + pname = "gputils"; version = "1.5.0-1"; src = fetchurl { - url = "mirror://sourceforge/gputils/${name}.tar.bz2"; + url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2"; sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; }; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 0f9219f10a0..d3afbbc1bc7 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -7,7 +7,7 @@ }: buildGoPackage rec { - name = "hound-unstable-${version}"; + pname = "hound-unstable"; version = "2018-11-02"; rev = "74ec7448a234d8d09e800b92e52c92e378c07742"; diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index 294d1fa10dd..996dda4ca94 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.9.16"; - name = "igprof-${version}"; + pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 8bc35ba01a6..b04de1832ab 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "inotify-tools-${version}"; + pname = "inotify-tools"; version = "3.20.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 281b09393b5..12197c2de40 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -3,7 +3,7 @@ , procps, utilmacros, gtk-doc, openssl, peg }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-${version}"; + pname = "intel-gpu-tools"; version = "1.23"; src = fetchurl { diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index a9f451d31e7..c837728f72d 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, gettext, perlPackages }: stdenv.mkDerivation rec { - name = "intltool-${version}"; + pname = "intltool"; version = "0.51.0"; src = fetchurl { - url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index b431e804d8d..8da3cd57703 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "kdbg-${version}"; + pname = "kdbg"; version = "3.0.0"; src = fetchurl { - url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz"; sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in"; }; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index f4c3237ee7a..7d824fd81fb 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -16,11 +16,11 @@ let "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; }; in stdenv.mkDerivation rec { - name = "kibana-${version}"; + pname = "kibana"; version = elk5Version; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz"; sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); }; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 240d52ca7d0..ace34f35059 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { - name = "loccount-${version}"; + pname = "loccount"; version = "1.2"; goPackagePath = "gitlab.com/esr/loccount"; diff --git a/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/pkgs/development/tools/misc/lsof/darwin-dfile.patch deleted file mode 100644 index 9952228e613..00000000000 --- a/pkgs/development/tools/misc/lsof/darwin-dfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c ---- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500 -+++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400 -@@ -43,7 +43,7 @@ - #include "lsof.h" - - #if defined(PROC_FP_GUARDED) --#extern struct pff_tab Pgf_tab[]; -+extern struct pff_tab Pgf_tab[]; - #endif /* defined(PROC_FP_GUARDED) */ - - diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 63003f338eb..98acccb252a 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,34 +1,22 @@ -{ stdenv, fetchurl, buildPackages, ncurses }: +{ stdenv, fetchFromGitHub, buildPackages, ncurses }: let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { - name = "lsof-${version}"; - version = "4.91"; + pname = "lsof"; + version = "4.93.2"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; - src = fetchurl { - urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down... - ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] - ++ map ( - # the tarball is moved after new version is released - isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" - + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ] - ++ map ( - # the tarball is moved after new version is released - isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/" - + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ] - ; - sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9"; + src = fetchFromGitHub { + owner = "lsof-org"; + repo = "lsof"; + rev = "${version}"; + sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; }; - unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - - patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + patches = [ ./no-build-info.patch ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 @@ -47,12 +35,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/man/man8 - cp lsof.8 $out/man/man8/ + cp Lsof.8 $out/man/man8/lsof.8 cp lsof $out/bin ''; meta = with stdenv.lib; { - homepage = https://people.freebsd.org/~abe/; + homepage = "https://github.com/lsof-org/lsof"; description = "A tool to list open files"; longDescription = '' List open files. Can show what process has opened some file, diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 42ca1a1b7d5..17837a54877 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-${version}"; + pname = "lttng-tools"; version = "2.10.7"; src = fetchurl { - url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; + url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd"; }; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index adc4bbd5c39..ad5276e5e1a 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-${version}"; + pname = "lttng-ust"; version = "2.10.4"; src = fetchurl { - url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm"; }; diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index ebe62452440..ce62634e7d7 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "macdylibbundler-${version}"; + pname = "macdylibbundler"; version = "20180825"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 23b7119e7d7..7cbd9246081 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "go-md2man-${version}"; + pname = "go-md2man"; version = "1.0.6"; goPackagePath = "github.com/cpuguy83/go-md2man"; diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix index c45e7841d45..a5e4572d18d 100644 --- a/pkgs/development/tools/misc/moby/default.nix +++ b/pkgs/development/tools/misc/moby/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "moby-${version}"; + pname = "moby"; version = "2017-07-06"; rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40"; diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index ade9954021a..164e0e80b60 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -2,7 +2,8 @@ let version = "0.1.2"; in pythonPackages.buildPythonApplication { - name = "nixbang-${version}"; + pname = "nixbang"; + inherit version; namePrefix = ""; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index a449c28ea28..dea6256824d 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "objconv-${version}"; + pname = "objconv"; version = "2.51"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. - url = "https://archive.org/download/objconv/${name}.zip"; + url = "https://archive.org/download/objconv/${pname}-${version}.zip"; sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; }; diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index 3e02f085ae6..ea31cc3704f 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -2,10 +2,10 @@ GEM remote: https://rubygems.org/ specs: bindata (2.4.4) - elftools (1.0.2) + elftools (1.1.0) bindata (~> 2) - one_gadget (1.6.2) - elftools (~> 1.0.2) + one_gadget (1.7.2) + elftools (>= 1.0.2, < 1.2.0) PLATFORMS ruby diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/development/tools/misc/one_gadget/gemset.nix index 485ddf940fd..26507a26e91 100644 --- a/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajymn59fr9117dkwf5xl8vmr737h6xmrcf1033zjlj2l5qkxn4a"; + sha256 = "0kdf0ck4rzxpd006y09rfwppdrqb3sxww4gzfpv2053yq4mkimbn"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; one_gadget = { dependencies = ["elftools"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wacvysd7ddnbx2jl1vhzbkb28y974riyns7bpx889518zaa09z0"; + sha256 = "07s2nigjw1yik895gliz3a7ps0m9j5nccq82zwdd30sv740jmf5b"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.2"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 874aa04157d..21e825ac0bf 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { - name = "opengrok-${version}"; + pname = "opengrok"; version = "1.0"; # binary distribution src = fetchurl { - url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i"; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 882c52384b8..80203dd0df9 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { - name = "openocd-${version}"; + pname = "openocd"; version = "0.10.0"; src = fetchurl { diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 29d713a9af4..c673bd26109 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; + pname = "patchelf"; version = "0.10-pre-20190328"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index fbb21a8b7c6..0b91953a7c7 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pmccabe-${version}"; + pname = "pmccabe"; version = "2.6"; src = fetchurl { diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index f99c904ed01..c0e7a3653a8 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -4,7 +4,8 @@ let version = "20130503"; in stdenv.mkDerivation rec { - name = "prelink-${version}"; + pname = "prelink"; + inherit version; buildInputs = [ libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc) diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 8ceb3d4a436..d9d28580210 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "premake5-${version}"; + pname = "premake5"; version = "5.0.0-alpha12"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 8f27609abab..7182144fd20 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -15,7 +15,7 @@ , }: stdenv.mkDerivation rec { - name = "pwndbg-${version}"; + pname = "pwndbg"; version = "2019.01.25"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 19e4423f7d8..0519e4d05e0 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -27,7 +27,6 @@ assert stdenv.hostPlatform.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.18"; - name = "${pname}-${version}"; src = fetchurl { name = "saleae-logic-${version}-64bit.zip"; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index a506831cd8e..004975f10d8 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.5.1"; - name = "sipp-${version}"; + pname = "sipp"; src = fetchFromGitHub { owner = "SIPp"; diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index fdacdaef20f..98c400d5285 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -7,7 +7,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "stlink-${version}"; + pname = "stlink"; + inherit version; src = fetchFromGitHub { owner = "texane"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index acdc712786f..c809437f6fb 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libunwind, buildPackages }: stdenv.mkDerivation rec { - name = "strace-${version}"; + pname = "strace"; version = "5.2"; src = fetchurl { - url = "https://strace.io/files/${version}/${name}.tar.xz"; + url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"; }; diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index b50aa088ac5..9872c91ac4b 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { - name = "tcptrack-${version}"; + pname = "tcptrack"; version = "1.4.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 82d0ec6119e..2975d64113e 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -3,7 +3,8 @@ let version = "2.1"; in stdenv.mkDerivation { - name = "teensy-loader-cli-${version}"; + pname = "teensy-loader-cli"; + inherit version; src = fetchgit { url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index 77b362c712c..29d809b5f05 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { version = "3.8"; - name = "tet-${version}"; + pname = "tet"; src = fetchurl { url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ; diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index b094f05e951..247733b81ba 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "texi2html-1.82"; + pname = "texi2html"; + version = "5.0"; src = fetchurl { - url = "mirror://savannah/texi2html/${name}.tar.bz2"; - sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n"; + url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2"; + sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"; }; - buildInputs = [perl]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ perl ]; - meta = { + preBuild = '' + substituteInPlace separated_to_hash.pl \ + --replace "/usr/bin/perl" "${perl}/bin/perl" + ''; + + meta = with stdenv.lib; { description = "Perl script which converts Texinfo source files to HTML output"; homepage = https://www.nongnu.org/texi2html/; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 63e5bea19d7..5f4478bd4fb 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo, ncurses, lzma }: stdenv.mkDerivation rec { - name = "texinfo-${version}"; + pname = "texinfo"; version = "4.13a"; src = fetchurl { - url = "mirror://gnu/texinfo/${name}.tar.lzma"; + url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma"; sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; }; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index c380243a898..5e40152df8d 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tie-${version}"; + pname = "tie"; version = "2.4"; src = fetchurl { - url = "http://mirrors.ctan.org/web/tie/${name}.tar.gz"; + url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz"; sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj"; }; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 11caf8e7b20..65a17fd1242 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionOlder "4.02" ocaml.version; stdenv.mkDerivation rec { - name = "trv-${version}"; + pname = "trv"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index ebc85c19b39..68409a59f37 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { - name = "universal-ctags-${version}"; + pname = "universal-ctags"; version = "unstable-2019-07-30"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 0fa854f9b2a..fb43ff61a81 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tcl, usb-modeswitch }: stdenv.mkDerivation rec { - name = "usb-modeswitch-data-${version}"; + pname = "usb-modeswitch-data"; version = "20170806"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff"; }; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index d34a94e0467..7c119c92943 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "usb-modeswitch-${version}"; + pname = "usb-modeswitch"; version = "2.5.2"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"; }; diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix index e806a779638..2b6e349b9fd 100644 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libelf }: stdenv.mkDerivation rec { - name = "vtable-dumper-${version}"; + pname = "vtable-dumper"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index d6b8eb5b95f..e2ea96cd590 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "watson-ruby-${version}"; + pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; env = bundlerEnv rec { diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 8f3f6c1b22a..6edf6551b06 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "787"; - name = "xc3sprog-${version}"; + pname = "xc3sprog"; src = fetchsvn rec { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 2e67da18ae9..b409009b524 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "ycmd-${version}"; + pname = "ycmd"; version = "2018-09-20"; src = fetchgit { diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 76130f255fd..5520a4a30be 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, perl, icmake, utillinux }: stdenv.mkDerivation rec { - name = "yodl-${version}"; + pname = "yodl"; version = "4.02.01"; nativeBuildInputs = [ icmake ]; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 6390c1d7fd2..60e948d593f 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "mod-${version}"; + pname = "mod"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 2b5f42b2cbe..1d7784ae1cc 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: stdenv.mkDerivation rec { - name = "msgpack-tools-${version}"; + pname = "msgpack-tools"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 0b060624de3..41e74bc120f 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mustache-go-${version}"; + pname = "mustache-go"; version = "1.0.1"; goPackagePath = "github.com/cbroglie/mustache"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 07005131fb5..689b7da8802 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation rec { - name = "nailgun-${version}"; + pname = "nailgun"; + inherit version; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 57beec8f171..e052b724439 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -20,7 +20,7 @@ let }; in stdenv.mkDerivation rec { - name = "nwjs-${version}"; + pname = "nwjs"; version = "0.12.3"; src = fetchurl { diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 234f5a5bfae..081e86c44dd 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: stdenv.mkDerivation rec { - name = "nrpl-${version}"; + pname = "nrpl"; version = "20150522"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 7117d7dd628..0539e8de92b 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchzip, scons, zlib }: stdenv.mkDerivation rec { - name = "nsis-${version}"; + pname = "nsis"; version = "3.04"; src = diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 96516bfda48..30f531d7db2 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -32,7 +32,7 @@ let }; in stdenv.mkDerivation rec { - name = "nwjs-${version}"; + pname = "nwjs"; version = "0.33.4"; src = if sdk then fetchurl { diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index a83959fba39..4a4203a2f59 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -26,7 +26,7 @@ let param = { in stdenv.mkDerivation rec { - name = "camlp4-${version}"; + pname = "camlp4"; inherit (param) version; src = fetchzip { diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 91870a570b0..fb1eb4276d6 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { - name = "ocaml-findlib-${version}"; + pname = "ocaml-findlib"; version = "1.8.1"; src = fetchurl { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index 1307635abb9..90e88979de4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index ff59fa7cf8a..e9e7f9d279e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "js_of_ocaml-camlp4-${version}"; + pname = "js_of_ocaml-camlp4"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index c5a345f505b..c1526892312 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -7,7 +7,7 @@ then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "js_of_ocaml-compiler-${version}"; + pname = "js_of_ocaml-compiler"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index f88811855a2..e6fb1b353d2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -7,7 +7,8 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" in stdenv.mkDerivation { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; + inherit version; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; sha256 = { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index e7a31c1ce2e..65afee16afb 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-lwt-${version}"; + pname = "js_of_ocaml-lwt"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index bf33b4e59e5..4b2b14d317b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ocamlbuild-${version}"; + pname = "js_of_ocaml-ocamlbuild"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 0649aee162a..277973afba8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ppx-${version}"; + pname = "js_of_ocaml-ppx"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index ddea73b3c76..5b5f7d18f79 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ppx_deriving_json-${version}"; + pname = "js_of_ocaml-ppx_deriving_json"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 1ba9ddd0ab7..c24162cccf7 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-tyxml-${version}"; + pname = "js_of_ocaml-tyxml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 2364058729e..90b092f0e4b 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.10"; - name = "ocaml-oasis-${version}"; + pname = "ocaml-oasis"; # You must manually update the url, not just the version. OCamlforge keys off # the number after download.php, not the filename. diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 87d592bd112..e7528d4f772 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocamlPackages }: stdenv.mkDerivation rec { - name = "obelisk-${version}"; + pname = "obelisk"; version = "0.4.0"; src = fetchFromGitHub { owner = "lelio-brun"; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 41cde6f8ab7..61e8e77f384 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -3,7 +3,8 @@ let version = "0.1.10"; in stdenv.mkDerivation { - name = "obuild-${version}"; + pname = "obuild"; + inherit version; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 74dee630d29..dbf33424439 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { - name = "ocamlmod-${version}"; + pname = "ocamlmod"; version = "0.0.9"; src = fetchurl { diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index f91ae713200..09ab9587ddb 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - name = "${pname}-${version}"; version = "3.4.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 0f536c489eb..da7a5b439ab 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "omake-${version}"; + pname = "omake"; version = "0.10.3"; src = fetchurl { - url = "http://download.camlcity.org/download/${name}.tar.gz"; + url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; }; diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix index fa5393c1871..a49749ad716 100644 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ b/pkgs/development/tools/ocaml/opaline/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "opaline-${version}"; + pname = "opaline"; src = fetchFromGitHub { owner = "jaapb"; diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index ddd8d4b9920..87490bcb617 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -44,7 +44,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "opam-${version}"; + pname = "opam"; version = "1.2.2"; buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 452f162b235..763642e5da1 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -60,7 +60,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "opam-${version}"; + pname = "opam"; version = "2.0.5"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index d9e563952ea..8b7354ae48a 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune +{ stdenv, fetchurl, ocaml, findlib, dune , lambdaTerm, cppo, makeWrapper }: @@ -7,16 +7,16 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.0"; - name = "utop-${version}"; + pname = "utop"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "1g1xf19fhzwsikp33pv1wf6wb2qdc5y7dzqi46h8c4l850cwscjh"; + sha256 = "0kbg7sfn7jaic7xcy7dm543yzsywirxbgpiv2rzwnp9ny2510f9g"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml findlib ocamlbuild cppo dune ]; + buildInputs = [ ocaml findlib cppo dune ]; propagatedBuildInputs = [ lambdaTerm ]; @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime runtime = stdenv.mkDerivation rec { - name = "utop-runtime-env-${version}"; + pname = "utop-runtime-env"; + inherit version; buildInputs = [ findlib ] ++ propagatedBuildInputs; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 725219c3d7c..f2915333427 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "omniorb-${version}"; + pname = "omniorb"; version = "4.2.3"; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 85f8955185f..784895845e5 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - name = "omnisharp-roslyn-${version}"; + pname = "omnisharp-roslyn"; version = "1.32.19"; src = fetchurl { diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix new file mode 100644 index 00000000000..0e4810f0ba4 --- /dev/null +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchgit, qemu, docker, which, makeWrapper }: + +buildGoPackage rec { + pname = "out-of-tree"; + version = "1.1.1"; + + buildInputs = [ makeWrapper ]; + + goPackagePath = "code.dumpstack.io/tools/${pname}"; + + src = fetchgit { + rev = "refs/tags/v${version}"; + url = "https://code.dumpstack.io/tools/${pname}.git"; + sha256 = "048jda3vng11mg62fd3d8vs9yjsp569zlfylnkqv8sb6wd1qn66d"; + }; + + goDeps = ./deps.nix; + + postFixup = '' + wrapProgram $bin/bin/out-of-tree \ + --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" + ''; + + meta = with stdenv.lib; { + description = "kernel {module, exploit} development tool"; + homepage = https://out-of-tree.io; + maintainers = [ maintainers.dump_stack ]; + license = licenses.agpl3Plus; + }; +} diff --git a/pkgs/development/tools/out-of-tree/deps.nix b/pkgs/development/tools/out-of-tree/deps.nix new file mode 100644 index 00000000000..28c6af4586c --- /dev/null +++ b/pkgs/development/tools/out-of-tree/deps.nix @@ -0,0 +1,120 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "5dd71670cca4bc0ee90371eabd0f1bdba1ac6f35"; + sha256 = "1zq7gq5bhf5w9g43680v2z6j0px366a3gmmk5dyxqv0gyrgcpm17"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/naoina/toml"; + fetch = { + type = "git"; + url = "https://github.com/naoina/toml"; + rev = "9fafd69674167c06933b1787ae235618431ce87f"; + sha256 = "0mpvdnidgab48k7dfq1vaiz1wny8n29y7zxpipnp1zm8ibxpism0"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "e6d60cf7ba1f42d86d54cdf5508611c4aafb3970"; + sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; + }; + } + { + goPackagePath = "github.com/otiai10/copy"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/copy"; + rev = "7e9a647135a142c2669943d4a4d29be015ce9392"; + sha256 = "1fpjyk6zrcdwgw3w93v3sb4xf0gq8w5py6vvlljxgf4gi7k96klj"; + }; + } + { + goPackagePath = "github.com/remeh/sizedwaitgroup"; + fetch = { + type = "git"; + url = "https://github.com/remeh/sizedwaitgroup"; + rev = "5e7302b12ccef91dce9fde2f5bda6d5c7ea5d2eb"; + sha256 = "1xwdzby27xzcghsqhli3il165iz3vkx3g4abgvkl99wysyhcvn0a"; + }; + } + { + goPackagePath = "github.com/zcalusic/sysinfo"; + fetch = { + type = "git"; + url = "https://github.com/zcalusic/sysinfo"; + rev = "fbadb57345c2ba8d05d75e81206f665d322c0bb2"; + sha256 = "0556jj50aw2an6a4s4v2n0kk42hbkpgcvd4gbahkdlh4qrqg2r0j"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/logrusorgru/aurora.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/logrusorgru/aurora.v1"; + rev = "a7b3b318ed4e1ae5b80602b08627267303c68572"; + sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; + }; + } +] diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 24a6404dc03..9e0da00dd52 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "packer-${version}"; + pname = "packer"; version = "1.4.1"; goPackagePath = "github.com/hashicorp/packer"; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 82849be40b2..54100dfdee9 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "packet-${version}"; + pname = "packet"; version = "v2.2.2"; goPackagePath = "github.com/ebsarr/packet"; diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix index 616a2049c77..0f8ead579d0 100644 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ b/pkgs/development/tools/parse-cli-bin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "parse-cli-bin-${version}"; + pname = "parse-cli-bin"; version = "3.0.5"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index b53116b888e..9e86a29cf93 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre}: stdenv.mkDerivation rec { - name = "antlr-${version}"; + pname = "antlr"; version = "3.4"; src = fetchurl { url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index e6e54f8dab9..fcd7e445b8a 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -12,7 +12,8 @@ let runtime = { cpp = stdenv.mkDerivation { - name = "antlr-runtime-cpp-${version}"; + pname = "antlr-runtime-cpp"; + inherit version; src = source; outputs = [ "out" "dev" "doc" ]; @@ -35,7 +36,8 @@ let }; antlr = stdenv.mkDerivation { - name = "antlr-${version}"; + pname = "antlr"; + inherit version; src = fetchurl { url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 9b3fd86b555..23ea39c6fa9 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "byacc-${version}"; + pname = "byacc"; version = "20190617"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/byacc/${name}.tgz" - "https://invisible-mirror.net/archives/byacc/${name}.tgz" + "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q"; }; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index d7d27ac9a1c..e46a494de76 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "flex-${version}"; + pname = "flex"; version = "2.6.4"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 681f90bbe5a..93f1d1ee649 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bobcat, icmake, yodl }: stdenv.mkDerivation rec { - name = "flexc++-${version}"; + pname = "flexc++"; version = "2.05.00"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index bf5a2374fde..d41c113821a 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation rec { - name = "hammer-${version}"; + pname = "hammer"; version = "e7aa734"; src = fetchgit { diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 108576d0b11..aa7b63dafea 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "lemon-${version}"; + pname = "lemon"; version = "1.69"; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index d08df8265b0..2f4db7982b7 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -5,10 +5,11 @@ let generic = { version, sha256, license }: stdenv.mkDerivation rec { - name = "ragel-${version}"; + pname = "ragel"; + inherit version; src = fetchurl { - url = "https://www.colm.net/files/ragel/${name}.tar.gz"; + url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 1d0545f6889..f6e35f08639 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "re2c-${version}"; + pname = "re2c"; version = "1.0.3"; sourceRoot = "${src.name}/re2c"; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index ce562bbf5ac..7953a55c7d9 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "pet-${version}"; + pname = "pet"; version = "0.3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 6f26a48b9c4..e4b50f31776 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,6 +1,5 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "pew"; version = "1.1.2"; diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 47b426604da..8aaae2b1c43 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "pgloader"; version = "3.6.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index a37de2a3f62..29b8d4d5ae1 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -15,7 +15,7 @@ let ''; in stdenv.mkDerivation rec { - name = "phantomjs-${version}"; + pname = "phantomjs"; version = "2.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/development/tools/pigeon/default.nix new file mode 100644 index 00000000000..ae543533059 --- /dev/null +++ b/pkgs/development/tools/pigeon/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage { + pname = "pigeon"; + version = "20190810-f3db42a662"; + + goPackagePath = "github.com/mna/pigeon"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "mna"; + repo = "pigeon"; + rev = "f3db42a662eded7550fc7cd11605d05311dfa30f"; + sha256 = "1n0zqidwbqqfslrirpbqw14ylgiry6ggcp9ll4h8rf1chqwk6dhv"; + }; + + meta = { + homepage = "https://github.com/mna/pigeon"; + description = "A PEG parser generator for Go"; + maintainers = with lib.maintainers; [ zimbatm ]; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/tools/pigeon/deps.nix b/pkgs/development/tools/pigeon/deps.nix new file mode 100644 index 00000000000..d836dc43c7c --- /dev/null +++ b/pkgs/development/tools/pigeon/deps.nix @@ -0,0 +1,66 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "b29f5f60c37a"; + sha256 = "118rvb59hc1fykbmif4008rbxw1p0dblc8dxkq96yaapd6p0vbpn"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } +] diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 8155f3016c3..b02ae3c544f 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.1-7"; - name = "EZTrace-${version}"; + pname = "EZTrace"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz"; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 5ff0d2ca2b1..5aaf3d436de 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "heaptrack-${version}"; + pname = "heaptrack"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 9130f31f21d..120fd89377b 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pprof-unstable-${version}"; + pname = "pprof-unstable"; version = "2018-08-15"; rev = "781f11b1fcf71fae9d185e7189b5e686f575075a"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 8f711e14654..3f0b37a7175 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let ## stap binaries stapBuild = stdenv.mkDerivation { - name = "systemtap-${version}"; + pname = "systemtap"; + inherit version; src = fetchgit { inherit url rev sha256; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 559383f45fe..6d6a02ab49f 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "protoc-gen-doc-unstable-${version}"; + pname = "protoc-gen-doc-unstable"; version = "2019-04-22"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 10a10fa21ef..13e8c233ec3 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pup-${version}"; + pname = "pup"; version = "0.4.0"; rev = "v${version}"; diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 0f1482d7953..6a709cf8f9b 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -24,7 +24,8 @@ let }; in stdenv.mkDerivation rec { - name = "pypi2nix-${version}"; + pname = "pypi2nix"; + inherit version; srcs = [ src click diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index a5683e7a953..a2ab9a47a79 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, openssh }: stdenv.mkDerivation rec { - name = "rdocker-${version}"; + pname = "rdocker"; version = "unstable-2018-07-17"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 939febae693..dfa31b30a7e 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -37,7 +37,7 @@ let xorg.libXScrnSaver ]; in stdenv.mkDerivation rec { - name = "react-native-debugger-${version}"; + pname = "react-native-debugger"; version = "0.9.10"; src = fetchurl { diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix index 3e69b4ffa07..b82c0694fec 100644 --- a/pkgs/development/tools/reflex/default.nix +++ b/pkgs/development/tools/reflex/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { - name = "reflex-${version}"; + pname = "reflex"; version = "0.2.0"; goPackagePath = "github.com/cespare/reflex"; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 6ef724022e8..2d5346f2112 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "reftools-unstable-${version}"; + pname = "reftools-unstable"; version = "2018-09-14"; rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399"; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index 35aab138292..80c64a65083 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: with pythonPackages; buildPythonApplication rec { - name = "reno-${version}"; + pname = "reno"; version = "2.3.2"; src = fetchurl { - url = "mirror://pypi/r/reno/${name}.tar.gz"; + url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz"; sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4"; }; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index ffd9774ee44..44654e052d1 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { - name = "nexus-${version}"; + pname = "nexus"; version = "3.16.1-02"; src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln"; }; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index aa537df1508..507402deed6 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "richgo-${version}"; + pname = "richgo"; version = "0.2.8"; goPackagePath = "github.com/kyoh86/richgo"; diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 499cec2e6a7..51801864796 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }: stdenv.mkDerivation rec { - name = "ronn-${version}"; + pname = "ronn"; version = env.gems.ronn.version; env = bundlerEnv rec { diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index da3b27ebacc..3a9ecb7697a 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: stdenv.mkDerivation rec { - name = "rtags-${version}"; + pname = "rtags"; version = "2.16"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 09008c9d63d..12b00ce93f3 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - name = "rucksack-${version}"; + pname = "rucksack"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index df782d93515..ca1c2fa45e9 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -5,6 +5,8 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; version = "0.51.0"; + RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update + src = fetchFromGitHub { owner = "rust-lang"; repo = pname; diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index e7c8e869c87..b5c6f19ddc3 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n"; + sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc"; }; - cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r"; + cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix new file mode 100644 index 00000000000..5ea935babd1 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-watch"; + version = "7.2.1"; + + src = fetchFromGitHub { + owner = "passcod"; + repo = pname; + rev = "v${version}"; + sha256 = "13zjsypj0ay9xb5j5fhl3yfn57kp2yngl138vmnyfk1h7gjdxpk3"; + }; + + cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg"; + + buildInputs = lib.optional stdenv.isDarwin CoreServices; + + # `test with_cargo` tries to call cargo-watch as a cargo subcommand + # (calling cargo-watch with command `cargo watch`) + checkPhase = "PATH=target/debug:$PATH cargo test"; + + meta = with lib; { + description = "A Cargo subcommand for watching over Cargo project's source"; + homepage = https://github.com/passcod/cargo-watch; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ xrelkd ivan ]; + }; +} diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index ca4b6825a38..945b78caccc 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y"; + sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88"; }; - cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; + cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/maturin/default.nix index a17d50262a0..7bd49132d0e 100644 --- a/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -4,17 +4,17 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { - name = "pyo3-pack-${version}"; - version = "0.6.1"; + name = "maturin-${version}"; + version = "0.7.1"; src = fetchFromGitHub { owner = "PyO3"; - repo = "pyo3-pack"; + repo = "maturin"; rev = "v${version}"; - sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; + sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2"; }; - cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; + cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335"; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +27,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Build and publish crates with pyo3 bindings as python packages"; - homepage = https://github.com/PyO3/pyo3-pack; + homepage = https://github.com/PyO3/maturin; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index c6b3d0b4cd0..4cd8b328353 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "sauce-connect-${version}"; + pname = "sauce-connect"; version = "4.5.4"; src = fetchurl ( diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f9128582092..5937b00f459 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -27,7 +27,7 @@ let ]; in stdenv.mkDerivation rec { - name = "chromedriver-${version}"; + pname = "chromedriver"; version = "76.0.3809.68"; src = fetchurl { diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index a8085399b3d..3f4b8a22d64 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "htmlunit-driver-standalone-${version}"; + pname = "htmlunit-driver-standalone"; version = "2.27"; src = fetchurl { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; + installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; meta = { homepage = https://github.com/SeleniumHQ/htmlunit-driver; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 61b74ce108d..d3a8efaadb6 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -8,7 +8,7 @@ let patchVersion = "0"; in stdenv.mkDerivation rec { - name = "selenium-server-standalone-${version}"; + pname = "selenium-server-standalone"; version = "${minorVersion}.${patchVersion}"; src = fetchurl { @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { buildInputs = [ jre makeWrapper ]; installPhase = '' - mkdir -p $out/share/lib/${name} - cp $src $out/share/lib/${name}/${name}.jar + mkdir -p $out/share/lib/${pname}-${version} + cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ + --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 04076a8f0cf..71f488c760a 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -4,7 +4,7 @@ , GLUT }: stdenv.mkDerivation rec { - name = "simavr-${version}"; + pname = "simavr"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 61d47cf907b..58dde838692 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -1,10 +1,10 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "skaffold-${version}"; - version = "0.35.0"; - # rev is the 0.35.0 commit, mainly for skaffold version command output - rev = "1da7608f9eb21ebe722bc054584e591e4223a3dc"; + pname = "skaffold"; + version = "0.36.0"; + # rev is the 0.36.0 commit, mainly for skaffold version command output + rev = "1c054d4ffc7e14b4d81efcbea8b2022403ee4b89"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1vh7vlz14gfjpxf2wy1pybw5x55mw34j6isyy5zl0rsbs9mf6ci1"; + sha256 = "1d7z36r33lmxm5cv1kby6g9zbsr88prgsp32x4jcs9l1ifwblhng"; }; meta = { diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d8899de205f..786cac68425 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -20,7 +20,8 @@ let in buildGoPackage rec { - name = "skopeo-${version}"; + pname = "skopeo"; + inherit version; inherit src goPackagePath; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index f2f50c18e0b..d84322bb547 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -2,7 +2,7 @@ , zlib, expat, dbus, openssl, python3 }: stdenv.mkDerivation rec { - name = "sourcetrail-${version}"; + pname = "sourcetrail"; version = "2019.2.39"; src = fetchurl { diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index c9df2703daa..550cd9dce27 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }: +{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.1"; + version = "2019.3"; in -assert version == spirv-headers.version; stdenv.mkDerivation rec { - name = "spirv-tools-${version}"; + pname = "spirv-tools"; inherit version; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r"; + sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8"; }; enableParallelBuilding = true; - buildInputs = [ cmake python ]; + buildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 4acfa4a2b0e..52c33f3e444 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -4,11 +4,11 @@ let mainVersion = "2.5"; in stdenv.mkDerivation rec { - name = "sqsh-${version}"; + pname = "sqsh"; version = "${mainVersion}.16.1"; src = fetchurl { - url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz"; + url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz"; sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; }; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 21068a8b05f..f1a1ceb9bb1 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -1,7 +1,7 @@ { stdenv, libgit2, fetchgit }: stdenv.mkDerivation rec { - name = "stagit-${version}"; + pname = "stagit"; version = "0.9.1"; src = fetchgit { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index a3499258a99..cc865e2bd52 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { - name = "textql-${version}"; + pname = "textql"; version = "2.0.3"; goPackagePath = "github.com/dinedal/textql"; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index f07451ae840..50c34dc39ed 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -14,7 +14,7 @@ let ]; }; in stdenv.mkDerivation rec { - name = "thrust-${version}"; + pname = "thrust"; version = "0.7.6"; src = fetchurl { diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 90d36c71caa..df6279b5a4c 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.93"; - name = "toluapp-${version}"; + pname = "toluapp"; src = fetchFromGitHub { owner = "LuaDist"; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 2bbe2cfe16d..7f35d3c438d 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -5,7 +5,7 @@ let qscintillaLib = (qscintilla.override { withQt5 = true; }); in mkDerivation rec { - name = "tora-${version}"; + pname = "tora"; version = "3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 565ec7904f1..a5c13e2266e 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "toxiproxy-${version}"; + pname = "toxiproxy"; version = "2.1.3"; src = fetchFromGitHub { owner = "Shopify"; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 1deb2c7a8fc..c98529484d5 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,14 +8,16 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2019.08.09"; + version = "2019.09.01"; + realVersion = with stdenv.lib; with builtins; + "1.0-53-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; - sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; + rev = "98871e0e2959bc8cb4de3c7ebe2b9eddc4efe00c"; + sha256 = "1yq7ih2xvhfvdpijmbqjq6jcngl6710kiv66hkww5ih8j5dzsq5l"; name = "trellis"; }) (fetchFromGitHub { @@ -32,6 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; preConfigure = with builtins; '' + substituteInPlace libtrellis/CMakeLists.txt \ + --replace "git describe --tags" "echo ${realVersion}" + rmdir database && ln -sfv ${elemAt srcs 1} ./database source environment.sh diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 775e26eb6a8..01531d23c78 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: buildGoPackage rec { - name = "tychus-${version}"; + pname = "tychus"; version = "0.6.3"; goPackagePath = "github.com/devlocker/tychus"; diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix new file mode 100644 index 00000000000..6996d5bf13f --- /dev/null +++ b/pkgs/development/tools/udis86/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, python }: + +stdenv.mkDerivation rec { + pname = "udis86"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "vmt"; + repo = "udis86"; + rev = "v${version}"; + url = "https://github.com/vmt/udis86/archive/v${version}.tar.gz"; + sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; + }; + + nativeBuildInputs = [ autoreconfHook python ]; + + configureFlags = [ + "--enable-shared" + ]; + + outputs = [ "bin" "out" "dev" "lib" ]; + + meta = with stdenv.lib; { + homepage = "http://udis86.sourceforge.net"; + license = licenses.bsd2; + maintainers = with maintainers; [ timor ]; + description = '' + Easy-to-use, minimalistic x86 disassembler library (libudis86) + ''; + platforms = platforms.all ; + }; +} diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index f62cd1aabb1..796d3509c1c 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "uftrace-${version}"; + pname = "uftrace"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index 1e81c5b9f86..a6c087d7be7 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -5,7 +5,7 @@ }: buildGoPackage rec { - name = "unconvert-unstable-${version}"; + pname = "unconvert-unstable"; version = "2018-07-03"; rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b"; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 54ace72c5fb..0ca7e37ef70 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -23,7 +23,7 @@ let build = "f2"; in stdenv.mkDerivation rec { - name = "unity-editor-${version}"; + pname = "unity-editor"; version = "${ver}x${build}"; src = fetchurl { diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index ebeb81c90ec..71c47a7394b 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}: stdenv.mkDerivation rec { version = "0.36.2"; - name = "valadoc-${version}"; + pname = "valadoc"; src = fetchurl { - url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h"; }; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index f6c160de65c..8f3bc560905 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -4,7 +4,6 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "vcstool"; version = "0.1.36"; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 9601771f75f..e8173a6b5b0 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -8,7 +8,7 @@ }: buildGoPackage rec { - name = "vgo2nix-${version}"; + pname = "vgo2nix"; version = "unstable-2019-02-06"; goPackagePath = "github.com/adisbladis/vgo2nix"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 3e8a228bacf..27296edfac0 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -3,7 +3,7 @@ with python3Packages; buildPythonApplication rec { - name = "vim-vint-${version}"; + pname = "vim-vint"; version = "0.3.20"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 42cf6f07f4d..197f48dbbfb 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vndr-unstable-${version}"; + pname = "vndr-unstable"; version = "2018-06-23"; rev = "81cb8916aad3c8d06193f008dba3e16f82851f52"; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index e87ba2b52c1..b0768ca4b7e 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -8,7 +8,7 @@ }: mkDerivation rec { - name = "vogl-${version}"; + pname = "vogl"; version = "2016-05-13"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 3c189d09f1c..36d018682df 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang -, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: +, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }: + stdenv.mkDerivation rec { - name = "vulkan-validation-layers-${version}"; - version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! + pname = "vulkan-validation-layers"; + version = "1.1.114.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp"; + sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 8e17c531547..7cc8ce6fe13 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vultr-${version}"; + pname = "vultr"; version = "1.15.0"; goPackagePath = "github.com/JamesClonk/vultr"; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index e9ced0e753a..f8936e27516 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { - name = "wabt-${version}"; + pname = "wabt"; version = "1.0.11"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 4a056db6c0c..3a58e1088ea 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "watchman-${version}"; + pname = "watchman"; version = "4.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index aaf1b20ea6f..8db830b3284 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { version = "v0.5.1"; - name = "wiiload-${version}"; + pname = "wiiload"; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 17c64f0548b..da1b493b0d2 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "ws-${version}"; + pname = "ws"; version = "0.2.1"; rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 29717d75394..0874c9e5515 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -16,7 +16,7 @@ let sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; }; in stdenv.mkDerivation rec { - name = "xcbuild-${version}"; + pname = "xcbuild"; # Once a version is released that includes # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index c163c4cbcf6..44a7254a3d7 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { - name = "xqilla-${version}"; + pname = "xqilla"; version = "2.3.4"; src = fetchurl { diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index 1a8d7f13aff..ece440c692f 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { - name = "yaml2json-${version}"; + pname = "yaml2json"; version = "unstable-2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 3520bcfc1b1..a2076668f60 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "yj-${version}"; + pname = "yj"; version = "4.0.0"; rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558"; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix new file mode 100644 index 00000000000..3180131c6f7 --- /dev/null +++ b/pkgs/development/tools/yq-go/default.nix @@ -0,0 +1,31 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# buildGoModule is not supported by the project +# See https://github.com/mikefarah/yq/issues/227 +buildGoPackage rec { + pname = "yq-go"; + version = "2.4.0"; + + goPackagePath = "gopkg.in/mikefarah/yq.v2"; + + src = fetchFromGitHub { + owner = "mikefarah"; + rev = version; + repo = "yq"; + sha256 = "0nizg08mdpb8g6hj887kk5chljba6x9v0f5ysqf28py511yp0dym"; + }; + + goDeps = ./deps.nix; + + postInstall = '' + mv $bin/bin/yq.v2 $bin/bin/yq + ''; + + meta = with stdenv.lib; { + description = "Portable command-line YAML processor"; + homepage = http://mikefarah.github.io/yq/; + license = [ licenses.mit ]; + maintainers = [ maintainers.lewo ]; + }; +} diff --git a/pkgs/development/tools/yq-go/deps.nix b/pkgs/development/tools/yq-go/deps.nix new file mode 100644 index 00000000000..ec2057964ec --- /dev/null +++ b/pkgs/development/tools/yq-go/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "972238283c0625cf3e881de7699ba8f2524c340a"; + sha256 = "194h0lq3s27wcxcgahjl350x46v116x81zgkgh98q9v5iydig28l"; + }; + } + { + goPackagePath = "gopkg.in/imdario/mergo.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/imdario/mergo.v0"; + rev = "7c29201646fa3de8506f701213473dd407f19646"; + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; + }; + } + { + goPackagePath = "gopkg.in/mikefarah/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mikefarah/yaml.v2"; + rev = "1a71b09ff830e9b158685a8657c85f6462559726"; + sha256 = "0rvix49in3bm3i90v1dp1s49b14m1pyyqm3fv27mgg0spvcqy7vr"; + }; + } + { + goPackagePath = "gopkg.in/op/go-logging.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/op/go-logging.v1"; + rev = "b2cb9fa56473e98db8caba80237377e83fe44db5"; + sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn"; + }; + } + { + goPackagePath = "gopkg.in/spf13/cobra.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/spf13/cobra.v0"; + rev = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } +] diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index c157ddd65a8..82fac9f6be7 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "yuicompressor-${version}"; + pname = "yuicompressor"; version = "2.4.8"; src = fetchurl { - url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar"; + url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4159e369049..4db0da4f418 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.10.0"; - name = "csslint-${version}"; + pname = "csslint"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/${name}.tgz"; + url = "https://registry.npmjs.org/csslint/-/${pname}-${version}.tgz"; sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 24f56789198..5427f66478f 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -10,7 +10,7 @@ let ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { - name = "grails-${version}"; + pname = "grails"; version = "4.0.0"; src = fetchurl { diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 26cec8f3730..81417f6287b 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -17,7 +17,7 @@ let stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "insomnia-${version}"; + pname = "insomnia"; version = "6.5.3"; src = fetchurl { diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 485c4026afa..ec1ec527c5e 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "kcgi"; version = "0.10.8"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kristapsdz"; diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 91b4fe15e5a..eb3254dcd3a 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "now-cli-${version}"; + pname = "now-cli"; version = "15.8.7"; # TODO: switch to building from source, if possible diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 58b0f0e876f..1767eaab8bc 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "postman-${version}"; + pname = "postman"; version = "7.0.7"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 24e04842dc9..d56819be019 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "remarkjs-${version}"; + pname = "remarkjs"; version = "0.7.0"; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 266217d94e2..a625a815603 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -2,7 +2,7 @@ , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { - name = "valum-${version}"; + pname = "valum"; version = "0.3.15"; src = fetchFromGitHub { diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index bda6dab14d8..b77184e5652 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,7 +1,7 @@ { brotli, cmake, fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "woff2-${version}"; + pname = "woff2"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index f0966357d93..b9b0ccf7272 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - name = "xmlindent-${version}"; + pname = "xmlindent"; version = "0.2.17"; src = fetchurl { - url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz"; sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs"; }; |