diff options
Diffstat (limited to 'nixpkgs/pkgs/development')
85 files changed, 1535 insertions, 643 deletions
diff --git a/nixpkgs/pkgs/development/beam-modules/default.nix b/nixpkgs/pkgs/development/beam-modules/default.nix index f71379459dcb..a1eedaad6a0f 100644 --- a/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/default.nix @@ -23,12 +23,8 @@ let hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { }; rebar = callPackage ../tools/build-managers/rebar { }; - rebar3-open = callPackage ../tools/build-managers/rebar3 { - hermeticRebar3 = false; - }; - rebar3 = callPackage ../tools/build-managers/rebar3 { - hermeticRebar3 = true; - }; + rebar3-open = callPackage ../tools/build-managers/rebar3 { }; + rebar3 = callPackage ../tools/build-managers/rebar3 { }; # rebar3 port compiler plugin is required by buildRebar3 pc_1_6_0 = callPackage ./pc {}; @@ -36,6 +32,9 @@ let fetchHex = callPackage ./fetch-hex.nix { }; + fetchRebar3Deps = callPackage ./fetch-rebar-deps.nix { }; + rebar3Relx = callPackage ./rebar3-release.nix { }; + buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; @@ -75,25 +74,6 @@ let lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; - # We list all base hex packages for beam tooling explicitly to ensure - # tha the tooling does not break during hex-packages.nix updates. - erlware_commons_1_0_0 = buildHex { - name = "erlware_commons"; - version = "1.0.0"; - sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7"; - beamDeps = [ cf_0_2_2 ]; - }; - cf_0_2_2 = buildHex { - name = "cf"; - version = "0.2.2"; - sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28"; - }; - getopt_0_8_2 = buildHex { - name = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; - }; - # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex {}; diff --git a/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix new file mode 100644 index 000000000000..a94d803f0d32 --- /dev/null +++ b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -0,0 +1,32 @@ +{ stdenv, rebar3, curl }: + +{ name, version, sha256, src +, meta ? {} +}: + +with stdenv.lib; + +stdenv.mkDerivation ({ + name = "rebar-deps-${name}-${version}"; + + phases = [ "downloadPhase" "installPhase" ]; + + downloadPhase = '' + cp ${src} . + HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps + ''; + + installPhase = '' + mkdir -p "$out/_checkouts" + for i in ./_build/default/lib/* ; do + echo "$i" + cp -R "$i" "$out/_checkouts" + done + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; +}) diff --git a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix new file mode 100644 index 000000000000..837d0ccf15cf --- /dev/null +++ b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix @@ -0,0 +1,85 @@ +{ stdenv, writeText, erlang, rebar3, openssl, libyaml, + pc, lib }: + +{ name, version +, src +, checkouts ? null +, releaseType +, buildInputs ? [] +, setupHook ? null +, profile ? "default" +, installPhase ? null +, buildPhase ? null +, configurePhase ? null +, meta ? {} +, enableDebugInfo ? false +, ... }@attrs: + +with stdenv.lib; + +let + debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; + + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + customPhases = filterAttrs + (_: v: v != null) + { inherit setupHook configurePhase buildPhase installPhase; }; + + pkg = self: stdenv.mkDerivation (attrs // { + + name = "${name}-${version}"; + inherit version; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl ]; + propagatedBuildInputs = [checkouts]; + + dontStrip = true; + + inherit src; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + + configurePhase = '' + runHook preConfigure + ${if checkouts != null then + ''cp --no-preserve=all -R ${checkouts}/_checkouts .'' + else + ''''} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" + then '' escriptize'' + else '' release''} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + dir=${if releaseType == "escript" + then ''bin'' + else ''rel''} + mkdir -p "$out/$dir" + cp -R --preserve=mode "_build/${profile}/$dir" "$out" + runHook postInstall + ''; + + meta = { + inherit (erlang.meta) platforms; + } // meta; + + passthru = { + packageName = name; + env = shell self; + }; + } // customPhases); +in + fix pkg diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 9039553e3d1e..0c4a48656b72 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.06"; + version = "1.73.08"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6"; + sha256 = "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index a307978f59a5..bc6767e8766e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -43,6 +43,9 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace tools/extra/clangd/CMakeLists.txt \ + --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; outputs = [ "out" "lib" "python" ]; diff --git a/nixpkgs/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix index 48279fd71087..b7a2f602cc63 100644 --- a/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.5.2"; - rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d"; - sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0"; + version = "0.5.3"; + rev = "10d17f245839f208ec5085309022a32cd2502f55"; + sha256 = "1jq41pd3nj534cricy1nq6wgk4wlwg239387n785aswpwd705jbb"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; diff --git a/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/nixpkgs/pkgs/development/coq-modules/iris/default.nix index 134ea45493df..ea26f3e1ca9d 100644 --- a/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix new file mode 100644 index 000000000000..f90be596fef1 --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "coq${coq.coq-version}-mathcomp-analysis-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "analysis"; + rev = version; + sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "Analysis library compatible with Mathematical Components"; + inherit (src.meta) homepage; + inherit (coq.meta) platforms; + license = stdenv.lib.licenses.cecill-c; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.8" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix new file mode 100644 index 000000000000..fa4a2aaeddba --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "coq${coq.coq-version}-mathcomp-bigenough-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "bigenough"; + rev = version; + sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A small library to do epsilon - N reasonning"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix new file mode 100644 index 000000000000..a5d0d006a38c --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.1.0"; + name = "coq${coq.coq-version}-mathcomp-finmap-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "finmap"; + rev = version; + sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A finset and finmap library"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index 46a6cafb6ab8..c196bdbcd766 100644 --- a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 91801850ebfb..883ed971b083 100644 --- a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index c5ddd18ff49b..74527a759b84 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1186,6 +1186,12 @@ 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 + insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch; + + uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { + url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; + sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4"; + }); # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC @@ -1203,4 +1209,13 @@ self: super: { sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; stripLen = 1; }); + + # Fix for base >= 4.11 + scat = overrideCabal super.scat (drv: { + patches = [(pkgs.fetchpatch { + url = "https://github.com/redelmann/scat/pull/6.diff"; + sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl"; + })]; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 46c8c3f9f5b8..cf5ba1d6ad4b 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -153,9 +153,6 @@ self: super: builtins.intersectAttrs super { gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; - # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build - taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })); - # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch new file mode 100644 index 000000000000..1e9ac5aa66a4 --- /dev/null +++ b/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch @@ -0,0 +1,25 @@ +diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal +index 0e8923a..bfbbec4 100644 +--- a/insert-ordered-containers.cabal ++++ b/insert-ordered-containers.cabal +@@ -21,8 +21,8 @@ tested-with: + GHC==7.10.3, + GHC==8.0.1, + GHC==8.2.2, +- GHC==8.4.3, +- GHC==8.6.1 ++ GHC==8.4.4, ++ GHC==8.6.3 + + extra-source-files: + CHANGELOG.md +@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests + , unordered-containers + , base + , insert-ordered-containers +- , tasty >= 0.10.1.2 && <1.2 ++ , tasty >= 0.10.1.2 && <1.3 + , tasty-quickcheck >= 0.8.3.2 && <0.11 + , QuickCheck >=2.7.6 && <2.13 + default-language: Haskell2010 + diff --git a/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 6b55f006cd2a..dc04e72c7411 100644 --- a/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2"; + sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 3d9235757c6e..39f8d2514108 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -253,16 +253,16 @@ in { }; php72 = generic { - version = "7.2.14"; - sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm"; + version = "7.2.15"; + sha256 = "0m05dmad138qfxcb2z4czf9pfv1746g9yzlch48kjikajhb7cgn9"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.1"; - sha256 = "13iqfkz9rmx9vy106lvw1nbk88qgwdkvxam0l5s14r7jsw62pvxg"; + version = "7.3.2"; + sha256 = "1p8amf91i6lrrphd6ypfh3kic64bpqf04dxp7dj1xxnjrgd50vwl"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 836d0128a8c1..aeb4253826b8 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -250,6 +250,35 @@ let }; }; + mkDictFromLibreOffice = + { shortName + , shortDescription + , dictFileName + , license + , readmeFile ? "README_${dictFileName}.txt" + , sourceRoot ? dictFileName }: + mkDict rec { + name = "hunspell-dict-${shortName}-libreoffice-${version}"; + version = "6.2.0.3"; + inherit dictFileName readmeFile; + src = fetchFromGitHub { + owner = "LibreOffice"; + repo = "dictionaries"; + rev = "libreoffice-${version}"; + sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj"; + }; + buildPhase = '' + cp -a ${sourceRoot}/* . + ''; + meta = with stdenv.lib; { + homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = license; + maintainers = with maintainers; [ vlaci ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -510,6 +539,15 @@ in { ]; }; + /* HUNGARIAN */ + + hu-hu = mkDictFromLibreOffice { + shortName = "hu-hu"; + dictFileName = "hu_HU"; + shortDescription = "Hungarian (Hungary)"; + license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + }; + /* SWEDISH */ sv-se = mkDictFromDSSO rec { diff --git a/nixpkgs/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix index 312257304421..ec025d31ce3f 100644 --- a/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h"; + sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 026674e44fc4..1605abf6efa1 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -48,7 +48,7 @@ in rec { }; libtoxcore_0_2 = generic { - version = "0.2.8"; - sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm"; + version = "0.2.9"; + sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix index e4bbeacb3624..9c35d3373505 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3}: +{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }: let pname = "libwnck"; @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec{ description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = []; + maintainers = [ maintainers.worldofpeace ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 804c3f8ed228..1f41696a4e33 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.12.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index c11a93373dd1..8058891615f2 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; + sha256 = "07m012a966l821f09jmrrhs25cs2rcmhlxcicywibllaac10wk5k"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix new file mode 100644 index 000000000000..972dfdd7ad1a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, coreutils, root }: + +stdenv.mkDerivation rec { + name = "hepmc3-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; + sha256 = "12kzdqdbq7md0nn58jvilhh00yddfir65f0q2026k0ym37bfwdyd"; + }; + + buildInputs = [ cmake root ]; + + postInstall = '' + substituteInPlace "$out"/bin/HepMC3-config \ + --replace 'greadlink' '${coreutils}/bin/readlink' + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; + license = licenses.gpl3; + homepage = http://hepmc.web.cern.ch/hepmc/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 4053afe4beca..30383dda50cf 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.3.0"; +let version = "8.4.0"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1xwiqf6xkl9glpardak97ycy5f2bwjf8x0hwvf0acsxqj03a3hj6"; + sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index d3c20258425b..badd08291de4 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,24 +1,44 @@ -{ callPackage, cudatoolkit_8, cudatoolkit_9 }: +{ stdenv, fetchFromGitHub, which, cudatoolkit }: -let - generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { - inherit (args) cudatoolkit; +stdenv.mkDerivation rec { + name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; + version = "2.4.2-1"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nccl"; + rev = "v${version}"; + sha256 = "0aa4gv51nbmmdhx6vp40l249m4arp30sijrn6kwxdfi1k9kajiq5"; }; -in + outputs = [ "out" "dev" ]; -{ - nccl_cudatoolkit_8 = generic rec { - version = "2.1.4"; - cudatoolkit = cudatoolkit_8; - srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; - sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; - }; + nativeBuildInputs = [ which ]; + + buildInputs = [ cudatoolkit ]; + + preConfigure = '' + patchShebangs src/collectives/device/gen_rules.sh + ''; + + makeFlags = [ + "CUDA_HOME=${cudatoolkit}" + "PREFIX=$(out)" + ]; + + postFixup = '' + moveToOutput lib/libnccl_static.a $dev + ''; + + NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ]; + + enableParallelBuilding = true; - nccl_cudatoolkit_9 = generic rec { - version = "2.1.4"; - cudatoolkit = cudatoolkit_9; - srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; - sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter orivej ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/generic.nix deleted file mode 100644 index 609a7df51e58..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/generic.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ version -, srcName -, sha256 -}: - -{ stdenv -, lib -, requireFile -, cudatoolkit -}: - -stdenv.mkDerivation rec { - name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; - - inherit version; - - src = requireFile rec { - name = srcName; - inherit sha256; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library - at https://developer.nvidia.com/nccl, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${name} - ''; - }; - - unpackCmd = "tar xJf $src"; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib/libnccl.so - - mkdir -p $out - cp -a include $out/include - cp -a lib $out/lib - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - passthru = { - inherit cudatoolkit; - }; - - meta = with stdenv.lib; { - description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; - homepage = https://developer.nvidia.com/nccl; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/vte/ng.nix b/nixpkgs/pkgs/development/libraries/vte/ng.nix index 3aee9e9dcdf3..6231b8315cd5 100644 --- a/nixpkgs/pkgs/development/libraries/vte/ng.nix +++ b/nixpkgs/pkgs/development/libraries/vte/ng.nix @@ -2,13 +2,13 @@ vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; - version = "0.50.2.a"; + version = "0.54.2.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; + sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index 27b95208432e..442e3fca77c3 100644 --- a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.15"; + version = "1.5.16"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "1f6fhkdmcfs8w7x08vhiqygss4qzcsimhd91h0j58zw25ky6rzqn"; + sha256 = "1gnajsk73vkj7ii43ynr20ln9qck3f0lshf5gdbxsam3qgmx7gd4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index f82cf33e3079..ec63e58fbb65 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, lwt_react, cryptokit, - ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + ipaddr, ocamlnet, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml +, lwt_ppx }: -assert stdenv.lib.versionAtLeast ocaml.version "4.03"; - stdenv.mkDerivation rec { pname = "eliom"; - version = "6.3.0"; + version = "6.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; + sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh"; }; patches = [ ./camlp4.patch ]; @@ -27,15 +26,12 @@ stdenv.mkDerivation rec ]; propagatedBuildInputs = [ - camlp4 - cryptokit - ipaddr js_of_ocaml-lwt js_of_ocaml-ppx js_of_ocaml-tyxml + lwt_camlp4 + lwt_ppx lwt_react - lwt_ssl - ocamlnet ocaml_pcre ocsigen_server ppx_deriving ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix new file mode 100644 index 000000000000..53f0435f462f --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildDunePackage, camlp4 }: + +buildDunePackage rec { + pname = "lwt_camlp4"; + version = "git-20180325"; + + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = "45f25a081e01071ab566924b48ba5f7553bb33ac"; + sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; + }; + + minimumOCamlVersion = "4.02"; + + propagatedBuildInputs = [ camlp4 ]; + + meta = { + description = "Camlp4 syntax extension for Lwt (deprecated)"; + license = lib.licenses.lgpl21; + inherit (src.meta) homepage; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 474f69ba918e..147b4200cf69 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,42 +1,37 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl -, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, -libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl +{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl +, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr +, pgocaml, camlzip, ocaml_sqlite3 +, makeWrapper }: +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "ocsigenserver is not available for OCaml ${ocaml.version}" +else + let mkpath = p: n: - let v = stdenv.lib.getVersion ocaml; in - "${p}/lib/ocaml/${v}/site-lib/${n}"; + "${p}/lib/ocaml/${ocaml.version}/site-lib/${n}"; in -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { - version = "2.9"; - sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; - buildInputs = [ lwt_react lwt_ssl ]; - ldpath = ""; - } else { - version = "2.8"; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; - buildInputs = [ lwt2 ]; - ldpath = "${mkpath lwt2 "lwt"}"; - } -; in - -stdenv.mkDerivation { - name = "ocsigenserver-${param.version}"; +stdenv.mkDerivation rec { + version = "2.11.0"; + name = "ocsigenserver-${version}"; - src = fetchurl { - url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "ocsigenserver"; + rev = version; + sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2"; }; - buildInputs = [ocaml which findlib react ssl - ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] - ++ (param.buildInputs or []); + buildInputs = [ which makeWrapper ocaml findlib + lwt_react pgocaml camlzip ocaml_sqlite3 + ]; + + propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet + ocaml_pcre tyxml xml-light + ]; - configureFlags = [ "--root $(out) --prefix /" ]; + configureFlags = [ "--root $(out)" "--prefix /" ]; dontAddPrefix = true; @@ -46,7 +41,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index ba7e3e93c989..4bc9b7f8629e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 +, resource-pooling }: buildOcaml rec { name = "ocsigen-start"; - version = "1.1.0"; + version = "1.5.0"; buildInputs = [ eliom js_of_ocaml-camlp4 ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,13 +17,13 @@ buildOcaml rec substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; - src = fetchurl { - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; - sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = name; + rev = version; + sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; }; - createFindlibDestdir = true; - meta = { homepage = http://ocsigen.org/ocsigen-start; description = "Eliom application skeleton"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 37c8c8f76c95..4e46c1534d80 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, opaline +{ stdenv, fetchFromGitHub, ocaml, findlib, opaline , calendar, eliom, js_of_ocaml-ppx_deriving_json }: -buildOcaml rec -{ - name = "ocsigen-toolkit"; - version = "1.1.0"; +stdenv.mkDerivation rec { + pname = "ocsigen-toolkit"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "2.0.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; - buildInputs = [ opaline ]; + buildInputs = [ ocaml findlib opaline ]; installPhase = '' @@ -17,16 +17,21 @@ buildOcaml rec opaline -prefix $out ''; - src = fetchurl { - sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = version; + sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; }; + createFindlibDestdir = true; + meta = { homepage = http://ocsigen.org/ocsigen-toolkit/; description = " User interface widgets for Ocsigen applications"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + inherit (ocaml.meta) platforms; }; diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 307cd9b84b0a..917a93798820 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b"; + sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d"; }; # Tests are not included in the PyPI package diff --git a/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 5bd545db51cc..5e24a880e759 100644 --- a/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.50.0"; + version = "3.51.0"; src = fetchPypi { inherit pname version; - sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030"; + sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix new file mode 100644 index 000000000000..ab6abc4cd6f6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }: + +buildPythonPackage rec { + pname = "cfn-flip"; + version = "1.1.0.post1"; + + src = fetchPypi { + pname = "cfn_flip"; + inherit version; + sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck"; + }; + + propagatedBuildInputs = [ six pyyaml click ]; + nativeBuildInputs = [ pytestrunner ]; + + # No tests in Pypi + doCheck = false; + + meta = with lib; { + description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; + homepage = https://github.com/awslabs/aws-cfn-template-flip; + license = licenses.asl20; + maintainers = with maintainers; [ psyanticy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/nixpkgs/pkgs/development/python-modules/daphne/default.nix index 772ca350f132..da85fbb1d9b7 100644 --- a/nixpkgs/pkgs/development/python-modules/daphne/default.nix +++ b/nixpkgs/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "2.2.4"; + version = "2.2.5"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi"; + sha256 = "0ixgq1rr3s60bmrwx8qwvlvs3lag1c2nrmg4iy7wcmb8i1ddylqr"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 0ea3a9d8ab4d..29460f14eab3 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,27 +19,28 @@ , tornado , zict , pyyaml -, pythonOlder +, isPy3k , futures , singledispatch +, mpi4py +, bokeh }: buildPythonPackage rec { pname = "distributed"; - version = "1.25.2"; + version = "1.25.3"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "0rv5831xv5byx0f8ly3mlji207nb3bzq6qmdf7ishrgy9kpphc68"; + sha256 = "0bvjlw74n0l4rgzhm876f66f7y6j09744i5h3iwlng2jwzyw97gs"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml - ] ++ lib.optional (pythonOlder "3.2") [ futures ] - ++ lib.optional (pythonOlder "3.4") [ singledispatch ]; + sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses diff --git a/nixpkgs/pkgs/development/python-modules/django/2_0.nix b/nixpkgs/pkgs/development/python-modules/django/2_0.nix deleted file mode 100644 index daabcefb6e92..000000000000 --- a/nixpkgs/pkgs/development/python-modules/django/2_0.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, - isPy3k, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "2.0.10"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0292a7ad7d8ffc9cfc6a77f043d2e81f5bbc360c0c4a1686e130ef3432437d23"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - propagatedBuildInputs = [ pytz ]; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix index 35879a7bfb49..9dfdf51186fc 100644 --- a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b"; + sha256 = "0xjs803r5fxaqpkjbpsb17j8racxa4q1nvjjaj1akkgkgw9dj343"; }; # tests assume the availability of a mysql/postgresql database diff --git a/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix index 7df148df09c9..9e49147315b5 100644 --- a/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "A backport of fstrings to python<3.6"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; + broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged }; } diff --git a/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/nixpkgs/pkgs/development/python-modules/httmock/default.nix index b50753c55864..53447544ca92 100644 --- a/nixpkgs/pkgs/development/python-modules/httmock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httmock/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "httmock"; - version = "1.2.6"; + version = "1.3.0"; src = fetchFromGitHub { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "0iya8qsb2jm03s9p6sf1yzgm1irxl3dcq0k0a9ygl0skzjz5pvab"; + sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q"; }; checkInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix index a069c205144d..c6fdd21d2ebe 100644 --- a/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Applications"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "a03af60ddc9c5afdae4d5c9a8dd4ca857550e0b793733a5072e0725829b87017"; + sha256 = "1yk9brcvr96s1slpgj9vr6np7fk8limcrw9v2pjq72c6k0mpnq30"; }; # Cyclic dependency: keras-applications requires keras, which requires keras-applications diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 52cac7177803..e6a493f7b641 100644 --- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0e2eee3802163bd0605975ed1e284cafc23203919bfa80c0cc5d3cd2543aaf97"; + sha256 = "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index 8a9b5da68ef9..9b268686b8ff 100644 --- a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.6.6"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271"; + sha256 = "03vylg5mdsxp2nyk8sm7yxmb470hcb92q263dfq8d6b9xp96ckwx"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index 7d7f7da753e1..ec68cb54afe3 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.1"; + version = "0.6.1.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0ncclbj9qdd88fs26mvgf217m7kgfcy1zgsyzi1j65b6z2wywl9a"; + sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 58ad690ce2df..20a9c7ca9812 100644 --- a/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.1"; + version = "3.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5dc85bde91bc80fa05f0d89e9f3a8eaee735b2b404047266874e0ff9c104407f"; + sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index 950d478b30f8..f1ce7ba2a087 100644 --- a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchPypi , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers @@ -6,19 +6,13 @@ buildPythonPackage rec { pname = "prawcore"; - version = "1.0.0"; + version = "1.0.1"; - src = fetchFromGitHub { - owner = "praw-dev"; - repo = "prawcore"; - rev = "v${version}"; - sha256 = "1j905wi5n2xgik3yk2hrv8dky318ahfjl5k1zs21mrl81jk0907f"; + src = fetchPypi { + inherit pname version; + sha256 = "ab5558efb438aa73fc66c4178bfc809194dea3ce2addf4dec873de7e2fd2824e"; }; - postPatch = '' - sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py - ''; - propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 412b3b2342a5..5f43ae32ea23 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.15"; + version = "3.16"; src = fetchPypi { inherit pname version; - sha256 = "78aa7fa0af707641e215ea93bfd4bb5fd47f18a7193d84ed60bb9e6cccb75b7f"; + sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix index 42d19bb87550..6ae90ac55243 100644 --- a/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.7"; + version = "1.8.8"; src = fetchPypi { inherit pname version; - sha256 = "1b65jkbk9bcl10s49w9frsjcarfzi8gp22a40cz7zxry8b8yvcf0"; + sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va"; }; buildInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 3ec5998cadd7..4b128db82eac 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.5.6"; + version = "3.5.7"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "efe9c318b2a37ae498a555889684c30ccb6a1b06bd391cb3baf0eb5ba68e9062"; + sha256 = "8969435f8e7ca10f60c22096b02b15ad3af143de7d3bb4d73507b812bcdd8e37"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/nixpkgs/pkgs/development/python-modules/pymacaroons-pynacl/default.nix deleted file mode 100644 index 8bc644252c0f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pymacaroons-pynacl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }: - -buildPythonPackage rec { - pname = "pymacaroons-pynacl"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "pymacaroons"; - rev = "v${version}"; - sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii"; - }; - - propagatedBuildInputs = [ pynacl six ]; - - # Tests require an old version of hypothesis - doCheck = false; - - meta = with lib; { - description = "Macaroon library for Python"; - homepage = https://github.com/matrix-org/pymacaroons; - license = licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix b/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix new file mode 100644 index 000000000000..96023c01e1e5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymacaroons/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pynacl }: + +buildPythonPackage rec { + pname = "pymacaroons"; + version = "0.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8"; + }; + + propagatedBuildInputs = [ + six + pynacl + ]; + + # Tests require an old version of hypothesis + doCheck = false; + + meta = with lib; { + description = "Macaroon library for Python"; + homepage = https://github.com/ecordell/pymacaroons; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pynvim/default.nix b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix index 3811e5082c0f..40aae88c3ab7 100644 --- a/nixpkgs/pkgs/development/python-modules/pynvim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x"; + sha256 = "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix index 35b2ac34cabc..e0d60df69984 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s"; + sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index cdce1b337183..44f1c0d6c39d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , python @@ -11,28 +11,33 @@ , testscenarios , testrepository , kerberos +, requests +, unittest2 +, requests-mock }: buildPythonPackage rec { pname = "python-jenkins"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b44b3c8e0dabed371a1a8a301cc8833c635625faf003fd68c176800c71a6597c"; + sha256 = "1h14hfcwichmppbgxf1k8njw29hchpav1kj574b4lly3j0n2vnag"; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml six multi_key_dict testtools testscenarios testrepository kerberos ]; + propagatedBuildInputs = [ pbr pyyaml six multi_key_dict requests ]; + + checkInputs = [ unittest2 testscenarios requests-mock ]; + checkPhase = '' + unit2 + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python bindings for the remote Jenkins API"; homepage = https://pypi.python.org/pypi/python-jenkins; license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pywal/default.nix b/nixpkgs/pkgs/development/python-modules/pywal/default.nix index 7f908c943aef..3fd618918781 100644 --- a/nixpkgs/pkgs/development/python-modules/pywal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywal/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pywal"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; + sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg"; }; preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix index 446a86f3c8f5..ff2d8cf0740c 100644 --- a/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.5.5"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0yb194c927g9nqknfb49nfqv32l74bb0m71wswijbbybb7syabbl"; + sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3"; }; propagatedBuildInputs = [ qtpy six pyside ]; diff --git a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix index a8997e279b27..bdbc3629ec71 100644 --- a/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpmfluff/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; + sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l"; }; LC_ALL="en_US.utf-8"; diff --git a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index ed90291ba8a0..53d2006315c1 100644 --- a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.4.1"; + version = "1.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "020acd4507fd00c38835b78b5f338db60d3df840187623e0d41ab2ca89d7ae57"; + sha256 = "0rqpmscxjznxyz3dyxpc56gib319k01vl837r8g8w57dinz4y863"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/sly/default.nix b/nixpkgs/pkgs/development/python-modules/sly/default.nix new file mode 100644 index 000000000000..011fa1799abd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sly/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "sly"; + version = "0.3"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "be6a3825b042a9e1b6f5730fc747e6d983c917f0f002d798d0b9f86ca5c05ad9"; + }; + + checkInputs = [ pytest ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "An improved PLY implementation of lex and yacc for Python 3"; + homepage = https://github.com/dabeaz/sly; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 700a7fad4aab..2daa9766a3af 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.4.2"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr"; + sha256 = "0af7651hfjh4hv97xns4vpf8n3kqy7ghyjlkfda5wxw56hxgp6hn"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index c6d3a21b10ba..da2fd2cd22d1 100644 --- a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, sqlalchemy, telethon }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, sqlalchemy }: buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; version = "0.2.5"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; diff --git a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 596fa6b825fc..d34231ca9a9e 100644 --- a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.0.2"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1rjbj9wks7b7n75mbm01y0g2ngyai8yi05ck9gicmcdyix7vw42c"; + sha256 = "12z36fq6qfn9sgd1snsfwrk5j2cw29bsb7mkb0g818fal41g7dr4"; }; nativeBuildInputs = [ pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index c055618b2e60..997c4a2deeb6 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.11.2"; + version = "0.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1cnghx1xcgdq675abmrys311vspmzgjgiji4wh8iyw194qalfwdg"; + sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix b/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix new file mode 100644 index 000000000000..ddd992a51447 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/yubico-client/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "yubico-client"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0skkmrpvpb1pwyqjf3lh9vq46xagvwdx9kagpdbba2v5dgrk34d1"; + }; + + propagatedBuildInputs = [ requests ]; + + # pypi package missing test_utils and github releases is behind + doCheck = false; + + meta = with lib; { + description = "Verifying Yubico OTPs based on the validation protocol version 2.0"; + homepage = https://github.com/Kami/python-yubico-client/; + maintainers= with maintainers; [ peterromfeldhk ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index b011cb0b918a..84b74cfe1f32 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.91.0"; + version = "0.92.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "14snr65pbnczkv49lmhgyjzlgrrlfwsxkd7g6xbv9y5xl4sp0309"; + sha256 = "1v83hkkbls5x2062ry3gwrnn9al8rhsmargv2mvanxlpf0a63wx3"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index e96852602fc7..6d64c82f90ff 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,46 +1,46 @@ { stdenv, fetchurl, - fetchHex, erlang, hermeticRebar3 ? true, + fetchHex, erlang, tree, hexRegistrySnapshot }: let - version = "3.6.1"; + version = "3.9.0"; bootstrapper = ./rebar3-nix-bootstrap; erlware_commons = fetchHex { pkg = "erlware_commons"; - version = "1.2.0"; - sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7"; + version = "1.3.1"; + sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; }; ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; version = "1.1.3"; - sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if"; + sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe"; }; certifi = fetchHex { pkg = "certifi"; - version = "2.0.0"; - sha256 = "075v7cvny52jbhnskchd3fp68fxgp7qfvdls0haamcycxrn0dipx"; + version = "2.3.1"; + sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68"; }; providers = fetchHex { pkg = "providers"; version = "1.7.0"; - sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb"; + sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6"; }; getopt = fetchHex { pkg = "getopt"; version = "1.0.1"; - sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak"; + sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; }; bbmustache = fetchHex { pkg = "bbmustache"; - version = "1.5.0"; - sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd"; + version = "1.6.0"; + sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df"; }; relx = fetchHex { pkg = "relx"; - version = "3.26.0"; - sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9"; + version = "3.28.0"; + sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5"; }; cf = fetchHex { pkg = "cf"; @@ -49,59 +49,71 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.4.2"; - sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav"; + version = "1.4.3"; + sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.5.0"; sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; - rebar3_hex = fetchHex { - pkg = "rebar3_hex"; - version = "4.0.0"; - sha256 = "0k0ykx1lz62r03dpbi2zxsvrxgnr5hj67yky0hjrls09ynk4682v"; + hex_core = fetchHex { + pkg = "hex_core"; + version = "0.4.0"; + sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f"; + }; + parse_trans = fetchHex { + pkg = "parse_trans"; + version = "3.3.0"; + sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; }; in stdenv.mkDerivation { name = "rebar3-${version}"; - inherit version; + inherit version erlang; src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0"; + sha256 = "14prx5bkyy9sisnp5rj2058xpylq80xygsj1hq8b7m0awvj3r9wy"; }; inherit bootstrapper; - patches = if hermeticRebar3 == true - then [ ./hermetic-rebar3.patch ] - else []; + buildInputs = [ erlang tree ]; - buildInputs = [ erlang tree ]; + # TODO: Remove registry snapshot propagatedBuildInputs = [ hexRegistrySnapshot ]; postPatch = '' ${erlang}/bin/escript ${bootstrapper} registry-only + mkdir -p _checkouts mkdir -p _build/default/lib/ - mkdir -p _build/default/plugins - cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons - cp --no-preserve=mode -R ${providers} _build/default/lib/providers - cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt - cp --no-preserve=mode -R ${bbmustache} _build/default/lib/bbmustache - cp --no-preserve=mode -R ${certifi} _build/default/lib/certifi - cp --no-preserve=mode -R ${cf} _build/default/lib/cf - cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable - cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters - cp --no-preserve=mode -R ${relx} _build/default/lib/relx - cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun - cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex + + cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons + cp --no-preserve=mode -R ${providers} _checkouts/providers + cp --no-preserve=mode -R ${getopt} _checkouts/getopt + cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache + cp --no-preserve=mode -R ${certifi} _checkouts/certifi + cp --no-preserve=mode -R ${cf} _checkouts/cf + cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable + cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters + cp --no-preserve=mode -R ${relx} _checkouts/relx + cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core + cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans + + # Bootstrap script expects the dependencies in _build/default/lib + # TODO: Make it accept checkouts? + for i in _checkouts/* ; do + ln -s $(pwd)/$i $(pwd)/_build/default/lib/ + done ''; buildPhase = '' HOME=. escript bootstrap ''; + installPhase = '' mkdir -p $out/bin cp rebar3 $out/bin/rebar3 @@ -109,7 +121,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rebar/rebar3; - description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' rebar is a self-contained Erlang script, so it's easy to distribute or diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/nixpkgs/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch deleted file mode 100644 index 59004561126c..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/bootstrap b/bootstrap -index 5dedd713..864056c4 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -101,7 +101,7 @@ extract(Binary) -> - request(Url) -> - HttpOptions = [{relaxed, true} | get_proxy_auth()], - -- case httpc:request(get, {Url, []}, -+ case rebar_hermeticity:request(get, {Url, []}, - HttpOptions, - [{body_format, binary}], - rebar) of -diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl -index e69de29b..8f6cc7d0 100644 ---- a/src/rebar_hermeticity.erl -+++ b/src/rebar_hermeticity.erl -@@ -0,0 +1,42 @@ -+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -+%% ex: ts=4 sw=4 et -+%% ------------------------------------------------------------------- -+%% -+%% rebar: Erlang Build Tools -+%% -+%% Copyright (c) 2016 Eric Merritt (eric@merritt.tech) -+%% -+%% Permission is hereby granted, free of charge, to any person obtaining a copy -+%% of this software and associated documentation files (the "Software"), to deal -+%% in the Software without restriction, including without limitation the rights -+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+%% copies of the Software, and to permit persons to whom the Software is -+%% furnished to do so, subject to the following conditions: -+%% -+%% The above copyright notice and this permission notice shall be included in -+%% all copies or substantial portions of the Software. -+%% -+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+%% THE SOFTWARE. -+%% ------------------------------------------------------------------- -+-module(rebar_hermeticity). -+ -+-export([request/5]). -+ -+-include("rebar.hrl"). -+ -+%% ==================================================================== -+%% Public API -+%% ==================================================================== -+ -+request(Method, {Url, _Headers}, _HTTPOptions, _Options, _Profile) -> -+ ?ERROR("A request is being made that violates Nix hermicity " -+ "This request has been stopped. Details of the request " -+ "are as follows:", []), -+ ?ERROR("Request: ~p ~s", [Method, Url]), -+ erlang:halt(1). -diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index 2cf167ee..6080aaca 100644 ---- a/src/rebar_pkg_resource.erl -+++ b/src/rebar_pkg_resource.erl -@@ -127,7 +127,7 @@ make_vsn(_) -> - request(Url, ETag) -> - HttpOptions = [{ssl, ssl_opts(Url)}, - {relaxed, true} | rebar_utils:get_proxy_auth()], -- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} -+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} - || ETag =/= false] ++ - [{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, [{body_format, binary}], rebar) of -diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index 17446311..4d44d794 100644 ---- a/src/rebar_prv_update.erl -+++ b/src/rebar_prv_update.erl -@@ -38,6 +38,8 @@ init(State) -> - {ok, State1}. - - -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -+do(State) -> {ok, State}. -+-ifdef(non_hermetic). - do(State) -> - try - case rebar_packages:registry_dir(State) of -@@ -53,7 +55,7 @@ do(State) -> - {ok, Url} -> - HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()], - ?DEBUG("Fetching registry from ~p", [Url]), -- case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, [{stream, TmpFile}, {sync, true}], - rebar) of - {ok, saved_to_file} -> -@@ -77,6 +79,7 @@ do(State) -> - ?DEBUG("Error creating package index: ~p ~p", [C, S]), - throw(?PRV_ERROR(package_index_write)) - end. -+-endif. - - -spec format_error(any()) -> iolist(). - format_error({package_parse_cdn, Uri}) -> diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix new file mode 100644 index 000000000000..c93321638099 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dive/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "dive"; + version = "0.5.0"; + + goPackagePath = "github.com/wagoodman/dive"; + + src = fetchFromGitHub { + owner = "wagoodman"; + repo = "dive"; + rev = "v${version}"; + sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns"; + }; + + goDeps = ./deps.nix; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A tool for exploring each layer in a docker image"; + homepage = https://github.com/wagoodman/dive; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/dive/deps.nix b/nixpkgs/pkgs/development/tools/dive/deps.nix new file mode 100644 index 000000000000..c140b2ae7748 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dive/deps.nix @@ -0,0 +1,712 @@ +[ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + }; + } + + { + goPackagePath = "github.com/Azure/go-ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ansiterm"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; + }; + } + + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.11"; + sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; + }; + } + + { + goPackagePath = "github.com/Nvveen/Gotty"; + fetch = { + type = "git"; + url = "https://github.com/Nvveen/Gotty"; + rev = "cd527374f1e5"; + sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; + }; + } + + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "93e082742a009850ac46962150b2f652a822c5ff"; + sha256 = "0cvfxfmilriwdsv3iqy6p5m8m3zya4b8slwyqxljss1bnz0p8z1v"; + }; + } + + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "0b7cb16dde4a20d024c7be59801d63bcfd18611b"; + sha256 = "1sk55s1ghm06d1qq4jic05dvmplvzw2sl6d4j8vamajwa6harlwj"; + }; + } + + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + }; + } + + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.3.3"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "v0.4.0"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + + { + goPackagePath = "github.com/k0kubun/go-ansi"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/go-ansi"; + rev = "3bf9e2903213"; + sha256 = "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq"; + }; + } + + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.3"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.0.0"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.0.0"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + }; + } + + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "60ab7e3d12ed"; + sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; + }; + } + + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + }; + } + + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + + { + goPackagePath = "github.com/phayes/permbits"; + fetch = { + type = "git"; + url = "https://github.com/phayes/permbits"; + rev = "59f2482cd460"; + sha256 = "0ydc5d9kqmjvmscik98jvr6n19sj30v33mnw8akmq0s1lxij58hm"; + }; + } + + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.2.0"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.2"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + }; + } + + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.2.1"; + sha256 = "0y7czxki8zhjhanh5ydnx4sf2darw70z2i5dskgarbk4gjmagx6k"; + }; + } + + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3d3f9f413869"; + sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; + }; + } + + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "adae6a3d119a"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + }; + } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93218def8b18"; + sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951c"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "c66870c02cf8"; + sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; + }; + } + + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.16.0"; + sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + }; + } + + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + }; + } + + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + }; + } +] diff --git a/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix b/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix index e21749f90d02..5a24c3c95256 100644 --- a/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,29 +1,21 @@ -{ fetchFromGitHub, buildRebar3, +{ fetchFromGitHub, fetchRebar3Deps, rebar3Relx }: - # Erlang dependencies: - ibrowse_4_2_2, - getopt_0_8_2, - erlware_commons_1_0_0, - jsx_2_8_0 }: - -buildRebar3 rec { +rebar3Relx rec { name = "hex2nix"; version = "0.0.6-a31eadd7"; + releaseType = "escript"; + + checkouts = fetchRebar3Deps { + inherit name version; + src = "${src}/rebar.config"; + sha256 = "1b59vk6ynakdiwqd1s6axaj9bvkaaq7ll28b48nv613z892h7nm5"; + }; + src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex2nix"; rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0"; sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk"; }; - - beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ]; - - enableDebugInfo = true; - - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall - ''; - } +} diff --git a/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix index 9bbdc8c8334d..2c32cc5c6706 100644 --- a/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,49 +1,19 @@ -{ stdenv, buildHex +{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }: -, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }: - -let - providers_1_6_0 = buildHex { - name = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; - beamDeps = [ getopt_0_8_2 ]; - }; - bbmustache_1_0_4 = buildHex { - name = "bbmustache"; - version = "1.0.4"; - sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03"; - }; - -in -buildHex rec { +rebar3Relx rec { name = "relx-exe"; version = "3.23.1"; - hexPkg = "relx"; - sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + releaseType = "escript"; - beamDeps = [ - providers_1_6_0 - getopt_0_8_2 - erlware_commons_1_0_0 - cf_0_2_2 - bbmustache_1_0_4 - ]; - - postBuild = '' - HOME=. rebar3 escriptize - ''; - - postInstall = '' - mkdir -p "$out/bin" - cp -r "_build/default/bin/relx" "$out/bin/relx" - ''; - - meta = { - description = "Executable command for Relx"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/erlware/relx"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + src = fetchHex { + pkg = "relx"; + sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + version = "3.23.1"; }; + checkouts = fetchRebar3Deps { + inherit name version; + src = "${src}/rebar.lock"; + sha256 = "046b1lb9rymndlvzmin3ppa3vkssjqspyfp98869k11s5avg76hd"; + }; } diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix index 60f53c74bb24..20a26824e5e7 100644 --- a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix @@ -14,6 +14,7 @@ buildGoPackage rec { sha256 = "1c1y0n1yxcaxvhlsj7b0wvhi934b5g0s1mi46hh5amb9j3dhgq1c"; }; + subPackages = ["."]; goDeps = ./deps.nix; meta = { diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 267cd943edd5..11e02eba5663 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ccls-${version}"; - version = "0.20181225.7"; + version = "0.20181225.8"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1qgb2nk4nsgbx4qwymwlzi202daskk536a5l877fsp878jpp61cm"; + sha256 = "05vih8wi2lzp4zqlqd18fs3va6s8p74ws8sx7vwpcc8vcsdzq5w9"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 42da07baca66..00f679cfdac8 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,13 +1,17 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook }: with stdenv; +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + let isGreaterNix20 = with lib.versions; let @@ -34,8 +38,8 @@ let CatalystViewDownload CatalystViewJSON CatalystViewTT - CatalystXRoleApplicator CatalystXScriptServerStarman + CatalystXRoleApplicator CryptRandPasswd DBDPg DBDSQLite @@ -71,15 +75,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2018-08-07"; + version = "2019-02-01"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; - sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; + rev = "8b5948f4cf12424c04df67a6eb136c9846fb2cfd"; + sha256 = "0ldk3li394vykl9c4v9bs8pir05pmad24s0rx9bzqgz569zfj2iv"; }; buildInputs = @@ -88,6 +92,7 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests + nlohmann_json ] ++ lib.optionals isGreaterNix20 [ boost ]; hydraPath = lib.makeBinPath ( diff --git a/nixpkgs/pkgs/development/tools/misc/uhd/default.nix b/nixpkgs/pkgs/development/tools/misc/uhd/default.nix deleted file mode 100644 index 484e8787d50a..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/uhd/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, python, pythonPackages, orc, libusb1, boost }: - -# You need these udev rules to not have to run as root (copied from -# ${uhd}/share/uhd/utils/uhd-usrp.rules): -# -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" - -let - uhdVer = "v" + version; - - # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.13.0.1"; - - # Firmware images are downloaded (pre-built) from the respective release on Github - uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; - sha256 = "0y9i93z188ch0hdlkvv0k9m0k7vns7rbxaqsnk35xnlqlxxgqdvj"; - }; - -in stdenv.mkDerivation { - name = "uhd-${version}"; - - src = fetchFromGitHub { - owner = "EttusResearch"; - repo = "uhd"; - rev = "${uhdVer}"; - sha256 = "0si49qk96zhpanmcrzlr3igc5s1y30x4p0z973q60dx9fhqsbb6k"; - }; - - enableParallelBuilding = true; - - # ABI differences GCC 7.1 - # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - - cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; - - # Build only the host software - preConfigure = "cd host"; - patches = if stdenv.isAarch32 then ./neon.patch else null; - - postPhases = [ "installFirmware" ]; - - # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` - installFirmware = '' - mkdir -p "$out/share/uhd/images" - tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" - ''; - - meta = with stdenv.lib; { - description = "USRP Hardware Driver (for Software Defined Radio)"; - longDescription = '' - The USRP Hardware Driver (UHD) software is the hardware driver for all - USRP (Universal Software Radio Peripheral) devices. - - USRP devices are designed and sold by Ettus Research, LLC and its parent - company, National Instruments. - ''; - homepage = https://uhd.ettus.com/; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz tomberek ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/misc/uhd/neon.patch b/nixpkgs/pkgs/development/tools/misc/uhd/neon.patch deleted file mode 100644 index 18ec59c1d64b..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/uhd/neon.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: When building for armhf, enable NEON - NEON is part of the armhf baseline, so this will always be enabled on - armhf. -Author: Paul Tagliamonte <paultag@debian.org> -Bug-Debian: https://bugs.debian.org/873608 -Origin: vendor -Last-Update: 2017-08-29 - ---- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt -+++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt -@@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V - ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S - ) -+ -+ SET ( CMAKE_CXX_FLAGS "-mfpu=neon" ) - ENDIF() - - ######################################################################## diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 23aeceb41a75..6bc397cffcbe 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.1.7"; + version = "1.1.8"; name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "0i50y033y78wcfgz3b81d34p98azahl94w4b63ac0zyczlwlhvkf"; + sha256 = "0hfiwqi60xnwsmj7fmv1sk2gzr6wxdzbgd5zli2xnfrjvb4ydv12"; }; buildInputs = [ ocaml findlib dune ocp-build cmdliner re ]; diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 3945af2794d5..8cd6a3f09eef 100644 --- a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -46,10 +46,6 @@ in stdenv.mkDerivation rec { "-Dsystemdunitdir=lib/systemd/system" ]; - postInstall = '' - rm $out/share/applications/mimeinfo.cache - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/nixpkgs/pkgs/development/tools/rust/rls/default.nix b/nixpkgs/pkgs/development/tools/rust/rls/default.nix new file mode 100644 index 000000000000..accdc7678c60 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/rls/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, openssh, openssl, pkgconfig, cmake, zlib, curl }: + +rustPlatform.buildRustPackage rec { + name = "rls-${version}"; + # with rust 1.x you can only build rls version 1.x.y + version = "1.31.7"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rls"; + rev = version; + sha256 = "0n33pf7sm31y55rllb8wv3mn75srspr4yj2y6cpcdyf15n47c8cf"; + }; + + cargoSha256 = "0jcsggq4ay8f4vb8n6gh8z995icvvbjkzapxf6jq6qkg6jp3vv17"; + + # a nightly compiler is required unless we use this cheat code. + RUSTC_BOOTSTRAP=1; + + # clippy is hard to build with stable rust so we disable clippy lints + cargoBuildFlags = [ "--no-default-features" ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ openssh openssl curl zlib ]; + + doCheck = true; + # the default checkPhase has no way to pass --no-default-features + checkPhase = '' + runHook preCheck + echo "Running cargo test" + cargo test --no-default-features + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; + homepage = https://github.com/rust-lang/rls/; + license = licenses.mit; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix b/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix index dac00aa4c969..4684841cf478 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; rev = "${version}"; - sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; + sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy"; }; - cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; + cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix index f2e6b00c09b3..b8ba30361aa8 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: let # NOTE: bumping the version and updating the hash is insufficient; @@ -48,10 +48,22 @@ in buildRubyGem rec { # PATH additions: # - libarchive: Make `bsdtar` available for extracting downloaded boxes - postInstall = '' + # withLibvirt only: + # - libguestfs: Make 'virt-sysprep' available for 'vagrant package' + # - qemu: Make 'qemu-img' available for 'vagrant package' + postInstall = + let + pathAdditions = lib.makeSearchPath "bin" + (map (x: "${lib.getBin x}") ([ + libarchive + ] ++ lib.optionals withLibvirt [ + libguestfs + qemu + ])); + in '' wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' "${lib.getBin libarchive}/bin" + --prefix PATH ':' ${pathAdditions} mkdir -p "$out/vagrant-plugins/plugins.d" echo '{}' > "$out/vagrant-plugins/plugins.json" diff --git a/nixpkgs/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix index 7378729581fc..b2711d29b5ba 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v11.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.6.0"; - sha256 = "1czrpxmk6calqn0p92rm0bv2vlgbnx6q4z7n2j8r7aw0khwbxwll"; + version = "11.7.0"; + sha256 = "18md1xz055rxds4i831rmmya0xda7cc0wdmr1jnj8vigfbcbvzh7"; } |