From 9910ecd692368bc7edfd3bd6d0495e878a3a957c Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 21 Jul 2022 20:12:51 +0300 Subject: [PATCH 01/23] srcml: remove --- .../version-management/srcml/default.nix | 34 ------------------- .../version-management/srcml/gcc6.patch | 26 -------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/applications/version-management/srcml/default.nix delete mode 100644 pkgs/applications/version-management/srcml/gcc6.patch diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix deleted file mode 100644 index 60260ee4de3..00000000000 --- a/pkgs/applications/version-management/srcml/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2, - curl -}: - -with lib; - -stdenv.mkDerivation rec { - version = "0.9.5_beta"; - pname = "srcml"; - - src = fetchurl { - url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz"; - sha256 = "13pswdi75qjsw7z75lz7l3yjsvb58drihla2mwj0f9wfahaj3pam"; - }; - - prePatch = '' - patchShebangs . - substituteInPlace CMake/install.cmake --replace /usr/local $out - ''; - - patches = [ - ./gcc6.patch - ]; - - nativeBuildInputs = [ cmake antlr2 ]; - buildInputs = [ libxml2 libxslt boost libarchive python2 curl ]; - - meta = { - description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = "https://www.srcml.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/applications/version-management/srcml/gcc6.patch b/pkgs/applications/version-management/srcml/gcc6.patch deleted file mode 100644 index 7cd596d9ea7..00000000000 --- a/pkgs/applications/version-management/srcml/gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/CMake/config.cmake w/CMake/config.cmake -index 28f8047..c596cf8 100644 ---- i/CMake/config.cmake -+++ w/CMake/config.cmake -@@ -95,7 +95,7 @@ else() - find_package(LibXml2 REQUIRED) - find_package(CURL REQUIRED) - set(Boost_NO_BOOST_CMAKE ON) -- set(Boost_USE_STATIC_LIBS ON) -+ set(Boost_USE_STATIC_LIBS OFF) - find_package(Boost COMPONENTS program_options filesystem system thread regex date_time REQUIRED) - - # add include directories -diff --git i/src/libsrcml/srcml_reader_handler.hpp w/src/libsrcml/srcml_reader_handler.hpp -index 0b23fed..c02dfef 100644 ---- i/src/libsrcml/srcml_reader_handler.hpp -+++ w/src/libsrcml/srcml_reader_handler.hpp -@@ -456,7 +456,7 @@ public : - - if(uri == SRCML_CPP_NS_URI) { - -- if(archive->language != 0) { -+ if(srcml_check_language(archive->language->c_str()) != 0) { - - if(*archive->language == "C++" || *archive->language == "C" || *archive->language == "Objective-C") - archive->options |= SRCML_OPTION_CPP | SRCML_OPTION_CPP_NOMACRO; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bf0a61c3c2e..db1f295e14a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1337,6 +1337,7 @@ mapAliases ({ sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 squid4 = squid; # added 2019-08-22 + srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e65d7719fa..207ca022323 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10789,8 +10789,6 @@ with pkgs; squashfuse = callPackage ../tools/filesystems/squashfuse { }; - srcml = callPackage ../applications/version-management/srcml { }; - srt-live-server = callPackage ../applications/video/srt-live-server { }; srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; From ab98ee2c9243823fcfce6f5a285a956c7d522259 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Tue, 26 Jul 2022 11:54:41 -0700 Subject: [PATCH 02/23] plan9port: remove spurious patches --- pkgs/tools/system/plan9port/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 1d64e3b9341..de076e181e8 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -17,24 +17,8 @@ stdenv.mkDerivation rec { }; postPatch = '' - #hardcoded path - substituteInPlace src/cmd/acme/acme.c \ - --replace /lib/font/bit $out/plan9/font - - #deprecated flags - find . -type f \ - -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ - -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; - substituteInPlace bin/9c \ --replace 'which uniq' '${which}/bin/which uniq' - '' + lib.optionalString (!stdenv.isDarwin) '' - #add missing ctrl+c\z\x\v keybind for non-Darwin - substituteInPlace src/cmd/acme/text.c \ - --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \ - --replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \ - --replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \ - --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" ''; buildInputs = [ perl ] ++ (if !stdenv.isDarwin then [ From 7d8385de76d4f7638cfa79c27061a03a8edc9065 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:23:47 +0200 Subject: [PATCH 03/23] aegisub: 3.3.2 -> 3.3.3 --- pkgs/applications/video/aegisub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 82d1adfeec0..f83cbf69edb 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "aegisub"; - version = "3.3.2-20220612"; + version = "3.3.3"; src = fetchFromGitHub { owner = "wangqr"; repo = pname; - rev = "91f8b5f91eb960bad19899c10af08aca34f9b697"; - sha256 = "sha256-lPkPWSsncsBKJHDnma9cUXsQJynruT9JpPkMTHdQ/e8="; + rev = "v${version}"; + sha256 = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78="; }; nativeBuildInputs = [ From 9d2509be75d9a389942469eda2c512b42d3da187 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 05:33:45 +0000 Subject: [PATCH 04/23] fend: 1.0.3 -> 1.0.4 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index afdc719a5e4..cb09016b44e 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eYCFX3JVsTnmVzHQd9JU6BT80kS0LTjVwVcfNJink1M="; + sha256 = "sha256-6zYz6DMnYSGyDXqP5K8bKauy23YA2tzBmGk72f5+bgY="; }; - cargoSha256 = "sha256-+N8/ZKj1Ht2lkTYSEm/lrLtopBQqc82gIFiLzJ6NogU="; + cargoSha256 = "sha256-ydt2YGx5WWk42Vq4RXhiRf6kIne7Q/6XwIu+HEnhDVw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 7bfdfb3802e44d21265e02778b42a82be6cf6333 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Thu, 28 Jul 2022 16:21:55 +0200 Subject: [PATCH 05/23] bsp-layout: unstable-2022-06-19 -> unstable-2022-07-27 --- pkgs/tools/misc/bsp-layout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix index 48f68bebe6c..e5a78adcadf 100644 --- a/pkgs/tools/misc/bsp-layout/default.nix +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "phenax"; repo = pname; - rev = "181d38443778e81df2d4bc3639063c3ae608f9c7"; - sha256 = "sha256-4NKI+OnOTYGaJnaPvSoXGJdSSzMo9AjYRLOomp9onoo="; + rev = "9d60fc271454ea1bfca598575207a06d8d172d3e"; + sha256 = "sha256-7bBVWJdgAnXLWzjQGZxVqhku2rsxX2kMxU4xkI9/DHE="; }; nativeBuildInputs = [ makeWrapper git bc ]; From a0a481d1a55511744f2817747731353b19abb860 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 15:16:40 +0000 Subject: [PATCH 06/23] imgcrypt: 1.1.4 -> 1.1.6 --- pkgs/applications/virtualization/imgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index df9e3e73114..1f917080bce 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA="; + sha256 = "sha256-ytoxdwmyg7IlJOhC6FPI9dnoiptEQrlAAPV57/O3M4U="; }; ldflags = [ From 8886937677f10e71636a3426d949a1c89b10c2ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 16:46:34 +0000 Subject: [PATCH 07/23] jove: 4.17.3.7 -> 4.17.4.6 --- pkgs/applications/editors/jove/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index 2280c6d9e61..2fd28714481 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "jove"; - version = "4.17.3.7"; + version = "4.17.4.6"; src = fetchFromGitHub { owner = "jonmacs"; repo = "jove"; rev = version; - sha256 = "sha256-fD87FIWZlfJE2tVX+0QaiGGqu+tJFHheXe1guJR/Hxg="; + sha256 = "sha256-UCjqF0i43TSvtG5uxb2SA/F9oGBeo/WdEVJlrSSHV8g="; }; nativeBuildInputs = [ makeWrapper ]; From deab4fb7e76f75869faa41a23dd68139961c7cb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 17:33:00 +0000 Subject: [PATCH 08/23] k0sctl: 0.13.0 -> 0.13.1 --- pkgs/applications/networking/cluster/k0sctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 2d6f7ea2ac9..9f289c27b9e 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A50PbZTgv0EfL5aqTiTEOdfRXUgKGzTsRIiMgXItkxI="; + sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU="; }; - vendorSha256 = "sha256-2i6SoixE5RitRuJpOU4LdzN9JY/76c3mjsbsXlQp854="; + vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY="; ldflags = [ "-s" From eb1f9ccfb44a0c34ea3cd80da9397ab803d657e5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 28 Jul 2022 14:32:15 -0400 Subject: [PATCH 09/23] tcping-go: init at unstable-2022-05-28 --- .../networking/tcping-go/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/tcping-go/default.nix diff --git a/pkgs/applications/networking/tcping-go/default.nix b/pkgs/applications/networking/tcping-go/default.nix new file mode 100644 index 00000000000..b7f8ceb6d68 --- /dev/null +++ b/pkgs/applications/networking/tcping-go/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule { + pname = "tcping-go"; + version = "unstable-2022-05-28"; + + src = fetchFromGitHub { + owner = "cloverstd"; + repo = "tcping"; + rev = "83f644c761819f7c4386f0645cd0a337eccfc62e"; + sha256 = "sha256-GSkNfaGMJbBqDg8DKhDtLAuUg1yF3FbBdxcf4oG50rI="; + }; + + vendorSha256 = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ="; + + meta = with lib; { + description = "Ping over TCP instead of ICMP, written in Go"; + homepage = "https://github.com/cloverstd/tcping"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 014ba7e8164..f1ff07eece9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29273,6 +29273,8 @@ with pkgs; taxi-cli = with python3Packages; toPythonApplication taxi; + tcping-go = callPackage ../applications/networking/tcping-go { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; From 980a829a15bec51d518fd5987295f8241f9f1893 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 28 Jul 2022 22:59:27 +0200 Subject: [PATCH 10/23] wf-recorder: 0.2.1 -> 0.3.0 --- pkgs/applications/video/wf-recorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 418c931a7cc..49ec13de531 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; rev = "v${version}"; - sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim"; + sha256 = "sha256-othFp97rUrdUoAXkup8VvpcyPHs5iYNFyRE3h3rcmqE="; }; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ]; From 3b9c6d52451a29f3c570418453582e2fc2be5179 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 28 Jul 2022 22:59:50 +0200 Subject: [PATCH 11/23] wf-recorder: add myself to maintainers --- pkgs/applications/video/wf-recorder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 49ec13de531..0b16c478aeb 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ yuka ]; platforms = platforms.linux; }; } From 96843639d7761a613929dbaed8ecc2ca6e0479b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 22:10:24 +0000 Subject: [PATCH 12/23] libtorrent-rasterbar: 2.0.6 -> 2.0.7 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 8ecd27a043d..412446f215f 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.6"; + version = "2.0.7"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-SQ9yRuINxYJH0LIC3XK7Ssl/TO+DUxIRtdXz684bm8w="; + sha256 = "sha256-ikDtx1BIikVEL5jf37byNbuS+ft1lDtHUlFqegndapw="; fetchSubmodules = true; }; From 5a28202a9e5645c3bb852971bd5c05005d27a40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Fri, 29 Jul 2022 01:34:28 +0200 Subject: [PATCH 13/23] cbfmt: init at 0.1.1 --- pkgs/development/tools/cbfmt/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/cbfmt/default.nix diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/development/tools/cbfmt/default.nix new file mode 100644 index 00000000000..2a11ab5ca41 --- /dev/null +++ b/pkgs/development/tools/cbfmt/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cbfmt"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cTX7eBcEZiTJm3b1d2Mwu7NdbtHjeF+dkc3YMede0cQ="; + }; + + cargoSha256 = "sha256-vEInZplfgrM4gD5wPATl7j5iTo9pSstElfd0Lq9giJw="; + + passthru.tests.version = testers.testVersion { + package = cbfmt; + }; + + meta = with lib; { + description = "A tool to format codeblocks inside markdown and org documents"; + homepage = "https://github.com/lukas-reineke/cbfmt"; + license = licenses.mit; + maintainers = [ maintainers.stehessel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab4f7974df7..04b1bf4f762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -292,6 +292,8 @@ with pkgs; buf = callPackage ../development/tools/buf { }; + cbfmt = callPackage ../development/tools/cbfmt { }; + cfn-nag = callPackage ../development/tools/cfn-nag { }; cxx-rs = callPackage ../development/libraries/cxx-rs { }; From 811fcda8271074aa6a4e64990c49479ef5616bb5 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 29 Jul 2022 01:02:04 +0200 Subject: [PATCH 14/23] mautrix-telegram: override mautrix and asyncpg dependencies --- pkgs/servers/mautrix-telegram/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 2d0ab908cb8..eb6372b1203 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -5,6 +5,21 @@ let python = python3.override { packageOverrides = self: super: { + asyncpg = super.asyncpg.overridePythonAttrs (oldAttrs: rec { + version = "0.25.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA="; + }; + }); + mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { + version = "0.16.3"; + src = oldAttrs.src.override { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + }; + }); tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { version = "1.25.0a7"; pname = "tulir-telethon"; From fa5f4907e3211ba3faccad08ccbb5f49094cff25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 19:26:11 +0000 Subject: [PATCH 15/23] lazygit: 0.34 -> 0.35 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 4dca5d98e0b..196c65d2100 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AXbbgNP10r3BVRXg9R8Ssd8yORCcQwaGRuHV6yXz5i0="; + sha256 = "sha256-TYtjwEQTXjkp1o95cXJw0VDVv5us07K+6NrJF9bsJfg="; }; vendorSha256 = null; From 0d3888a5213362bbeb04f9c83ff6856c8f8a4ff2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 21:15:28 +0000 Subject: [PATCH 16/23] libite: 2.5.1 -> 2.5.2 --- pkgs/development/libraries/libite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 067eba793f7..7dfb66dced9 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-G9X0ZMyasS9praogWnLDU1LeTvK4fYPgJ89o2y3AIJI="; + sha256 = "sha256-iviHxGXYUMjTgafkG4aqeHd9cnHA2VNhYG2eUta9R0Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 02cacab48e7415ba08673219234003955684fe69 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 29 Jul 2022 08:44:10 +0800 Subject: [PATCH 17/23] pipe-rename: 1.4.1 -> 1.5.0 --- pkgs/tools/misc/pipe-rename/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index 060f3a3e23c..d0343452206 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "pipe-rename"; - version = "1.4.1"; + version = "1.5.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3Jl/G1QqcChwkI5n1zQLBgGxT2CYdh3XdMHkF+V5SG4="; + sha256 = "sha256-NTAZy2ERxznRVld1WzYBchJakOIfs5uJr3yRNt81rMg="; }; - cargoSha256 = "sha256-y5BsdkHrjJHNO66MQTbvA6kKx6tLP7jNk5UmAmslz14="; + cargoSha256 = "sha256-6Rv3rVQEvxdrEp5plhf9NAxpXOD4szwFGU5M6tvakzk="; checkInputs = [ python3 ]; From 13a80d3aae0d65dafac5947658159d05b335bb0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 00:59:06 +0000 Subject: [PATCH 18/23] mokutil: 0.5.0 -> 0.6.0 --- pkgs/tools/security/mokutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mokutil/default.nix b/pkgs/tools/security/mokutil/default.nix index a84763a242f..b408e4d2c80 100644 --- a/pkgs/tools/security/mokutil/default.nix +++ b/pkgs/tools/security/mokutil/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "mokutil"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lcp"; repo = pname; rev = version; - sha256 = "sha256-dt41TCr6RkmE9H+NN8LWv3ogGsK38JtLjVN/b2mbGJs="; + sha256 = "sha256-qwSEv14mMpaKmm6RM882JzEnBQG3loqsoglg4qTFWUg="; }; nativeBuildInputs = [ From 22c1d4b18c8ac92742cea40af19346b62b0b492b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 01:52:22 +0000 Subject: [PATCH 19/23] nali: 0.4.2 -> 0.5.0 --- pkgs/applications/networking/nali/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index f90ec3644c7..94a79100290 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-7NUUX4hDwvMBBQvxiB7P/lNHKgxwOFObdD6DUd0vX5c="; + sha256 = "sha256-rK+UKECwG+2WcltV4zhODSFZ1EGkmLTBggLgKGMCAGI="; }; - vendorSha256 = "sha256-Ld5HehK5MnPwl6KtIl0b4nQRiXO4DjKVPL1iti/WBIQ="; + vendorSha256 = "sha256-pIJsCBevCVMg6NXc96f6hAbFK5VKwjFwCe34A+54NW8="; subPackages = [ "." ]; meta = with lib; { From cbe577f7d3eeea4ea08b902be6f145325d32b68c Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 29 Jul 2022 11:45:25 +0800 Subject: [PATCH 20/23] rust-script: 0.20.0 -> 0.21.0 --- pkgs/development/tools/rust/rust-script/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index 41650636771..a1edc135679 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WcvRkp57VyBB5gQgamFoR6wK1cRJ+3hQqixOBgeapJU="; + sha256 = "sha256-5T5DivfT7/MkBJo5YgLAVnfct84nBhw/OXWQ/4TMm2A="; }; - cargoSha256 = "sha256-qJIftByppOrT4g3sxmKRSLhxtpAW4eXWX0FhmMDJNu0="; + cargoSha256 = "sha256-mDH3R9gn64DXVoe3Vkl2Kwhr7OTOUWKBLW5Y+Uo4aXM="; # tests require network access doCheck = false; From fc630be0e442f7dc20009fea203a12955add20dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 12:51:53 +0000 Subject: [PATCH 21/23] gleam: 0.21.0 -> 0.22.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 30d4882a50b..d6202a5e2b2 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI="; + sha256 = "sha256-/mP15jPZiiavnZ7fwFehSSzJUtVVmksj1xfbDOycxmQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q="; + cargoSha256 = "sha256-JAQQiCnl/EMKCMqoL8WkwUcjng+MSz2Cjb3L5yyrQ+E="; meta = with lib; { description = "A statically typed language for the Erlang VM"; From 4038ca6ccc698c9b5f1c712339784457bbe4196b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 00:07:08 +0000 Subject: [PATCH 22/23] mimir: 2.1.0 -> 2.2.0 --- pkgs/servers/monitoring/mimir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 9a837073eee..57f99a4388c 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mimir"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-n7Vzp/GQIC+Mryu9SycMZ3ScPo5O+5tA4TdigpKzmLU="; + sha256 = "sha256-c2WOE7lm62uZ+oVSWd2Gyo0UZJaf9yFzEQZvcwpvshA="; }; vendorSha256 = null; From 4024ac355868d55963883ca8b1904a66dd0c1dae Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 29 Jul 2022 10:38:45 +0800 Subject: [PATCH 23/23] openpgp-card-tools: init at 0.0.12 --- .../security/openpgp-card-tools/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/openpgp-card-tools/default.nix diff --git a/pkgs/tools/security/openpgp-card-tools/default.nix b/pkgs/tools/security/openpgp-card-tools/default.nix new file mode 100644 index 00000000000..572c862b7f1 --- /dev/null +++ b/pkgs/tools/security/openpgp-card-tools/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +, pkg-config +, pcsclite +, nettle +, PCSC +, testers +, openpgp-card-tools +}: + +rustPlatform.buildRustPackage rec { + pname = "openpgp-card-tools"; + version = "0.0.12"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-3OKOMe7Uj+8qpzfu0DzqwIGa/QJ0YoKczPN9W8HXJZU="; + }; + + cargoHash = "sha256-gq17BXorXrlJx4zlvLuOT8XGUCqZXFDSxgs/Fv9dChk="; + + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; + buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; + + passthru = { + tests.version = testers.testVersion { + package = openpgp-card-tools; + }; + }; + + meta = with lib; { + description = "CLI tools for OpenPGP cards"; + homepage = "https://gitlab.com/openpgp-card/openpgp-card"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "opgpcard"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e8c0bd84f0..f31130a7f6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20462,6 +20462,10 @@ with pkgs; openpa = callPackage ../development/libraries/openpa { }; + openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; + opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph {