From c495c40f15a1466562161783b2f2cd0ac119fdf7 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 9 Apr 2024 23:08:47 +0800 Subject: [PATCH 01/10] pomodoro-gtk: init at 1.4.1 --- pkgs/by-name/po/pomodoro-gtk/package.nix | 63 ++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/po/pomodoro-gtk/package.nix diff --git a/pkgs/by-name/po/pomodoro-gtk/package.nix b/pkgs/by-name/po/pomodoro-gtk/package.nix new file mode 100644 index 000000000000..ef667552a811 --- /dev/null +++ b/pkgs/by-name/po/pomodoro-gtk/package.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gjs +, gobject-introspection +, blueprint-compiler +, wrapGAppsHook4 +, desktop-file-utils +, libadwaita +, libgda6 +, gsound +, gst_all_1 +, libportal-gtk4 +}: + +stdenv.mkDerivation { + pname = "pomodoro-gtk"; + version = "1.4.1"; + + src = fetchFromGitLab { + owner = "idevecore"; + repo = "pomodoro"; + rev = "44b724557539084991f3eb55b9593053a2c73eba"; # author didn't make a tag + fetchSubmodules = true; + hash = "sha256-krVRVMrrzuqPY/3P9dCz7rVCCW7/j5cpT95XniGpBEs="; + }; + + postPatch = '' + patchShebangs --build troll/gjspack/bin/gjspack + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gjs # runtime for gjspack + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + gjs + libadwaita + libgda6 + gsound + gst_all_1.gst-plugins-base + libportal-gtk4 + ]; + + meta = { + description = "A simple and intuitive timer application (also named Planytimer)"; + homepage = "https://gitlab.com/idevecore/pomodoro"; + license = lib.licenses.gpl3Plus; + mainProgram = "pomodoro"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +} From 68b0265ab5c2b420f916b4f51880f5bcbf6a51ff Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:13:40 +0530 Subject: [PATCH 02/10] ananicy-rules-cachyos: unstable-2023-10-11 -> unstable-2024-04-10 commit: de55e2f55e6adf559bf4990aa433f5c202dc073d adding myself as maintainer --- pkgs/misc/ananicy-rules-cachyos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/ananicy-rules-cachyos/default.nix b/pkgs/misc/ananicy-rules-cachyos/default.nix index 096528fa3538..c73f9e3b3fb9 100644 --- a/pkgs/misc/ananicy-rules-cachyos/default.nix +++ b/pkgs/misc/ananicy-rules-cachyos/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ananicy"; - version = "unstable-2023-10-11"; + version = "unstable-2024-04-10"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "3dafc3eb667b6ed7024359de78bf961c7248954d"; - sha256 = "sha256-bMwM/2R6jdgrQ6C0JnHyMp9L4OWI6KVGcninrr7wLQ8="; + rev = "de55e2f55e6adf559bf4990aa433f5c202dc073d"; + sha256 = "sha256-TWaOMVEeTLI67eG5BPyb+OSnz31QvTueQD2yfEEbTEo="; }; dontConfigure = true; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "ananicy-cpp-rules for CachyOS "; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; + maintainers = with maintainers; [ artturin johnrtitor ]; }; } From 403c17e488fd6570964d627fa055ba4186a89f80 Mon Sep 17 00:00:00 2001 From: someplaceguy Date: Wed, 10 Apr 2024 13:16:28 +0000 Subject: [PATCH 03/10] flint: remove mpir dependency MPIR is no longer being maintained and its website no longer exists. Furthermore, flint can use GMP instead of MPIR. --- pkgs/development/libraries/flint/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index eeb2cf1127e4..eeb928be8710 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , gmp -, mpir , mpfr , ntl , openblas ? null, blas, lapack @@ -22,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ gmp - mpir mpfr ntl ] ++ lib.optionals withBlas [ @@ -35,7 +33,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp=${gmp}" - "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-ntl=${ntl}" ] ++ lib.optionals withBlas [ From 229a97457054f259ddf2c48a80f297bf403cd2cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 19:26:30 +0000 Subject: [PATCH 04/10] mountpoint-s3: 1.5.0 -> 1.6.0 --- pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 3bd0527c2983..5aff3e552842 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-DsxcQ/FEVcrzPyv9LgssNut4XnbU3mPKbuBwQKLiRLA="; + hash = "sha256-1d2PPbTheUcHw2xS5LEcdchnfwu7szBApv+FnPaxt+I="; fetchSubmodules = true; }; - cargoHash = "sha256-UOQRdSQ/whlOTZL2vaNiIcKB+Zgpk8tbinWBRWPyllc="; + cargoHash = "sha256-tBi41kdaa4mVHh0MkXJ8kaG1e3CQURIKVk9Lboy1N8Y="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 From b64d76aa6cc182aeb7fb90fdfc1d2d875a5d9483 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Fri, 12 Apr 2024 00:02:58 +0200 Subject: [PATCH 05/10] vscode-extensions.asvetliakov.vscode-neovim: 1.7.1 -> 1.8.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 727a5a30042f..c23bbd719fe9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -428,8 +428,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.7.1"; - sha256 = "0ib4sjk7r370ckvaqb4yzgy7csy8pli9z2jhibhhwwcq2748ah4q"; + version = "1.8.1"; + sha256 = "0kqzry0cbvvy1pkbx5rhnk5ry7j91cbf11vz1s1jrqc7j0hq0yx8"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; From 50e1ce4c3b39e7933c7b6d698bc6a8c6356f4251 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 10 Apr 2024 21:00:51 +0200 Subject: [PATCH 06/10] =?UTF-8?q?webkitgtk:=202.44.0=20=E2=86=92=202.44.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2024/04/09/webkitgtk2.44.1-released.html --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 07fc616efacc..6ee2b7978be1 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.44.0"; + version = "2.44.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-xmUw5Bulmx7bpO6J7yCyGI4nO+0El+lQhHKePPvjDIc="; + hash = "sha256-QlsUWbDwTQYAx40au15+36PAYKQg+LIx6aai1dKcVWE="; }; patches = lib.optionals stdenv.isLinux [ From e44c60ebad02e3217ca7e7db08f0ea90b4829889 Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 12 Apr 2024 00:44:51 +0200 Subject: [PATCH 07/10] kubeswitch: fix package Complete broken package and correct the shell completions --- pkgs/development/tools/kubeswitch/default.nix | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix index 76aeeb2e94c8..aad4fb5318c7 100644 --- a/pkgs/development/tools/kubeswitch/default.nix +++ b/pkgs/development/tools/kubeswitch/default.nix @@ -1,4 +1,11 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, kubeswitch }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + kubeswitch, + installShellFiles, +}: buildGoModule rec { pname = "kubeswitch"; @@ -6,9 +13,9 @@ buildGoModule rec { src = fetchFromGitHub { owner = "danielfoehrKn"; - repo = pname; + repo = "kubeswitch"; rev = version; - sha256 = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M="; + hash = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M="; }; vendorHash = null; @@ -16,25 +23,30 @@ buildGoModule rec { subPackages = [ "cmd/main.go" ]; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}" "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01" - ]; - passthru.tests.version = testers.testVersion { - package = kubeswitch; - }; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' - mv $out/bin/main $out/bin/switch + mv $out/bin/main $out/bin/switcher + for shell in bash zsh fish; do + $out/bin/switcher --cmd switcher completion $shell > switcher.$shell + installShellCompletion --$shell switcher.$shell + done ''; - meta = with lib; { - description = "The kubectx for operators"; - license = licenses.asl20; + passthru.tests.version = testers.testVersion { package = kubeswitch; }; + + meta = { + changelog = "https://github.com/danielfoehrKn/kubeswitch/releases/tag/${version}"; + description = "The kubectx for operators, a drop-in replacement for kubectx"; + license = lib.licenses.asl20; homepage = "https://github.com/danielfoehrKn/kubeswitch"; - maintainers = with maintainers; [ bryanasdev000 ]; - mainProgram = "switch"; + maintainers = with lib.maintainers; [ bryanasdev000 ]; + mainProgram = "switcher"; }; } From 262222169f97ad43ed7a2c5bc58f1db034b3dcf4 Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 12 Apr 2024 00:46:02 +0200 Subject: [PATCH 08/10] nixos/kubeswitch: init Add a module to activate the kubeswitch in the shell --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/kubeswitch.nix | 56 +++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 nixos/modules/programs/kubeswitch.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 89c8104564fc..786f838bc6c6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -214,6 +214,7 @@ ./programs/kclock.nix ./programs/kdeconnect.nix ./programs/lazygit.nix + ./programs/kubeswitch.nix ./programs/less.nix ./programs/liboping.nix ./programs/light.nix diff --git a/nixos/modules/programs/kubeswitch.nix b/nixos/modules/programs/kubeswitch.nix new file mode 100644 index 000000000000..ba2d25fbeb45 --- /dev/null +++ b/nixos/modules/programs/kubeswitch.nix @@ -0,0 +1,56 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.programs.kubeswitch; +in +{ + options = { + programs.kubeswitch = { + enable = lib.mkEnableOption (lib.mdDoc "kubeswitch"); + + commandName = lib.mkOption { + type = lib.types.str; + default = "kswitch"; + description = "The name of the command to use"; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.kubeswitch; + defaultText = lib.literalExpression "pkgs.kubeswitch"; + description = "The package to install for kubeswitch"; + }; + }; + }; + + config = + let + shell_files = pkgs.stdenv.mkDerivation rec { + name = "kubeswitch-shell-files"; + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/share + for shell in bash zsh; do + ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell + ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell + done + ''; + }; + in + lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + programs.bash.interactiveShellInit = '' + source ${shell_files}/share/${cfg.commandName}_init.bash + source ${shell_files}/share/${cfg.commandName}_completion.bash + ''; + programs.zsh.interactiveShellInit = '' + source ${shell_files}/share/${cfg.commandName}_init.zsh + source ${shell_files}/share/${cfg.commandName}_completion.zsh + ''; + }; +} From 078dca4b1e60f1fcd6f6f0c5017e76d532032c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 12 Apr 2024 09:29:40 +1000 Subject: [PATCH 09/10] aewan: fix darwin build --- pkgs/applications/editors/aewan/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 6e817646d9e7..dcc59560a246 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses }: +{ lib, gccStdenv, fetchurl, fetchpatch, zlib, ncurses }: +let stdenv = gccStdenv; +in stdenv.mkDerivation rec { pname = "aewan"; version = "1.0.01"; From 5fe89bc95dc792594446c435036815c3ffecb466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 12 Apr 2024 10:04:04 +1000 Subject: [PATCH 10/10] afio: darwin build --- pkgs/tools/archivers/afio/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index d321bd44985d..4f01c1c58ba6 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub, fetchpatch } : stdenv.mkDerivation rec { version = "2.5.2"; @@ -11,11 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy"; }; - /* - * A patch to simplify the installation and for removing the - * hard coded dependency on GCC. - */ - patches = [ ./0001-makefile-fix-installation.patch ]; + patches = [ + /* + * A patch to simplify the installation and for removing the + * hard coded dependency on GCC. + */ + ./0001-makefile-fix-installation.patch + + # fix darwin build (include headers) + (fetchpatch { + url = "https://github.com/kholtman/afio/pull/18/commits/a726614f99913ced08f6ae74091c56969d5db210.patch"; + name = "darwin-headers.patch"; + hash = "sha256-pK8mN29fC2mL4B69Fv82dWFIQMGwquyl825OBDTxzpo="; + }) + ]; installFlags = [ "DESTDIR=$(out)" ];