From e1dd90b1b3d267854ff183a51d38af42d6bb6842 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 05:54:33 +0000 Subject: python310Packages.coinmetrics-api-client: 2023.9.29.14 -> 2023.10.30.13 --- pkgs/development/python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 967bcab909d4..91484fe6a7f7 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.9.29.14"; + version = "2023.10.30.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-88tNPg/0U5ZC2OvH8Bh9EzKzRFF2YClS2tyrswBaUZw="; + hash = "sha256-Kb6iVLV///X0UKby/7/wfbSGUFLw6HQX3SUwPX79QD0="; }; pythonRelaxDeps = [ -- cgit 1.4.1 From 0d6c05b175b3ef647f2f8a9da21f4ad2aea81ed8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 15:21:28 +0000 Subject: python311Packages.radish-bdd: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/radish-bdd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index e5db1cbad3ce..f0f9070180ef 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.17.0"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-4cGUF4Qh5+mxHtKNnAjh37Q6hEFCQ9zmntya98UHx+0="; + hash = "sha256-9Wt+W7PWUVijzAeZMvcOl/Na60OCCGJJqxh2UaAxAcM="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 0a39e3ad2bd4993858e404d62b041f1725aff62f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 6 Nov 2023 12:35:05 -0500 Subject: wolfssl: fix condition for ASM SP Math support --- pkgs/development/libraries/wolfssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 35280e4b5eb3..2065ae2f8757 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-bigcache" # Use WolfSSL's Single Precision Math with timing-resistant cryptography. - "--enable-sp=yes${lib.optionalString (!stdenv.isx86_32) ",asm"}" + "--enable-sp=yes${lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"}" "--enable-sp-math-all" "--enable-harden" ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ -- cgit 1.4.1 From 19c740d734e9b9fbbb4cd61b65d1ce7a8f7a81f5 Mon Sep 17 00:00:00 2001 From: Corné Dorrestijn Date: Tue, 7 Nov 2023 07:55:07 +0100 Subject: bun: 1.0.7 -> 1.0.10 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index b5f922977619..4ca59fffe7f3 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.7"; + version = "1.0.10"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-aPFKKCqjKZSz/ZX5G3RiIkLHIj89MGPp+PgFbE4vpgE="; + hash = "sha256-xwKNDTlghNkq36wMAKSa+reROqGwMm4dZ/Hfos1zuP4="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-u2UlimmIE2z7qsqkAbSfi7kxuOjlJGkX4RAsUGMklGc="; + hash = "sha256-gaquYp4q22IJHV7Fx5GxZWVFvJzU30HOmL32lkxJeQ8="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-MO01plCsZRR+2kC2J0/VhXJIhchMfLtMFvidPNAXtB4="; + hash = "sha256-DPVnTzdGprjZ16kme3Y6xBognjWHt+0N/zk0J3dm8jY="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-yw17x8DmKktE5fNBF3JQdVSEXFwAotA7hCzfLcd6JoI="; + hash = "sha256-Er7QiWBhENTa9xhCIVqECCzexWejBwBC59u3CJKQiwc="; }; }; updateScript = writeShellScript "update-bun" '' -- cgit 1.4.1 From 7262829e9c7a8731dc4aee8d25dc2e0ddc6bd462 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 8 Nov 2023 10:56:49 +0100 Subject: python311Packages.transformers: 4.34.1 -> 4.35.0 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.35.0 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 2b8d597ae67f..3c4fda87976f 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.34.1"; + version = "4.35.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-ZyRn1AyyKvtrUUSWZ95jfIMXydcCSM5zZeseF7golhU="; + hash = "sha256-f66Y6kcAm//Z2UyCl/iEBDP+6nm3QJ5EtwpAnBn4gbc="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From ee22acfd5c8b23b191ec2b78e3dbe1ea19ea558b Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Wed, 8 Nov 2023 14:05:57 +0100 Subject: python3Packages.wagtail: relax draftjs_exporter dep to allow using 5.0 --- pkgs/development/python-modules/wagtail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index cc5fa6c5a9a0..2d33a92c274d 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ - --replace "Pillow>=4.0.0,<10.0.0" "Pillow>=9.1.0,<11.0.0" + --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" ''; propagatedBuildInputs = [ -- cgit 1.4.1 From 700811fa738a8ced371d5ec238194fb235d2a880 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Wed, 8 Nov 2023 14:07:03 +0100 Subject: python3Packages.wagtail: 5.1.1 -> 5.1.3 --- pkgs/development/python-modules/wagtail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 2d33a92c274d..8fe5ba39ed51 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.1.1"; + version = "5.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IR/wzXBZ+Win/EOFUDsg2AHB5otW9YMeCmpPxgCllD8="; + hash = "sha256-RfrHlOTCDH51sBgGnX+XYfJfqjYZ7zDfJAE8okq/mnQ="; }; postPatch = '' -- cgit 1.4.1 From b5b93529d9abd1292147daa87eea4f1087aec1e0 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Wed, 8 Nov 2023 14:13:16 +0100 Subject: python3Packages.wagtail-localize: 1.5.2 -> 1.6 --- pkgs/development/python-modules/wagtail-localize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 29439bb2a2d1..23b41404034f 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5.2"; + version = "1.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-7r2FFfWGqjE3Z7wsdf6KwwbUZ+wXqOscsL/2CepSMLY="; + hash = "sha256-OrRR5wLTq3icSBq+9m+MxIvkTvJP7yiGR9yzPt53q+k="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 8a759d134711666f8a00f29cfa1c2a7bd13f9531 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Nov 2023 16:05:48 +0000 Subject: python311Packages.azure-storage-file-share: 12.14.2 -> 12.15.0 --- pkgs/development/python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1a4ef7c80cb6..b89653fb6781 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.14.2"; + version = "12.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mcMtgN2jX4hO4NSNk/1X9vT/vgCulYR5w7fV9OsCHrw="; + hash = "sha256-AJjxz6k0TE94HODNUE/zo1JVdRVTwB5yDczQyqjYqio="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From d0ca316cd5229a634e1e2f99dee989793cf0fcc8 Mon Sep 17 00:00:00 2001 From: hexchen Date: Wed, 8 Nov 2023 13:11:59 +0000 Subject: python311Packages.htmllistparse: init at 0.6.1 --- .../python-modules/htmllistparse/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/htmllistparse/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix new file mode 100644 index 000000000000..ae13f6585a1d --- /dev/null +++ b/pkgs/development/python-modules/htmllistparse/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, beautifulsoup4 +, html5lib +, requests +, fusepy +}: + +buildPythonPackage rec { + pname = "htmllistparse"; + version = "0.6.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bcimvwPIQ7nTJYQ6JqI1GnlbVzzZKiybgnFiEBnGQII="; + }; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ beautifulsoup4 html5lib requests fusepy ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "htmllistparse" + ]; + + meta = with lib; { + homepage = "https://github.com/gumblex/htmllisting-parser"; + description = "Python parser for Apache/nginx-style HTML directory listing"; + license = licenses.mit; + maintainers = with maintainers; [ hexchen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad4748773e0a..43f3091dfd10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5092,6 +5092,8 @@ self: super: with self; { htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + htmllistparse = callPackage ../development/python-modules/htmllistparse { }; + htmlmin = callPackage ../development/python-modules/htmlmin { }; html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; -- cgit 1.4.1 From 06348e8d14f3300ae6f66dc5563518f63b07c0be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Nov 2023 17:21:48 +0000 Subject: python311Packages.pyglet: 2.0.9 -> 2.0.10 --- pkgs/development/python-modules/pyglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index e27a5d99f4e5..393ec9f2e4cc 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.9"; + version = "2.0.10"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oJIuQvLSWFBWeOL0o1XFR2waY1LD86N3VAQt23589y8="; + hash = "sha256-JCvrGzvWfFvr3+W6EexWtpathrUMbn8qMX+NeDJWuck="; extension = "zip"; }; -- cgit 1.4.1 From 0981d53469e52e3edb6c1c1597f51c6ff30c3525 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 8 Nov 2023 20:04:28 +0000 Subject: python3Packages.cassandra-driver: 3.26.0 -> 3.28.0 --- .../python-modules/cassandra-driver/default.nix | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 5d6c520ad3c1..e985ed544d3c 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, cryptography , cython , eventlet , fetchFromGitHub @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.26.0"; + version = "3.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "datastax"; repo = "python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-mLQEG41WyFtXY2PJzoM4uaI4Cm+0xSIAPGhijHHbTBk="; + hash = "sha256-5JRbzYl7ftgK6GuvXWdvo52ZlS1th9JyLAYu/UCcPVc="; }; postPatch = '' @@ -56,17 +57,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - eventlet mock nose pytz pyyaml sure - scales - gremlinpython - gevent - twisted - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests @@ -77,6 +73,13 @@ buildPythonPackage rec { '') + '' # increase tolerance for time-based test substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' + + export HOME=$(mktemp -d) + # cythonize this before we hide the source dir as it references + # one of its files + cythonize -i tests/unit/cython/types_testhelper.pyx + + mv cassandra .cassandra.hidden ''; pythonImportsCheck = [ @@ -105,6 +108,15 @@ buildPythonPackage rec { "test_nts_token_performance" ]; + passthru.optional-dependencies = { + cle = [ cryptography ]; + eventlet = [ eventlet ]; + gevent = [ gevent ]; + graph = [ gremlinpython ]; + metrics = [ scales ]; + twisted = [ twisted ]; + }; + meta = with lib; { description = "A Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; -- cgit 1.4.1 From 82c55fdc0b66d1021e2e4a3bece214fcbe5c1945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Oct 2023 14:45:12 +0000 Subject: quickemu: 4.8 -> 4.9 --- pkgs/development/quickemu/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index 95043c7be482..39400d5b4bc6 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -25,6 +25,7 @@ , quickemu , testers , installShellFiles +, fetchpatch }: let runtimePaths = [ @@ -50,15 +51,23 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-QchY9inmBqAwNEhUL+uFCRX1laaM57ICbDJEBW7qTic="; + hash = "sha256-ZCHGZb4mdtnNfFBcSqZJRW7fmkTBrWrVko3iwEhO1RY="; }; + patches = [ + # https://github.com/quickemu-project/quickemu/pull/815 + (fetchpatch { + url = "https://github.com/quickemu-project/quickemu/commit/2b9d95a746fd85be0cea48e5544b18dc3ae18d27.patch"; + hash = "sha256-fTJEd3o7LznT1mGwfxXWlW8XM1BmIeId+j8pGjIfIcE="; + }) + ]; + postPatch = '' sed -i \ -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \ -- cgit 1.4.1 From 087cc185f674dcb62601908708f96cc957c7acdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 01:25:54 +0000 Subject: xmake: 2.8.3 -> 2.8.5 --- pkgs/development/tools/build-managers/xmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 6d8222e387e4..01fc3b3aafb7 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.3"; + version = "2.8.5"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-BC6RazVbT1sr4RLQ1ZR4hHZGXDqFSvuqpt5vPyMDylA="; + hash = "sha256-GcZ747z8valsqHoY7/rDm/zMRD+7N1THu8AVEd7NJK8="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 07055fb3ecfe25be8471a6739a0289affb65164b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 2 Nov 2023 07:11:45 +0100 Subject: ocamlPackages.semver: 0.1.0 → 0.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/semver/default.nix | 28 ++++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/semver/default.nix b/pkgs/development/ocaml-modules/semver/default.nix index 15bd02f18687..5f4880c0cf2e 100644 --- a/pkgs/development/ocaml-modules/semver/default.nix +++ b/pkgs/development/ocaml-modules/semver/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") - "semver is not available on OCaml older than 4.02" - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-semver"; - version = "0.1.0"; - src = fetchzip { - url = "https://github.com/rgrinberg/ocaml-semver/archive/v${version}.tar.gz"; - sha256 = "sha256-0BzeuVTpuRIQjadGg08hTvMzZtKCl2utW2YK269oETk="; +buildDunePackage rec { + pname = "semver"; + version = "0.2.1"; + src = fetchurl { + url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${version}/semver-${version}.tbz"; + hash = "sha256-CjzDUtoe5Hvt6zImb+EqVIulRUUUQd9MmuJ4BH/2mLg="; }; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - - strictDeps = true; - createFindlibDestdir = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/rgrinberg/ocaml-semver"; description = "Semantic versioning module"; - platforms = ocaml.meta.platforms; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.ulrikstrid ]; }; -- cgit 1.4.1 From a0eb0aa889311cdaccd688cd88f23e2a8af61a0b Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 1 Nov 2023 12:58:58 -0700 Subject: coqPackages.vcfloat: fix --- pkgs/development/coq-modules/vcfloat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/coq-modules/vcfloat/default.nix b/pkgs/development/coq-modules/vcfloat/default.nix index d5837812ae88..5d1805c2573f 100644 --- a/pkgs/development/coq-modules/vcfloat/default.nix +++ b/pkgs/development/coq-modules/vcfloat/default.nix @@ -4,6 +4,10 @@ with lib; mkCoqDerivation { pname = "vcfloat"; owner = "VeriNum"; inherit version; + sourceRoot = "source/vcfloat"; + postPatch = '' + coq_makefile -o Makefile -f _CoqProject *.v + ''; defaultVersion = with versions; switch coq.coq-version [ { case = range "8.16" "8.17"; out = "2.1.1"; } ] null; -- cgit 1.4.1