From 3db7a3ab006a891f226f36a77d9d3c553d5e7e06 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 19:40:31 +0000 Subject: [PATCH 01/27] maintainers/team-list: Add team gitlab --- maintainers/team-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index cbf4b0dc480d..93ac8f8a56c0 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -297,6 +297,18 @@ with lib.maintainers; { shortName = "Geospatial"; }; + gitlab = { + members = [ + globin + krav + talyz + yayayayaka + yuka + ]; + scope = "Maintain gitlab packages."; + shortName = "gitlab"; + }; + golang = { members = [ kalbasit From e52907eb4796382890a99ee50582f2eaef30999f Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:04:44 +0000 Subject: [PATCH 02/27] gitlab: Add gitlab team members to maintainers --- pkgs/applications/version-management/gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 105c2ce3e476..cac1a1760ca5 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ globin krav talyz yayayayaka yuka ]; + maintainers = teams.gitlab.members; } // (if gitlabEnterprise then { license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE From 5c64716a89f1ac525aa0852c2e1915c0881a7a3a Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:25:19 +0000 Subject: [PATCH 03/27] gitaly: Add gitlab team members to maintainers --- pkgs/applications/version-management/gitlab/gitaly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index f668d1050644..f727f7bc4d8e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -68,7 +68,7 @@ buildGoModule ({ homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ roblabla globin talyz yayayayaka ]; + maintainers = teams.gitlab.members; license = licenses.mit; }; } // commonOpts) From 314cc14e7e9b7591f0befed5b23e688950d298b3 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:25:55 +0000 Subject: [PATCH 04/27] gitlab-pages: Add gitlab team members to maintainers --- .../version-management/gitlab/gitlab-pages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index fe2b8deaa070..cf968f2a9f94 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://gitlab.com/gitlab-org/gitlab-pages"; changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.gitlab.members; }; } From be9536f47033cbc226d96ed4632aaff8eaef18cb Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:26:34 +0000 Subject: [PATCH 05/27] gitlab-shell: Add gitlab team members to maintainers --- .../version-management/gitlab/gitlab-shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index d2d8a372e5c3..2c9c66279cee 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ globin talyz yayayayaka ]; + maintainers = teams.gitlab.members; license = licenses.mit; }; } From 517fb6a862cbc451340a9b38553c3ade3b774150 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:27:47 +0000 Subject: [PATCH 06/27] gitlab-workhorse: Add gitlab team members to maintainers --- .../version-management/gitlab/gitlab-workhorse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b9427e0e34c8..8f8c1f010bf6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ globin talyz yayayayaka ]; + maintainers = teams.gitlab.members; license = licenses.mit; }; } From 27d73b3d46799064eaca9a3da99ebfca75ad6f0e Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:05:46 +0000 Subject: [PATCH 07/27] nixos/gitlab: Add gitlab team members to maintainers --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 12c67c5f5a1e..49ad6e6b7d96 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1665,5 +1665,5 @@ in { }; meta.doc = ./gitlab.md; - + meta.maintainers = teams.gitlab.members; } From 7312a90546791db2c8276a93ed8655db09675902 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:06:35 +0000 Subject: [PATCH 08/27] gitlab-runner: Add gitlab team members to maintainers --- .../tools/continuous-integration/gitlab-runner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index f38dd58438ba..7e0be0ec31a0 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -63,6 +63,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm globin yayayayaka ]; + maintainers = with maintainers; [ bachp zimbatm globin ] ++ teams.gitlab.members; }; } From 2681d4ff1285f65ec3428a2f2ab68e2d6dbec762 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 20:07:32 +0000 Subject: [PATCH 09/27] nixos/gitlab-runner: Add gitlab team members to maintainers --- nixos/modules/services/continuous-integration/gitlab-runner.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 53f39f40daa5..10a2fe8a44dd 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -611,4 +611,6 @@ in { (mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "advertiseAddress" ] [ "services" "gitlab-runner" "settings" "session_server" "advertise_address" ] ) (mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "sessionTimeout" ] [ "services" "gitlab-runner" "settings" "session_server" "session_timeout" ] ) ]; + + meta.maintainers = teams.gitlab.members; } From 4df93f374d8372bd1af11a8967e8ac20c4a3b99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tobias=20Christ?= Date: Sun, 2 Jul 2023 17:41:08 +0200 Subject: [PATCH 10/27] python3Packages.mautrix: 0.19.16 -> 0.20.0 Diff: https://github.com/mautrix/python/compare/v0.19.16...v0.20.0 Changelog: https://github.com/mautrix/python/releases/tag/v0.20.0 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index b97730fbd4d1..74a44ad69287 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.19.16"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk="; + hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; }; propagatedBuildInputs = [ From bb55edd515ac095c775652923d38b40637c690e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tobias=20Christ?= Date: Sun, 2 Jul 2023 17:44:51 +0200 Subject: [PATCH 11/27] mautrix-telegram: 0.14.0 -> 0.14.1 Add new configuration option regarding IPv6 support to the example. Diff: https://github.com/mautrix/telegram/compare/refs/tags/v0.14.0...v0.14.1 Changelog: https://github.com/mautrix/telegram/releases/tag/v0.14.1 --- nixos/modules/services/matrix/mautrix-telegram.nix | 3 +++ pkgs/servers/mautrix-telegram/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index b64cc71d9873..17032ed808e9 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -80,6 +80,9 @@ in { "example.com" = "full"; "@admin:example.com" = "admin"; }; + telegram = { + connection.use_ipv6 = true; + }; } ''; description = lib.mdDoc '' diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 1f1404f20d8c..6caff9c3e3d0 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -9,11 +9,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.28.0a9"; + version = "1.29.0a2"; pname = "tulir-telethon"; src = fetchPypi { inherit pname version; - hash = "sha256-7lRoJYhy9c8RxJTW1/7SrNtA36mwIrPcyRMPVNhWJTk="; + hash = "sha256-pTN8mJxbXvnhL11PCH/ZLeSqW0GV124Y3JnDcLek8JE="; }; doCheck = false; }); @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.14.0"; + version = "0.14.1"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "refs/tags/v${version}"; - hash = "sha256-OPWa3jqaLnV7M1Q77N10A3HT65dNon6RWE5mbQRvjEs="; + hash = "sha256-n3gO8R5lVl/8Tgo2tPzM64O2BRhoitsuPIC87bfxczc="; }; format = "setuptools"; From 339379873ce7107a3ea7b483a3329fed1accc17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tobias=20Christ?= Date: Mon, 3 Jul 2023 19:47:30 +0200 Subject: [PATCH 12/27] Revert "python3Packages.mautrix: 0.19.16 -> 0.20.0" This reverts commit 4df93f374d8372bd1af11a8967e8ac20c4a3b99b. Updating mautrix would break dependencies. --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 74a44ad69287..b97730fbd4d1 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.0"; + version = "0.19.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; + hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk="; }; propagatedBuildInputs = [ From f979f99b32c62e701e5f29f9acfd643ad8cf6626 Mon Sep 17 00:00:00 2001 From: Galen Huntington Date: Mon, 3 Jul 2023 18:57:25 -0700 Subject: [PATCH 13/27] maintainers: add galen --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e274c51c7346..09d14be5e5b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5751,6 +5751,11 @@ githubId = 7047019; name = "Florent Becker"; }; + galen = { + github = "galenhuntington"; + githubId = 1851962; + name = "Galen Huntington"; + }; gamb = { email = "adam.gamble@pm.me"; github = "gamb"; From 808f40f4cbb5756fe6b9946df3e3dd5e7a704676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tobias=20Christ?= Date: Tue, 4 Jul 2023 19:34:13 +0200 Subject: [PATCH 14/27] mautrix-telegram: Add override for mautrix Due to tight version constraints on the mautrix library, this commit introduces an override pinning the exact version necessary. --- pkgs/servers/mautrix-telegram/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 6caff9c3e3d0..f2ef7060eabb 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -17,6 +17,14 @@ let }; doCheck = false; }); + mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { + version = "0.20.0"; + src = oldAttrs.src.override { + rev = "refs/tags/v${version}"; + hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; + }; + doCheck = false; + }); }; }; in From 48ecdb1e92a10539e83dc4250732e06753a82cd9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 5 Jul 2023 11:03:15 -0400 Subject: [PATCH 15/27] cargo-cranky: init at 0.3.0 https://github.com/ericseppanen/cargo-cranky --- .../tools/rust/cargo-cranky/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-cranky/default.nix diff --git a/pkgs/development/tools/rust/cargo-cranky/default.nix b/pkgs/development/tools/rust/cargo-cranky/default.nix new file mode 100644 index 000000000000..1af60f183fdc --- /dev/null +++ b/pkgs/development/tools/rust/cargo-cranky/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cranky"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ericseppanen"; + repo = "cargo-cranky"; + rev = "v${version}"; + hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas="; + }; + + cargoHash = "sha256-jmyrtaJTdZlffC7i5k7z9BEsHAs1rPTCs2/jgq1Jt6Y="; + + meta = with lib; { + description = "An easy to configure wrapper for Rust's clippy"; + homepage = "https://github.com/ericseppanen/cargo-cranky"; + changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/${src.rev}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e60adcfe1bc4..b167e4160342 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16687,6 +16687,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-component = callPackage ../development/tools/rust/cargo-component { }; + cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; From 4395d46948d1838ecc8e4727d53058742b841a6a Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 5 Jul 2023 11:30:06 -0400 Subject: [PATCH 16/27] wasmer-pack: init at 0.7.1 https://github.com/wasmerio/wasmer-pack --- .../tools/misc/wasmer-pack/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/misc/wasmer-pack/default.nix diff --git a/pkgs/development/tools/misc/wasmer-pack/default.nix b/pkgs/development/tools/misc/wasmer-pack/default.nix new file mode 100644 index 000000000000..0f5e85349833 --- /dev/null +++ b/pkgs/development/tools/misc/wasmer-pack/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "wasmer-pack"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-pack"; + rev = "v${version}"; + hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E="; + }; + + cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "-p=wasmer-pack-cli" ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + description = "Import your WebAssembly code just like any other dependency"; + homepage = "https://github.com/wasmerio/wasmer-pack"; + changelog = "https://github.com/wasmerio/wasmer-pack/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e60adcfe1bc4..e336a1aa448a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19913,6 +19913,8 @@ with pkgs; wails = callPackage ../development/tools/wails { }; + wasmer-pack = callPackage ../development/tools/misc/wasmer-pack { }; + whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; whatstyle = callPackage ../development/tools/misc/whatstyle { From 108248096898961e064cd054b209b589936182be Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 5 Jul 2023 17:07:40 -0400 Subject: [PATCH 17/27] regex-cli: init at 0.1.0 https://github.com/rust-lang/regex/tree/master/regex-cli --- .../tools/misc/regex-cli/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/regex-cli/default.nix diff --git a/pkgs/development/tools/misc/regex-cli/default.nix b/pkgs/development/tools/misc/regex-cli/default.nix new file mode 100644 index 000000000000..e6bac18d98cb --- /dev/null +++ b/pkgs/development/tools/misc/regex-cli/default.nix @@ -0,0 +1,23 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "regex-cli"; + version = "0.1.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-4l12Eaab1G3SP3Srxt3UR9MCRlLm0KDPx/Z2rQpSQR0="; + }; + + cargoHash = "sha256-fAIYWzfzq/VuBc684SG7p365uudX9M/TtVdMahyrmdk="; + + meta = with lib; { + description = "A command line tool for debugging, ad hoc benchmarking and generating regular expressions"; + homepage = "https://github.com/rust-lang/regex/tree/master/regex-cli"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c65b5d6e798f..c5b622c270c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19509,6 +19509,8 @@ with pkgs; regclient = callPackage ../development/tools/regclient { }; inherit (regclient) regbot regctl regsync; + regex-cli = callPackage ../development/tools/misc/regex-cli { }; + reno = callPackage ../development/tools/reno { }; re2c = callPackage ../development/tools/parsing/re2c { }; From 48c8e69ddacccd555d51dacef731e05a43598cd1 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Jul 2023 21:24:37 +0300 Subject: [PATCH 18/27] vscode: 1.79.2 -> 1.80.0 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 381de9e9462c..9f1450a53cfb 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -24,21 +24,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ykchyksfc7aqar2f691jva36v0syn575rj6hydws0y79pplvinh"; - x86_64-darwin = "1zayc6z4zfkjb238dx51b1f2s9clqzhxhvb91j5w0ayqk735bd5d"; - aarch64-linux = "1nbnprf6sjqqrw7qha0r6f78n7jjvhn8kv1wxh5pi535nlmxza14"; - aarch64-darwin = "0lijfhlbj0vsjd6kdfr0fmks2spjazrzwnlxxw0ka80psxghavs6"; - armv7l-linux = "0dhgb1lxq8r4fk6nkb14h986w3dj19llvjvn8jq4mxdbscnik2j5"; + x86_64-linux = "09prf6sv0znsrmysflbsa8f9gsdjxjscl5jmwz1b7gx06ambkx40"; + x86_64-darwin = "1xgxf5drrc8dhl3hjp7xia0ccb5244avr1ckmqkxdcxy70h1s4ki"; + aarch64-linux = "0fjhw903kyx38v22fr253cx9xqwbgak7ksxsp30ngyzh5zpp8854"; + aarch64-darwin = "0klbmgjy3bwjb8svggd5j0mlxp3ni711jp2bnh35n64z8ai29rqk"; + armv7l-linux = "03im7n827fmdm6g5x7n63fiac9g9p3rrwbj2na0ljyn5072mmh6d"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.79.2"; + version = "1.80.0"; pname = "vscode"; # This is used for VS Code - Remote SSH test - rev = "695af097c7bd098fbf017ce3ac85e09bbc5dda06"; + rev = "660393deaaa6d1996740ff4880f1bad43768c814"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -62,7 +62,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0xbc20vh6rj2g6wvw73k8wqm1lxwirph3swwilq5f9hmkzha1z7i"; + sha256 = "1pkpfsrd686whl9zghxxyiw3x696msh24cf67h2k9yp1d4a9cdz8"; }; }; From cf2d3129fa8b3477c9aba3e14b8458423b5b0806 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Jul 2023 21:06:39 +0200 Subject: [PATCH 19/27] kea: 2.2.0 -> 2.4.0 https://downloads.isc.org/isc/kea/2.4.0/Kea-2.4.0-ReleaseNotes.txt --- pkgs/tools/networking/kea/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 466ba5715287..9ee9a3df0f75 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "2.2.0"; # only even minor versions are stable + version = "2.4.0"; # only even minor versions are stable src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI="; + hash = "sha256-OjPNCNwzGf9UTmu/LAQpBCEG9AUevhFdwbsmJclQA/c="; }; patches = [ @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://downloads.isc.org/isc/kea/${version}/Kea-${version}-ReleaseNotes.txt"; homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' From 048b14d40faeea86231c9ce7ca301fc028e6b337 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Jul 2023 21:59:51 +0200 Subject: [PATCH 20/27] nixos/tests: Fix delegated prefix in prefix-delegation test Prefix/pool validation since kea 2.4.0 is now complaining about overlapping and not properly aligned prefix lengths. --- nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index e6bed6b9218f..54f371e6c070 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -67,14 +67,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { interfaces-config.interfaces = [ "eth1" ]; subnet6 = [ { interface = "eth1"; - subnet = "2001:DB8:F::/36"; + subnet = "2001:DB8::/32"; pd-pools = [ { - prefix = "2001:DB8:F::"; + prefix = "2001:DB8:1000::"; prefix-len = 36; delegated-len = 48; } ]; pools = [ { - pool = "2001:DB8:0000:0000:FFFF::-2001:DB8:0000:0000:FFFF::FFFF"; + pool = "2001:DB8:0000:0000::-2001:DB8:0FFF:FFFF::FFFF"; } ]; } ]; From 5a5c6fd6755bc26b8d47a45ab1a964117fd5cff1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 23:10:47 +0200 Subject: [PATCH 21/27] python311Packages.in-n-out: 0.1.7 -> 0.1.8 Changelog: https://github.com/pyapp-kit/in-n-out/blob/v0.1.8/CHANGELOG.md --- .../python-modules/in-n-out/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/in-n-out/default.nix b/pkgs/development/python-modules/in-n-out/default.nix index f431ced8efe3..baffe42e0f36 100644 --- a/pkgs/development/python-modules/in-n-out/default.nix +++ b/pkgs/development/python-modules/in-n-out/default.nix @@ -6,27 +6,28 @@ , pytestCheckHook , pythonAtLeast , pythonOlder -, setuptools -, setuptools-scm +, hatchling +, hatch-vcs , toolz }: buildPythonPackage rec { pname = "in-n-out"; - version = "0.1.7"; - format = "setuptools"; + version = "0.1.8"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-g4Dw0ejB6BxcMpRZGgxNDeAyuY93UROVsIrAwv6vSqY="; + pname = "in_n_out"; + inherit version; + hash = "sha256-gWKvh4fmgutLNtBH+RQZnYDxEk46QUIM1T3mgOfQolQ="; }; nativeBuildInputs = [ cython_3 - setuptools - setuptools-scm + hatchling + hatch-vcs ]; propagatedBuildInputs = [ @@ -52,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for dependency injection and result processing"; - homepage = "https://app-model.readthedocs.io/"; + homepage = "https://github.com/pyapp-kit/in-n-out"; changelog = "https://github.com/pyapp-kit/in-n-out/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; From c97ad2763a42263966f9dd939bd06e22f13ed457 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 7 Jul 2023 12:52:12 +0200 Subject: [PATCH 22/27] rm Profpatsch from stuff without interest/capacity of maintaining MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For tree-sitter I’m still interested, but don’t want to be first in the list :) --- maintainers/team-list.nix | 1 - pkgs/applications/accessibility/dasher/default.nix | 2 +- pkgs/applications/networking/feedreaders/rss2email/default.nix | 2 +- pkgs/applications/version-management/git-vendor/default.nix | 2 +- pkgs/data/fonts/fira-code/symbols.nix | 2 +- pkgs/data/fonts/hasklig/default.nix | 2 +- pkgs/data/fonts/league-of-moveable-type/default.nix | 2 +- pkgs/data/fonts/raleway/default.nix | 2 +- pkgs/development/compilers/purescript/psc-package/default.nix | 2 +- pkgs/development/libraries/bearssl/default.nix | 2 +- pkgs/development/mobile/adbfs-rootless/default.nix | 2 +- pkgs/development/tools/buildah/default.nix | 2 +- pkgs/development/tools/parsing/tree-sitter/default.nix | 2 +- pkgs/development/tools/shellcheck/default.nix | 2 +- pkgs/games/anki/default.nix | 2 +- pkgs/games/garden-of-coloured-lights/default.nix | 2 +- pkgs/servers/gonic/default.nix | 2 +- 17 files changed, 16 insertions(+), 17 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c21f84773873..1bc62617b6d9 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -594,7 +594,6 @@ with lib.maintainers; { nix = { members = [ - Profpatsch eelco grahamc pierron diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 328ff2c5c570..c159f2579eae 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { homepage = "https://www.inference.org.uk/dasher/"; description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures"; license = lib.licenses.gpl2Only; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 132fe7f627cc..2653af6f51ae 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { description = "A tool that converts RSS/Atom newsfeeds to email"; homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; - maintainers = with maintainers; [ Profpatsch ekleog ]; + maintainers = with maintainers; [ ekleog ]; }; passthru.tests = { smoke-test = nixosTests.rss2email; diff --git a/pkgs/applications/version-management/git-vendor/default.nix b/pkgs/applications/version-management/git-vendor/default.nix index a4e0290d3102..9d72cc18b94f 100644 --- a/pkgs/applications/version-management/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-vendor/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { ''; homepage = "https://github.com/brettlangdon/git-vendor"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 35d51bb340c9..b31885b3714b 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { See https://github.com/tonsky/FiraCode/issues/211. ''; license = licenses.ofl; - maintainers = [ maintainers.Profpatsch ]; + maintainers = [ ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; } diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index a69f8f743cbe..b0d37aca9e12 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ davidrusu Profpatsch ]; + maintainers = with maintainers; [ davidrusu ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 905cf0a9adec..236a2e39ed10 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -57,6 +57,6 @@ symlinkJoin { license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ bergey minijackson Profpatsch ]; + maintainers = with lib.maintainers; [ bergey minijackson ]; }; } diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index ffaca35c6b9e..c8a91165f30a 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -35,6 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://www.theleagueofmoveabletype.com/raleway"; license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ minijackson Profpatsch ]; + maintainers = with lib.maintainers; [ minijackson ]; }; }) diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 88f7adce5a1a..d291b1f3cfee 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A package manager for PureScript based on package sets"; license = licenses.bsd3; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix index ba55c6d8932a..b8dc2e1e1806 100644 --- a/pkgs/development/libraries/bearssl/default.nix +++ b/pkgs/development/libraries/bearssl/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index cba73e23fd9c..674988dccb17 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; - maintainers = with maintainers; [ Profpatsch aleksana ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3031a1339778..effadab1a67a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -69,6 +69,6 @@ buildGoModule rec { homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 30adef7ccab1..b9d7cfcd6afd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -163,6 +163,6 @@ rustPlatform.buildRustPackage { * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; license = licenses.mit; - maintainers = with maintainers; [ Profpatsch oxalica ]; + maintainers = with maintainers; [ oxalica Profpatsch ]; }; } diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 59b744e21df1..1ce28d4832e5 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -46,6 +46,6 @@ let in overrideMeta shellcheck (old: { - maintainers = with lib.maintainers; [ Profpatsch zowoq ]; + maintainers = with lib.maintainers; [ zowoq ]; outputsToInstall = [ "bin" "man" "doc" ]; }) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 9b3c3367d3d2..299897afda49 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -277,6 +277,6 @@ python3.pkgs.buildPythonApplication { ''; license = licenses.agpl3Plus; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ oxij Profpatsch euank ]; + maintainers = with maintainers; [ oxij euank ]; }; } diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 3223cc458052..7012449f6afc 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; homepage = "https://garden.sourceforge.net/drupal/"; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3; }; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index 7178694868b8..34f8db9e43c3 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -49,7 +49,7 @@ buildGoModule rec { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } From fa2b33ae06a9620694483684a290995bdb145df1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jul 2023 11:21:15 +0000 Subject: [PATCH 23/27] python310Packages.trimesh: 3.22.2 -> 3.22.3 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d94485386a87..9d0bc808a917 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.22.2"; + version = "3.22.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-YT9Ponvz19SqHAJUO9/KSaBPQrW2W++MRNgF/8L0OPc="; + hash = "sha256-PrXqBYOEFCXIZsihhImh1swbGFRCoyTGl82dkfBE7aU="; }; nativeBuildInputs = [ setuptools ]; From cbec01c9c7b8e3dca670ef4c50ca08b6a1915607 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Fri, 7 Jul 2023 19:55:12 +0800 Subject: [PATCH 24/27] paperwm: fix broken source hash --- pkgs/desktops/gnome/extensions/paperwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 6b3a9ccf5454..9bfa5f0761b8 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "paperwm"; repo = "PaperWM"; rev = "v${finalAttrs.version}"; - hash = "sha256-QTeUbhqHi1fMhw5cgT5S6JGgDaPhBuMwn4nRcp7mSMU="; + hash = "sha256-oGBnQGtx2ku4cfgZkZ3OdHlVuiYR8hy1eYDWDZP3fn4="; }; dontConfigure = true; From 319e4db197ac2544f3ed7f0e6e5717edabb0f31c Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Fri, 7 Jul 2023 09:34:08 -0300 Subject: [PATCH 25/27] millet: 0.12.4 -> 0.12.5 --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index b4899f0c79d1..7d9ebf6b19b6 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.4" +version = "0.12.5" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.12.4" +version = "0.12.5" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.4" +version = "0.12.5" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.4" +version = "0.12.5" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.4" +version = "0.12.5" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.4" +version = "0.12.5" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.4" +version = "0.12.5" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.4" +version = "0.12.5" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.4" +version = "0.12.5" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.12.4" +version = "0.12.5" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.4" +version = "0.12.5" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.4" +version = "0.12.5" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.4" +version = "0.12.5" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.4" +version = "0.12.5" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.4" +version = "0.12.5" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.4" +version = "0.12.5" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.4" +version = "0.12.5" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.4" +version = "0.12.5" [[package]] name = "sml-parse" -version = "0.12.4" +version = "0.12.5" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.4" +version = "0.12.5" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.4" +version = "0.12.5" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.4" +version = "0.12.5" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.4" +version = "0.12.5" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.4" +version = "0.12.5" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.4" +version = "0.12.5" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.4" +version = "0.12.5" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.4" +version = "0.12.5" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.4" +version = "0.12.5" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 59175f153e77..cd668d42da23 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-RSi6rJL0RG1A1mKn4BznQjBfPlBvEC73vx0YevqvZ3E="; + hash = "sha256-sG4mowQMBiFAgTO1Rf+NCD2/GRgaqmmEQ1oSxn3hGTM="; }; cargoLock = { From 73d174c62ba412c79358895282b6ecee9497469a Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Fri, 7 Jul 2023 09:35:32 -0300 Subject: [PATCH 26/27] vscode-extensions.azdavis.millet: 0.3.5 -> 0.12.5 --- pkgs/applications/editors/vscode/extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cfbc75de3821..f38ab88aa90f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -372,13 +372,13 @@ let mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.3.5"; - sha256 = "sha256-lQ7EMs6nsTEgP9BESMpyoZG7QVOe7DXzfg/iZr1+DCQ="; + version = "0.12.5"; + sha256 = "sha256-gJIxCdoxWGThalY+qJ930UtRLFkvr34LfaSioAZH9TQ="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/lang-srv"' package.json | sponge package.json + jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json ''; meta = { description = "Standard ML support for VS Code"; From 4dd813ffa0c8594f3506c7f9fd6625e3b8c38a42 Mon Sep 17 00:00:00 2001 From: Galen Huntington Date: Mon, 3 Jul 2023 19:30:33 -0700 Subject: [PATCH 27/27] xv: init at 4.1.1 --- pkgs/applications/graphics/xv/default.nix | 38 +++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/graphics/xv/default.nix diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/applications/graphics/xv/default.nix new file mode 100644 index 000000000000..8b26c42b9cac --- /dev/null +++ b/pkgs/applications/graphics/xv/default.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + xorg, + libpng, + libwebp, + libtiff, + libjpeg, + jasper, +}: + +stdenv.mkDerivation rec { + pname = "xv"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "jasper-software"; + repo = "xv"; + rev = "v${version}"; + sha256 = "vwSUKWr4Hffx04ATUI58m7UOS/lVTnIVDC3ZTWRwJMM="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ xorg.libX11 xorg.libXt libpng libwebp libtiff jasper ]; + + meta = { + description = "Classic image viewer and editor for X."; + homepage = "http://www.trilon.com/xv/"; + license = { + fullName = "XV License"; + url = "https://github.com/jasper-software/xv/blob/main/src/README"; + free = false; + }; + maintainers = with lib.maintainers; [ galen ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e12893e27e0..10e25d1a7c62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1847,7 +1847,6 @@ mapAliases ({ ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 - xv = xxv; # Added 2020-02-22 xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c79afe4956b..380b22765938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36094,6 +36094,8 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; + xv = callPackage ../applications/graphics/xv { }; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; xzgv = callPackage ../applications/graphics/xzgv { };