diff options
Diffstat (limited to 'pkgs/development')
92 files changed, 686 insertions, 364 deletions
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 8b013bbd6503..48e4d9bdc6c4 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; + maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 9aaf85c598fc..560af19e2010 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; + maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index e3dfa8ea324c..6374846f4407 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.3627"; + version = "1.0.4062"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8"; + sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index f22771a35e9d..e4d99dcec955 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); - propagatedBuildInputs = [glib]; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 6f61068738af..8a7fb96723a7 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.6"; + version = "0.13.8"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25"; + sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns"; + sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy"; }; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = "https://www.purescript.org/"; license = licenses.bsd3; - maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ]; + maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 332824185616..09e51e4c6471 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.06.11"; + version = "2020.06.16"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d"; - sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp"; + rev = "39ba90a8b84d740b670a9f1df5148b824d441c63"; + sha256 = "1ncscbhyq4f07d28l32j37y5d84vyqxfx0fbzhb7nzfhplk8hh0s"; }; enableParallelBuilding = true; diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix index c689f7156fb4..6af08edf88a7 100644 --- a/pkgs/development/dhall-modules/Prelude.nix +++ b/pkgs/development/dhall-modules/Prelude.nix @@ -1,26 +1,17 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makePrelude = - version: - lib.makeOverridable - ( { rev, sha256, file ? "package.dhall" }: - buildDhallPackage { - name = "Prelude-${version}"; - - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-lang"; - - inherit rev sha256; - }; - - in - "${src}/Prelude/${file}"; - } - ); + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "Prelude-${version}"; + owner = "dhall-lang"; + repo = "dhall-lang"; + directory = "Prelude"; + file = "package.dhall"; + + inherit rev sha256; + }; in lib.mapAttrs makePrelude { diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix index 23a1123eacb3..2de89d63ec37 100644 --- a/pkgs/development/dhall-modules/dhall-kubernetes.nix +++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix @@ -1,29 +1,16 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makeDhallKubernetes = - version: - lib.makeOverridable - ( { rev - , sha256 - , file ? "package.dhall" - }: - buildDhallPackage { - name = "dhall-kubernetes-${version}"; + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "dhall-kubernetes-${version}"; + owner = "dhall-lang"; + repo = "dhall-kubernetes"; + file = "package.dhall"; - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-kubernetes"; - - inherit rev sha256; - }; - - in - "${src}/${file}"; - } - ); + inherit rev sha256; + }; in lib.mapAttrs makeDhallKubernetes { diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix index 34ebbed68699..866b689e38a1 100644 --- a/pkgs/development/dhall-modules/dhall-packages.nix +++ b/pkgs/development/dhall-modules/dhall-packages.nix @@ -1,47 +1,32 @@ -{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }: +{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }: let makeDhallPackages = - version: - lib.makeOverridable - ( { rev - , sha256 - , dependencies - }: - buildDhallPackage { - name = "dhall-packages-${version}"; + version: { rev, sha256, dependencies }: + buildDhallGitHubPackage { + name = "dhall-packages-${version}"; + owner = "EarnestResearch"; + repo = "dhall-packages"; + file = "package.dhall"; - inherit dependencies; - - code = - let - src = fetchFromGitHub { - owner = "EarnestResearch"; - repo = "dhall-packages"; - - inherit rev sha256; - }; - - in - "${src}/package.dhall"; - } - ); + inherit rev sha256 dependencies; + }; in lib.mapAttrs makeDhallPackages { "0.11.1" = let - k8s_6a47bd = dhall-kubernetes."3.0.0".override { + k8s_6a47bd = dhall-kubernetes.override { rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4"; sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh"; }; - k8s_4ad581 = dhall-kubernetes."3.0.0".override { + k8s_4ad581 = dhall-kubernetes.override { rev = "4ad58156b7fdbbb6da0543d8b314df899feca077"; sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0"; }; - k8s_fee24c = dhall-kubernetes."3.0.0".override { + k8s_fee24c = dhall-kubernetes.override { rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d"; sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk"; }; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 9baeefe1b2cb..0d8b382167e5 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -17,7 +17,7 @@ # # if vendorSha256 is null, then we won't fetch any dependencies and # rely on the vendor folder within the source. -, vendorSha256 ? null +, vendorSha256 # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 99e3ddf34f17..000932cc010a 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "guile-cairo"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "11fn2x2973dizzw94fkz6rj9crsyzchphq5097lvbkvqpzbyidyp"; + sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix new file mode 100644 index 000000000000..b4401a85d141 --- /dev/null +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -0,0 +1,25 @@ +{ buildDhallPackage, lib }: + +# This is a minor variation on `buildDhallPackage` that splits the `code` +# argument into `src` and `file` in such a way that you can easily override +# the `file` +# +# This function is used by `dhall-to-nixpkgs` when given a directory +lib.makeOverridable + ( { # Arguments passed through to `buildDhallPackage` + name + , dependencies ? [] + , source ? false + + , src + , # The file to import, relative to the root directory + file ? "package.dhall" + }: + + buildDhallPackage { + inherit name dependencies source; + + code = "${src}/${file}"; + } + ) + diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix new file mode 100644 index 000000000000..9289e9b656d3 --- /dev/null +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -0,0 +1,50 @@ +{ buildDhallPackage, fetchFromGitHub, lib }: + +# This function is used by `dhall-to-nixpkgs` when given a GitHub repository +lib.makeOverridable + ( { # Arguments passed through to `buildDhallPackage` + name + , dependencies ? [] + , source ? false + + , # The directory containing the Dhall files, if other than the root of the + # repository + directory ? "" + , # The file to import, relative to the above directory + file ? "package.dhall" + + # Arguments passed through to `fetchFromGitHub` + , owner + , repo + , rev + # Extra arguments passed through to `fetchFromGitHub`, such as the hash + # or `fetchSubmodules` + , ... + }@args: + + buildDhallPackage { + inherit name dependencies source; + + code = + let + src = fetchFromGitHub ({ + name = "${name}-source"; + + inherit owner repo rev; + } // removeAttrs args [ + "name" + "dependencies" + "source" + "directory" + "file" + "owner" + "repo" + "rev" + ]); + + prefix = lib.optionalString (directory != "") "${directory}/"; + + in + "${src}/${prefix}${file}"; + } + ) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index f6f4e36532ec..32312401f963 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1zdiwddnppwg5zrizy2ypd449zj4mivib76h73xhvr1syl7dk7sc"; + sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 7ea38b6472b8..c09fb8d91ee1 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.15.12"; + version = "5.15.13"; src = fetchurl { - sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1"; + sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index df0eecfd0be9..5324fe0685d6 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa"; + sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index dc742a5c051a..01da4753b0e6 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "cpp-hocon"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { - sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3"; + sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 274a657cb1af..9f2710f42a46 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curlcpp"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; rev = version; - sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; + sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; }; buildInputs = [ cmake curl ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index f244bdc7ad2b..c1b9318130c1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.40"; + version = "1.1.42"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq"; + sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index d638c2bb2788..f579da5f1d6c 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -63,7 +63,7 @@ stdenvNoLibs.mkDerivation rec { export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD - export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1' + export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1' "$sourceRoot/../gcc/configure" $gccConfigureFlags diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index d7df4ab72127..a19febbfd66e 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp-2_0 ]; + buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index eb23f5c82c23..278059465ecb 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gmm"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; - sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46"; + sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index e2552ba713e0..7c6168c3d3e4 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.1"; + version = "1.90.2"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"; + sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 03a907162b12..03324c15d8f7 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libiio"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1r67h5mayx9krh3mmzs5vz20mvwb2lw04hpbyyisygl01ndc77kq"; + sha256 = "1929gvizkqmm9cwh3vihxxszfxvgcp5saq9q6chdk3fpdhzajc00"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 1d6f274cbb3b..bbf0db233821 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.2"; + version = "0.1.3"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "0smd1i6gzpp34gv494jcnx40wm36v1s8bypqlfrf8l6q9cl77gyd"; + sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc"; }; patches = [ diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 83d08dc019bf..5d0459b4f308 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza"; + sha256 = "0v6w8b9r994mkkbm2gqgd7k5yfmdhgbabh0j1gmn375nyvhy4qqh"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 556db28f8568..55e07c03b287 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; pname = "libnetfilter_queue"; src = fetchurl { url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; - sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; + sha256 = "0w7s6g8bikch1m4hnxdakpkwgrkw64ikb6wb4v4zvgyiywrk5yai"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 1cd1f5e62ac1..bbe0b6145503 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "libraspberrypi"; - version = "2019-10-22"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "5070cb7fc150fc98f1ed64a7739c3356970d9f76"; - sha256 = "08yfzwn9s7lhrblcsxyag9p5lj5vk3n66b1pv3f7r3hah7qcggyq"; + rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; + sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; }; cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux") diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 9443846acf1e..d559efd3aab5 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.13"; + version = "0.7.14"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8"; + sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 513e842edfa5..64f6fccefa79 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.24"; + version = "0.9.25"; - src = fetchFromGitHub { - owner = "LMDB"; - repo = "lmdb"; + src = fetchgit { + url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm"; + sha256 = "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix new file mode 100644 index 000000000000..a63d367b800d --- /dev/null +++ b/pkgs/development/libraries/nanopb/default.nix @@ -0,0 +1,88 @@ +{ callPackage +, cmake +, fetchFromGitHub +, lib +, protobuf +, python3 +, stdenv +}: + +let + pythonRuntime = python3.withPackages(ps: [ ps.protobuf ]); +in stdenv.mkDerivation rec { + pname = "nanopb"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "16zxk42wzn519bpxf4578qn97k0h1cnbkvqqkqvka9sl0n3lz2dp"; + }; + + nativeBuildInputs = [ cmake python3 ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} + "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a + "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" + ]; + + # On a case-insensitive filesystem (such as on Darwin), CMake fails to create + # the build directory because of the existence of the BUILD file. + # TODO: This can be removed once https://github.com/nanopb/nanopb/pull/537 is merged. + preConfigure = "rm BUILD"; + + # install the generator which requires Python3 with the protobuf package. It + # also requires the nanopb module that's generated by CMake to be in a + # relative location to the generator itself so we move it out of the + # python.sitePackages into the shared generator folder. + postInstall = '' + mkdir -p $out/share/nanopb/generator/proto + cp ../generator/nanopb_generator.py $out/share/nanopb/generator/nanopb_generator.py + cp ../generator/proto/_utils.py $out/share/nanopb/generator/proto/_utils.py + cp ../generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto + mv $out/${python3.sitePackages}/nanopb_pb2.py $out/share/nanopb/generator/proto + rm -rf $out/${python3.sitePackages} + + mkdir $out/bin + substitute ${./protoc-gen-nanopb} $out/bin/protoc-gen-nanopb \ + --subst-var-by python ${pythonRuntime}/bin/python \ + --subst-var-by out $out + chmod +x $out/bin/protoc-gen-nanopb + ''; + + passthru.tests = { + simple-proto2 = callPackage ./test-simple-proto2 {}; + simple-proto3 = callPackage ./test-simple-proto3 {}; + message-with-annotations = callPackage ./test-message-with-annotations {}; + message-with-options = callPackage ./test-message-with-options {}; + }; + + meta = with lib; { + inherit (protobuf.meta) platforms; + + description = "Protocol Buffers with small code size"; + homepage = "https://jpa.kapsi.fi/nanopb/"; + license = licenses.zlib; + maintainers = with maintainers; [ kalbasit ]; + + longDescription = '' + Nanopb is a small code-size Protocol Buffers implementation in ansi C. It + is especially suitable for use in microcontrollers, but fits any memory + restricted system. + + - Homepage: jpa.kapsi.fi/nanopb + - Documentation: jpa.kapsi.fi/nanopb/docs + - Downloads: jpa.kapsi.fi/nanopb/download + - Forum: groups.google.com/forum/#!forum/nanopb + + In order to use the nanopb options in your proto files, you'll need to + tell protoc where to find the nanopb.proto file. + You can do so with the --proto_path (-I) option to add the directory + ''${nanopb}/share/nanopb/generator/proto like so: + + protoc --proto_path=. --proto_path=''${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=''${nanopb}/bin/protoc-gen-nanopb --nanopb_out=out file.proto + ''; + }; +} diff --git a/pkgs/development/libraries/nanopb/protoc-gen-nanopb b/pkgs/development/libraries/nanopb/protoc-gen-nanopb new file mode 100644 index 000000000000..764e6614b18a --- /dev/null +++ b/pkgs/development/libraries/nanopb/protoc-gen-nanopb @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec @python@ @out@/share/nanopb/generator/nanopb_generator.py --protoc-plugin diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix new file mode 100644 index 000000000000..618d7c521ce0 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -0,0 +1,27 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-message-with-annotations"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto + ''; + + docheck = true; + checkphase = '' + grep -q WithAnnotations $out/withannotations.pb.c || (echo "error: WithAnnotations not found in $out/withannotations.pb.c"; exit 1) + grep -q WithAnnotations $out/withannotations.pb.h || (echo "error: WithAnnotations not found in $out/withannotations.pb.h"; exit 1) + grep -q "pb_byte_t uuid\[16\]" $out/withannotations.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withannotations.pb.h"; exit 1) + grep -q "FIXED_LENGTH_BYTES, uuid" $out/withannotations.pb.h || (echo "error: uuid is not of fixed lenght bytes in $out/withannotations.pb.h"; exit 1) + grep -q "#define WithAnnotations_size" $out/withannotations.pb.h || (echo "error: the size of WithAnnotations is not known in $out/withannotations.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto b/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto new file mode 100644 index 000000000000..d8109e877d68 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +import "nanopb.proto"; + +message WithAnnotations { + bytes uuid = 1 [(nanopb).max_size = 16, (nanopb).fixed_length = true]; +} diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix new file mode 100644 index 000000000000..c15b51f71977 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -0,0 +1,27 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-message-with-options"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto + ''; + + docheck = true; + checkphase = '' + grep -q WithOptions $out/withoptions.pb.c || (echo "error: WithOptions not found in $out/withoptions.pb.c"; exit 1) + grep -q WithOptions $out/withoptions.pb.h || (echo "error: WithOptions not found in $out/withoptions.pb.h"; exit 1) + grep -q "pb_byte_t uuid\[16\]" $out/withoptions.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withoptions.pb.h"; exit 1) + grep -q "FIXED_LENGTH_BYTES, uuid" $out/withoptions.pb.h || (echo "error: uuid is not of fixed lenght bytes in $out/withoptions.pb.h"; exit 1) + grep -q "#define WithOptions_size" $out/withoptions.pb.h || (echo "error: the size of WithOptions is not known in $out/withoptions.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options new file mode 100644 index 000000000000..ecf98a217367 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options @@ -0,0 +1 @@ + WithOptions.uuid max_size:16 fixed_length:true diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto new file mode 100644 index 000000000000..5a5da3a1c973 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +message WithOptions { + bytes uuid = 1; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix new file mode 100644 index 000000000000..a915e7785370 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-simple-proto2"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto + ''; + + doCheck = true; + checkPhase = '' + grep -q SimpleMessage $out/simple.pb.c || (echo "ERROR: SimpleMessage not found in $out/simple.pb.c"; exit 1) + grep -q SimpleMessage $out/simple.pb.h || (echo "ERROR: SimpleMessage not found in $out/simple.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto b/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto new file mode 100644 index 000000000000..b02936b1ae26 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto @@ -0,0 +1,5 @@ +syntax = "proto2"; + +message SimpleMessage { + required int32 lucky_number = 1; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix new file mode 100644 index 000000000000..3e2bba731b9f --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-simple-proto3"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto + ''; + + doCheck = true; + checkPhase = '' + grep -q SimpleMessage $out/simple.pb.c || (echo "ERROR: SimpleMessage not found in $out/simple.pb.c"; exit 1) + grep -q SimpleMessage $out/simple.pb.h || (echo "ERROR: SimpleMessage not found in $out/simple.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto b/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto new file mode 100644 index 000000000000..6b99cdb5daa7 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +message SimpleMessage { + int32 lucky_number = 1; +} diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index c84e66608f2a..d5c230862333 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; - homepage = "https://matrix.org/git/olm/about"; + homepage = "https://gitlab.matrix.org/matrix-org/olm"; platforms = with stdenv.lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index a62138e8ccf4..c8b1205bc91b 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "10sbiwjljxi0a1q3xakmf6v02x3yf38ljvjpql70q4rqggqj9zhh"; + sha256 = "0qz9mdkanz4vd38bdpwvcwvbpzf19i6019rmqw3k1vh5mh22ljhr"; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 38041e6b5d80..5c185f630d98 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -19,7 +19,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.3"; + version = "4.0.4"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl"; + sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7"; }; postPatch = '' diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 17df9eee84e8..a16b8356e618 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.6.11"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "0s8xdxrxnh1l0v41n5cw89b89rrlqlxn1yj14sw224230y8m70ka"; + sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index 304f9d61f397..82126727282c 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -1,12 +1,11 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // { - version = "1.3.1"; +callPackage ./generic.nix (args // rec { + version = "1.3.3"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - #rev = "v${version}"; - rev = "9412830d0680150d429d2aa170b8d7218ab49397"; - sha256 = "175cmaj5231iqzhf5a9sxw2y3i165chk3681m1b5mp8di927q5ai"; + rev = "v${version}"; + sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv"; }; }) diff --git a/pkgs/development/libraries/swiften/build-fix.patch b/pkgs/development/libraries/swiften/build-fix.patch new file mode 100644 index 000000000000..01814cadfbd4 --- /dev/null +++ b/pkgs/development/libraries/swiften/build-fix.patch @@ -0,0 +1,32 @@ +diff -wbBur swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h +--- swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2018-04-06 13:06:46.000000000 +0300 ++++ swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2019-10-08 20:52:23.171475337 +0300 +@@ -9,6 +9,7 @@ + #include <set> + + #include <QWizard> ++#include <QAbstractItemModel> + + #include <Swiften/Base/Override.h> + +diff -wbBur swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp +--- swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp 2018-04-06 13:06:46.000000000 +0300 ++++ swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp 2019-10-08 21:12:25.284754131 +0300 +@@ -157,7 +157,7 @@ + miniUPnPInterface = new MiniUPnPInterface(); + miniUPnPSupported = miniUPnPInterface->isAvailable(); + } +- SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; ++// SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; + if (miniUPnPSupported) { + return miniUPnPInterface; + } +@@ -168,7 +168,7 @@ + natPMPInterface = new NATPMPInterface(); + natPMPSupported = natPMPInterface->isAvailable(); + } +- SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; ++// SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; + if (natPMPSupported) { + return natPMPInterface; + } diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index bdac55fe2ec3..19bacdd2a614 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -12,17 +12,21 @@ stdenv.mkDerivation rec { sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; - patches = [ ./scons.patch ]; + patches = [ ./scons.patch ./build-fix.patch ]; sconsFlags = [ "openssl=${openssl.dev}" "boost_includedir=${boost.dev}/include" "boost_libdir=${boost.out}/lib" "boost_bundled_enable=false" + "max_jobs=1" + "optimize=1" + "debug=0" + "swiften_dll=1" ]; preInstall = '' installTargets="$out" - installFlags+=" SWIFT_INSTALLDIR=$out" + installFlags+=" SWIFTEN_INSTALLDIR=$out" ''; enableParallelBuilding = true; @@ -33,6 +37,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.twey ]; - broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114681755) }; } diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b264c3bc6c6e..2421d3f88990 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,36 +1,32 @@ -{ stdenv, lib, fetchurl, fetchpatch -, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps -, uthash, which +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, autoconf-archive, pkg-config, doxygen, perl +, openssl, json_c, curl, libgcrypt +, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which }: stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.3.2"; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2"; + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs"; }; - patches = [ - # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch"; - sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n"; - }) - ]; - nativeBuildInputs = [ - doxygen perl pkgconfig - # For unit tests and integration tests. - ibm-sw-tpm2 iproute procps which + autoreconfHook autoconf-archive pkg-config doxygen perl ]; - buildInputs = [ - openssl - # For unit tests and integration tests. - cmocka uthash + buildInputs = [ openssl json_c curl libgcrypt ]; + checkInputs = [ + cmocka uthash ibm-sw-tpm2 iproute procps which ]; + preAutoreconf = "./bootstrap"; + + enableParallelBuilding = true; + postPatch = "patchShebangs script"; configureFlags = [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 104e0c3440aa..33db6e9d75b1 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland , libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4 +, libpng, ffmpeg }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 + libpng ffmpeg ]; postInstall = '' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 8de7f99fe5fd..da29eacdc0e9 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig -, gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xorgproto, gstreamer, gst-plugins-base, GConf, setfile +, libXinerama, libSM, libXxf86vm +, gtk2, GConf ? null, gtk3 +, xorgproto, gstreamer, gst-plugins-base, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? libGLSupported , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true @@ -28,9 +29,10 @@ stdenv.mkDerivation rec { sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + buildInputs = [ + libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + ] ++ optionals withGtk2 [ gtk2 GConf ] + ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 99f86974cdb4..790968a88f76 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig -, gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xorgproto, gstreamer, gst-plugins-base, GConf, setfile +, libXinerama, libSM, libXxf86vm +, gtk2, GConf ? null, gtk3 +, xorgproto, gstreamer, gst-plugins-base, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true @@ -27,9 +28,10 @@ stdenv.mkDerivation rec { sha256 = "0gfdhb7xq5vzasm7s1di39nchv42zsp0dmn4v6knzb7mgsb107wb"; }; - buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + buildInputs = [ + libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + ] ++ optionals withGtk2 [ gtk2 GConf ] + ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2dbda51bfe8b..7eae27d85c6f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -359,6 +359,33 @@ inspect = buildLuarocksPackage { license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; +ldbus = buildLuarocksPackage { + pname = "ldbus"; + version = "scm-0"; + + knownRockspec = (fetchurl { + url = "https://luarocks.org/dev/ldbus-scm-0.rockspec"; + sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/daurnimator/ldbus.git", + "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", + "date": "2019-08-16T14:26:05+10:00", + "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/daurnimator/ldbus"; + description = "A Lua library to access dbus."; + license.fullName = "MIT/X11"; + }; +}; ldoc = buildLuarocksPackage { pname = "ldoc"; version = "1.4.6-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 30be2c197a5d..94edbd0737b7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -76,6 +76,17 @@ with super; */ }); + ldbus = super.ldbus.override({ + extraVariables = { + DBUS_DIR="${pkgs.dbus.lib}"; + DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0"; + }; + buildInputs = with pkgs; [ + dbus + ]; + }); + ljsyscall = super.ljsyscall.override(rec { version = "unstable-20180515"; # package hasn't seen any release for a long time diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index 1591a1efd17a..a8f7e4795e77 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libusb1 }: let - version = "2018-03-27"; + version = "2020-05-11"; name = "rpiboot-unstable-${version}"; in stdenv.mkDerivation { inherit name; @@ -9,8 +9,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "fb86716935f2e820333b037a2ff93a338ad9b695"; - sha256 = "163g7iw7kf6ra71adx6lf1xzf3kv20bppva15ljwn54jlah5mv98"; + rev = "c650cd747c1d0597487dcf319bf95b5ba775d78b"; + sha256 = "17kapny79dh05vfmrniqdvz6xhpwnqnw0511ycfx4qcjh4krxh8n"; }; nativeBuildInputs = [ libusb1 ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 2f623dd0f0ef..c58944a59d72 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, pythonAtLeast , attrs , chardet , multidict @@ -14,7 +13,6 @@ , pytestrunner , pytestCheckHook , gunicorn -, pytest-timeout , async_generator , pytest_xdist , pytestcov @@ -63,6 +61,8 @@ buildPythonPackage rec { "test_read_boundary_with_incomplete_chunk" "test_read_incomplete_chunk" "test_request_tracing_exception" + ] ++ lib.optionals stdenv.isDarwin [ + "test_close" ]; # aiohttp in current folder shadows installed version diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7ccc569a87e5..ca750f32dba9 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, ffmpeg_4 +, ffmpeg , pkgconfig }: @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg_4 ]; + buildInputs = [ ffmpeg ]; # Tests require downloading files from internet doCheck = false; diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 0c2b3338690f..e3549e0a4a85 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.22"; + version = "0.2.23"; src = fetchPypi { inherit pname version; - sha256 = "c64a8ad0204743d49cf2f8775f92d9c23dd9d7eb6996a61f4a9de57a53d429f9"; + sha256 = "d7458b499959af66e0a640e29e6b676a39cc9614cd504e5a2e8f8d0c7f546597"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 045dd14da0d8..9709037792dc 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.2.3"; + version = "2.3.0"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"; + sha256 = "04i788glp2cslwi67dixy1pi5l0izcl078i9mrd1j1sh8f99cvcs"; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 1b10fe166f8a..9b27ae254903 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -6,6 +6,7 @@ , six , html5lib , setuptools +, packaging }: buildPythonPackage rec { @@ -18,11 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six html5lib setuptools ]; - - postPatch = '' - substituteInPlace setup.py --replace ",<3dev" "" - ''; + propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests checkPhase = '' diff --git a/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch b/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch new file mode 100644 index 000000000000..685d34228a1b --- /dev/null +++ b/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch @@ -0,0 +1,27 @@ +From 6f544a5bd43446859754cb80e012af933b843db9 Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Wed, 3 Jun 2020 22:05:34 +0200 +Subject: [PATCH] clipboard: make which substitutable + +This is used to detect the presence of xclip and other clipboard +handling tools. +--- + bpython/clipboard.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bpython/clipboard.py b/bpython/clipboard.py +index aee429b..f346429 100644 +--- a/bpython/clipboard.py ++++ b/bpython/clipboard.py +@@ -58,7 +58,7 @@ class OSXClipboard(object): + + def command_exists(command): + process = subprocess.Popen( +- ["which", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE ++ ["@which@", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE + ) + process.communicate() + +-- +2.26.2 + diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 73ce843cf018..ad7322cbf661 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pygments, greenlet, curtsies, urwid, requests, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, curtsies +, greenlet +, mock +, pygments +, requests +, substituteAll +, urwid +, which }: buildPythonPackage rec { pname = "bpython"; @@ -9,6 +19,11 @@ buildPythonPackage rec { sha256 = "1764ikgj24jjq46s50apwkydqvy5a13adb2nbszk8kbci6df0v27"; }; + patches = [ (substituteAll { + src = ./clipboard-make-which-substitutable.patch; + which = "${which}/bin/which"; + })]; + propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; postInstall = '' diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index e7942760b72c..e48fec89b9d7 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.2"; + version = "1.11.6"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1gsvjgypjgw5a0k85kdvbbf7q6wspmv6z76acrgnidhav8sdn4dm"; + sha256 = "0jyygq7zmam7yriiv5j4d6mpjdi2p3p7d53bn3qwfzkh4ifsbfan"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index ff4f6198aa5e..aca4bf35434b 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -19,14 +19,14 @@ }: buildPythonPackage rec { - pname = "nio"; - version = "0.10.0"; + pname = "matrix-nio"; + version = "0.12.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "04ryf9lrm0820hqij46hav6mgplabnyl9dfj46iwvxasn06fh2j8"; + sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix new file mode 100644 index 000000000000..589a8f3db819 --- /dev/null +++ b/pkgs/development/python-modules/playsound/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "playsound"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "TaylorSMarks"; + repo = "playsound"; + rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; + sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; + }; + + doCheck = false; + + pythonImportsCheck = [ "playsound" ]; + + meta = with lib; { + homepage = "https://github.com/TaylorSMarks/playsound"; + description = "Pure Python, cross platform, single function module with no dependencies for playing sounds"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ luc65r ]; + }; +} diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 6b6aad2b2342..7531bb8f7bbc 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -47,7 +47,8 @@ buildPythonPackage rec { and not test_libcurl_ssl_openssl" \ --ignore=tests/getinfo_test.py \ --ignore=tests/memory_mgmt_test.py \ - --ignore=tests/multi_memory_mgmt_test.py + --ignore=tests/multi_memory_mgmt_test.py \ + --ignore=tests/multi_timer_test.py ''; preConfigure = '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index ef33b6fb2bd5..371bfba2f0f9 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , ujson , email_validator , typing-extensions @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; }; + # fix tests, remove on next version bump + patches = [ + (fetchpatch { + url = "https://github.com/samuelcolvin/pydantic/commit/a5b0e741e585040a0ab8b0be94dd9dc2dd3afcc7.patch"; + sha256 = "0v91ac3dw23rm73370s2ns84vi0xqbfzpvj84zb7xdiicx8fhmf1"; + }) + ]; + propagatedBuildInputs = [ ujson email_validator diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index 447fbdfcdc44..b3d1fb3d26df 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , gdb @@ -19,6 +20,9 @@ buildPythonPackage rec { checkInputs = [ gdb ]; + # tests require gcc for some reason + doCheck = !stdenv.hostPlatform.isDarwin; + postPatch = '' # tries to execute flake8, # which is likely to break on flake8 updates diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 128fb8961d4d..cb3fe1a9f38d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { description = "Engine.IO server"; homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 0027c8d32a63..82ddb8c810b0 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -9,6 +9,7 @@ , pkgconfig , dotnetbuildhelpers , clang +, glib , mono }: @@ -63,6 +64,7 @@ buildPythonPackage rec { ]; buildInputs = [ + glib mono psutil # needed for memory leak tests ]; diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 6bcc05fb34d6..73b5e0b8c2b5 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rope"; - version = "0.16.0"; + version = "0.17.0"; disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 src = fetchPypi { inherit pname version; - sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj"; + sha256 = "1qa9nqryp05ah9b4r8cy5ph31kr9cm4ak79pvzbg7p23bxqdd2k5"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 6a54cc1ec715..f0a143ec30c7 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1fgm1zlw8mjhmk64skxs79ymhcningml13y9c9fy7rj1b1yadwzh"; + sha256 = "0nri437dyapiq5gx8lbmjdfvqw2cnw3di13kp44rzr17bm5yh2jv"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { # ''; postPatch = '' - substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8" + substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8" ''; meta = with lib; { @@ -62,5 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; maintainers = with maintainers; [ danieldk sdll ]; - }; + }; } diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 1f1558b23c39..1c02b05d303e 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,108 +1,108 @@ [{ "pname": "de_core_news_md", - "version": "2.2.5", - "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk", + "version": "2.3.0", + "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", "license": "cc-by-sa-40" }, { "pname": "de_core_news_sm", - "version": "2.2.5", - "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g", + "version": "2.3.0", + "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", "license": "cc-by-sa-40" }, { "pname": "el_core_news_md", - "version": "2.2.5", - "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36", + "version": "2.3.0", + "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", "license": "cc-by-sa-40" }, { "pname": "el_core_news_sm", - "version": "2.2.5", - "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l", + "version": "2.3.0", + "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.2.5", - "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr", + "version": "2.3.0", + "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.2.5", - "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy", + "version": "2.3.0", + "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.2.5", - "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0", + "version": "2.3.0", + "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.1.0", - "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", + "version": "2.3.0", + "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.2.5", - "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl", + "version": "2.3.0", + "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.2.5", - "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi", + "version": "2.3.0", + "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.2.5", - "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b", + "version": "2.3.0", + "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.2.5", - "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y", + "version": "2.3.0", + "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.2.5", - "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px", + "version": "2.3.0", + "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "2.2.5", - "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08", + "version": "2.3.0", + "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_sm", - "version": "2.2.5", - "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1", + "version": "2.3.0", + "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", "license": "mit" }, { "pname": "nl_core_news_sm", - "version": "2.2.1", - "sha256": "0gw9a1j3v4f15cxcz7zr7dz7mqi2a3541b04q6kj74gg397li4ny", + "version": "2.3.0", + "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.2.5", - "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a", + "version": "2.3.0", + "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.2.0", - "sha256": "0niwnd1mdaji92yp2dqsbmr0w420gpaybb1ppbqr1rmk6bwgyhsb", + "version": "2.3.0", + "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", "license": "cc-by-sa-40" }] diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index bdd275a218b8..8e2c28336cf7 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz"; + sha256 = "1xx5i6z9a36h7k4ipikrk2zidk7jcjv8ryqyq2m5hnwy0gpyw9mb"; }; buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 577a09e8de99..61aee215031a 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -2,20 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "1.3.0"; + version = "1.5.1"; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "107v7bp35kxbv9v7wl79h7115z1m4b48rhasp0cnivql1grd277i"; + sha256 = "0k927mycj1k4l3fbxrk597bhcjl2nrpaas1imbjgk64cyq8dv7lh"; }; postPatch = '' patchShebangs cpplint_unittest.py ''; + checkInputs = with python3Packages; [ pytest pytestrunner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 0d2d1f318443..2f026c9d99c0 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "3.2.0"; + version = "3.2.1"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "0r3vc47w5vxgy5rzh75q0lng1c490ic1a1dcc0ih7dcl6i5p1p88"; + sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 499ef7a19b31..b119b5a38105 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200506"; + version = "20200606"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1qiq6lvlg2hqiq03slv4vzv3bn4cr3w95r3i6m5fa4hgn2dkrhqa"; + sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index a92c96684a48..ae993f9611e0 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8"; + sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index fd705c4fc1b0..96b39e42d101 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk"; + sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw"; }; - patches = [ - # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172 - (fetchpatch { - url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch"; - sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb"; - }) - ]; - buildInputs = [ hiredis http-parser jansson libevent ]; makeFlags = [ diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 1349d4c009aa..adb36d8e92cb 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.3"; + version = "6.4.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b"; + sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index c0c398926352..6b64a088353e 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.3"; + version = "1.2.6"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "12kdgsma62nzksvw266qm3ivkbz62ma93dd25wy0p19789v4fi7s"; + sha256 = "0qzmrprc7npc0ln6mhkjrm8fgh2n94rdylixk11p6imxyx5fj3gg"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 43731b72a55a..62a750269209 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 3f33ff7c13a0..c59f6716a7b6 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0"; + version = "2.0.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "057dzf7xkb4fdv4bc2fgw7mxnxclcjmflafx3n2qw0qcdky18gzr"; + sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix deleted file mode 100644 index 33a8bf1df61d..000000000000 --- a/pkgs/development/tools/misc/cquery/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ fetchFromGitHub, makeWrapper -, cmake, llvmPackages, ncurses -, runtimeShell }: - -let - src = fetchFromGitHub { - owner = "cquery-project"; - repo = "cquery"; - rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e"; - sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx"; - fetchSubmodules = true; - }; - - stdenv = llvmPackages.stdenv; - -in -stdenv.mkDerivation { - pname = "cquery"; - version = "2018-10-14"; - - inherit src; - - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = with llvmPackages; [ clang clang-unwrapped llvm ncurses ]; - - cmakeFlags = [ - "-DSYSTEM_CLANG=ON" - "-DCLANG_CXX=ON" - ]; - - shell = runtimeShell; - postFixup = '' - # We need to tell cquery where to find the standard library headers. - - standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" - standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" - export standard_library_includes - - wrapped=".cquery-wrapped" - export wrapped - - mv $out/bin/cquery $out/bin/$wrapped - substituteAll ${./wrapper} $out/bin/cquery - chmod --reference=$out/bin/$wrapped $out/bin/cquery - ''; - - doInstallCheck = true; - installCheckPhase = '' - pushd ${src} - $out/bin/cquery --ci --test-unit - - # The integration tests have to be disabled because cquery ignores `--init` - # if they are invoked, which means it won't find the system includes. - #$out/bin/cquery --ci --test-index - ''; - - meta = with stdenv.lib; { - description = "A c/c++ language server powered by libclang"; - homepage = "https://github.com/cquery-project/cquery"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.tobim ]; - }; -} diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper deleted file mode 100644 index 8b3e57290429..000000000000 --- a/pkgs/development/tools/misc/cquery/wrapper +++ /dev/null @@ -1,12 +0,0 @@ -#! @shell@ -e - -initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@" - -if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then - read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} - initString+=$(printf ', \"%s\"' "${cflags_array[@]}") -fi - -initString+="]}" - -exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index d46696a32af9..ff5a3ec1b54f 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "out-of-tree"; - version = "1.3.0"; + version = "1.4.0"; buildInputs = [ makeWrapper ]; src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "02xh23nbwyyf087jqkm97jbnwpja1myaz190q5r166mpwcdpz2dn"; + sha256 = "1rn824l3dzh3xjxsbzzj053qg1abhzjimc8l73r0n5qrl44k2qk2"; }; - vendorSha256 = "1dk0cipdgj2yyg1bc9l7nvy4y373pmqwy8xiyc0wg7pchb4h9p7s"; + vendorSha256 = "0kg5c4h7xnwfcfshrh5n76xv98wzr73kxzr8q65iphsjimbxcpy3"; postFixup = '' wrapProgram $out/bin/out-of-tree \ diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index c5ae5e191211..62f2ed6e3065 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -24,7 +24,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg ]; } ); diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 32e205a6f8d3..338e8f68d355 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.8"; + version = "2.2.9"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95"; + sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index f5d70b912df5..00838c6e0c55 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -85,10 +85,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gssapi = { dependencies = ["ffi"]; @@ -149,10 +149,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -212,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2020.0425"; + version = "3.2020.0512"; }; multi_json = { groups = ["default"]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 28e438fa1e95..199d7f81fe0f 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1hlmgcppr01bddvp28js010hhlzyx2lm7g7lq9nrcjazfw7kd2pf"; + sha256 = "11rxfnjam1kr8piiw0s4r0qg8rj4qfpppp6dixk1hhsq2iwbnzj6"; fetchSubmodules = true; }; - cargoSha256 = "1jqaryr7np6h65a1bqr952h0vllsvd6v6v6wvivc7933dcbhdal4"; + cargoSha256 = "107i9zvlwiwad58c7lmh6zl9iwlqn1h8qk7zf7x68b6498p8nh7d"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts index ab13cee9dbe2..18d451480137 100755 --- a/pkgs/development/web/deno/update/update.ts +++ b/pkgs/development/web/deno/update/update.ts @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch nix-prefetch-url +#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch */ import { commit, diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 339286015917..1a7a3d6607f4 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.123"; + version = "0.0.131"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1gs796n2cw8kpfsqr21zqxzp8dmnhhmjfy7vnpi838566i5ql9q3"; + sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna"; + vendorSha256 = "1gxz9pp4zl8q7pmwg9z261fjrjfr658k1sn5nq1xzz51wrlzg9ag"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; |