From cd201a3ac7b126532ca6eefb22019b0f400f2885 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Dec 2020 04:39:14 +0000 Subject: [PATCH 01/17] igraph: 0.8.4 -> 0.8.5 --- pkgs/development/libraries/igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 6019a69f352..7d801521038 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "159qd4al19k1i5a54m2q2mxvig4z2lz9h3rd5rq44bklybdc0i7j"; + sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From cc6e51138a59f5326126afe9ac9ae70a57aa87c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Dec 2020 19:24:27 +0000 Subject: [PATCH 02/17] osinfo-db: 20201015 -> 20201119 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ced7483ae4e..9721d083475 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20201015"; + version = "20201119"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1i20lribrb03vsn57q722mbmjhxqswq2y2dpii95ic5zxvnaj1qa"; + sha256 = "1a0c42rh3anl3wy4hpg36s8k37y8zxpi5lc67wjwnj4j6mwi7w3l"; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; From db9875370255287f6fd84f54ba5d4d289fda3edb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 10 Dec 2020 04:20:00 +0000 Subject: [PATCH 03/17] pythonPackages.hass-nabucasa: 0.37.2 -> 0.39.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 1739183c3a8..0d5937a6bec 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,16 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub , acme, aiohttp, snitun, attrs, pycognito, warrant -, pytest-aiohttp, asynctest, atomicwrites, pytest, pythonOlder }: +, pytest-aiohttp, asynctest, atomicwrites, pytest }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.37.2"; + version = "0.39.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "0gv8p9nba7269qhc05ds0i79wz4419qjfhn7k9kcngfj1yngb6dm"; + sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w"; }; postPatch = '' From edadfdef74f5b87100db3c6230e5eef85bcf5dcb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Dec 2020 05:43:48 +0000 Subject: [PATCH 04/17] python37Packages.prance: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/prance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 1b762fed059..758cd0a7846 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "prance"; - version = "0.19.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "0ffpfny3z8v3g0drirm27qafafbbvbc4h5k8v7yiwirnh0vn9v46"; + sha256 = "f7e98b0f7e8ef0dd581c40d8a3e869e15e74b08026b862c3212447f8aa2426a7"; }; buildInputs = [ From 3b110a0a53030a06f38c837bfab7ba5c1f8038f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Dec 2020 06:10:20 +0000 Subject: [PATCH 05/17] python37Packages.azure-synapse-accesscontrol: 0.3.0 -> 0.4.0 --- .../python-modules/azure-synapse-accesscontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index a46202b6f18..1f8ba7dbe8a 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-accesscontrol"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5cead7051df3816a3382a74033efa0b8774cb7f8cdf5871c6825dd1638289189"; + sha256 = "a4f32423d9facaae512c433f5460b4ceec73a6c20b44b00e9de9de7a0e86dacd"; extension = "zip"; }; From 9fb4856405819be05a4b91ca1aa6c2d21efcb1cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Dec 2020 09:27:30 +0000 Subject: [PATCH 06/17] python37Packages.azure-mgmt-recoveryservicesbackup: 0.9.0 -> 0.10.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 8a061991059..229cf58cea9 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6b902eb7b9ccdf612e0a1738f42096f591dbf9c19d20b6d398a6361db278d4a7"; + sha256 = "2debf30be50d5bb85acf4f73a2e57e11c814ead04e58f52279e5ef0a2df71d4f"; }; propagatedBuildInputs = [ From 7a1e1053bbc1ed08ccbf0a3d4608114b8c3fbdc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Dec 2020 03:37:53 +0000 Subject: [PATCH 07/17] gutenprint: 5.2.14 -> 5.3.4 --- pkgs/misc/drivers/gutenprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 9946f499329..c7fc859576b 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.2.14"; + name = "gutenprint-5.3.4"; src = fetchurl { url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; - sha256 = "1293x19gw1b742id7c7bz5giv3vlxaqpmbdz2g0n99wny5k0ggs5"; + sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; From 8eca99557db7819adc73b16698ca1156c2437434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 12 Dec 2020 11:24:25 +0100 Subject: [PATCH 08/17] python3Packages.thinc: 7.4.4 -> 7.4.5 Changelog: https://github.com/explosion/thinc/releases/tag/v7.4.5 Also move cython from propagatedBuildInputs to buildInputs. --- pkgs/development/python-modules/thinc/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index f63b181a8a8..ed9beedf95e 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.4"; + version = "7.4.5"; src = fetchPypi { inherit pname version; - sha256 = "08cf5cf7d70135db931c9f9d6f3b1844c53046c88f6072675fc164884f44c9e2"; + sha256 = "5743fde41706252ec6ce4737c68d3505f7e1cc3d4431174a17149838d594f8cb"; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate CoreFoundation CoreGraphics CoreVideo ]); @@ -38,7 +38,6 @@ buildPythonPackage rec { blis catalogue cymem - cython murmurhash numpy plac @@ -60,7 +59,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \ + --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ --replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0" From 5d6ade75cfad45a37e304915b9face97325ba282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 12 Dec 2020 11:25:57 +0100 Subject: [PATCH 09/17] python3Packages.thinc: nixpkgs-fmt --- .../python-modules/thinc/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index ed9beedf95e..cfc92642460 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -31,20 +31,23 @@ buildPythonPackage rec { }; buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Accelerate CoreFoundation CoreGraphics CoreVideo + Accelerate + CoreFoundation + CoreGraphics + CoreVideo ]); propagatedBuildInputs = [ - blis - catalogue - cymem - murmurhash - numpy - plac - preshed - srsly - tqdm - wasabi + blis + catalogue + cymem + murmurhash + numpy + plac + preshed + srsly + tqdm + wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; @@ -76,5 +79,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/thinc"; license = licenses.mit; maintainers = with maintainers; [ aborsu danieldk sdll ]; - }; + }; } From a93e4736dc360d72d07c275c54b46c1388c98aba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Dec 2020 19:39:57 +0000 Subject: [PATCH 10/17] python37Packages.google_cloud_translate: 3.0.1 -> 3.0.2 --- .../python-modules/google_cloud_translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index 60f9e3e11ae..1049895bda1 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759"; + sha256 = "6183168465749f007449ef4125356d03cca0114ed49faf7ed64f34ec3edd4fe8"; }; disabled = pythonOlder "3.6"; From 418069487eeba9bf5989444c4c76c797f90b8cfd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Dec 2020 22:24:49 +0000 Subject: [PATCH 11/17] python37Packages.pytorch-metric-learning: 0.9.94 -> 0.9.95 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 64564a4dca5..0430ab37a68 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.94"; + version = "0.9.95"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1i2m651isa6xk3zj8dhzdbmd1bdzl51bh6rxifx6gg22hfa5dj9a"; + sha256 = "1msvs1j3n47762ahm21bnkk2qqabxw8diiyi7s420x4zg24mr23g"; }; propagatedBuildInputs = [ From fa9d40263ec03190ecc33a7641ed61d79538daff Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 13 Dec 2020 04:20:00 +0000 Subject: [PATCH 12/17] git-lfs: 2.12.1 -> 2.13.1 https://github.com/git-lfs/git-lfs/releases/tag/v2.13.1 --- pkgs/applications/version-management/git-lfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index bd6c5f5cc67..d6249818208 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.12.1"; + version = "2.13.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1x8s1w8yqhj5nm20knr2gkb59rwzx220nf099lgd62cajzsdpjx5"; + sha256 = "0n4gi7sh6d1maqwp12fsznrky9xwkk2jrmxfwa2hnk8wb2rhvlrm"; }; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -30,7 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; - changelog = "https://github.com/git-lfs/git-lfs/releases/tag/v${version}"; + changelog = "https://github.com/git-lfs/git-lfs/blob/v${version}/CHANGELOG.md"; license = [ licenses.mit ]; maintainers = [ maintainers.twey maintainers.marsam ]; }; From b292eb4373d833844b75f10554d612b14f22f2f6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 13 Dec 2020 16:06:00 -0500 Subject: [PATCH 13/17] ncspot: 0.2.4 -> 0.2.5 https://github.com/hrkfdn/ncspot/releases/tag/v0.2.5 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 60fb40c5f74..623682f4173 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0vdg1ybzfj7xg8nmrb8q9vr8bpwcs52730v9v0413wjyxb7hcll2"; + sha256 = "19jy1ma2viqnyfbqdpm4cf8mpdrc0xyxrk7sayx1b7dqmkxcyp5c"; }; - cargoSha256 = "0afaxx8dv7jn48934ba0r8kd1h8l3k00sl83v07a1xqmfcmil2qf"; + cargoSha256 = "0lgd4ff70qsjplm847hkx1hgs3kpwv2ahmgyhsld3mng3k7qfm09"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; From 0a81ee52f74953ed4f6bfc53a36ad1ab75d28a3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 13 Dec 2020 23:19:45 +0000 Subject: [PATCH 14/17] nodejs-15_x: 15.3.0 -> 15.4.0 --- pkgs/development/web/nodejs/v15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix index f5cd88c3d39..06cb48260cd 100644 --- a/pkgs/development/web/nodejs/v15.nix +++ b/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.3.0"; - sha256 = "0h625hhswwv5rpijacxiak28fy5br8kpxrihfcjdqwm3dvyvkc1v"; + version = "15.4.0"; + sha256 = "0kp0hckhjkmaqyvjpcj17rj6fw9fg3c95j78r2nr10bc65anjwms"; } From ca776e68b56066c7929c2f3b85f37f20288bc2f0 Mon Sep 17 00:00:00 2001 From: chessai Date: Sun, 13 Dec 2020 16:08:14 -0800 Subject: [PATCH 15/17] simdjson: init at 0.7.0 --- .../libraries/simdjson/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/simdjson/default.nix diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix new file mode 100644 index 00000000000..63ad97cbe2b --- /dev/null +++ b/pkgs/development/libraries/simdjson/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "simdjson"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "simdjson"; + repo = "simdjson"; + rev = "v${version}"; + sha256 = "14gi2zq430nfjy424q6r57imc2gnz30nhx4r0wbajzp9qvna819w"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DSIMDJSON_JUST_LIBRARY=ON" + ]; + + meta = with stdenv.lib; { + homepage = "https://simdjson.org/"; + description = "Parsing gigabytes of JSON per second"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ chessai ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 923b725701f..bcb3fd6b248 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2577,6 +2577,8 @@ in shell-hist = callPackage ../tools/misc/shell-hist { }; + simdjson = callPackage ../development/libraries/simdjson { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; simplenes = callPackage ../misc/emulators/simplenes { }; From 3017f4f757571bc9d66a20558da2f9c562ccfecc Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 14 Dec 2020 03:11:30 +0100 Subject: [PATCH 16/17] pythonPackages.clize: fix build --- pkgs/development/python-modules/clize/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 72b6a2fa30a..e2ef3ea5bb1 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -10,7 +10,7 @@ , repeated_test , pygments , unittest2 -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -22,12 +22,17 @@ buildPythonPackage rec { sha256 = "f54dedcf6fea90a3e75c30cb65e0ab1e832760121f393b8d68edd711dbaf7187"; }; + # Remove overly restrictive version constraints + postPatch = '' + substituteInPlace setup.py --replace "attrs>=19.1.0,<20" "attrs" + ''; + checkInputs = [ + pytestCheckHook dateutil pygments repeated_test unittest2 - pytest ]; propagatedBuildInputs = [ @@ -38,14 +43,11 @@ buildPythonPackage rec { six ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "clize" ]; meta = with stdenv.lib; { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; license = licenses.mit; }; - } From 1e8ca69151d384b17c3e4490ae2dc1e06b50bae3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Dec 2020 16:36:41 +0100 Subject: [PATCH 17/17] =?UTF-8?q?ocamlPackages.torch:=200.10=20=E2=86=92?= =?UTF-8?q?=200.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/torch/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 0e2bdf7311c..ebb5b9b9c25 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmdliner , ctypes +, dune-configurator , npy , ocaml-compiler-libs , ppx_custom_printf @@ -16,17 +17,21 @@ buildDunePackage rec { pname = "torch"; - version = "0.10"; + version = "0.11"; - minimumOCamlVersion = "4.07"; + useDune2 = true; + + minimumOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "1rqrv6hbical8chk0bl2nf60q6m4b5d1gab9fc5q03vkz2987f9b"; + sha256 = "19zbl9zn6fslrcm6x9cis6nswhwz8mc57nrhkada658n7rcdmskr"; }; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ cmdliner ctypes