From 3feee7f66e7c1914c3fa973b50cffccb0b9318a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 14:55:43 +0000 Subject: [PATCH 1/5] hexd: 1.0.0 -> 1.1.0 --- pkgs/tools/misc/hexd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index 467e85128b82..e3a3f79f3268 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "hexd"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "FireyFly"; repo = "hexd"; rev = "v${version}"; - sha256 = "1lm0mj5c71id5kpqar8n44023s1kymb3q45nsz0hjh9v7p8libp0"; + sha256 = "sha256-b/dROBQVPEiMBTcu4MTi6Lf6ChkFZqZrJ1V0j54rrFY="; }; makeFlags = [ "PREFIX=$(out)" ]; From 87c1d9f92ce36f139e2ad0d5cef59a88965dd9f9 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 18 Feb 2022 11:15:42 +0100 Subject: [PATCH 2/5] bada-bib: 0.4.1 -> 0.5.1 --- pkgs/applications/science/misc/bada-bib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 356630329bbe..bd2f94ac4a74 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -9,15 +9,15 @@ , glib , gnome , gobject-introspection -, gtk3 +, gtk4 , libxml2 , pkg-config , python3Packages -, wrapGAppsHook }: +, wrapGAppsHook4 }: python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.4.1"; + version = "0.5.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "v${version}"; - sha256 = "sha256-kub2lLauru2RrinzxMDyBVC0htPx0Niv/M6bbmTS7Hk="; + sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo="; }; nativeBuildInputs = [ @@ -35,13 +35,13 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ gdk-pixbuf glib - gtk3 + gtk4 ]; checkInputs = [ From 0d033358d6fcbed3a1cf0864e0acddbb06ed74b3 Mon Sep 17 00:00:00 2001 From: betaboon Date: Mon, 21 Feb 2022 09:32:44 +0100 Subject: [PATCH 3/5] python3Packages.pivy: fix build --- pkgs/development/python-modules/pivy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 6637198b5643..092bcbfcfd9d 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ + substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' ''; From d4dc5559857ea6132a557b570809ee7f8edf7c12 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 26 Jan 2022 12:31:28 +1000 Subject: [PATCH 4/5] aardvark-dns: init at 1.0.0 --- .../tools/networking/aardvark-dns/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/networking/aardvark-dns/default.nix diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix new file mode 100644 index 000000000000..fd557ba24112 --- /dev/null +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "aardvark-dns"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RFA/C0Q4u1WMQ0bsFKbkyzar0vDRfQ6YPpu/Np3xXWA="; + }; + + cargoVendorDir = "vendor"; + + preBuild = '' + rm build.rs + + export \ + VERGEN_BUILD_SEMVER="${version}" \ + VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ + VERGEN_GIT_SHA="${src.rev}" \ + VERGEN_RUSTC_HOST_TRIPLE="" + ''; + + meta = with lib; { + description = "Authoritative dns server for A/AAAA container records"; + homepage = "https://github.com/containers/aardvark-dns"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91bcffde8b0..758d4d3e45bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -879,6 +879,8 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; + aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; + a2ps = callPackage ../tools/text/a2ps { }; abcm2ps = callPackage ../tools/audio/abcm2ps { }; From 74b10859829153d5c5d50f7c77b86763759e8654 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 22 Jan 2022 17:09:34 +1000 Subject: [PATCH 5/5] netavark: init at 1.0.0 --- pkgs/tools/networking/netavark/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/networking/netavark/default.nix diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix new file mode 100644 index 000000000000..e29acd23dc41 --- /dev/null +++ b/pkgs/tools/networking/netavark/default.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, mandown +}: + +rustPlatform.buildRustPackage rec { + pname = "netavark"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-E3Mdrc8/IwuOOwwVf4LaLrNFzuO95MEvy8BbStQRgoE="; + }; + + cargoVendorDir = "vendor"; + + preBuild = '' + substituteInPlace Cargo.toml \ + --replace 'build = "build.rs"' "" + + rm build.rs + + export \ + VERGEN_BUILD_SEMVER="${version}" \ + VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ + VERGEN_GIT_SHA="${src.rev}" \ + VERGEN_RUSTC_HOST_TRIPLE="" + ''; + + nativeBuildInputs = [ installShellFiles mandown ]; + + postBuild = '' + make -C docs + installManPage docs/*.1 + ''; + + meta = with lib; { + description = "Rust based network stack for containers"; + homepage = "https://github.com/containers/netavark"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 758d4d3e45bc..2afc3d838382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8062,6 +8062,8 @@ with pkgs; netatalk = callPackage ../tools/filesystems/netatalk { }; + netavark = callPackage ../tools/networking/netavark { }; + netcdf = callPackage ../development/libraries/netcdf { hdf5 = hdf5.override { usev110Api = true; }; };