From 656a7235d67be089c3e14bed737d9040da5b69b8 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 22 Feb 2024 20:13:04 +0900 Subject: [PATCH 01/65] vimPlugins.ddc-vim: init at 2024-02-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4d80030d7aa3..38857b05f06b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2910,6 +2910,18 @@ final: prev: meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; + ddc-vim = buildVimPlugin { + pname = "ddc.vim"; + version = "2024-02-09"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc.vim"; + rev = "e5daae126a42e6c736af9743fbb69263d117f328"; + sha256 = "0iq3bbf07g12mn8m2jz7w2phr3sb2gzy6ajc00316dvy4l65x5jh"; + }; + meta.homepage = "https://github.com/Shougo/ddc.vim/"; + }; + debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; version = "2024-07-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5c34c77a3f91..159a236d3f13 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -662,6 +662,10 @@ ''; }; + ddc-vim = super.ddc-vim.overrideAttrs { + dependencies = with self; [ denops-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 64b5a4776d05..7f475bd5c91e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -242,6 +242,7 @@ https://github.com/scottmckendry/cyberdream.nvim/,, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, +https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, https://github.com/kristijanhusak/defx-git/,, From 14cefb10280a5c1c7d43fa39431e20bc622a0d58 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 22 Feb 2024 20:15:48 +0900 Subject: [PATCH 02/65] vimPlugins.ddc-source-lsp: init at 2024-01-15 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 38857b05f06b..19f38c15c426 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2910,6 +2910,18 @@ final: prev: meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; + ddc-source-lsp = buildVimPlugin { + pname = "ddc-source-lsp"; + version = "2024-01-15"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-source-lsp"; + rev = "ad43a10726ebdacea80fafee5034247816fb099d"; + sha256 = "1agrpcq75j4m5ac7qs292kyq8aqwmm0filvpkw3775hcgv1gkxz3"; + }; + meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; + }; + ddc-vim = buildVimPlugin { pname = "ddc.vim"; version = "2024-02-09"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 159a236d3f13..9efcd6167e3d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -662,6 +662,10 @@ ''; }; + ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + ddc-vim = super.ddc-vim.overrideAttrs { dependencies = with self; [ denops-vim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7f475bd5c91e..cc94353ed9c2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -242,6 +242,7 @@ https://github.com/scottmckendry/cyberdream.nvim/,, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, +https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, From 64e3bc78e9fee96f5e00ba48541946c95254fe45 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 22 Feb 2024 20:18:31 +0900 Subject: [PATCH 03/65] vimPlugins.ddc-filter-matcher_head: init at 2023-12-25 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19f38c15c426..2a49d0766899 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2910,6 +2910,18 @@ final: prev: meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; + ddc-filter-matcher_head = buildVimPlugin { + pname = "ddc-filter-matcher_head"; + version = "2023-12-25"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-filter-matcher_head"; + rev = "17b656e38221743290bd0cd26f5b177efe318d77"; + sha256 = "0532x2zglfr341as2r160p673yxvch801ywxcka91fm0cb4j6gsl"; + }; + meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; + }; + ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; version = "2024-01-15"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9efcd6167e3d..08eb491983d8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -662,6 +662,10 @@ ''; }; + ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { dependencies = with self; [ ddc-vim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cc94353ed9c2..4ab98f02b785 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -242,6 +242,7 @@ https://github.com/scottmckendry/cyberdream.nvim/,, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, +https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, From fde6c03762f7362fd28068e540c8cebf2549a183 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 22 Feb 2024 20:18:52 +0900 Subject: [PATCH 04/65] vimPlugins.ddc-filter-sorter_rank: init at 2023-09-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 2a49d0766899..616050357f82 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2922,6 +2922,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; }; + ddc-filter-sorter_rank = buildVimPlugin { + pname = "ddc-filter-sorter_rank"; + version = "2023-09-11"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-filter-sorter_rank"; + rev = "fccbd5892dc57f44f07cddcbef9d465838b36cee"; + sha256 = "1cs4c7q8r60q7pxacl0f091ap9kjsqmc19mlb2rwrwi76v6x1avs"; + }; + meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; + }; + ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; version = "2024-01-15"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 08eb491983d8..b5907d382d48 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -674,6 +674,10 @@ dependencies = with self; [ denops-vim ]; }; + ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4ab98f02b785..a173733754af 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -243,6 +243,7 @@ https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, +https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, From ebdf5e9126f13f67a8fc9e48a6b42627ec2db109 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 22 Feb 2024 20:39:05 +0900 Subject: [PATCH 05/65] vimPlugins.ddc-ui-native: init at 2024-01-10 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 616050357f82..8891cd034aaf 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2946,6 +2946,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; }; + ddc-ui-native = buildVimPlugin { + pname = "ddc-ui-native"; + version = "2024-01-10"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-ui-native"; + rev = "3f370d0da93bd47bb3a937a0c8f8193582eee8c8"; + sha256 = "1knfvwcd7wfiy1vh2m9gwr5wh1crn60mmvpjwdqa739m8nrdfw79"; + }; + meta.homepage = "https://github.com/Shougo/ddc-ui-native/"; + }; + ddc-vim = buildVimPlugin { pname = "ddc.vim"; version = "2024-02-09"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b5907d382d48..fd8cd767ae03 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -678,6 +678,10 @@ dependencies = with self; [ ddc-vim ]; }; + ddc-ui-native = super.ddc-ui-native.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a173733754af..7424f32e28ab 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -245,6 +245,7 @@ https://github.com/glepnir/dashboard-nvim/,, https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, +https://github.com/Shougo/ddc-ui-native/,HEAD, https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, From 067065d5fb56b0e5aff196d9506e7149d5dc7c6f Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 22 Feb 2024 20:40:12 +0900 Subject: [PATCH 06/65] vimPlugins.ddc-ui-pum: init at 2023-10-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8891cd034aaf..19c8f38c66d7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2958,6 +2958,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/ddc-ui-native/"; }; + ddc-ui-pum = buildVimPlugin { + pname = "ddc-ui-pum"; + version = "2023-10-07"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-ui-pum"; + rev = "6fd98ba227889883bbf75405506c451feaae6ef8"; + sha256 = "1yy572i672ha5zlxkda6lv5mp2y5yq0sd1ffpa6my59rzv86ixr7"; + }; + meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; + }; + ddc-vim = buildVimPlugin { pname = "ddc.vim"; version = "2024-02-09"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fd8cd767ae03..bb78638b0a76 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -682,6 +682,10 @@ dependencies = with self; [ ddc-vim ]; }; + ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { + dependencies = with self; [ ddc-vim pum-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7424f32e28ab..166061f20679 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -246,6 +246,7 @@ https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc-ui-native/,HEAD, +https://github.com/Shougo/ddc-ui-pum/,HEAD, https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, From 31958e50af05fd3febd8249c0ef394f541917726 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 5 Mar 2024 00:31:48 +0900 Subject: [PATCH 07/65] vimPlugins: update ddc-* plugins --- .../editors/vim/plugins/generated.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19c8f38c66d7..27cc9bd788c9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2912,72 +2912,72 @@ final: prev: ddc-filter-matcher_head = buildVimPlugin { pname = "ddc-filter-matcher_head"; - version = "2023-12-25"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-matcher_head"; - rev = "17b656e38221743290bd0cd26f5b177efe318d77"; - sha256 = "0532x2zglfr341as2r160p673yxvch801ywxcka91fm0cb4j6gsl"; + rev = "28f60903e1a9f1010ec01575cb99c64e76683466"; + sha256 = "155yp27p3j982cchgjijci7f1vci1idrv7hp6imz5kxxrcdvfcz4"; }; meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; }; ddc-filter-sorter_rank = buildVimPlugin { pname = "ddc-filter-sorter_rank"; - version = "2023-09-11"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-sorter_rank"; - rev = "fccbd5892dc57f44f07cddcbef9d465838b36cee"; - sha256 = "1cs4c7q8r60q7pxacl0f091ap9kjsqmc19mlb2rwrwi76v6x1avs"; + rev = "539584150b922acb549203730d427dd2fd85fe86"; + sha256 = "16d8jx7bq3602wd9a019zh93ifv1bxdnrrjhsa8d8g8zm2wmv47x"; }; meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; }; ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "2024-01-15"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "ad43a10726ebdacea80fafee5034247816fb099d"; - sha256 = "1agrpcq75j4m5ac7qs292kyq8aqwmm0filvpkw3775hcgv1gkxz3"; + rev = "7511be6f82cab3dd9fd1592a9076c19f4273570d"; + sha256 = "0kbm1w89rc3kmh4zi1fn8wskj785a0gq1lr5d1ijrb0i2z237rcy"; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; }; ddc-ui-native = buildVimPlugin { pname = "ddc-ui-native"; - version = "2024-01-10"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-ui-native"; - rev = "3f370d0da93bd47bb3a937a0c8f8193582eee8c8"; - sha256 = "1knfvwcd7wfiy1vh2m9gwr5wh1crn60mmvpjwdqa739m8nrdfw79"; + rev = "2567067b60419a9be265aae5fa480dc51e4ba1c3"; + sha256 = "1lr039vnr1yw0nccr3f20a19f4mnxm12kkr8rlzix4r6j3z6vz0h"; }; meta.homepage = "https://github.com/Shougo/ddc-ui-native/"; }; ddc-ui-pum = buildVimPlugin { pname = "ddc-ui-pum"; - version = "2023-10-07"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-ui-pum"; - rev = "6fd98ba227889883bbf75405506c451feaae6ef8"; - sha256 = "1yy572i672ha5zlxkda6lv5mp2y5yq0sd1ffpa6my59rzv86ixr7"; + rev = "989b3f0acb0d35bfcd0a3b0ec9239ad2a838e478"; + sha256 = "14ysvz1gp2ha6143f60v3nq2s2yybx7b916q8bs845jzk5q7qlwd"; }; meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; }; ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2024-02-09"; + version = "2024-08-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "e5daae126a42e6c736af9743fbb69263d117f328"; - sha256 = "0iq3bbf07g12mn8m2jz7w2phr3sb2gzy6ajc00316dvy4l65x5jh"; + rev = "09f2f778f2da1c2c96965669e9791665455c12eb"; + sha256 = "1ipzlxxlwbzz076cp9ggln2qspgvmnzaqbbq1m1c5rr756d6k7k3"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; }; From 0a9774970be2429ea86c9c778230ebacf3a3f597 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Mon, 26 Aug 2024 22:06:18 +0800 Subject: [PATCH 08/65] fragments: 3.0.0 -> 3.0.1 --- pkgs/by-name/fr/fragments/package.nix | 47 ++++++++++++++------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 7976a2add11b..a3077697781d 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -1,41 +1,42 @@ -{ lib -, stdenv -, fetchFromGitLab -, appstream-glib -, cargo -, dbus -, desktop-file-utils -, git -, glib -, gtk4 -, libadwaita -, meson -, ninja -, openssl -, pkg-config -, rustPlatform -, rustc -, sqlite -, transmission_4 -, wrapGAppsHook4 +{ + lib, + stdenv, + fetchFromGitLab, + appstream-glib, + cargo, + dbus, + desktop-file-utils, + git, + glib, + gtk4, + libadwaita, + meson, + ninja, + openssl, + pkg-config, + rustPlatform, + rustc, + sqlite, + transmission_4, + wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "fragments"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - hash = "sha256-HtulyB1XYBsA595ghJN0EmyJT7DjGUbtJKaMGM3f0I8="; + hash = "sha256-lTOO6ZQWImaFqYZ3qerYYHWj/eOLYU/2k2Wh/ju9Njw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-EUE+Qc+MqsKPqHMYJflZQ6zm3ErW+KLuJq/7HEBf8VM="; + hash = "sha256-7TIjd1ewazJGY8uG6f1B97ol+7+uLjnZVGC2/2DlUdQ="; }; nativeBuildInputs = [ From 67cb78ed56b0ebe532c89034330154e7268bc222 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 26 Aug 2024 17:28:11 +0200 Subject: [PATCH 09/65] portfolio: 0.70.3 -> 0.70.4 https://github.com/portfolio-performance/portfolio/releases/tag/0.70.4 --- pkgs/by-name/po/portfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 6142aa26813a..a7e4b02fbc65 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -35,11 +35,11 @@ let in stdenvNoCC.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.70.3"; + version = "0.70.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-mT8cIoWTVzXyEktuybkC9sTtwlNCftiaMeyHYcyHV8A="; + hash = "sha256-4L2hoWUFAmxyUCbQFWoIQlIhbdyncN0fGFmahPMk0FU="; }; nativeBuildInputs = [ From d603c386f939a30c45205fbcdda550e4be14770b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:21:01 +0200 Subject: [PATCH 10/65] prow: unstable-2020-04-01 -> 0-unstable-2024-08-27 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../networking/cluster/prow/default.nix | 105 ++++++++++-------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 1ef34b011ef8..55e138ccfcd6 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -1,58 +1,71 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ + lib, + buildGoModule, + fetchFromGitHub, + git, +}: buildGoModule rec { - pname = "prow-unstable"; - version = "2020-04-01"; - rev = "32e3b5ce7695fb622381421653db436cb57b47c5"; + pname = "prow"; + version = "0-unstable-2024-08-27"; + rev = "195f38540f39dd3ec95ca2d7086487ec19922e61"; src = fetchFromGitHub { inherit rev; - owner = "kubernetes"; - repo = "test-infra"; - hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; + owner = "kubernetes-sigs"; + repo = "prow"; + hash = "sha256-/OhlJdxPa4rTuT7XIklx8vxprbENfasJYwiJxD4CeXY="; }; - vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; + vendorHash = "sha256-bJ0P/rHp+0zB/Dtp3F3n4AN3xF/A5qoq3lCQVBK+L4w="; - doCheck = false; + # doCheck = false; subPackages = [ - "prow/cmd/admission" - "prow/cmd/branchprotector" - "prow/cmd/checkconfig" - "prow/cmd/clonerefs" - "prow/cmd/cm2kc" - "prow/cmd/config-bootstrapper" - "prow/cmd/crier" - "prow/cmd/deck" - "prow/cmd/entrypoint" - "prow/cmd/exporter" - "prow/cmd/gcsupload" - "prow/cmd/gerrit" - "prow/cmd/hook" - "prow/cmd/horologium" - "prow/cmd/initupload" - "prow/cmd/jenkins-operator" - "prow/cmd/mkbuild-cluster" - "prow/cmd/mkpj" - "prow/cmd/mkpod" - "prow/cmd/peribolos" - "prow/cmd/phaino" - "prow/cmd/phony" - "prow/cmd/pipeline" - "prow/cmd/plank" - "prow/cmd/sidecar" - "prow/cmd/sinker" - "prow/cmd/status-reconciler" - "prow/cmd/sub" - "prow/cmd/tackle" - "prow/cmd/tide" - "prow/cmd/tot" + "cmd/admission" + "cmd/branchprotector" + "cmd/checkconfig" + "cmd/clonerefs" + "cmd/cm2kc" + "cmd/config-bootstrapper" + "cmd/crier" + "cmd/deck" + "cmd/entrypoint" + "cmd/exporter" + "cmd/external-plugins" + "cmd/gangway" + "cmd/gcsupload" + "cmd/generic-autobumper" + "cmd/gerrit" + "cmd/ghproxy" + "cmd/hmac" + "cmd/hook" + "cmd/horologium" + "cmd/initupload" + "cmd/invitations-accepter" + "cmd/jenkins-operator" + "cmd/mkpj" + "cmd/mkpod" + "cmd/moonraker" + "cmd/peribolos" + "cmd/phony" + "cmd/pipeline" + "cmd/prow-controller-manager" + "cmd/sidecar" + "cmd/sinker" + "cmd/status-reconciler" + "cmd/sub" + "cmd/tackle" + "cmd/tide" + "cmd/tot" + "cmd/webhook-server" ]; - meta = with lib; { - description = "Kubernetes based CI/CD system"; + nativeCheckInputs = [ git ]; + + meta = { + description = "Kubernetes based CI/CD system developed to serve the Kubernetes community"; longDescription = '' Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various types of events and report their status to many different services. In @@ -60,9 +73,9 @@ buildGoModule rec { policy enforcement, chat-ops via /foo style commands, and automatic PR merging. ''; - homepage = "https://github.com/kubernetes/test-infra/tree/master/prow"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/kubernetes-sigs/prow"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kalbasit ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From 13419f08762836e22952968c82a10ff59176b72c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:25:08 +0200 Subject: [PATCH 11/65] prow: move to by-name Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../cluster/prow/default.nix => by-name/pr/prow/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/prow/default.nix => by-name/pr/prow/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/by-name/pr/prow/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/prow/default.nix rename to pkgs/by-name/pr/prow/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f232039d14d8..e7fcca612764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38917,8 +38917,6 @@ with pkgs; jx = callPackage ../applications/networking/cluster/jx { }; - prow = callPackage ../applications/networking/cluster/prow { }; - pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { }; tagref = callPackage ../tools/misc/tagref { }; From f25def232a0f6b3e8c35ac342189adec4c5c4bd2 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 29 Aug 2024 12:37:00 +0300 Subject: [PATCH 12/65] nixos/tests/ec2-nixops: fix build - change image format to qcow2 - add 10 minute meta.timeout - add 2 minute timeout to ssh check --- nixos/tests/ec2.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index e649761d029d..4511a37854ea 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -22,6 +22,8 @@ let ln -s vda1 /dev/xvda1 ''; + amazonImage.format = "qcow2"; + # In a NixOS test the serial console is occupied by the "backdoor" # (see testing/test-instrumentation.nix) and is incompatible with # the configuration in virtualisation/amazon-image.nix. @@ -53,7 +55,7 @@ let } ]; }).config; - image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd"; + image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.qcow2"; sshKeys = import ./ssh-keys.nix pkgs; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; @@ -63,6 +65,7 @@ let in { boot-ec2-nixops = makeEc2Test { name = "nixops-userdata"; + meta.timeout = 600; inherit image; sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! @@ -95,7 +98,7 @@ in { machine.succeed( "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" ) - machine.succeed("ssh -o BatchMode=yes localhost exit") + machine.succeed("ssh -o BatchMode=yes localhost exit", timeout=120) # Test whether the root disk was resized. blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":")) From 6280d2eadb31399f1bb4be83e1431fa5c173e72c Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 2 Sep 2024 12:56:47 +0200 Subject: [PATCH 13/65] radicle-node: 1.0.0-rc.14 -> 1.0.0-rc.16 Signed-off-by: Florian Brandes --- pkgs/by-name/ra/radicle-node/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 2161d39de828..24df6d28bb02 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -18,15 +18,15 @@ , xdg-utils }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.14"; + version = "1.0.0-rc.16"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-vqLDutaLeRuqRu8R9+0x2sDKxBrDeJ1RgKAiedkTvAw="; + hash = "sha256-TsM4z5ga0lH/ommyag8u7t5LiCMjz305ejUK4Dds0Lk="; }; - cargoHash = "sha256-Qipt1IstoFGo1qQn/ZSwm3d1jrqj4mwIJep/A+/21WY="; + cargoHash = "sha256-mMls/E3Pt4Se2G8FeVn/ELkhxCgZrthlHfFa03sH1Lc="; nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; From 92c2cf5bf9e0c51f10f92817ff3ab4f675b598fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 2 Sep 2024 14:54:26 +0100 Subject: [PATCH 14/65] polkadot: stable2407-1 -> stable2407-2 --- pkgs/applications/blockchains/polkadot/Cargo.lock | 8 ++++---- pkgs/applications/blockchains/polkadot/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 5384966db3a6..5b5faf69a831 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -3654,7 +3654,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" -version = "0.17.0" +version = "0.17.1" dependencies = [ "async-trait", "cumulus-client-collator", @@ -11507,7 +11507,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "36.0.0" +version = "36.0.1" dependencies = [ "docify", "frame-benchmarking", @@ -12833,7 +12833,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "async-channel", @@ -13862,7 +13862,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "16.0.1" +version = "16.0.2" dependencies = [ "assert_matches", "bitflags 1.3.2", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 9a1aba5de6eb..546348d3c433 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "stable2407-1"; + version = "stable2407-2"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-${version}"; - hash = "sha256-IYRkXmFBjRAYSROL37EgEjC7wM1N97HabuSHtcSUxdg="; + hash = "sha256-4WOoFjihzErc6lIgiWvLg6fqDOxs1A+A0ERvu/D8btw="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. From 5e6e3520df70cf2be576d4fb133cca7db9d9d5ba Mon Sep 17 00:00:00 2001 From: fridtjof Date: Tue, 3 Sep 2024 13:31:47 +0200 Subject: [PATCH 15/65] net-snmp: darwin support The autotools files shipped in the source tarball did not want to link, so I added autoreconfHook to just remake them. --- pkgs/servers/monitoring/net-snmp/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 66085a04babd..3f5c8c84701e 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl , file, openssl, perl, nettools -, withPerlTools ? false }: let +, autoreconfHook +, withPerlTools ? false +, darwin }: let perlWithPkgs = perl.withPackages (ps: with ps; [ JSON @@ -52,9 +54,15 @@ in stdenv.mkDerivation rec { -e "/NETSNMP_CONFIGURE_OPTIONS/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" ''; - nativeBuildInputs = [ nettools file ]; + nativeBuildInputs = [ nettools file autoreconfHook ]; buildInputs = [ openssl ] - ++ lib.optional withPerlTools perlWithPkgs; + ++ lib.optional withPerlTools perlWithPkgs + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.DiskArbitration + ]; enableParallelBuilding = true; # Missing dependencies during relinking: @@ -74,6 +82,6 @@ in stdenv.mkDerivation rec { description = "Clients and server for the SNMP network monitoring protocol"; homepage = "http://www.net-snmp.org/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 6848dad99396f290c77795b1be8827e133ada56f Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Tue, 3 Sep 2024 20:43:41 +0200 Subject: [PATCH 16/65] python311Packages.python-troveclient: init at 7.0.0 Add [Trove Client package](https://github.com/openstack/python-troveclient), a client for the OpenStack Trove DBaaS service. --- .../python-troveclient/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 90 insertions(+) create mode 100644 pkgs/development/python-modules/python-troveclient/default.nix diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix new file mode 100644 index 000000000000..891a907e55bf --- /dev/null +++ b/pkgs/development/python-modules/python-troveclient/default.nix @@ -0,0 +1,87 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httplib2, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-utils, + pbr, + prettytable, + python-mistralclient, + python-openstackclient, + python-swiftclient, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-troveclient"; + version = "8.5.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-troveclient"; + rev = "refs/tags/${version}"; + hash = "sha256-lfnAmQ/IxEdc+XxC0dYxK2FgY7csNewGPuQuq0dNffM="; + }; + + env.PBR_VERSION = version; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + sphinxcontrib-apidoc + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + keystoneauth1 + osc-lib + oslo-i18n + oslo-utils + prettytable + python-mistralclient + python-openstackclient + python-swiftclient + requests + ]; + + nativeCheckInputs = [ + httplib2 + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "troveclient" ]; + + meta = { + homepage = "https://github.com/openstack/python-troveclient"; + description = "Client library for OpenStack Trove API"; + license = lib.licenses.asl20; + mainProgram = "trove"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab46f6533c89..f3c798e8a304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22956,6 +22956,7 @@ with pkgs; manilaclient = with python311Packages; toPythonApplication python-manilaclient; mistralclient = with python311Packages; toPythonApplication python-mistralclient; swiftclient = with python311Packages; toPythonApplication python-swiftclient; + troveclient = with python311Packages; toPythonApplication python-troveclient; openvdb = callPackage ../development/libraries/openvdb { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d0c8f1966ac..b70598eea646 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10611,6 +10611,8 @@ self: super: with self; { python-tado = callPackage ../development/python-modules/python-tado { }; + python-troveclient = callPackage ../development/python-modules/python-troveclient { }; + python-idzip = callPackage ../development/python-modules/python-idzip { }; pythonfinder = callPackage ../development/python-modules/pythonfinder { }; From 418baf49783ea414650de33fac31a96b1e1354c1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 3 Sep 2024 22:50:46 +0400 Subject: [PATCH 17/65] =?UTF-8?q?qrcp:=200.11.2=20=E2=86=92=200.11.3,=20fi?= =?UTF-8?q?x=20cross=20compilation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/qrcp/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index c9b463d25298..748412e17cba 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -6,32 +7,34 @@ buildGoModule rec { pname = "qrcp"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - hash = "sha256-BuZn+7gTjsHTUDu33JXTrntb5LUzcq3ZsmgFg+6ivZg="; + hash = "sha256-MmWBcDtZUDX5IV7XXifBp7KfeRh+0qU4vdfCoMv/UNk="; }; vendorHash = "sha256-lqGPPyoSO12MyeYIuYcqDVHukj7oR3zmHgsS6SxY3yo="; subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-X github.com/claudiodangelis/qrcp/version.version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd qrcp \ --bash <($out/bin/qrcp completion bash) \ --fish <($out/bin/qrcp completion fish) \ --zsh <($out/bin/qrcp completion zsh) ''; - meta = with lib; { - homepage = "https://claudiodangelis.com/qrcp/"; + meta = { + homepage = "https://qrcp.sh/"; description = "Transfer files over wifi by scanning a QR code from your terminal"; longDescription = '' qrcp binds a web server to the address of your Wi-Fi network @@ -39,8 +42,8 @@ buildGoModule rec { handler serves the content and exits the program when the transfer is complete. ''; - license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fgaz ]; mainProgram = "qrcp"; }; } From dcb32231391a6b2e039ab672883f21d679806ae0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 3 Sep 2024 22:51:56 +0400 Subject: [PATCH 18/65] qrcp: migrate to by-name --- .../networking/qrcp/default.nix => by-name/qr/qrcp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/qrcp/default.nix => by-name/qr/qrcp/package.nix} (100%) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/by-name/qr/qrcp/package.nix similarity index 100% rename from pkgs/tools/networking/qrcp/default.nix rename to pkgs/by-name/qr/qrcp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c734ccfa5358..49e87c02c978 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11874,8 +11874,6 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qrcp = callPackage ../tools/networking/qrcp { }; - qrscan = callPackage ../tools/misc/qrscan { }; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; From 361fde84f96f32e8cadfd21f6edfa86b4c1b9457 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Wed, 4 Sep 2024 11:51:15 +1000 Subject: [PATCH 19/65] Revert "nixos/firewall: fix reverse path check failures with IPsec" The inclusion of the "meta ipsec" rule in the default reverse path filtering breaks systems not built with specific XFRM kernel config options. Specifically CONFIG_XFRM must be set, which gets selected by CONFIG_NFT_XFRM, which is hidden behind CONFIG_XFRM_USER. These options are not selected by default in most defconfig's provided by the kernel with the exception of some device-specific defconfigs. These options are not set by the nix kernel common_config, and I would argue that IPSec support does not belong in a minimal kernel as that elevates its support status above other in-kernel VPN interfaces. The contributor of this feature does not seem interested in working towards a solution that does not break systems running kernels built with "autoModules = false" while supporting this feature, and as this silently breaks firewalls into an insecure state and poses an immediate security issue I propose this be reverted until a solution that does not break such systems is proposed. https://github.com/NixOS/nixpkgs/pull/310857#discussion_r1742834970 Devices used as firewalls, if they do not have the required kernel config, will fail to load the new firewall rules and will upon boot pass traffic without any filtering into the internal network. Devices exposed directly to the internet, after reboot, will boot without filtering potentially exposing services not intended to be exposed to the internet, such as databases. The following platforms in nixpkgs appear to be impacted: - pc_simplekernel - pogoplug4 - sheevaplug - zero-gravitas - zero-sugar - utilite - guruplug - beaglebone - fuloong2f_n32 References to hardware without autoModules can be found in nixos-hardware, as well as in active third-party repos on github. I suspect there are other users impacted that do not have their configurations public, as autoModules = true leads to long compile times when targeting kernels to less standard hardware or hardware with quirks that require patches that cannot be upstreamed. This reverts commit 3c12ef3f219c1a0f458d72e7b460782287974bbd. --- nixos/modules/services/networking/firewall-iptables.nix | 3 --- nixos/modules/services/networking/firewall-nftables.nix | 6 ------ 2 files changed, 9 deletions(-) diff --git a/nixos/modules/services/networking/firewall-iptables.nix b/nixos/modules/services/networking/firewall-iptables.nix index 68895189bcae..91756f826fe8 100644 --- a/nixos/modules/services/networking/firewall-iptables.nix +++ b/nixos/modules/services/networking/firewall-iptables.nix @@ -123,9 +123,6 @@ let # Allows this host to act as a DHCP4 client without first having to use APIPA iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN - # Allows decrypted packets from an IPsec VPN - ip46tables -t mangle -A nixos-fw-rpfilter -m policy --dir in --pol ipsec -j RETURN - # Allows this host to act as a DHCPv4 server iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN diff --git a/nixos/modules/services/networking/firewall-nftables.nix b/nixos/modules/services/networking/firewall-nftables.nix index 661d5c9fb1a6..a5ee7efc3c32 100644 --- a/nixos/modules/services/networking/firewall-nftables.nix +++ b/nixos/modules/services/networking/firewall-nftables.nix @@ -82,11 +82,6 @@ in } ]; - networking.nftables.preCheckRuleset = '' - # can't validate IPsec rules - sed '/meta ipsec/d' -i ruleset.conf - ''; - networking.nftables.tables."nixos-fw".family = "inet"; networking.nftables.tables."nixos-fw".content = '' ${optionalString (cfg.checkReversePath != false) '' @@ -94,7 +89,6 @@ in type filter hook prerouting priority mangle + 10; policy drop; meta nfproto ipv4 udp sport . udp dport { 67 . 68, 68 . 67 } accept comment "DHCPv4 client/server" - meta ipsec exists accept comment "decrypted packets from an IPsec VPN" fib saddr . mark ${optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept jump rpfilter-allow From c03bc76a2637c324a1c38ce3fb89700ef5a15676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 01:59:39 +0000 Subject: [PATCH 20/65] havoc: 0.5.0 -> 0.6.0 --- pkgs/by-name/ha/havoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix index b37550240386..ee5db97c9865 100644 --- a/pkgs/by-name/ha/havoc/package.nix +++ b/pkgs/by-name/ha/havoc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "havoc"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ii8"; repo = "havoc"; rev = finalAttrs.version; - hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; + hash = "sha256-YCZdAlIDptVLMUko40gfp2BCAbhGNsYyVTDB14VTNSE="; }; depsBuildBuild = [ From eb3833bf2c6935461b6a4bee158b10d2696f9ce9 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 3 Sep 2024 20:10:25 -0600 Subject: [PATCH 21/65] picocrypt: 1.41 -> 1.42 --- pkgs/by-name/pi/picocrypt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index 4a6cd51f222d..fcc166266421 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "picocrypt"; - version = "1.41"; + version = "1.42"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "Picocrypt"; rev = "refs/tags/${version}"; - hash = "sha256-jbZW9JqRVEH48RmGSQzSKaoTRSnA85N7iDHIQqTF6JQ="; + hash = "sha256-Ehsjt3zCtJFBJ0l707uRtEfDC3M99mb9HFcNlH1btVE="; }; sourceRoot = "${src.name}/src"; From a6ee7e5674ccc5af8ea5be5adf74cbb114baa37c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 04:31:40 +0000 Subject: [PATCH 22/65] python312Packages.clarifai: 10.7.0 -> 10.8.0 --- pkgs/development/python-modules/clarifai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index f3fb349f412d..6b39d48513d6 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.7.0"; + version = "10.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-a/twKAwlvn017fqUsDBOcDxoZ63W0p6whQf53wlXFRU="; + hash = "sha256-dRhFZACfdMW0cIBDVUOSGDl5fai0gFXDPyfDil+itwQ="; }; pythonRelaxDeps = [ From 8c2d7df19bac2c9768d5e4a59974f22989877f2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:02:59 +0000 Subject: [PATCH 23/65] gitu: 0.24.0 -> 0.25.0 --- pkgs/by-name/gi/gitu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index febc9a88c680..eda3c91c59cb 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-ERowsPJujsN27uKD0yW1kPADV9YOKH7KR3/4r1iISvc="; + hash = "sha256-DqJ/O87LdNXmJNmoBCdAvLod8uDRHlNuMzAv+kEew1w="; }; - cargoHash = "sha256-VhcCFh1seqanecRT3lER0ZSYFRoKn9V5sbGYlNg49DQ="; + cargoHash = "sha256-rfj2rDqO/sMaghpou2TCTfqrUmPxh0qooR6hhqlS4PM="; nativeBuildInputs = [ pkg-config From b2c52390d6f9bd8747445d70829e6462c46a63d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:06:49 +0000 Subject: [PATCH 24/65] sqldef: 0.17.17 -> 0.17.18 --- pkgs/development/tools/sqldef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 4c5c4e6c230b..a47e280dba68 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.17"; + version = "0.17.18"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-J3qFafiMVjnJUa9bsYOxBqe3Hrsc/XDUI4p/GGO9Kmg="; + hash = "sha256-mFQ8E56qlS6UDaXZFsWQBy71Q8DOIMo1Qcmyg1vde5M="; }; proxyVendor = true; - vendorHash = "sha256-cMRzDqsnQwZTSjroaXOgN4uOFCxVb2x7FT57VfN9qhk="; + vendorHash = "sha256-Bvo+1o4eTJi9zjF/NQ6zBfoAFFlq4egi2nRE8BtaOfM="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 95ae9a26749ca77795fb03c90303db69d2230181 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:22:17 +0000 Subject: [PATCH 25/65] ctlptl: 0.8.32 -> 0.8.33 --- pkgs/development/tools/ctlptl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 6bfd7a01fca5..c6d285a4cae4 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.32"; + version = "0.8.33"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-ydwPnR5tazLeeHqsIMyZKeO0vvxtCSa5ulCw2/Hv8TA="; + hash = "sha256-S3OK9qPnI8E1v5h9Tzx9cOZJVwPpYL4qs9JN0Uj6jzQ="; }; - vendorHash = "sha256-BjZYHLwXyagm9JJv+f83RkrpLBTIZvXGUXZhSxhhlfc="; + vendorHash = "sha256-EYe1hjxlaqVbie4yOsnlzWxQDyxmj8+cbhCUdR9ObeQ="; nativeBuildInputs = [ installShellFiles ]; From 227b4122f9fe0bd0c8f23038221550dc78196d13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:23:12 +0000 Subject: [PATCH 26/65] bosh-cli: 7.7.0 -> 7.7.1 --- pkgs/applications/networking/cluster/bosh-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index bc9627286a65..be658136505c 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.7.0"; + version = "7.7.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z3nC9h8kSQYukIVrcdtUiGyHIUl5W6r43RC7l40Vlwo="; + sha256 = "sha256-Bs7bKB9P6TzlH4ztXFsQ1Q81nxNR5n6cuZ6Ap23nLUw="; }; vendorHash = null; From fa1fe37fe9f04b37806c6269d95eb8f00797cfbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:29:11 +0000 Subject: [PATCH 27/65] viceroy: 0.11.0 -> 0.12.0 --- pkgs/development/tools/viceroy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 806adb97a9db..16282c7f7dd9 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-8Vfi/lHkaUvp6szSrqHaewXUWZ9Rb0oQdc8tuBFlvLI="; + hash = "sha256-0jED0Ju7ojqDxfEjZKmWuCfGR830/gJF5p+QtcVajIY="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-3HhNFcNo/TNnAOLARtVnN/Moh2/8cdW7cn7MTahR18g="; + cargoHash = "sha256-rSZe/MrJlbB0oaAsKg38mEnS3pqe9Rk4/aoRuLlOUFc="; cargoTestFlags = [ "--package viceroy-lib" From 2843ac99342782c2aa17157af4307798a65c4124 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:34:54 +0000 Subject: [PATCH 28/65] libplctag: 2.6.2 -> 2.6.3 --- pkgs/development/libraries/libplctag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index c6113cd44822..994cf0fef05c 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-V0YTW7+YbyW6Fh9b1IntIxCXabPUJj7QoDvYYyc/Y6k="; + sha256 = "sha256-HUog7Tlm4jiqYXk22dziumCA/68c35+OwnTNYu9mV5E="; }; nativeBuildInputs = [ cmake ]; From 84da803aedb365f6cf7084a66d7f66ca59d68cab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:37:03 +0000 Subject: [PATCH 29/65] python312Packages.aioesphomeapi: 25.3.1 -> 25.3.2 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 074a1025c458..8e13ca9d212b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "25.3.1"; + version = "25.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-3srw745rEDS8G4270kHPGjOr4Tnbrt5EMO/B/cb03Vs="; + hash = "sha256-ITNXPwQTKOyH0TXYr8v/VI5rPNCvKGb/zIE1q+Ja8j0="; }; build-system = [ From 32829d526fbf4e7c389f2f36efe37816e51aef82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:44:13 +0000 Subject: [PATCH 30/65] pscale: 0.208.0 -> 0.209.0 --- pkgs/development/tools/pscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 4075b1ad9d3c..bf055522254a 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pscale"; - version = "0.208.0"; + version = "0.209.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-q7rVTazlUmCOCv6W92uAg9/Jgkdxnl2eSxU3NSBsFZQ="; + sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8="; }; vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; From 7d12ce7348c70038edf7b37e634be128437d8041 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:50:36 +0000 Subject: [PATCH 31/65] python312Packages.pycontrol4: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/pycontrol4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index 7363381bdecd..4276c1dde748 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lawtancool"; repo = "pyControl4"; rev = "refs/tags/v${version}"; - hash = "sha256-1gZebYseuEBI0dlXlD72f/uozNuoxHPqVsc8AWJV148="; + hash = "sha256-0ZuztqHbrd+kMDGv3xyUYoTF/Ho+oHkycjSrKz8JABM="; }; build-system = [ setuptools ]; From 3a8f76141e79ebf49f45fa8e00c8d1e6fb76b195 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 4 Sep 2024 13:53:43 +0800 Subject: [PATCH 32/65] artalk: fix ui hash --- pkgs/by-name/ar/artalk/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix index 959bea5cd3b1..c56c066e2acf 100644 --- a/pkgs/by-name/ar/artalk/package.nix +++ b/pkgs/by-name/ar/artalk/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { }; web = fetchurl { url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz"; - hash = "sha256-3Rg5mCFigLkZ+X8Fxe6A16THd9j6hcTYMEAKU1SrLMw="; + hash = "sha256-Cx3fDpnl52kwILzH9BBLfsWe5qEbIl/ecJd1wJEB/Hc="; }; CGO_ENABLED = 1; From 9e155deed3be35ca0a9bffe7a2c2d36e920e9f36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:57:48 +0000 Subject: [PATCH 33/65] python312Packages.solarlog-cli: 0.2.0 -> 0.2.2 --- pkgs/development/python-modules/solarlog-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix index 25a4fc4deecb..eea509879c6a 100644 --- a/pkgs/development/python-modules/solarlog-cli/default.nix +++ b/pkgs/development/python-modules/solarlog-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solarlog-cli"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "solarlog_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-x9MovIKFImu60Ns2sJTy71S22cR9Az/yNMWzGM50y7Y="; + hash = "sha256-RibfHggpuJAtvENOToSp7eFuvfkTRHdSq0Eg9kk05vc="; }; build-system = [ hatchling ]; From 2f0d100ce4d0c72d6628397059f80f073ebc3640 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 4 Sep 2024 08:34:31 +0200 Subject: [PATCH 34/65] radicle-node: 1.0.0-rc.16 -> 1.0.0-rc.17 Signed-off-by: Florian Brandes --- pkgs/by-name/ra/radicle-node/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 24df6d28bb02..e3f33c7132df 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -18,15 +18,15 @@ , xdg-utils }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.16"; + version = "1.0.0-rc.17"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-TsM4z5ga0lH/ommyag8u7t5LiCMjz305ejUK4Dds0Lk="; + hash = "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk="; }; - cargoHash = "sha256-mMls/E3Pt4Se2G8FeVn/ELkhxCgZrthlHfFa03sH1Lc="; + cargoHash = "sha256-5xqoWW3pPU/vQs1ewPb24/fv/oKBF+ZZzbsYhC7LopM="; nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; From 8983b2925f92e817bb856d3104d4b282e5be0954 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 06:57:14 +0000 Subject: [PATCH 35/65] alacritty-theme: 0-unstable-2024-07-31 -> 0-unstable-2024-09-03 --- pkgs/data/themes/alacritty-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index 1f41852bd365..cf97f406ba06 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2024-07-31"; + version = "0-unstable-2024-09-03"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "4091fddff8da892d5594e94116927c7445620867"; - hash = "sha256-1tt4GL3KNa3S4dEFiRZf4B1+CM6e7/gO3Q34847lYkI="; + rev = "e759dafb8e2e00abb428592979ce006da7fba4a7"; + hash = "sha256-cZ+ziE+VbQFpJ+iDS7X9Q2YC1Ziu+JITzDmX79BCcRY="; }; dontConfigure = true; From dc700df6b22c12cc68d6e9ae2244081dc45e4317 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Tue, 3 Sep 2024 10:28:07 +0200 Subject: [PATCH 36/65] nixos/github-runner: fix build failure Shellcheck complains: > args=( > ^-- SC2054 (warning): Use spaces, not commas, to separate array elements. Add a comment disabling shellcheck in this case and annotating why. Signed-off-by: Sirio Balmelli --- .../services/continuous-integration/github-runner/service.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index fccdcc116a21..4b1fc230c2d3 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -151,9 +151,10 @@ with lib; # Always clean workDir find -H "$WORK_DIRECTORY" -mindepth 1 -delete ''; - configureRunner = writeScript "configure" '' + configureRunner = writeScript "configure" /*bash*/'' if [[ -e "${newConfigTokenPath}" ]]; then echo "Configuring GitHub Actions Runner" + # shellcheck disable=SC2054 # don't complain about commas in --labels args=( --unattended --disableupdate From 8b9028593dd818094d8383f9eefbcd4e3a86993f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 10:05:17 +0200 Subject: [PATCH 37/65] python312Packages.google-cloud-translate: 3.15.4 -> 3.16.0 Changelog: https://github.com/googleapis/python-translate/blob/v3.16.0/CHANGELOG.md --- .../google-cloud-translate/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index f3cbe6abc855..ef1a3925b957 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -5,6 +5,7 @@ google-api-core, google-cloud-core, google-cloud-testutils, + grpc-google-iam-v1, mock, proto-plus, protobuf, @@ -16,21 +17,23 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.15.4"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-nZ3YzyJe+fsGdahvkuecrDKVoo0JpEeeEj7wy+VHSWs="; + pname = "google_cloud_translate"; + inherit version; + hash = "sha256-B5fZVMT26gcyKelQASugg6TMl1K0MdwGJOJZTih0ae8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-core + grpc-google-iam-v1 proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; From 7d95d63b850749d1b8348555e682fd57febe5935 Mon Sep 17 00:00:00 2001 From: claes Date: Sat, 31 Aug 2024 10:23:37 +0200 Subject: [PATCH 38/65] dms: init at 1.6.0 --- pkgs/by-name/dm/dms/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/dm/dms/package.nix diff --git a/pkgs/by-name/dm/dms/package.nix b/pkgs/by-name/dm/dms/package.nix new file mode 100644 index 000000000000..52150cf74172 --- /dev/null +++ b/pkgs/by-name/dm/dms/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "dms"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "anacrolix"; + repo = "dms"; + rev = "refs/tags/v${version}"; + hash = "sha256-QwRLNCXDu/dKh2o17AyASlVQPIEOX6e4kTINa2ZzZkU="; + }; + + vendorHash = "sha256-Z0DoVmL0zJ4l9hrO+zGp6FcExvhbiPu5+N3Mfyxi5DE="; + + meta = { + homepage = "https://github.com/anacrolix/dms"; + description = "UPnP DLNA Digital Media Server with basic video transcoding"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.claes ]; + platforms = lib.platforms.linux; + mainProgram = "dms"; + }; +} From 8251dfd71648f6ac31978e01b7dc188b9858793d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 10:31:02 +0200 Subject: [PATCH 39/65] python312Packages.google-cloud-vision: 3.7.3 -> 3.7.4 Changelog: https://github.com/googleapis/python-vision/blob/v3.7.4/CHANGELOG.md --- .../python-modules/google-cloud-vision/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 75cc08070a31..c1c89e10081b 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.7.3"; + version = "3.7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-7kjEjoIMfgmTJmOYaXD+9FbcD0XHr3KdRvHz3ZfB37Y="; + pname = "google_cloud_vision"; + inherit version; + hash = "sha256-gLZ/Ci3Fh6MddILT0mkqdz8l+9CUaP2d5F0AtnGq2Zk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf From bb204cf8b88421eddebb6469c00880ff3a8c5039 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 4 Sep 2024 10:45:49 +0200 Subject: [PATCH 40/65] botan: remove gmp and boost These are unneeded. --- pkgs/development/libraries/botan/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 82082878df63..2ea07192f61c 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost +{ lib, stdenv, fetchurl, python3, bzip2, zlib # Passed by version specific builders , baseVersion, revision, hash , sourceExtension ? "tar.xz" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { inherit postPatch; nativeBuildInputs = [ python3 ]; - buildInputs = [ bzip2 zlib gmp boost ] + buildInputs = [ bzip2 zlib ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; botanConfigureFlags = [ From d9ea4bf018d2dfda34a5c55f9a45525653ff3e79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 11:06:23 +0200 Subject: [PATCH 41/65] python312Packages.google-cloud-dlp: 3.18.1 -> 3.22.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-dlp-v3.22.0/packages/google-cloud-dlp/CHANGELOG.md --- .../python-modules/google-cloud-dlp/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 6a7ddacb0649..15bbab8155a3 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.18.1"; + version = "3.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-KYqhwSa9Z+1s41Ve+GGbnR0BfSZE5UwAqgmqEWfxOC0="; + pname = "google_cloud_dlp"; + inherit version; + hash = "sha256-SabiX00pD91acxz83PdkDnPynLp5L9MAqKGY/IIUDAU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf @@ -41,7 +42,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test requires credentials + # Tests require credentials "test_inspect_content" "test_list_dlp_jobs" ]; From fb27fe2102a950d02cd71d4364e5f1cf11481a56 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Wed, 4 Sep 2024 17:18:17 +0800 Subject: [PATCH 42/65] python3Packages.bcc: init at 0.31.0 --- pkgs/by-name/bc/bcc/package.nix | 10 +++++----- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 50d812cd1d71..3d2235a0a0b3 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -13,12 +13,12 @@ , makeWrapper , netperf , nixosTests -, python3 +, python3Packages , stdenv , zip }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bcc"; version = "0.31.0"; @@ -44,14 +44,14 @@ python3.pkgs.buildPythonApplication rec { ./fix-deadlock-detector-import.patch ]; - propagatedBuildInputs = [ python3.pkgs.netaddr ]; + propagatedBuildInputs = [ python3Packages.netaddr ]; nativeBuildInputs = [ bison cmake flex llvmPackages.llvm.dev makeWrapper - python3.pkgs.setuptools + python3Packages.setuptools zip ]; @@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec { preInstall = '' # required for setuptool during install - export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH ''; postInstall = '' mkdir -p $out/bin $out/share diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d0c8f1966ac..41675b44e28a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1485,6 +1485,8 @@ self: super: with self; { bbox = callPackage ../development/python-modules/bbox { }; + bcc = toPythonModule (pkgs.bcc.override { python3Packages = self; }); + bc-detect-secrets = callPackage ../development/python-modules/bc-detect-secrets { }; bc-jsonpath-ng = callPackage ../development/python-modules/bc-jsonpath-ng { }; From 45c0d047355a8b847fb1606072c6a60b2887116d Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:26:12 +0200 Subject: [PATCH 43/65] nixos/timesyncd: minor refactoring --- nixos/modules/system/boot/timesyncd.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index f93064569bf6..82e3b8c15759 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -2,6 +2,9 @@ with lib; +let + cfg = config.services.timesyncd; +in { options = { @@ -41,7 +44,7 @@ with lib; }; }; - config = mkIf config.services.timesyncd.enable { + config = mkIf cfg.enable { systemd.additionalUpstreamSystemUnits = [ "systemd-timesyncd.service" ]; @@ -82,8 +85,8 @@ with lib; environment.etc."systemd/timesyncd.conf".text = '' [Time] - NTP=${concatStringsSep " " config.services.timesyncd.servers} - ${config.services.timesyncd.extraConfig} + NTP=${concatStringsSep " " cfg.servers} + ${cfg.extraConfig} ''; users.users.systemd-timesync = { From 34efcf8aef8682eb4fa0cce2f590f877ce52d06f Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:42:27 +0200 Subject: [PATCH 44/65] nixos/timesyncd: minor refactoring --- nixos/modules/system/boot/timesyncd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 82e3b8c15759..b75a413fa58e 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -9,11 +9,11 @@ in options = { - services.timesyncd = { + services.timesyncd = with types; { enable = mkOption { default = !config.boot.isContainer; defaultText = literalExpression "!config.boot.isContainer"; - type = types.bool; + type = bool; description = '' Enables the systemd NTP client daemon. ''; @@ -21,7 +21,7 @@ in servers = mkOption { default = config.networking.timeServers; defaultText = literalExpression "config.networking.timeServers"; - type = types.listOf types.str; + type = listOf str; description = '' The set of NTP servers from which to synchronise. Note if this is set to an empty list, the defaults systemd itself is @@ -31,7 +31,7 @@ in }; extraConfig = mkOption { default = ""; - type = types.lines; + type = lines; example = '' PollIntervalMaxSec=180 ''; From b4cd57870dc9ec1da8757148c79a491ed2bf2e90 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:59:22 +0200 Subject: [PATCH 45/65] nixos/timesyncd: allow null for option servers This gives the ability to not write `NTP=` to the `timesyncd.conf` file (servers = null) as opposed to writing `NTP=` (servers = []) which is interpreted slightly differently by systemd: > When the empty string is assigned, the list of NTP servers is reset, and all prior assignments will have no effect. --- nixos/modules/system/boot/timesyncd.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index b75a413fa58e..d54ed687c8e7 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -21,12 +21,15 @@ in servers = mkOption { default = config.networking.timeServers; defaultText = literalExpression "config.networking.timeServers"; - type = listOf str; + type = nullOr (listOf str); description = '' The set of NTP servers from which to synchronise. - Note if this is set to an empty list, the defaults systemd itself is - compiled with ({0..4}.nixos.pool.ntp.org) apply, - In case you want to disable timesyncd altogether, use the `enable` option. + + Setting this option to an empty list will write `NTP=` to the + `timesyncd.conf` file as opposed to setting this option to null which + will remove `NTP=` entirely. + + See man:timesyncd.conf(5) for details. ''; }; extraConfig = mkOption { @@ -85,9 +88,11 @@ in environment.etc."systemd/timesyncd.conf".text = '' [Time] + '' + + optionalString (cfg.servers != null) '' NTP=${concatStringsSep " " cfg.servers} - ${cfg.extraConfig} - ''; + '' + + cfg.extraConfig; users.users.systemd-timesync = { uid = config.ids.uids.systemd-timesync; From 24e08d0e9b74392bd40689e016a1af8274ee7108 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:56:01 +0200 Subject: [PATCH 46/65] nixos/timesyncd: allow NTP servers advertised by DHCP to be used - add option `fallbackServers` with default to `networking.timeServers` - option `servers` now default to null Fix #335050 --- .../manual/release-notes/rl-2411.section.md | 4 ++++ nixos/modules/system/boot/timesyncd.nix | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a2fd124765cd..2f89c8a42e50 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -448,6 +448,10 @@ - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246). +- `services.timesyncd.servers` now defaults to `null`, allowing systemd-timesyncd to use NTP servers advertised by DHCP. + +- `services.timesyncd.fallbackServers` was added and defaults to `networking.timeServers`. + - Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details. Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index d54ed687c8e7..117ced1f59dd 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -19,8 +19,7 @@ in ''; }; servers = mkOption { - default = config.networking.timeServers; - defaultText = literalExpression "config.networking.timeServers"; + default = null; type = nullOr (listOf str); description = '' The set of NTP servers from which to synchronise. @@ -32,6 +31,20 @@ in See man:timesyncd.conf(5) for details. ''; }; + fallbackServers = mkOption { + default = config.networking.timeServers; + defaultText = literalExpression "config.networking.timeServers"; + type = nullOr (listOf str); + description = '' + The set of fallback NTP servers from which to synchronise. + + Setting this option to an empty list will write `FallbackNTP=` to the + `timesyncd.conf` file as opposed to setting this option to null which + will remove `FallbackNTP=` entirely. + + See man:timesyncd.conf(5) for details. + ''; + }; extraConfig = mkOption { default = ""; type = lines; @@ -92,6 +105,9 @@ in + optionalString (cfg.servers != null) '' NTP=${concatStringsSep " " cfg.servers} '' + + optionalString (cfg.fallbackServers != null) '' + FallbackNTP=${concatStringsSep " " cfg.fallbackServers} + '' + cfg.extraConfig; users.users.systemd-timesync = { From 70b08eb089f7d04bfb812d0d0a823b2d27291cb0 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Wed, 4 Sep 2024 13:49:09 +0200 Subject: [PATCH 47/65] speedtest-go: 1.7.8 -> 1.7.9 --- pkgs/tools/networking/speedtest-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index e81dfe4fa8e6..316752d3b1fe 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "speedtest-go"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ggctB1zZ3YFArWhKCvXho8mVcDe0R3Br3uq2zU6sEYc="; + hash = "sha256-SFdUl06lCf+ObPZanEwvD2rSzPM0ia2J/XSuel5XGqg="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; From 5bc6e8cc37075bda10fc72e3c04af409132adfbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 12:28:27 +0000 Subject: [PATCH 48/65] cloudflare-dynamic-dns: 4.3.0 -> 4.3.2 --- pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index c5723c54ea39..5488a0f2196a 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; rev = "refs/tags/${version}"; - hash = "sha256-3sE4iaSkCAAMJ6FtZgXXkjb0aO73ehluY3WMQlOgxwc="; + hash = "sha256-SuDiR/saqxgfnEku31tjAtahWNg+5wFriD0F2FPkEEo="; }; - vendorHash = "sha256-/UaTOCbE8ieCtME6AudbXE5ntCptPFoESYrdn7qK0MU="; + vendorHash = "sha256-vHlBZOeJ0oZZ4zjy4UycbdiMGzEpGRqT7v3q0hDz28M="; subPackages = "."; From 123b06425c10b367ced57fa67994b23e8efb523c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 12:36:31 +0000 Subject: [PATCH 49/65] eksctl: 0.189.0 -> 0.190.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 58ce467b2030..7d601aaae8b8 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.189.0"; + version = "0.190.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-YG1p7T2K1b3LO2MiTkCC88ZpgCpVTSCBUoCEcJK+V7I="; + hash = "sha256-IEe0NDl8Z1XBvfy/2cwL+O/RYGFS6VXd2ZUpyhEdaGs="; }; - vendorHash = "sha256-W7tAdImEsPWSQkK8FnXgx5ADZ2JOdVc2xNBkNM11FOw="; + vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4="; doCheck = false; From e2c1e73f9a3dcc2ac5118f59ba40e7ebf06e101f Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 4 Sep 2024 15:33:05 +0200 Subject: [PATCH 50/65] wstunnel: 10.1.0 - 10.1.1 https://github.com/erebe/wstunnel/releases/tag/v10.1.1 --- pkgs/by-name/ws/wstunnel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 46b9723e9559..d6c66e152bb6 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -8,7 +8,7 @@ }: let - version = "10.1.0"; + version = "10.1.1"; in rustPlatform.buildRustPackage { @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-nOks9OMA0z7e1nYnKxkSmEj5GXP00385E+jr67lzS5c="; + hash = "sha256-qEWIyQkLRrmTH40S96hj8JXFz/VJChIbg8qEQc938nI="; }; - cargoHash = "sha256-QJ5Fb1M5CLDd2bZPy2p9zqh2A9KIoHp7PA1fxX2RDjI="; + cargoHash = "sha256-3b+pX/qQuhOY1OYr+CfT5wtiJcEJ8CJJsQZ4QOcYv74="; nativeBuildInputs = [ versionCheckHook ]; From 197b4434c99f6e921f7dd0ffaf60c7b7a03c533a Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 4 Sep 2024 14:26:00 +0200 Subject: [PATCH 51/65] coqPackages.coq: 8.20+rc1 -> 8.20.0 --- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 25531c6a33af..fd20908c9329 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -58,7 +58,7 @@ let "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; - "8.20+rc1".sha256 = "sha256-OLGPMvvA3hc42zdgWSOnOkN0/WwzBpneUcUVRNcNVms="; + "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5a862d26d68b..1c47a2a4691e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -232,6 +232,6 @@ in rec { coqPackages_8_19 = mkCoqPackages coq_8_19; coqPackages_8_20 = mkCoqPackages coq_8_20; - coqPackages = recurseIntoAttrs coqPackages_8_19; + coqPackages = recurseIntoAttrs coqPackages_8_20; coq = coqPackages.coq; } From 981d819d4672ecd22e14199e1482cbb49aa0cb5d Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 4 Sep 2024 14:20:24 +0200 Subject: [PATCH 52/65] botan: refactor Improve overridability and make it more idiomatic. --- pkgs/development/libraries/botan/2.0.nix | 7 -- pkgs/development/libraries/botan/3.0.nix | 9 -- pkgs/development/libraries/botan/default.nix | 114 +++++++++++++++++++ pkgs/development/libraries/botan/generic.nix | 83 -------------- pkgs/top-level/all-packages.nix | 11 +- 5 files changed, 118 insertions(+), 106 deletions(-) delete mode 100644 pkgs/development/libraries/botan/2.0.nix delete mode 100644 pkgs/development/libraries/botan/3.0.nix create mode 100644 pkgs/development/libraries/botan/default.nix delete mode 100644 pkgs/development/libraries/botan/generic.nix diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix deleted file mode 100644 index c14fdb4cef1f..000000000000 --- a/pkgs/development/libraries/botan/2.0.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - baseVersion = "2.19"; - revision = "5"; - hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; -}) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix deleted file mode 100644 index 0cffb67104c6..000000000000 --- a/pkgs/development/libraries/botan/3.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, stdenv, lib, ... } @ args: - -callPackage ./generic.nix (args // { - baseVersion = "3.5"; - revision = "0"; - hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; - # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again - extraPatches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; -}) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix new file mode 100644 index 000000000000..ba4883858303 --- /dev/null +++ b/pkgs/development/libraries/botan/default.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + fetchurl, + python3, + bzip2, + zlib, + darwin, + static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* +}: + +let + common = + { + version, + hash, + patches ? [ ], + }: + stdenv.mkDerivation (finalAttrs: { + pname = "botan"; + inherit version; + + __structuredAttrs = true; + enableParallelBuilding = true; + strictDeps = true; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz"; + inherit hash; + }; + + inherit patches; + + nativeBuildInputs = [ python3 ]; + buildInputs = + [ + bzip2 + zlib + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + Security + ] + ); + + botanConfigureFlags = + [ + "--prefix=${placeholder "out"}" + "--with-bzip2" + "--with-zlib" + ] + ++ lib.optionals stdenv.cc.isClang [ + "--cc=clang" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + "--cpu=aarch64" + ] + ++ lib.optionals static [ + "--enable-static-library" + "--disable-shared-library" + ]; + + configurePhase = '' + runHook preConfigure + python configure.py ''${botanConfigureFlags[@]} + runHook postConfigure + ''; + + preInstall = '' + if [ -d src/scripts ]; then + patchShebangs src/scripts + fi + ''; + + postInstall = '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + ''; + + doCheck = true; + + meta = with lib; { + description = "Cryptographic algorithms library"; + homepage = "https://botan.randombit.net"; + mainProgram = "botan"; + maintainers = with maintainers; [ + raskin + thillux + ]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + }); +in +{ + botan3 = common { + version = "3.5.0"; + hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; + # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; + }; + + botan2 = common { + version = "2.19.5"; + hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; + }; +} diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix deleted file mode 100644 index 2ea07192f61c..000000000000 --- a/pkgs/development/libraries/botan/generic.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv, fetchurl, python3, bzip2, zlib -# Passed by version specific builders -, baseVersion, revision, hash -, sourceExtension ? "tar.xz" -, extraConfigureFlags ? "" -, extraPatches ? [ ] -, badPlatforms ? [ ] -, postPatch ? null -, knownVulnerabilities ? [ ] -, CoreServices ? null -, Security ? null -, static ? stdenv.hostPlatform.isStatic # generates static libraries *only* -, ... -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "botan"; - version = "${baseVersion}.${revision}"; - - __structuredAttrs = true; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - name = "Botan-${finalAttrs.version}.${sourceExtension}"; - urls = [ - "http://files.randombit.net/botan/v${baseVersion}/Botan-${finalAttrs.version}.${sourceExtension}" - "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.${sourceExtension}" - ]; - inherit hash; - }; - patches = extraPatches; - inherit postPatch; - - nativeBuildInputs = [ python3 ]; - buildInputs = [ bzip2 zlib ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; - - botanConfigureFlags = [ - "--prefix=${placeholder "out"}" - "--with-bzip2" - "--with-zlib" - ] ++ lib.optionals stdenv.cc.isClang [ - "--cc=clang" - ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ - "--cpu=aarch64" - ] ++ lib.optionals static [ - "--enable-static-library" - "--disable-shared-library" - ]; - - configurePhase = '' - runHook preConfigure - python configure.py ''${botanConfigureFlags[@]} ${extraConfigureFlags} - runHook postConfigure - ''; - - enableParallelBuilding = true; - - preInstall = '' - if [ -d src/scripts ]; then - patchShebangs src/scripts - fi - ''; - - postInstall = '' - cd "$out"/lib/pkgconfig - ln -s botan-*.pc botan.pc || true - ''; - - doCheck = true; - - meta = with lib; { - description = "Cryptographic algorithms library"; - mainProgram = "botan"; - maintainers = with maintainers; [ raskin thillux ]; - platforms = platforms.unix; - license = licenses.bsd2; - inherit badPlatforms; - inherit knownVulnerabilities; - }; - passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89010d628c39..224ac5aba4f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19489,13 +19489,10 @@ with pkgs; bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { }; - botan2 = callPackage ../development/libraries/botan/2.0.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; - - botan3 = callPackage ../development/libraries/botan/3.0.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + inherit (callPackages ../development/libraries/botan { }) + botan2 + botan3 + ; box2d = callPackage ../development/libraries/box2d { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; From d386719eb17c6e9150b8b5d0e60be49f8136589b Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 4 Sep 2024 14:27:03 +0200 Subject: [PATCH 53/65] botan: do not install python module This has never been patched and thus doesn't work on NixOS. If we eventually want to use this we should create a separate package. --- pkgs/development/libraries/botan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index ba4883858303..907d9de86764 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -53,6 +53,7 @@ let botanConfigureFlags = [ "--prefix=${placeholder "out"}" + "--no-install-python-module" "--with-bzip2" "--with-zlib" ] From 0b68b152e270d45df844edbc3b1e2d99f0cd19de Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:27:27 +0000 Subject: [PATCH 54/65] go: set meta attribute for bootstrap binary derivation (#276857) * go: set sourceProvenance for bootstrap binary * Update pkgs/development/compilers/go/binary.nix --------- Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> Co-authored-by: Aleksana --- pkgs/development/compilers/go/binary.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index 777c82a59775..d5b86c06f557 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -18,7 +18,7 @@ let platform = toGoPlatform stdenv.hostPlatform; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "go-${version}-${platform}-bootstrap"; src = fetchurl { @@ -36,4 +36,14 @@ stdenv.mkDerivation rec { ln -s $out/share/go/bin/go $out/bin/go runHook postInstall ''; + + meta = with lib; { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; + description = "The Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux; + }; } From 08eabd49ce48aa2b1fe951a260ac997f14287c66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Sep 2024 00:35:40 +1000 Subject: [PATCH 55/65] oh-my-zsh: 2024-08-27 -> 2024-09-01 (#339190) --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f7e3982815d3..e1149cf9c687 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-08-27"; + version = "2024-09-01"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "efe21261d031b4836f64112a899706322acd26b0"; - sha256 = "sha256-ICHdwxySSzX64q+mfPKOQqOrLrc/RKiyvPioseNt4hE="; + rev = "b8c69d265257fae88fe504ea43cbcf2728bc1308"; + sha256 = "sha256-Q0SjYWkWY5/haoPunp5yusYoXIXzmB2tces/9gOZgJM="; }; strictDeps = true; From 138d76c31b9ff80694ef036b4bd8cbd4b9e9aff5 Mon Sep 17 00:00:00 2001 From: Mathias Sven Date: Wed, 4 Sep 2024 15:23:35 +0100 Subject: [PATCH 56/65] doc/dockertools: add note about base image config inheritance --- doc/build-helpers/images/dockertools.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index aeb831c770c5..aece0cbcb7e2 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -50,6 +50,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has If specified, the layer created by `buildImage` will be appended to the layers defined in the base image, resulting in an image with at least two layers (one or more layers from the base image, and the layer created by `buildImage`). Otherwise, the resulting image with contain the single layer created by `buildImage`. + :::{.note} + Only **Env** configuration is inherited from the base image. + ::: + _Default value:_ `null`. `fromImageName` (String or Null; _optional_) From cc15cb63e6ea888642b66d61262574c433be166a Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Sep 2024 22:44:43 +0800 Subject: [PATCH 57/65] go: fix eval for binary derivation This was broken in https://github.com/NixOS/nixpkgs/pull/276857 commit 69aa113e45f448d12a2648986ab3694a7ad2b84f --- pkgs/development/compilers/go/binary.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index d5b86c06f557..3c43cc4de150 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, version, hashes }: +{ lib, stdenv, fetchurl, version, hashes }: let toGoKernel = platform: if platform.isDarwin then "darwin" @@ -37,13 +37,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + meta = { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; + license = lib.licenses.bsd3; + maintainers = lib.teams.golang.members; + platforms = lib.platforms.darwin ++ lib.platforms.linux; }; } From 4c465c0155ed9c4403886ea640ff7255587351c3 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 4 Sep 2024 15:31:16 +0200 Subject: [PATCH 58/65] botan: only build the requested parts --- pkgs/development/libraries/botan/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 907d9de86764..8be711df6a27 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -50,10 +50,17 @@ let ] ); + buildTargets = + [ "cli" ] + ++ lib.optionals finalAttrs.doCheck [ "tests" ] + ++ lib.optionals static [ "static" ] + ++ lib.optionals (!static) [ "shared" ]; + botanConfigureFlags = [ "--prefix=${placeholder "out"}" "--no-install-python-module" + "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}" "--with-bzip2" "--with-zlib" ] @@ -62,10 +69,6 @@ let ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--cpu=aarch64" - ] - ++ lib.optionals static [ - "--enable-static-library" - "--disable-shared-library" ]; configurePhase = '' From c8204eda767df9eba559e64036b46fb436f7a17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:47:34 -0400 Subject: [PATCH 59/65] pkgs: fix eval --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5ebfb6ac4cb..2ff06a97f20c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14793,7 +14793,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - inherit (coqPackages) compcert; + inherit (coqPackages_8_19) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { From b497f64fa0673206039e9383e185cac27b5a901c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 15:00:23 +0000 Subject: [PATCH 60/65] zsh-autocomplete: 23.07.13 -> 24.09.04 --- pkgs/shells/zsh/zsh-autocomplete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 1ecd96121972..bd265a3868ba 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-autocomplete"; - version = "23.07.13"; + version = "24.09.04"; src = fetchFromGitHub { owner = "marlonrichert"; repo = "zsh-autocomplete"; rev = version; - sha256 = "sha256-0NW0TI//qFpUA2Hdx6NaYdQIIUpRSd0Y4NhwBbdssCs="; + sha256 = "sha256-o8IQszQ4/PLX1FlUvJpowR2Tev59N8lI20VymZ+Hp4w="; }; strictDeps = true; From c8a92b6001c98fd71e0e5da348e5f302e62068b3 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 4 Sep 2024 16:02:46 +0200 Subject: [PATCH 61/65] botan: split into a separate bin, doc, man output --- pkgs/development/libraries/botan/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 8be711df6a27..81c38c2d982b 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, python3, + docutils, bzip2, zlib, darwin, @@ -25,8 +26,11 @@ let strictDeps = true; outputs = [ + "bin" "out" "dev" + "doc" + "man" ]; src = fetchurl { @@ -36,7 +40,11 @@ let inherit patches; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ + python3 + docutils + ]; + buildInputs = [ bzip2 @@ -59,10 +67,14 @@ let botanConfigureFlags = [ "--prefix=${placeholder "out"}" + "--bindir=${placeholder "bin"}/bin" + "--docdir=${placeholder "doc"}/share/doc" + "--mandir=${placeholder "man"}/share/man" "--no-install-python-module" "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}" "--with-bzip2" "--with-zlib" + "--with-rst2man" ] ++ lib.optionals stdenv.cc.isClang [ "--cc=clang" From b6b4f4044c4c9f628889603740727577c8e42845 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Sep 2024 18:41:11 +0300 Subject: [PATCH 62/65] raycast: 1.81.2 -> 1.82.0 Changelog: https://www.raycast.com/changelog/1-82-0 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 1b866a70691b..5f992b9d2398 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.81.2"; + version = "1.82.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-Yz4H71doc5QC+AX5iSmOwewuKjU9dnK5ijVzYoOedYc="; + hash = "sha256-+USKcwmjapDH+zet7lHSWS6vT1GZ0ch+yPBRD2BrLS0="; }; dontPatch = true; From c14563a5be1237619098e2dd830958ff9702ab19 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 4 Sep 2024 17:46:54 +0200 Subject: [PATCH 63/65] flake-edit: init at 0.1.0 --- pkgs/by-name/fl/flake-edit/package.nix | 57 ++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/fl/flake-edit/package.nix diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix new file mode 100644 index 000000000000..e3d0522026d0 --- /dev/null +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -0,0 +1,57 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + installShellFiles, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "flake-edit"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "a-kenji"; + repo = "flake-edit"; + rev = "v${version}"; + hash = "sha256-dNTvAYBVZLeDlC1bsaonwojE7+1CD16/sCxtQVvT9WE="; + }; + + cargoHash = "sha256-ipLjbfnNqrUUD40awRnE8URX5pHhG4SwUM9JedoBM8Y="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env.ASSET_DIR = "target/assets"; + + postInstall = '' + installManPage target/assets/flake-edit.1 + + installShellCompletion --bash --name flake-edit.bash target/assets/flake-edit.bash + installShellCompletion --fish --name flake-edit.fish target/assets/flake-edit.fish + installShellCompletion --zsh --name _flake-edit target/assets/_flake-edit + ''; + + meta = { + description = "Edit your flake inputs with ease"; + homepage = "https://github.com/a-kenji/flake-edit"; + changelog = "https://github.com/a-kenji/flake-edit/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ a-kenji ]; + mainProgram = "flake-edit"; + }; +} From f6306c0961997917ff151c318f770059a168aee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 4 Sep 2024 12:21:09 -0400 Subject: [PATCH 64/65] treewide: fix eval related to `with lib;` removal --- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/resolvconf.nix | 2 +- .../services/continuous-integration/jenkins/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index e94186f19d76..515805ef5b1b 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -13,7 +13,7 @@ }; defaultText = lib.literalExpression '' pkgs.glibcLocales.override { - allLocales = any (x: x == "all") config.i18n.supportedLocales; + allLocales = lib.any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; } ''; diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index 9fee272410dc..3609b1ba475b 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -35,7 +35,7 @@ in (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ]) (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) - (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for lib.anything lib.anyways") + (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways") ]; options = { diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 95372ec2bbf8..cba1a07ed789 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -205,13 +205,13 @@ in { preStart = let replacePlugins = lib.optionalString (cfg.plugins != null) ( - let pluginCmds = lib.attrsets.lib.mapAttrsToList + let pluginCmds = lib.mapAttrsToList (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi") cfg.plugins; in '' rm -r ${cfg.home}/plugins || true mkdir -p ${cfg.home}/plugins - ${lib.strings.lib.concatStringsSep "\n" pluginCmds} + ${lib.concatStringsSep "\n" pluginCmds} ''); in '' rm -rf ${cfg.home}/war From c4ce4bb8abd5bc5fef47f38c3f56f183a8c9730e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 17:15:10 +0000 Subject: [PATCH 65/65] mkgmap: 4921 -> 4922 --- pkgs/applications/misc/mkgmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index a73767492f3f..f475359a86cb 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4921"; + version = "4922"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; + sha256 = "sha256-LgGdV6l9tjRR4BpGTDTm0MeAq2uiOe7Pv0qv87nbbWw="; }; patches = [