From e4341d36239a78b6ca66adc683a61b467b1c93dd Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Mar 2023 23:13:07 +0100 Subject: [PATCH 01/28] python3Packages.imageio: 2.25.0 -> 2.26.0 https://github.com/imageio/imageio/releases/tag/v2.25.1 https://github.com/imageio/imageio/releases/tag/v2.26.0 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 45eb10658b57..b31fc7c322e7 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.25.0"; + version = "2.26.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - sha256 = "sha256-uAeWofjDjGl6lAoq1zl+4okA1cTlEGG5pn0WrKhn8z4="; + sha256 = "sha256-Fp8WQs23IxM/6P6QGIf08bObwDZFjEZk8fnSViJs7TU="; inherit pname version; }; From 852ff3f7b665fae100b3c8affe91c9a8ff4e27f0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Mar 2023 04:20:00 +0000 Subject: [PATCH 02/28] cloud-nuke: 0.21.0 -> 0.27.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 45246f7dfea4..029f0abf9f75 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.21.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcR5pofMcV2Y5qVA2h3I5h/1qS25+deVAUQWIMLu/KI="; + hash = "sha256-q1/BPJkoLjNbk6OTd+VDmRX7zjDXr8vKWme7csG9xN8="; }; - vendorSha256 = "sha256-GRHyoKv05JRZiY0g3Xd11liDYPcA6rfE8vorZRCV1wI="; + vendorHash = "sha256-MQjUajAE9ST8mwbmfwTMBOkhyqPe7pS0yQimFaBn50U="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From 01dd333fc0cd147890ec8d0c398192008fd8c365 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Mar 2023 05:23:10 +0000 Subject: [PATCH 03/28] python310Packages.pytest-order: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/pytest-order/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix index 46ba61cef6ea..018095e1b1d4 100644 --- a/pkgs/development/python-modules/pytest-order/default.nix +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xda5KfvX6qbQ7gdYb2XGI7q7Cv5ytIQ8XxUFXWs7Gx8="; + sha256 = "sha256-E50lswgmt47rtCci90fqsUxEuIBZ16cdT3nRSgVyaaU="; }; buildInputs = [ pytest ]; From cd6818baf7e3c0b81373ae9f29761e73bbb3551f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Sep 2022 21:09:03 +0000 Subject: [PATCH 04/28] rustPlatform: forward unpack hooks to cargo fetch Sometimes it's more ergonomic to set up the build environment in hooks, to add to the default behaviour rather than replacing it. It's very surprising that the fetcher works fine with a custom unpackPhase, but not with custom preUnpack or postUnpack. Packages that use preUnpack or postUnpack and Cargo FODs seem to be very rare. I searched Nixpkgs for files containing one of "cargoHash", "cargoDeps", and "cargoSha256", and one of "preUnpack" or "postUnpack", and only found two such packages: python3.pkgs.tokenizers and rustdesk. Neither of their Cargo FOD hashes are affected by this change. So if that's any indication, we're unlikely to be breaking many out-of-tree hashes with these changes either. --- pkgs/build-support/rust/build-rust-package/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 5ba166bae1a3..2c5d4ae10003 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -24,7 +24,9 @@ , src ? null , srcs ? null +, preUnpack ? null , unpackPhase ? null +, postUnpack ? null , cargoPatches ? [] , patches ? [] , sourceRoot ? null @@ -68,7 +70,7 @@ let if cargoVendorDir != null then null else if cargoLock != null then importCargoLock cargoLock else fetchCargoTarball ({ - inherit src srcs sourceRoot unpackPhase cargoUpdateHook; + inherit src srcs sourceRoot preUnpack unpackPhase postUnpack cargoUpdateHook; name = cargoDepsName; patches = cargoPatches; } // lib.optionalAttrs (args ? cargoHash) { From ac57f9ba4a99c3805d7c040ac3dbd403de9164fa Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Sun, 29 Jan 2023 21:29:28 +0000 Subject: [PATCH 05/28] python3Packages.sshfs: init at 2023.1.0 --- .../python-modules/sshfs/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/sshfs/default.nix diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix new file mode 100644 index 000000000000..ab9076a18fe8 --- /dev/null +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -0,0 +1,30 @@ +{ lib +, asyncssh +, bcrypt +, buildPythonPackage +, fetchPypi +, fsspec +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sshfs"; + version = "2023.1.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-syIVtAi7aPeVPJSKHdDJIArsYj0mtIAP104vR3Vb1UQ="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ fsspec asyncssh bcrypt ]; + + meta = with lib; { + description = "SSH/SFTP implementation for fsspec "; + homepage = "https://pypi.org/project/sshfs/${version}"; + changelog = "https://github.com/fsspec/sshfs/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c63ac709b295..cd5e8a293f59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11180,6 +11180,8 @@ self: super: with self; { ssh-mitm = callPackage ../development/python-modules/ssh-mitm { }; + sshfs = callPackage ../development/python-modules/sshfs { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; sshtunnel = callPackage ../development/python-modules/sshtunnel { }; From 2c06e8ee807024ecc11b7347f22c0e71ee26e08b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:56:39 +0100 Subject: [PATCH 06/28] python310Packages.sshfs: minor formatting changes --- pkgs/development/python-modules/sshfs/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index ab9076a18fe8..09f56297835e 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -16,12 +16,18 @@ buildPythonPackage rec { hash = "sha256-syIVtAi7aPeVPJSKHdDJIArsYj0mtIAP104vR3Vb1UQ="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ fsspec asyncssh bcrypt ]; + propagatedBuildInputs = [ + asyncssh + bcrypt + fsspec + ]; meta = with lib; { - description = "SSH/SFTP implementation for fsspec "; + description = "SSH/SFTP implementation for fsspec"; homepage = "https://pypi.org/project/sshfs/${version}"; changelog = "https://github.com/fsspec/sshfs/releases/tag/${version}"; license = licenses.asl20; From ee1ebad37e097322ecebeb876e615e0e58470a31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:59:10 +0100 Subject: [PATCH 07/28] python310Packages.sshfs: add pythonImportsCheck --- pkgs/development/python-modules/sshfs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 09f56297835e..b34033d0c1ea 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { fsspec ]; + pythonImportsCheck = [ + "sshfs" + ]; + meta = with lib; { description = "SSH/SFTP implementation for fsspec"; homepage = "https://pypi.org/project/sshfs/${version}"; From aec078fb432db9a37c9a6603516e605cc0b6ce66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 10:13:46 +0100 Subject: [PATCH 08/28] python310Packages.mock-ssh-server: init at 0.9.1 --- .../mock-ssh-server/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mock-ssh-server/default.nix diff --git a/pkgs/development/python-modules/mock-ssh-server/default.nix b/pkgs/development/python-modules/mock-ssh-server/default.nix new file mode 100644 index 000000000000..870a54b2485e --- /dev/null +++ b/pkgs/development/python-modules/mock-ssh-server/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, paramiko +, pkgs +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mock-ssh-server"; + version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "carletes"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo="; + }; + + propagatedBuildInputs = [ + paramiko + ]; + + nativeCheckInputs = [ + pytestCheckHook + pkgs.openssh + ]; + + pythonImportsCheck = [ + "mockssh" + ]; + + disabledTests = [ + # ValueError: Invalid file descriptor: -1 + "test_ssh_session" + ]; + + meta = with lib; { + description = "Python mock SSH server for testing purposes"; + homepage = "https://github.com/carletes/mock-ssh-server"; + changelog = "https://github.com/carletes/mock-ssh-server/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd5e8a293f59..520b4110ac58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6081,6 +6081,8 @@ self: super: with self; { mock-services = callPackage ../development/python-modules/mock-services { }; + mock-ssh-server = callPackage ../development/python-modules/mock-ssh-server { }; + mockupdb = callPackage ../development/python-modules/mockupdb { }; modeled = callPackage ../development/python-modules/modeled { }; From a33b89aacb8d596feac73ecf33a5ae78c295e93c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 10:15:17 +0100 Subject: [PATCH 09/28] python310Packages.sshfs: enable tests --- .../python-modules/sshfs/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index b34033d0c1ea..1931c3e76109 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -2,8 +2,11 @@ , asyncssh , bcrypt , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fsspec +, mock-ssh-server +, pytest-asyncio +, pytestCheckHook , setuptools-scm }: @@ -11,11 +14,15 @@ buildPythonPackage rec { pname = "sshfs"; version = "2023.1.0"; - src = fetchPypi { - inherit pname version; - hash = "sha256-syIVtAi7aPeVPJSKHdDJIArsYj0mtIAP104vR3Vb1UQ="; + src = fetchFromGitHub { + owner = "fsspec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-TETxjBI4T8dgmtCtx/lq2LIIwyFsAMWY6xdm7+Qsjb0="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; @@ -26,6 +33,12 @@ buildPythonPackage rec { fsspec ]; + nativeCheckInputs = [ + mock-ssh-server + pytest-asyncio + pytestCheckHook + ]; + pythonImportsCheck = [ "sshfs" ]; From a309e2c845a6460c426c7216e2cb1fe1e5ca8373 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 10:20:58 +0100 Subject: [PATCH 10/28] python310Packages.sshfs: update homepage --- pkgs/development/python-modules/sshfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 1931c3e76109..763541221d0a 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "SSH/SFTP implementation for fsspec"; - homepage = "https://pypi.org/project/sshfs/${version}"; + homepage = "https://github.com/fsspec/sshfs/"; changelog = "https://github.com/fsspec/sshfs/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; From 629c0fbcad21b77065d5c282ef9582e5cd770604 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:03 +0100 Subject: [PATCH 11/28] ocamlPackages.mirage-time: use Dune 3 --- pkgs/development/ocaml-modules/mirage-time/default.nix | 10 +++++----- pkgs/development/ocaml-modules/mirage-time/unix.nix | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix index 1780ba05ac47..6b4b5f9ac721 100644 --- a/pkgs/development/ocaml-modules/mirage-time/default.nix +++ b/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -1,19 +1,19 @@ -{ lib, buildDunePackage, fetchurl, ocaml_lwt }: +{ lib, buildDunePackage, fetchurl, lwt }: buildDunePackage rec { - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.08"; pname = "mirage-time"; version = "3.0.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; - sha256 = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw="; + hash = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw="; }; - propagatedBuildInputs = [ ocaml_lwt ]; + propagatedBuildInputs = [ lwt ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-time"; diff --git a/pkgs/development/ocaml-modules/mirage-time/unix.nix b/pkgs/development/ocaml-modules/mirage-time/unix.nix index c19ca30fe024..9678815edf05 100644 --- a/pkgs/development/ocaml-modules/mirage-time/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-time/unix.nix @@ -1,11 +1,12 @@ -{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }: +{ buildDunePackage, fetchurl, mirage-time, lwt, duration }: buildDunePackage { pname = "mirage-time-unix"; - inherit (mirage-time) src useDune2 version minimumOCamlVersion; + inherit (mirage-time) src version; + duneVersion = "3"; - propagatedBuildInputs = [ mirage-time ocaml_lwt duration ]; + propagatedBuildInputs = [ mirage-time lwt duration ]; meta = mirage-time.meta // { description = "Time operations for MirageOS on Unix"; From 8122f3ef0db47dee5efe38af152a1b1c5c56ff5a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:10 +0100 Subject: [PATCH 12/28] ocamlPackages.alcotest-mirage: use Dune 3 --- pkgs/development/ocaml-modules/alcotest/mirage.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/alcotest/mirage.nix b/pkgs/development/ocaml-modules/alcotest/mirage.nix index dcf6533cdab1..e27889b40462 100644 --- a/pkgs/development/ocaml-modules/alcotest/mirage.nix +++ b/pkgs/development/ocaml-modules/alcotest/mirage.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (alcotest) version src; + duneVersion = "3"; + propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ]; doCheck = true; From 50a35f7c20256b9de289e5e1470b51d6b1552c7b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:14 +0100 Subject: [PATCH 13/28] ocamlPackages.happy-eyeballs: use Dune 3 --- pkgs/development/ocaml-modules/happy-eyeballs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index b70c6af0f8e0..79b1a30d61fc 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -7,6 +7,7 @@ buildDunePackage rec { version = "0.5.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; From 2a9ab2a9671d2a14523500b842aba31067b0c04e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:18 +0100 Subject: [PATCH 14/28] ocamlPackages.mirage-vnetif: use Dune 3 --- pkgs/development/ocaml-modules/mirage-vnetif/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix index 22955018bdef..94b5f39820fa 100644 --- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix +++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix @@ -9,10 +9,11 @@ buildDunePackage rec { version = "0.6.0"; minimalOCamlVersion = "4.06"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw="; + hash = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw="; }; propagatedBuildInputs = [ From 2ac2434fe090f5a636edb564d19471673c2951c7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:22 +0100 Subject: [PATCH 15/28] ocamlPackages.mirage-unix: use Dune 3 --- pkgs/development/ocaml-modules/mirage-unix/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 3663e4b9cb71..c0ce9fec102c 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -4,9 +4,11 @@ buildDunePackage rec { pname = "mirage-unix"; version = "5.0.1"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; + hash = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; }; propagatedBuildInputs = [ lwt duration mirage-runtime ]; From 8971fdbc3c0b103d103f347e2feb0836a2c0c4c3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:25 +0100 Subject: [PATCH 16/28] ocamlPackages.metrics: use Dune 3 --- pkgs/development/ocaml-modules/metrics/default.nix | 1 + pkgs/development/ocaml-modules/metrics/influx.nix | 2 ++ pkgs/development/ocaml-modules/metrics/lwt.nix | 2 ++ pkgs/development/ocaml-modules/metrics/rusage.nix | 1 + pkgs/development/ocaml-modules/metrics/unix.nix | 2 ++ 5 files changed, 8 insertions(+) diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix index 5fcf7cf51108..c82e77adb515 100644 --- a/pkgs/development/ocaml-modules/metrics/default.nix +++ b/pkgs/development/ocaml-modules/metrics/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "0.4.0"; minimalOCamlVersion = "4.04"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/metrics/influx.nix b/pkgs/development/ocaml-modules/metrics/influx.nix index cca344f991c2..f004c1042aa7 100644 --- a/pkgs/development/ocaml-modules/metrics/influx.nix +++ b/pkgs/development/ocaml-modules/metrics/influx.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "metrics-influx"; inherit (metrics) version src; + duneVersion = "3"; + propagatedBuildInputs = [ duration fmt lwt metrics ]; meta = metrics.meta // { diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/pkgs/development/ocaml-modules/metrics/lwt.nix index 088a4e586ccb..465f4adc5c5d 100644 --- a/pkgs/development/ocaml-modules/metrics/lwt.nix +++ b/pkgs/development/ocaml-modules/metrics/lwt.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (metrics) version src; + duneVersion = "3"; + propagatedBuildInputs = [ logs lwt metrics ]; meta = metrics.meta // { diff --git a/pkgs/development/ocaml-modules/metrics/rusage.nix b/pkgs/development/ocaml-modules/metrics/rusage.nix index 8e93823c21b8..ed944fb6dfc9 100644 --- a/pkgs/development/ocaml-modules/metrics/rusage.nix +++ b/pkgs/development/ocaml-modules/metrics/rusage.nix @@ -7,6 +7,7 @@ buildDunePackage { inherit (metrics) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ fmt logs metrics ]; diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix index 5df5e14982cc..3816dfa8ffb7 100644 --- a/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/pkgs/development/ocaml-modules/metrics/unix.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (metrics) version src; + duneVersion = "3"; + # Fixes https://github.com/mirage/metrics/issues/57 postPatch = '' substituteInPlace src/unix/dune --replace "mtime mtime.clock" "mtime" From 7c21cff3579df967f9000287d8aed8b6156a40c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Mar 2023 20:51:31 +0100 Subject: [PATCH 17/28] =?UTF-8?q?ocamlPackages.duration:=200.2.0=20?= =?UTF-8?q?=E2=86=92=200.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/duration/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix index 1a1f9b07769f..34326c8a1143 100644 --- a/pkgs/development/ocaml-modules/duration/default.nix +++ b/pkgs/development/ocaml-modules/duration/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "duration"; - version = "0.2.0"; + version = "0.2.1"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz"; - sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk="; + url = "https://github.com/hannesm/duration/releases/download/v${version}/duration-${version}.tbz"; + hash = "sha256-xzjB84z7mYIMEhzT3fgZ3ksiKPDVDqy9HMPOmefHHis="; }; doCheck = lib.versionAtLeast ocaml.version "4.08"; From 6b819292478f8067b0c5d0f6db567e0902e7d725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Mar 2023 17:37:37 +0000 Subject: [PATCH 18/28] sarasa-gothic: 0.40.2 -> 0.40.3 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index f87738a419d9..a15e0d50ae0b 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.40.2"; + version = "0.40.3"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-ZarDttwwZzBb0+iBipVHZGLf1K3lQ7xvjMR6jE3hmh8="; + hash = "sha256-lhjsmsgFEXMX5byp50qRoHoX9nuKcsrAp6NGDdfXo3I="; }; sourceRoot = "."; From d84e010821c601ba1f1c333522d3b8631cb1ccb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 19:15:17 +0100 Subject: [PATCH 19/28] python310Packages.mock-ssh-server: disable tests Tests are terminated as they reach the max. timeout. They work locally but not on Hydra. --- .../python-modules/mock-ssh-server/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/mock-ssh-server/default.nix b/pkgs/development/python-modules/mock-ssh-server/default.nix index 870a54b2485e..46608965c1c1 100644 --- a/pkgs/development/python-modules/mock-ssh-server/default.nix +++ b/pkgs/development/python-modules/mock-ssh-server/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , paramiko -, pkgs -, pytestCheckHook , pythonOlder }: @@ -25,20 +23,13 @@ buildPythonPackage rec { paramiko ]; - nativeCheckInputs = [ - pytestCheckHook - pkgs.openssh - ]; + # Tests are running into a timeout on Hydra, they work locally + doCheck = false; pythonImportsCheck = [ "mockssh" ]; - disabledTests = [ - # ValueError: Invalid file descriptor: -1 - "test_ssh_session" - ]; - meta = with lib; { description = "Python mock SSH server for testing purposes"; homepage = "https://github.com/carletes/mock-ssh-server"; From d349acac91693c3d2d6015740b0f524741b81b19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Mar 2023 18:23:50 +0000 Subject: [PATCH 20/28] fclones: 0.29.3 -> 0.30.0 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 6309483dd88f..6fecc3365e78 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.29.3"; + version = "0.30.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dz7Mxi5KIZYw0oLic50hNT6rWbQpfiBE4hlZsxNfKsA="; + sha256 = "sha256-eFWFXUARXy3VA53VPSZkJdw6ZvI+FtFnCCGHmCAdTto="; }; - cargoHash = "sha256-I9pd+Q3b++ujynfpZq88lqPSUOc/SXWpNzR/CwtNEPA="; + cargoHash = "sha256-C7DKwEMYdypfItflMOL7rjbAdXDRsXDNoPlc9j6aBRA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From 2e0e2a426bbb39b27e70afcace245f8174768c65 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 14 Mar 2023 15:49:18 -0400 Subject: [PATCH 21/28] fclones: fix build on x86_64-darwin --- pkgs/tools/misc/fclones/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 6fecc3365e78..4a22def16c2c 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -1,9 +1,8 @@ { lib -, stdenv -, fetchFromGitHub -, libiconv , rustPlatform -, AppKit +, fetchFromGitHub +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -20,8 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-C7DKwEMYdypfItflMOL7rjbAdXDRsXDNoPlc9j6aBRA="; buildInputs = lib.optionals stdenv.isDarwin [ - AppKit - libiconv + darwin.apple_sdk_11_0.frameworks.AppKit ]; # device::test_physical_device_name test fails on Darwin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 901039d799aa..53ab8af41911 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29952,9 +29952,7 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + fclones = callPackage ../tools/misc/fclones { }; fcp = callPackage ../tools/misc/fcp { }; From ad43c018d93da7621fc3552b7a158d31b16cadcc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Mar 2023 21:38:10 +0100 Subject: [PATCH 22/28] pkg: Use xz directly, not via lzma alias --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index a2bac43e5924..232e3e5add2b 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl -, bzip2, libarchive, libbsd, lzma, openssl, zlib +, bzip2, libarchive, libbsd, xz, openssl, zlib }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; nativeBuildInputs = [ m4 pkg-config tcl ]; - buildInputs = [ bzip2 libarchive lzma openssl zlib ] + buildInputs = [ bzip2 libarchive xz openssl zlib ] ++ lib.optional stdenv.isLinux libbsd; enableParallelBuilding = true; From a8bad6bb3617a4fc39d7cefdd6711ada494482cc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 Mar 2023 23:34:58 +0200 Subject: [PATCH 23/28] xen_4_10: drop --- .../xen/0000-fix-install-python.4.10.patch | 16 -- .../xen/0000-fix-ipxe-src.4.10.patch | 27 --- .../xen/0004-makefile-use-efi-ld.4.10.patch | 36 ---- ...5-makefile-fix-efi-mountdir-use.4.10.patch | 35 --- pkgs/applications/virtualization/xen/4.10.nix | 204 ------------------ .../virtualization/xen/packages.nix | 52 +---- pkgs/top-level/all-packages.nix | 6 - 7 files changed, 3 insertions(+), 373 deletions(-) delete mode 100644 pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch delete mode 100644 pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch delete mode 100644 pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.10.patch delete mode 100644 pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch delete mode 100644 pkgs/applications/virtualization/xen/4.10.nix diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch b/pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch deleted file mode 100644 index 53821c0d9c51..000000000000 --- a/pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch +++ /dev/null @@ -1,16 +0,0 @@ -tools/python/install-wrap script brakes shebangs patching, disable - -diff --git a/tools/Rules.mk b/tools/Rules.mk -index 87a56dc..a7da869 100644 ---- a/tools/Rules.mk -+++ b/tools/Rules.mk -@@ -90,8 +90,7 @@ CFLAGS += $(CFLAGS-y) - - CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) - --INSTALL_PYTHON_PROG = \ -- $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG) -+INSTALL_PYTHON_PROG = $(INSTALL_PROG) - - %.opic: %.c - $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS) diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch deleted file mode 100644 index 072338b87aba..000000000000 --- a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch +++ /dev/null @@ -1,27 +0,0 @@ -hack to make etherboot use prefetched ipxe - -diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile -index a0578d2..64428a0 100644 ---- a/tools/firmware/etherboot/Makefile -+++ b/tools/firmware/etherboot/Makefile -@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz - - D=ipxe - T=ipxe.tar.gz -+G=ipxe.git - - ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) - -@@ -36,9 +37,9 @@ $T: - fi - mv _$T $T - --$D/src/arch/i386/Makefile: $T Config -- rm -rf $D -- gzip -dc $T | tar xf - -+$D/src/arch/i386/Makefile: $G Config -+ mkdir $D -+ cp -a $G/* $D - for i in $$(cat patches/series) ; do \ - patch -d $D -p1 --quiet /dev/null && echo y) - # Check if the linker supports PE. --XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) -+XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) - CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI - - $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p') -@@ -188,20 +188,20 @@ - - $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ -+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ - $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) : - $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S - $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ - | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ -+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ - $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) : - $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S - $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ - | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ -+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ - $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@ - if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \ - else $(NM) -pa --format=sysv $(@D)/$(@F) \ diff --git a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch deleted file mode 100644 index 11989e86c770..000000000000 --- a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch +++ /dev/null @@ -1,35 +0,0 @@ -EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something -like that, and (on my machine) has directories within that called -{Boot, nixos, gummiboot}. - -This patch does two things: - -1) Xen apparently wants to put files in -$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name -because I can't see why we have it - -2) Ensures the said directory exists - - ---- a/xen/Makefile 2016-01-08 01:50:58.028045657 +0000 -+++ b/xen/Makefile 2016-01-08 01:51:33.560268718 +0000 -@@ -49,7 +49,9 @@ - ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ - ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ - if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ -- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ -+ [ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \ -+ $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\ -+ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ - elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \ - echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ - fi; \ -@@ -69,7 +69,7 @@ - rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi - rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi - rm -f $(D)$(EFI_DIR)/$(T).efi -- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi -+ rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi - - .PHONY: _debug - _debug: diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix deleted file mode 100644 index 4e4df3976fc1..000000000000 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ /dev/null @@ -1,204 +0,0 @@ -{ lib, callPackage, fetchurl, fetchpatch, fetchgit -, ocaml-ng -, withInternalQemu ? true -, withInternalTraditionalQemu ? true -, withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios ? null -, withInternalOVMF ? false # FIXME: tricky to build -, withOVMF ? false, OVMF -, withLibHVM ? true - -# xen -, lvm2, ncurses, python2Packages - -# qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsa-lib, glib, python2 -, ... } @ args: - -assert withInternalSeabios -> !withSeabios; -assert withInternalOVMF -> !withOVMF; - -with lib; - -# Patching XEN? Check the XSAs at -# https://xenbits.xen.org/xsa/ -# and try applying all the ones we don't have yet. - -let - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; - - qemuMemfdBuildFix = fetchpatch { - name = "xen-4.8-memfd-build-fix.patch"; - url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }; - - qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsa-lib glib python2 - ]; -in - -callPackage (import ./generic.nix (rec { - version = "4.10.4"; - - src = fetchurl { - url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "0ipkr7b3v3y183n6nfmz7q3gnzxa20011df4jpvxi6pmr8cpnkwh"; - }; - - # Sources needed to build tools and firmwares. - xenfiles = optionalAttrs withInternalQemu { - qemu-xen = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; - # rev = "refs/tags/qemu-xen-${version}"; - # use revision hash - reproducible but must be updated with each new version - rev = "qemu-xen-${version}"; - sha256 = "0laxvhdjz1njxjvq3jzw2yqvdr9gdn188kqjf2gcrfzgih7xv2ym"; - }; - buildInputs = qemuDeps; - postPatch = '' - # needed in build but /usr/bin/env is not available in sandbox - substituteInPlace scripts/tracetool.py \ - --replace "/usr/bin/env python" "${python2}/bin/python" - ''; - meta.description = "Xen's fork of upstream Qemu"; - }; - } // optionalAttrs withInternalTraditionalQemu { - qemu-xen-traditional = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; - # rev = "refs/tags/xen-${version}"; - # use revision hash - reproducible but must be updated with each new version - rev = "c8ea0457495342c417c3dc033bba25148b279f60"; - sha256 = "0v5nl3c08kpjg57fb8l191h1y57ykp786kz6l525jgplif28vx13"; - }; - buildInputs = qemuDeps; - patches = [ - ]; - postPatch = '' - substituteInPlace xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - ''; - meta.description = "Xen's fork of upstream Qemu that uses old device model"; - }; - } // optionalAttrs withInternalSeabios { - "firmware/seabios-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; - rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; - sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - meta.description = "Xen's fork of Seabios"; - }; - } // optionalAttrs withInternalOVMF { - "firmware/ovmf-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; - rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; - sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; - }; - meta.description = "Xen's fork of OVMF"; - }; - } // { - # TODO: patch Xen to make this optional? - "firmware/etherboot/ipxe.git" = { - src = fetchgit { - url = "https://git.ipxe.org/ipxe.git"; - rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; - sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; - }; - meta.description = "Xen's fork of iPXE"; - }; - } // optionalAttrs withLibHVM { - xen-libhvm-dir-remote = { - src = fetchgit { - name = "xen-libhvm"; - url = "https://github.com/michalpalka/xen-libhvm"; - rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; - sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; - }; - buildPhase = '' - make - cd biospt - cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm - ''; - installPhase = '' - make install - cp biospt/biospt $out/bin/ - ''; - meta = { - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen''; - license = licenses.bsd2; - }; - }; - }; - - configureFlags = [] - ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH - ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" - ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - - ++ optional (withSeabios) "--with-system-seabios=${seabios}" - ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" - ++ optional (withInternalOVMF) "--enable-ovmf"; - - env.NIX_CFLAGS_COMPILE = toString [ - # Fix build on Glibc 2.24. - "-Wno-error=deprecated-declarations" - # Fix build with GCC 8 - "-Wno-error=maybe-uninitialized" - "-Wno-error=stringop-truncation" - "-Wno-error=format-truncation" - "-Wno-error=array-bounds" - # Fix build with GCC 9 - "-Wno-error=address-of-packed-member" - "-Wno-error=format-overflow" - "-Wno-error=absolute-value" - # Fix build with GCC 10 - "-Wno-error=enum-conversion" - "-Wno-error=zero-length-bounds" - ]; - - patches = [ - ./0000-fix-ipxe-src.4.10.patch - ./0000-fix-install-python.4.10.patch - ./0004-makefile-use-efi-ld.4.10.patch - ./0005-makefile-fix-efi-mountdir-use.4.10.patch - ]; - - postPatch = '' - substituteInPlace tools/blktap2/lvm/lvm-util.c \ - --replace /usr/sbin/vgs ${lvm2}/bin/vgs \ - --replace /usr/sbin/lvs ${lvm2}/bin/lvs - - substituteInPlace tools/xenstat/Makefile \ - --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h - - # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. - sed 1i'#include ' \ - -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c - # Makefile didn't include previous PKG_CONFIG_PATH so glib wasn't found - substituteInPlace tools/Makefile \ - --replace 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config' 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config:$(PKG_CONFIG_PATH)' - ''; - - passthru = { - qemu-system-i386 = if withInternalQemu - then "lib/xen/bin/qemu-system-i386" - else throw "this xen has no qemu builtin"; - }; - -})) ({ - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - pythonPackages = python2Packages; -} // args) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 722551461946..c55a719995c0 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -6,52 +6,6 @@ # light] for each ./.nix. rec { - xen_4_10-vanilla = callPackage ./4.10.nix { - meta = { - description = "vanilla"; - longDescription = '' - Vanilla version of Xen. Uses forks of Qemu and Seabios bundled - with Xen. This gives vanilla experince, but wastes space and - build time: typical NixOS setup that runs lots of VMs will - build three different versions of Qemu when using this (two - forks and upstream). - ''; - }; - }; - - xen_4_10-slim = xen_4_10-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = true; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "slim"; - longDescription = '' - Slimmed-down version of Xen that reuses nixpkgs packages as - much as possible. Different parts may get out of sync, but - this builds faster and uses less space than vanilla. Use with - `qemu_xen` from nixpkgs. - ''; - }; - }; - - xen_4_10-light = xen_4_10-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = false; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "light"; - longDescription = '' - Slimmed-down version of Xen without `qemu-traditional` (you - don't need it if you don't know what it is). Use with - `qemu_xen-light` from nixpkgs. - ''; - }; - }; - xen_4_15-vanilla = callPackage ./4.15.nix { meta = { description = "vanilla"; @@ -98,7 +52,7 @@ rec { }; }; - xen-vanilla = xen_4_10-vanilla; - xen-slim = xen_4_10-slim; - xen-light = xen_4_10-light; + xen-vanilla = xen_4_15-vanilla; + xen-slim = xen_4_15-slim; + xen-light = xen_4_15-light; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4ad447c5e2b..815cc38165d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26839,8 +26839,6 @@ with pkgs; # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; }); - qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; }); qemu_xen_4_15 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-slim; }); qemu_xen_4_15-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-light; }); @@ -34550,10 +34548,6 @@ with pkgs; xen-slim = xenPackages.xen-slim; xen-light = xenPackages.xen-light; - xen_4_10 = xenPackages.xen_4_10-vanilla; - xen_4_10-slim = xenPackages.xen_4_10-slim; - xen_4_10-light = xenPackages.xen_4_10-light; - xen_4_15 = xenPackages.xen_4_15-vanilla; xen_4_15-slim = xenPackages.xen_4_15-slim; xen_4_15-light = xenPackages.xen_4_15-light; From a4476d4f06a674d581d9ad405c9a2212ca70411a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 16:02:34 +0000 Subject: [PATCH 24/28] mullvad: 2023.1 -> 2023.2 --- pkgs/applications/networking/mullvad/mullvad.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index f23ba1561a6c..cb6b8a19ed5c 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -19,16 +19,16 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2023.1"; + version = "2023.2"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-BoduliiDOpzEPYHAjr636e7DbrhFnC/v9au6Mp9T/Qs="; + hash = "sha256-UozgUsew6MRplahTW/y688R2VetO50UGQevmVo8/QNs="; }; - cargoHash = "sha256-5kK2IA0Z1dQbHlnGXNZHD+BycurshfpqrwcIEveWKT0="; + cargoHash = "sha256-/DYEG/8FlDbyWsvnxM+0tbKG4/DbwEnNX2KiC3ryyGI="; patches = [ # https://github.com/mullvad/mullvadvpn-app/pull/4389 From 85cccb63e6f59d8afaad78b926d2d92c68ca477e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 14 Mar 2023 22:21:13 +0000 Subject: [PATCH 25/28] SDL2_mixer: fix path to timidity.cfg Without the change client programs like `fheroes2` fail to load `MIDI` files: $ nix run -f '' fheroes2 $ 14.03.2023 22:22:21: [ERROR] createMusic: Failed to create a music track from memory. The error: Couldn't open timidity.cfg After the change music plays as expected. It's a forward-port of the same fix that `SDL2_mixer` had in f11d1d9 ("SDl2_mixer: fix MIDI playback by adding timidity paths") --- pkgs/development/libraries/SDL2_mixer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index dab76bdab70b..b412e22b8f0c 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "--disable-music-mp3-mpg123-shared" "--disable-music-opus-shared" "--disable-music-midi-fluidsynth-shared" + + # override default path to allow MIDI files to be played + "--with-timidity-cfg=${timidity}/share/timidity/timidity.cfg" ] ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" From 5ca9faa109b24ffdc51214f65674920f64873cc6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 15 Mar 2023 00:54:37 +0200 Subject: [PATCH 26/28] xen: cleanup --- pkgs/applications/virtualization/xen/4.15.nix | 5 ++--- pkgs/applications/virtualization/xen/generic.nix | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.15.nix b/pkgs/applications/virtualization/xen/4.15.nix index c5c02f7e9181..11f5900ee84c 100644 --- a/pkgs/applications/virtualization/xen/4.15.nix +++ b/pkgs/applications/virtualization/xen/4.15.nix @@ -3,7 +3,7 @@ , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios ? null +, withSeabios ? !withInternalSeabios, seabios , withInternalOVMF ? false # FIXME: tricky to build , withOVMF ? false, OVMF , withLibHVM ? false @@ -179,6 +179,5 @@ callPackage (import ./generic.nix (rec { }; })) ({ - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - pythonPackages = python3Packages; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // args) diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 2631c6ea44c2..8a687d45e28c 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -5,7 +5,7 @@ config: , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib , acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl , xz, yajl, zlib -, pythonPackages +, python3Packages # Xen Optional , ocamlPackages @@ -16,7 +16,7 @@ config: , util-linux, procps, systemd # Documentation -# pythonPackages.markdown +# python3Packages.markdown , fig2dev, ghostscript, texinfo, pandoc , binutils-unwrapped @@ -71,16 +71,16 @@ stdenv.mkDerivation (rec { # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio - libiconv libuuid ncurses openssl perl pythonPackages.python xz yajl zlib + libiconv libuuid ncurses openssl perl python3Packages.python xz yajl zlib # oxenstored ocamlPackages.findlib ocamlPackages.ocaml systemd # Python fixes - pythonPackages.wrapPython + python3Packages.wrapPython # Documentation - pythonPackages.markdown fig2dev ghostscript texinfo pandoc + python3Packages.markdown fig2dev ghostscript texinfo pandoc # Others ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) From 628036113e84811064838dc610fdd831ac5c1c64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 00:20:37 +0100 Subject: [PATCH 27/28] python310Packages.peaqevcore: 13.0.1 -> 13.1.1 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f4c93a252bcf..7259a886e38b 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "13.0.1"; + version = "13.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2V0+F0S2i7paBDN8FmsT1wV4qdJ4XmkOyZ3EDfyjGks="; + hash = "sha256-JwmShU/YJhJvNofKrE8/e3/PKFSEGWWhHO8heEWTZac="; }; postPatch = '' From d03560dc0a18ed6054ea27bfd058b59b05b7782f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 00:25:43 +0100 Subject: [PATCH 28/28] python310Packages.pontos: 23.3.3 -> 23.3.5 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.3.3...v23.3.5 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.3.5 --- pkgs/development/python-modules/pontos/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index deb91a2b1ef4..65d9ea010e64 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -9,6 +9,7 @@ , pytestCheckHook , python-dateutil , pythonOlder +, semver , rich , tomlkit , typing-extensions @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.3.3"; + version = "23.3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wd02dlRIRBBJ2cKNxIZxOoWjp1aPxqmc37tvUbc/pJk="; + hash = "sha256-Eb9mX04ws+FhiRw5j1XsEhjm5ZdYFCbA5pntgb4z//M="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { httpx packaging python-dateutil + semver rich typing-extensions tomlkit