From f9ec68bd6dbb1a8b56066330d44b91d64dc850a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 23:18:21 +0200 Subject: [PATCH 01/12] python310Packages.ropper: 1.13.6 -> 1.13.7 --- .../python-modules/ropper/default.nix | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 391e8d36139b..82dee5155a9a 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , capstone , filebytes -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ropper"; - version = "1.13.6"; + version = "1.13.7"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "6e4226f5ef01951c7df87029535e051c6deb3f156f7511613fb69e8a7f4801fb"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sashs"; + repo = "Ropper"; + rev = "v${version}"; + hash = "sha256-3tWWIYqh/G/b7Z6BMua5bRvtSh4SibT6pv/NArhmqPE="; }; - # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise - # workaround: sudo chmod 777 /dev/shm - checkPhase = '' - py.test testcases - ''; - doCheck = false; # Tests not included in archive - checkInputs = [pytest]; - propagatedBuildInputs = [ capstone filebytes ]; + propagatedBuildInputs = [ + capstone + filebytes + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ropper" + ]; + meta = with lib; { + description = "Show information about files in different file formats"; homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; - description = "Show information about files in different file formats"; maintainers = with maintainers; [ bennofs ]; }; } From eeb57890bb962ef6a9998a5eb6c780016e8d3d3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 00:00:28 +0200 Subject: [PATCH 02/12] python310Packages.pywinrm: 0.4.2 -> 0.4.3 --- .../python-modules/pywinrm/default.nix | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 629c75bfeaf6..8830ee67e2d8 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy38 +, pythonOlder , kerberos , mock -, pytest +, pytestCheckHook , requests , requests_ntlm , six @@ -13,25 +13,41 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.4.2"; - disabled = isPy38; + version = "0.4.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "e7865ec5e46e7fedb859c656cfaba4fcf669de7c042b5a7d8a759544636bcfb7"; + hash = "sha256-mVZ0v1rGSyViycVlQEcxCeUw02veEMJi1aUpYSGtVWU="; }; - checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ]; + propagatedBuildInputs = [ + requests + requests_ntlm + six + kerberos + xmltodict + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "winrm" + ]; + + pytestFlagsArray = [ + "winrm/tests/" + ]; meta = with lib; { description = "Python library for Windows Remote Management"; homepage = "https://github.com/diyan/pywinrm"; license = licenses.mit; - maintainers = with maintainers; [ - elasticdog - kamadorueda - ]; - platforms = platforms.all; + maintainers = with maintainers; [ elasticdog kamadorueda ]; }; } From d37aa7fe6a8c4d5743045b2533cc2055b873ff79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 00:09:23 +0200 Subject: [PATCH 03/12] python310Packages.pytenable: 1.4.4 -> 1.4.6 --- pkgs/development/python-modules/pytenable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 843f140ce754..7405df0aaf01 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.4"; + version = "1.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = version; - hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc="; + hash = "sha256-0isXHh0b2l8Br4XXR1y8A+zu8vkJjEsJ6faNNEx12lM="; }; propagatedBuildInputs = [ From d60e768cb1560188df672c5d08ef962ba81d96be Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 2 May 2022 19:49:02 -0400 Subject: [PATCH 04/12] redpanda: init at 21.11.15 --- pkgs/servers/redpanda/default.nix | 35 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/redpanda/default.nix diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix new file mode 100644 index 000000000000..6b0704b04a59 --- /dev/null +++ b/pkgs/servers/redpanda/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchzip }: + +let + version = "21.11.15"; + platform = if stdenv.isLinux then "linux" else "darwin"; + arch = if stdenv.isAarch64 then "arm" else "amd"; +in stdenv.mkDerivation rec { + pname = "redpanda"; + inherit version; + + src = fetchzip { + url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip"; + sha256 = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp rpk $out/bin + + runHook postInstall + ''; + + # stripping somehow completely breaks it + dontStrip = true; + + meta = with lib; { + description = "Redpanda is a streaming data platform for developers. Kafka API compatible. 10x faster. No ZooKeeper. No JVM! "; + license = licenses.bsl11; + homepage = "https://redpanda.com/"; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fd9b47dcfbc..5e6f2140bb71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9745,6 +9745,8 @@ with pkgs; redmine = callPackage ../applications/version-management/redmine { }; + redpanda = callPackage ../servers/redpanda { }; + redsocks = callPackage ../tools/networking/redsocks { }; rep = callPackage ../development/tools/rep { }; From 4558d28cfce57227fd78a7a15120f275c9cf0389 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 2 May 2022 21:34:51 -0500 Subject: [PATCH 05/12] scalafix: 0.9.0 -> 0.10.0, completions, setup-hook instead of jdk (#171074) * scalafix: 0.9.0 -> 0.10.0 Bump scala version 2.12.7 -> 2.13.8 (latest AFAICT), as well. Prefer hash format that matches what nix outputs these days for easier updating. * scalafix: shell completion (bash, zsh) * scalafix: use setJavaClassPath, drop jdk dep No need to pull in entire JDK just to use the setup-hook. --- pkgs/development/tools/scalafix/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index a38b6cee8524..3d57bdbd92c5 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -1,33 +1,36 @@ -{ lib, stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jre, coursier, makeWrapper, installShellFiles, setJavaClassPath }: let baseName = "scalafix"; - version = "0.9.0"; + version = "0.10.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) - ${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps + ${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.13.8:${version} > deps mkdir -p $out/share/java cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; + outputHash = "sha256-lDeg90L484MggtQ2a9OyHv4UcfLPjzG3OJZCaWW2AC8="; }; in stdenv.mkDerivation { pname = baseName; inherit version; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk deps ]; + nativeBuildInputs = [ makeWrapper installShellFiles setJavaClassPath ]; + buildInputs = [ deps ]; dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/${baseName} \ --add-flags "-cp $CLASSPATH scalafix.cli.Cli" + + installShellCompletion --cmd ${baseName} \ + --bash <($out/bin/${baseName} --bash) \ + --zsh <($out/bin/${baseName} --zsh) ''; installCheckPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e6f2140bb71..5aca0f5950a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13815,7 +13815,6 @@ with pkgs; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; scalafmt = callPackage ../development/tools/scalafmt { }; From 24c33ab7952544ad355d0677c9eea931b23f371c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Rauscher?= Date: Tue, 3 May 2022 02:40:48 +0000 Subject: [PATCH 06/12] metals: 0.11.2 -> 0.11.4 (#171127) --- pkgs/development/tools/metals/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index a4fd0ee23380..b7e8eca1b831 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, coursier, jdk, jre, makeWrapper }: +{ stdenv, lib, coursier, jre, makeWrapper, setJavaClassPath }: stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.2"; + version = "0.11.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) - ${coursier}/bin/cs fetch org.scalameta:metals_2.12:${version} \ + ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \ -r bintray:scalacenter/releases \ -r sonatype:snapshots > deps mkdir -p $out/share/java @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U="; + outputHash = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk deps ]; + nativeBuildInputs = [ makeWrapper setJavaClassPath ]; + buildInputs = [ deps ]; dontUnpack = true; @@ -32,24 +32,19 @@ stdenv.mkDerivation rec { # This variant is not targeted at any particular client, clients are # expected to declare their supported features in initialization options. makeWrapper ${jre}/bin/java $out/bin/metals \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main" # Further variants targeted at clients with featuresets pre-set. makeWrapper ${jre}/bin/java $out/bin/metals-emacs \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main" makeWrapper ${jre}/bin/java $out/bin/metals-vim \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main" makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main" makeWrapper ${jre}/bin/java $out/bin/metals-sublime \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main" ''; From dda33d2b2b2c69a0fc04b4abc460248e5b63436b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 3 May 2022 14:45:54 +1200 Subject: [PATCH 07/12] nixos/doc/manual: Remove trailing white space from 22.05 release notes This was an annoyance for me as I have editor hooks cleaning up trailing white space which lead to regenerating parts of the release notes unnecessarily. --- .../from_md/release-notes/rl-2205.section.xml | 16 ++++++++++++++-- .../doc/manual/release-notes/rl-2205.section.md | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 34bfbad7f635..10608685c471 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -74,8 +74,20 @@ -Pulseaudio has been upgraded to version 15.0 and now optionally supports additional Bluetooth audio codecs like aptX or LDAC, with codec switching support being available in pavucontrol. This feature is disabled by default but can be enabled by using hardware.pulseaudio.package = pkgs.pulseaudioFull;. -Existing 3rd party modules that provided similar functionality, like pulseaudio-modules-bt or pulseaudio-hsphfpd are deprecated and have been removed. + + Pulseaudio has been upgraded to version 15.0 and now + optionally + supports + additional Bluetooth audio codecs like aptX or LDAC, + with codec switching support being available in + pavucontrol. This feature is disabled by + default but can be enabled by using + hardware.pulseaudio.package = pkgs.pulseaudioFull;. + Existing 3rd party modules that provided similar + functionality, like pulseaudio-modules-bt + or pulseaudio-hsphfpd are deprecated and + have been removed. + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a83a7ba2b561..3b118d4e03d2 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -27,7 +27,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Systemd has been upgraded to the version 250. -- Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`. +- Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`. Existing 3rd party modules that provided similar functionality, like `pulseaudio-modules-bt` or `pulseaudio-hsphfpd` are deprecated and have been removed. - The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks. From 53bc699e2c9bf49d747089f9a56260ab1c163d52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 02:51:54 +0000 Subject: [PATCH 08/12] python310Packages.teslajsonpy: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 278bf7187ad1..11235e13a81b 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-wkE1kgu3yMjH98BBmpz+ZQMg140i0wka4VrBUkJHkxk="; + sha256 = "sha256-/y+ZXNqNbSIjQeTDacu3/Fd+6FrDrW3Nigptj0f5KTg="; }; nativeBuildInputs = [ From 3c79fddd9f8ac37aca3bc096853029e509eea870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 03:43:23 +0000 Subject: [PATCH 09/12] python310Packages.hahomematic: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index c8b7b2eaa4f4..aef938e8266d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-INhw7d+hbVCfeB7vr9QhCgaLOpIl0OHhgrYN6o6E1YI="; + sha256 = "sha256-eXJXKWlvNJIqEJY5WE5Wbk9BdGu9N9xhintJbdSkJrQ="; }; propagatedBuildInputs = [ From 6fcda619244f9e07b7e8dfb3231cddbc18548ee8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 04:06:10 +0000 Subject: [PATCH 10/12] python310Packages.youtube-search-python: 1.6.4 -> 1.6.5 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 361966ef458f..9383d4cb0598 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.4"; + version = "1.6.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0="; + hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8="; }; propagatedBuildInputs = [ From 67947fa100a003a8bad3313f97f6ea7e86cafdaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 04:52:03 +0000 Subject: [PATCH 11/12] python310Packages.scmrepo: 0.0.19 -> 0.0.20 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 2393c4cedd12..5b80bb00dd63 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.19"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f/KV3NfIumkZcg9r421QhdyPU/274aAU4b78myi+fFY="; + hash = "sha256-3gNHWncP9laevuX3EcnmNJ825eQehoLp75WJ5V5/R9w="; }; propagatedBuildInputs = [ From deb70bd200e9dd8e483e05cd8638979c42045edd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Apr 2022 17:30:45 +0200 Subject: [PATCH 12/12] =?UTF-8?q?ocamlPackages.uuuu:=200.2.0=20=E2=86=92?= =?UTF-8?q?=200.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/uuuu/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix index 4f400d1ec75b..d2895ce68e67 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -1,20 +1,19 @@ { angstrom , buildDunePackage -, fetchzip +, fetchurl , findlib , lib -, menhir , ocaml , re }: buildDunePackage rec { pname = "uuuu"; - version = "0.2.0"; + version = "0.3.0"; - src = fetchzip { - url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-v${version}.tbz"; - sha256 = "0457qcxvakbbc56frsh8a5v4y4l0raj9p4zz7jx3brn9255j1mw3"; + src = fetchurl { + url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-${version}.tbz"; + sha256 = "sha256:19n39yc7spgzpk9i70r0nhkwsb0bfbvbgpf8d863p0a3wgryhzkb"; }; postPatch = '' @@ -22,9 +21,7 @@ buildDunePackage rec { 'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib ' ''; - useDune2 = true; - - nativeBuildInputs = [ menhir findlib ]; + nativeBuildInputs = [ findlib ]; buildInputs = [ angstrom ];