From 494ddbb3ffa626b42a2edec842160ebc3592429a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 21:39:25 +0000 Subject: [PATCH 01/25] doctl: 1.63.1 -> 1.64.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f5c485e5b014..1bc915942f32 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.63.1"; + version = "1.64.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-SSjTrCR5H+3nIKHKEfrQX917HjgpViS6H1RwmRe4coI="; + sha256 = "sha256-z5uPrhvCt2Sx88LxUPvDjul4AurVBF5WNnNBoJzU6KE="; }; meta = with lib; { From ba80ccc2b30745655ed691ba897a6cfab4585830 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 04:07:10 +0000 Subject: [PATCH 02/25] juju: 2.9.10 -> 2.9.11 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index dce623897f73..1adb61b89347 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.10"; + version = "2.9.11"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-2gCJ6aN6uN0KtOVddLDry4pLhScSh4JHmdsFws59phk="; + sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U="; }; - vendorSha256 = "sha256-vFO3Rv+7CLIkl1qS4zp177GmerewfgmyjxEbzdt/RsE="; + vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From fde652fb6cbe3e9f27d49386f9ab567c1eaf01ca Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Thu, 26 Aug 2021 13:41:29 -0400 Subject: [PATCH 03/25] todoist-electron: 0.2.4 -> 1.0.1 --- pkgs/applications/misc/todoist-electron/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 945b0b324910..bcd277cad4aa 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "0.2.4"; + version = "1.0.1"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "1xrf2qjhq116z18qx7n1zd7mhvkb2dccaq7az4w6fs216l8q5zf2"; + sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k"; }; appimageContents = appimageTools.extractType2 { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons/hicolor/0x0/apps $out/share/icons/hicolor/512x512 + cp -a ${appimageContents}/usr/share/icons/hicolor/512x512/apps $out/share/icons/hicolor/512x512 substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; From 0ad5158d6b6d7c49f814d5f15a9019f5f3ac1692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 29 Aug 2021 09:19:43 +0200 Subject: [PATCH 04/25] mediathekview: 13.7.1 -> 13.8.0 Hangs on startup when using openjdk16. We use adoptopenjdk-hotspot-bin-16 instead. --- .../applications/video/mediathekview/default.nix | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 2005a949a5c4..1a6f19721331 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,34 +1,38 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "13.7.1"; + version = "13.8.0"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "sha256-yFPyj1Mbgj2eJv4DpvfOtPyTbL9gMAXC5TzSx8AV27o="; + sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + + runHook postInstall ''; meta = with lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = "https://mediathekview.de/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3597b93ea47d..5a8a87c4b1d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25949,7 +25949,7 @@ with pkgs; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { }; + mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; }; megapixels = callPackage ../applications/graphics/megapixels { }; From 8ed16161577d4ba2e570654cfaaeae479d7ed79e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 30 Sep 2021 15:22:03 +0200 Subject: [PATCH 05/25] sbcl_2_1_8: remove at 2.1.8 --- pkgs/development/compilers/sbcl/2.1.8.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) delete mode 100644 pkgs/development/compilers/sbcl/2.1.8.nix diff --git a/pkgs/development/compilers/sbcl/2.1.8.nix b/pkgs/development/compilers/sbcl/2.1.8.nix deleted file mode 100644 index 3c450f1ba196..000000000000 --- a/pkgs/development/compilers/sbcl/2.1.8.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "2.1.8"; - sha256 = "0ijmw8adyf6fgaq4ixdj9v5lfg3cs9wyxhb96wxhfld0rjpppsm3"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a561b3672c4a..afab49052acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12570,7 +12570,6 @@ with pkgs; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {}; sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {}; - sbcl_2_1_8 = callPackage ../development/compilers/sbcl/2.1.8.nix {}; sbcl = sbcl_2_1_2; roswell = callPackage ../development/tools/roswell/default.nix { }; From 4467ba610121463a327dbeb1669e81e30387d3c4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 30 Sep 2021 15:22:20 +0200 Subject: [PATCH 06/25] sbcl_2_1_9: init at 2.1.9 http://www.sbcl.org/news.html#2.1.9 --- pkgs/development/compilers/sbcl/2.1.9.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) create mode 100644 pkgs/development/compilers/sbcl/2.1.9.nix diff --git a/pkgs/development/compilers/sbcl/2.1.9.nix b/pkgs/development/compilers/sbcl/2.1.9.nix new file mode 100644 index 000000000000..da26a9aeffb7 --- /dev/null +++ b/pkgs/development/compilers/sbcl/2.1.9.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "2.1.9"; + sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afab49052acb..4fc89161c674 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12570,6 +12570,7 @@ with pkgs; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {}; sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {}; + sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {}; sbcl = sbcl_2_1_2; roswell = callPackage ../development/tools/roswell/default.nix { }; From 9b3b8f74bb974dcb7ecbfe2730296217532e3a42 Mon Sep 17 00:00:00 2001 From: pennae Date: Thu, 30 Sep 2021 17:29:55 +0200 Subject: [PATCH 07/25] fix nested calls to extendDerivation if extendDerivation is called on something that already had extendDerivation called on it (eg a mkDerivation result) the second call will set outputUnspecified=true on every output by way of propagating attributes of the full derivation to the individual outputs. this in turn causes buildEnv--and thus nix-shell and environment.systemPackages--to install every output of such a derivation even when only a specific output was requested, which renders the point of multiple outputs moot. this happens in python modules (see #139756), though it seems that tcl and possibly others should also be affected. --- lib/customisation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index c17cb0d0f8e5..a794b673d70c 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -145,7 +145,8 @@ rec { let outputs = drv.outputs or [ "out" ]; - commonAttrs = drv // (builtins.listToAttrs outputsList) // + commonAttrs = (removeAttrs drv [ "outputUnspecified" ]) // + (builtins.listToAttrs outputsList) // ({ all = map (x: x.value) outputsList; }) // passthru; outputToAttrListElement = outputName: From eba8f7e3d5ccb29e617baadb7580e600a2b326db Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Sep 2021 22:45:58 +0200 Subject: [PATCH 08/25] varnish70: init at 7.0.0 --- pkgs/servers/varnish/default.nix | 12 +++++++++--- pkgs/servers/varnish/packages.nix | 15 ++++++++++++++- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 1d4a3276cc09..280a5a6962d3 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils +{ lib, stdenv, fetchurl, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils , python3, makeWrapper }: let @@ -16,8 +16,10 @@ let nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ]; buildInputs = [ - pcre libxslt groff ncurses readline libedit makeWrapper python3 - ]; + libxslt groff ncurses readline libedit makeWrapper python3 + ] + ++ lib.optional (lib.versionOlder version "7") pcre + ++ lib.optional (lib.versionAtLeast version "7") pcre2; buildFlags = [ "localstatedir=/var/spool" ]; @@ -52,4 +54,8 @@ in version = "6.5.2"; sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx"; }; + varnish70 = common { + version = "7.0.0"; + sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 647247acafd1..f83b8ee090e5 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60, varnish65, fetchFromGitHub }: { +{ callPackage, varnish60, varnish65, varnish70, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; digest = callPackage ./digest.nix { @@ -25,4 +25,17 @@ sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; }; }; + varnish70Packages = rec { + varnish = varnish70; + digest = callPackage ./digest.nix { + inherit varnish; + version = "6.6"; + sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; + }; + dynamic = callPackage ./dynamic.nix { + inherit varnish; + version = "2.4.0"; + sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr"; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde403f4af89..0e229cae85aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10406,9 +10406,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish65; + varnish60 varnish65 varnish70; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish65Packages; + varnish60Packages varnish65Packages varnish70Packages; varnishPackages = varnish65Packages; varnish = varnishPackages.varnish; From 83261624ae76a72719633b05911da9a9cbdfa3ab Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Sep 2021 22:46:37 +0200 Subject: [PATCH 09/25] varnish60: 6.0.7 -> 6.0.8 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 280a5a6962d3..70ef8ab0fa0b 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -47,8 +47,8 @@ let in { varnish60 = common { - version = "6.0.7"; - sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; + version = "6.0.8"; + sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; }; varnish65 = common { version = "6.5.2"; From 145f628f69224b9393b831ca2749b6a86ed0a9ff Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Sep 2021 22:48:24 +0200 Subject: [PATCH 10/25] varnish65*: drop because it is EOL upstream varnish66 could be introduced, but I don't think it's worth the effort --- .../from_md/release-notes/rl-2111.section.xml | 4 ++-- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- pkgs/servers/varnish/default.nix | 4 ---- pkgs/servers/varnish/packages.nix | 15 +-------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 0688de77af68..98fe3513e254 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1002,8 +1002,8 @@ Superuser created successfully. The varnish package was upgraded from 6.3.x - to 6.5.x. varnish60 for the last LTS - release is also still available. + to 7.x. varnish60 for the last LTS release + is also still available. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 56babf8ac006..fef42ec52c9e 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -310,7 +310,7 @@ In addition to numerous new and upgraded packages, this release has the followin configures the address and port the web UI is listening, it defaults to `:9001`. To be able to access the web UI this port needs to be opened in the firewall. -- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. +- The `varnish` package was upgraded from 6.3.x to 7.x. `varnish60` for the last LTS release is also still available. - The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 70ef8ab0fa0b..f975fd5c7fd0 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -50,10 +50,6 @@ in version = "6.0.8"; sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; }; - varnish65 = common { - version = "6.5.2"; - sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx"; - }; varnish70 = common { version = "7.0.0"; sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index f83b8ee090e5..48cc1f67b185 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60, varnish65, varnish70, fetchFromGitHub }: { +{ callPackage, varnish60, varnish70, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; digest = callPackage ./digest.nix { @@ -12,19 +12,6 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish65Packages = rec { - varnish = varnish65; - digest = callPackage ./digest.nix { - inherit varnish; - version = "6.6"; - sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; - }; - dynamic = callPackage ./dynamic.nix { - inherit varnish; - version = "2.3.1"; - sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; - }; - }; varnish70Packages = rec { varnish = varnish70; digest = callPackage ./digest.nix { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c81ee814bc73..d63dbdfa46f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,6 +969,7 @@ mapAliases ({ vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 + varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e229cae85aa..bdc0b625a078 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10406,11 +10406,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish65 varnish70; + varnish60 varnish70; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish65Packages varnish70Packages; + varnish60Packages varnish70Packages; - varnishPackages = varnish65Packages; + varnishPackages = varnish70Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; From 3a9ffac149446f885ac533025a10a84f64db836a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 30 Sep 2021 20:26:25 +0200 Subject: [PATCH 11/25] varnish70: fix build on darwin --- pkgs/servers/varnish/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index f975fd5c7fd0..e74b033568b5 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils +{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils , python3, makeWrapper }: let @@ -50,8 +50,15 @@ in version = "6.0.8"; sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; }; - varnish70 = common { + varnish70 = (common { version = "7.0.0"; sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"; - }; + }).overrideAttrs (oA: { + patches = [ + (fetchpatch { + url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch"; + sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82"; + }) + ]; + }); } From af9b4c3aee844f1948e9e87d82106424c59949b7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 30 Sep 2021 22:50:30 -0400 Subject: [PATCH 12/25] multus-cni: fix version ouput, clean up --- .../networking/cluster/multus-cni/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 542eeb6add5f..ca1ef06a79ec 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "multus-cni"; @@ -11,15 +11,14 @@ buildGoModule rec { sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc="; }; - ldflags = let - multus = "gopkg.in/intel/multus-cni.v3/pkg/multus"; - commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7"; - in [ - "-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}" + ldflags = [ + "-s" + "-w" + "-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}" ]; preInstall = '' - mv $GOPATH/bin/cmd $GOPATH/bin/multus + mv $GOPATH/bin/cmd $GOPATH/bin/multus ''; vendorSha256 = null; @@ -28,10 +27,11 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. "; + description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods"; homepage = "https://github.com/k8snetworkplumbingwg/multus-cni"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ onixie ]; + mainProgram = "multus"; }; } From 324351910baf45dc049bbd01d1d72b8cb2c4edac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Oct 2021 04:20:00 +0000 Subject: [PATCH 13/25] difftastic: 0.9 -> 0.10.1 --- pkgs/tools/text/difftastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 06bd7d0376b2..32644fdf28b2 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.9"; + version = "0.10.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-spncRJjROytGnIig6ujqHu0e/XBTN4dsJ3og4aIu+l8="; + sha256 = "12fcfwx56phs64yl94al2hkvss1km4n9wbrn2md7wfh1137jykbg"; }; - cargoSha256 = "sha256-2xGwS4wjLQ7zmfZ2gMdlUAkjPDF6SmUaiX2j1KYy0vo="; + cargoSha256 = "0xnlnkdvsd2l7acdrkz918cjkk36k01rvvm0c8hnpx5327v6nsa8"; postPatch = '' pushd vendor From c632d826a3b46e99ee14c15945cd8a758e74d4a1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Oct 2021 04:20:00 +0000 Subject: [PATCH 14/25] lxd: 4.18 -> 4.19 https://discuss.linuxcontainers.org/t/lxd-4-19-has-been-released/12276/2 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 523f8165802e..12ea0f7a55d0 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.18"; + version = "4.19"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn"; + sha256 = "0mxbzg8xra0qpd3g3z1b230f0519h56x4jnn09lbbqa92p5zck3f"; }; postPatch = '' From 8690708bc2a9ba546564a3e76e01a5e6488e1c9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 Oct 2021 10:51:23 +0000 Subject: [PATCH 15/25] python38Packages.qcengine: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 0dd24112bd0b..c3c8401bc476 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.19.0"; + version = "0.20.0"; checkInputs = [ pytest-runner @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0lz9r0fh31mcixdhayiwfc69cp8if9b3nkrk7gxdrb6vhbfrxhij"; + sha256 = "5b405efb4b6ebe81e7f991b360126a4f61c2768ceed6027346e2b8ef3f57ef39"; }; doCheck = true; From c48c82533b4701e9e40c30339a0bcf96cef3f239 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 23 Sep 2021 22:47:00 +0200 Subject: [PATCH 16/25] ssh-key-confirmer: init at 0.1 --- .../networking/ssh-key-confirmer/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/ssh-key-confirmer/default.nix diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/tools/networking/ssh-key-confirmer/default.nix new file mode 100644 index 000000000000..c7a90aee5236 --- /dev/null +++ b/pkgs/tools/networking/ssh-key-confirmer/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "ssh-key-confirmer"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "benjojo"; + repo = "ssh-key-confirmer"; + rev = "v${version}"; + sha256 = "18whj9ds3rpjj5b71lbadi37ps99v13nnmkn3vq28x6cqfdy6w09"; + }; + + vendorSha256 = "0v9yw6v8fj6dqgbkks4pnmvxx9b7jqdy7bn7ywddk396sbsxjiqa"; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Test ssh login key acceptance without having the private key"; + homepage = "https://github.com/benjojo/ssh-key-confirmer"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6faddfc54371..9e06f11722d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1828,6 +1828,8 @@ with pkgs; ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; + ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { }; + sshchecker = callPackage ../tools/security/sshchecker { }; titaniumenv = callPackage ../development/mobile/titaniumenv { }; From 1d5d0bb97ff8fbf9a1df7d8f3f379360531ce4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 29 Sep 2021 11:49:23 +0200 Subject: [PATCH 17/25] neil: init at 0.0.13 --- pkgs/development/tools/neil/default.nix | 36 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/neil/default.nix diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix new file mode 100644 index 000000000000..643ca8773cb7 --- /dev/null +++ b/pkgs/development/tools/neil/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, babashka +}: + +stdenv.mkDerivation rec { + pname = "neil"; + version = "0.0.13"; + + src = fetchFromGitHub { + owner = "babashka"; + repo = "neil"; + rev = "v${version}"; + sha256 = "0jiyl0d39d8kk5bpangwxiy90vqipj4lgp8x84rh4z5m53knjpkd"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + install -D neil $out/bin/neil + wrapProgram $out/bin/neil \ + --prefix PATH : "${lib.makeBinPath [ babashka ]}" + ''; + + meta = with lib; { + homepage = "https://github.com/babashka/neil"; + description = "A CLI to add common aliases and features to deps.edn-based projects"; + license = licenses.mit; + platforms = babashka.meta.platforms; + maintainers = with maintainers; [ jlesquembre ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c53485f5dea4..ab28214c08b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7669,6 +7669,8 @@ with pkgs; pwsafe = callPackage ../applications/misc/pwsafe { }; + neil = callPackage ../development/tools/neil { }; + niff = callPackage ../tools/package-management/niff { }; nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; From 4d631edcab4b456a074089e88875b3cc975e6ddf Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 28 Sep 2021 11:54:43 +0200 Subject: [PATCH 18/25] execline-man-pages: 2.8.0.1.1 -> 2.8.1.0.1 --- pkgs/data/documentation/execline-man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/data/documentation/execline-man-pages/default.nix index 9e325b79748a..0ab5d3947099 100644 --- a/pkgs/data/documentation/execline-man-pages/default.nix +++ b/pkgs/data/documentation/execline-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "execline-man-pages"; - version = "2.8.0.1.1"; - sha256 = "0xv9v39na1qnd8cm4v7xb8wa4ap3djq20iws0lrqz7vn1w40i8b4"; + version = "2.8.1.0.1"; + sha256 = "0d3lzxy7wv91q3nr6bw1wfmrfj285i15wmj4c8v9k9pxjg42iwwx"; description = "Port of the documentation for the execline suite to mdoc"; sections = [ 1 7 ]; maintainers = [ lib.maintainers.sternenseemann ]; From 3cf522b28641ffd4fa0ccfbdac8d4c0696dd358e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 28 Sep 2021 11:54:59 +0200 Subject: [PATCH 19/25] s6-man-pages: 2.10.0.3.1 -> 2.11.0.0.1 --- pkgs/data/documentation/s6-man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/data/documentation/s6-man-pages/default.nix index 78e3d1a3b866..73c06bc8e0d3 100644 --- a/pkgs/data/documentation/s6-man-pages/default.nix +++ b/pkgs/data/documentation/s6-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-man-pages"; - version = "2.10.0.3.1"; - sha256 = "0q9b6v7kbyjsh390s4bw80kjdp92kih609vlmnpl1qzyrr6kivsg"; + version = "2.11.0.0.1"; + sha256 = "00nxlpdf0kkdadyv84vj5w66y926pccqls8prkbip3zmcmnqgghs"; description = "Port of the documentation for the s6 supervision suite to mdoc"; sections = [ 1 7 ]; maintainers = [ lib.maintainers.sternenseemann ]; From 2020702689dbfcb62cd6ddae5cf1dda42e95629c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 28 Sep 2021 11:55:13 +0200 Subject: [PATCH 20/25] s6-networking-man-pages: 2.4.1.1.1 -> 2.5.0.0.1 --- pkgs/data/documentation/s6-networking-man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/data/documentation/s6-networking-man-pages/default.nix index 4177b502b5e5..3898418a5225 100644 --- a/pkgs/data/documentation/s6-networking-man-pages/default.nix +++ b/pkgs/data/documentation/s6-networking-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-networking-man-pages"; - version = "2.4.1.1.1"; - sha256 = "1qrqzm2r4rxf8hglz8k4laknjqcx1y0z1kjf636z91w1077qg0pn"; + version = "2.5.0.0.1"; + sha256 = "02xvyby23b2x30jxd4nw9c5629j4hdaxq9sph3qhajlhl53yiyf2"; description = "Port of the documentation for the s6-networking suite to mdoc"; sections = [ 1 7 ]; maintainers = [ lib.maintainers.sternenseemann ]; From e5fe6f4c58d229e8f74cd5738912abb83c482b2f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 28 Sep 2021 11:57:00 +0200 Subject: [PATCH 21/25] skawarePackages.buildManPages: drop unnecessary sections parameter Upstream has started passing the `-D` flag to install thankfully, so we no longer need to create the section subdirectories ahead of time. --- pkgs/build-support/skaware/build-skaware-man-pages.nix | 6 ------ pkgs/data/documentation/execline-man-pages/default.nix | 1 - pkgs/data/documentation/s6-man-pages/default.nix | 1 - pkgs/data/documentation/s6-networking-man-pages/default.nix | 1 - 4 files changed, 9 deletions(-) diff --git a/pkgs/build-support/skaware/build-skaware-man-pages.nix b/pkgs/build-support/skaware/build-skaware-man-pages.nix index a1f3977c0d56..92d8202ae95a 100644 --- a/pkgs/build-support/skaware/build-skaware-man-pages.nix +++ b/pkgs/build-support/skaware/build-skaware-man-pages.nix @@ -7,8 +7,6 @@ , version # : string , sha256 - # : list (int | string) -, sections # : string , description # : list Maintainer @@ -39,10 +37,6 @@ stdenv.mkDerivation { dontBuild = true; - preInstall = lib.concatMapStringsSep "\n" - (section: "mkdir -p \"${manDir}/man${builtins.toString section}\"") - sections; - meta = with lib; { inherit description license maintainers; inherit (src.meta) homepage; diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/data/documentation/execline-man-pages/default.nix index 0ab5d3947099..0b1cb34bb3b1 100644 --- a/pkgs/data/documentation/execline-man-pages/default.nix +++ b/pkgs/data/documentation/execline-man-pages/default.nix @@ -5,6 +5,5 @@ buildManPages { version = "2.8.1.0.1"; sha256 = "0d3lzxy7wv91q3nr6bw1wfmrfj285i15wmj4c8v9k9pxjg42iwwx"; description = "Port of the documentation for the execline suite to mdoc"; - sections = [ 1 7 ]; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/data/documentation/s6-man-pages/default.nix index 73c06bc8e0d3..583f1ff99fed 100644 --- a/pkgs/data/documentation/s6-man-pages/default.nix +++ b/pkgs/data/documentation/s6-man-pages/default.nix @@ -5,6 +5,5 @@ buildManPages { version = "2.11.0.0.1"; sha256 = "00nxlpdf0kkdadyv84vj5w66y926pccqls8prkbip3zmcmnqgghs"; description = "Port of the documentation for the s6 supervision suite to mdoc"; - sections = [ 1 7 ]; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/data/documentation/s6-networking-man-pages/default.nix index 3898418a5225..453125cc6827 100644 --- a/pkgs/data/documentation/s6-networking-man-pages/default.nix +++ b/pkgs/data/documentation/s6-networking-man-pages/default.nix @@ -5,6 +5,5 @@ buildManPages { version = "2.5.0.0.1"; sha256 = "02xvyby23b2x30jxd4nw9c5629j4hdaxq9sph3qhajlhl53yiyf2"; description = "Port of the documentation for the s6-networking suite to mdoc"; - sections = [ 1 7 ]; maintainers = [ lib.maintainers.sternenseemann ]; } From 84b08df988ec18cb36058e9e700c2b2d0833d23d Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sat, 2 Oct 2021 21:43:35 +0800 Subject: [PATCH 22/25] vscode-extensions.influxdata.flux: init at 0.6.5. --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 9b2b7fa2476f..579f080bbf1d 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -944,6 +944,18 @@ let }; }; + influxdata.flux = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "influxdata"; + name = "flux"; + version = "0.6.5"; + sha256 = "sha256-rKkZ7Sg8buryFtbIuKsrf3V3Rf7PP8hnbEIRFf4FvSM="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; From 0d9299b6a774deae66221cb0141d285a61e972df Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 2 Oct 2021 17:41:39 +0900 Subject: [PATCH 23/25] erlang: 24.0.6 -> 24.1.1 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 162af7c02b9b..2b2fd9dc5195 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.6"; - sha256 = "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z"; + version = "24.1.1"; + sha256 = "sha256-y5QtLCrYeMT4WdHkFngKv02CZ35eYZF3sjfI5OZNAH0="; } From db4de0e903c781e41c15aeba264d3cdd0c04f9c5 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 2 Oct 2021 23:39:39 +0800 Subject: [PATCH 24/25] papirus-icon-theme: 20210901 -> 20211001 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 777e38041de5..9e8856528b10 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210901"; + version = "20211001"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-SbqEHLXSomUUaLRJA1MJbtF1lTQPiWSUXgapjEzSl00="; + sha256 = "sha256-OVG/bKWOdSxOXVvtMOITnCDoGNSc+zPNZ/XOablfSEE="; }; nativeBuildInputs = [ gtk3 ]; From 5430af2013535e48facb1f660565db70aebb7e6b Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 2 Oct 2021 09:03:01 -0700 Subject: [PATCH 25/25] dwfv: init at 0.4.1 --- .../science/electronics/dwfv/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/science/electronics/dwfv/default.nix diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/applications/science/electronics/dwfv/default.nix new file mode 100644 index 000000000000..ed340271f262 --- /dev/null +++ b/pkgs/applications/science/electronics/dwfv/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "dwfv"; + version = "0.4.1"; + + src = fetchCrate { + inherit version pname; + sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7"; + }; + + cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy"; + + meta = with lib; { + description = "A simple digital waveform viewer with vi-like key bindings"; + homepage = "https://github.com/psurply/dwfv"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3767b069607..f974f5d93b90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14050,6 +14050,8 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; + dwfv = callPackage ../applications/science/electronics/dwfv { }; + dwz = callPackage ../development/tools/misc/dwz { }; easypdkprog = callPackage ../development/embedded/easypdkprog { };