From 469b1ecaae57e670ec0c409ebdd0e177b04488c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Dec 2022 23:59:27 +0000 Subject: sumneko-lua-language-server: 3.6.3 -> 3.6.4 --- pkgs/development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index d2baf6c0ba154..bd9e704eef329 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-E9Wpdf9V6MltdFncVuDhwxtsLS8mese35HLi7kV1eXI="; + sha256 = "sha256-46Fni1SWsbYnPdntgq6mgqkZ8DCKXGBhTBzSAD2EG5M="; fetchSubmodules = true; }; -- cgit 1.4.1 From 5cc5f394d7bc74ed9ce8b5dd59831e8053b74330 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 17 Dec 2022 11:34:51 +0800 Subject: cinnamon.nemo: Workaround duplicate right-click menu items Don't populate nemo actions from /run/current-system/sw/share They should only be loaded exactly once as $out/share --- pkgs/desktops/cinnamon/nemo/default.nix | 7 ++++ .../fix-nemo-actions-duplicate-menu-items.patch | 48 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 82cd30488c427..6af812141d3f4 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-ztx3Y+n9Bpzuz06mbkis3kdlM/0JrOaMDbRF5glzkDE="; }; + patches = [ + # Don't populate nemo actions from /run/current-system/sw/share + # They should only be loaded exactly once from $out/share + # https://github.com/NixOS/nixpkgs/issues/190781 + ./fix-nemo-actions-duplicate-menu-items.patch + ]; + outputs = [ "out" "dev" ]; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch b/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch new file mode 100644 index 0000000000000..3a555774c4504 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch @@ -0,0 +1,48 @@ +diff --git a/libnemo-private/nemo-action-manager.c b/libnemo-private/nemo-action-manager.c +index 4dac198..b671421 100644 +--- a/libnemo-private/nemo-action-manager.c ++++ b/libnemo-private/nemo-action-manager.c +@@ -146,6 +146,8 @@ set_up_actions_directories (NemoActionManager *action_manager) + data_dirs = (gchar **) g_get_system_data_dirs (); + + for (i = 0; i < g_strv_length (data_dirs); i++) { ++ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) ++ continue; + path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); + uri = g_filename_to_uri (path, NULL, NULL); + +diff --git a/src/nemo-action-config-widget.c b/src/nemo-action-config-widget.c +index fc4075e..6e1c837 100644 +--- a/src/nemo-action-config-widget.c ++++ b/src/nemo-action-config-widget.c +@@ -221,6 +221,8 @@ refresh_widget (NemoActionConfigWidget *widget) + data_dirs = (gchar **) g_get_system_data_dirs (); + + for (i = 0; i < g_strv_length (data_dirs); i++) { ++ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) ++ continue; + path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); + populate_from_directory (widget, path); + g_clear_pointer (&path, g_free); +@@ -390,6 +392,8 @@ static void setup_dir_monitors (NemoActionConfigWidget *widget) + + guint i; + for (i = 0; i < g_strv_length (data_dirs); i++) { ++ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) ++ continue; + gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); + try_monitor_path (widget, path); + g_free (path); +diff --git a/src/nemo-script-config-widget.c b/src/nemo-script-config-widget.c +index 3a2d349..b8a85b4 100644 +--- a/src/nemo-script-config-widget.c ++++ b/src/nemo-script-config-widget.c +@@ -288,6 +288,8 @@ static void setup_dir_monitors (NemoScriptConfigWidget *widget) + + guint i; + for (i = 0; i < g_strv_length (data_dirs); i++) { ++ if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0) ++ continue; + gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL); + try_monitor_path (widget, path); + g_free (path); -- cgit 1.4.1 From ae7e98fe8d44c1d0635ed1c98fd9f071c3d4a035 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sun, 18 Dec 2022 23:23:36 +0100 Subject: er-patcher: use mkDerivation --- pkgs/tools/games/er-patcher/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/tools/games/er-patcher/default.nix index f5e7ddf7de16a..1eaad03a32914 100644 --- a/pkgs/tools/games/er-patcher/default.nix +++ b/pkgs/tools/games/er-patcher/default.nix @@ -1,10 +1,10 @@ { lib -, runCommandLocal +, stdenvNoCC , fetchFromGitHub , python3 }: -runCommandLocal "er-patcher" rec { +stdenvNoCC.mkDerivation rec { pname = "er-patcher"; version = "1.06-2"; @@ -19,6 +19,12 @@ runCommandLocal "er-patcher" rec { python3 ]; + installPhase = '' + mkdir -p $out/bin + install -Dm755 $src/er-patcher $out/bin/er-patcher + patchShebangs $out/bin/er-patcher + ''; + meta = with lib; { homepage = "https://github.com/gurrgur/er-patcher"; changelog = "https://github.com/gurrgur/er-patcher/releases/tag/v${version}"; @@ -31,8 +37,4 @@ runCommandLocal "er-patcher" rec { license = licenses.mit; maintainers = [ maintainers.ivar ]; }; -} '' - mkdir -p $out/bin - install -Dm755 $src/er-patcher $out/bin/er-patcher - patchShebangs $out/bin/er-patcher -'' +} -- cgit 1.4.1 From b874ecd68e0f1c2252501dade48c9647cfc9a59c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Dec 2022 00:19:25 +0000 Subject: yq-go: 4.30.5 -> 4.30.6 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 61e5d10b0c950..e07899633d7ab 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.30.5"; + version = "4.30.6"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-+OMBDWiQXCPVTjE8FhzfVRCyGJ0cEw7TVhcoS4yW/50="; + sha256 = "sha256-2vG5rdrvpRV7yZtAKnwTQ9+s6Ddz3DrxCY7HhQ6LegU="; }; - vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s="; + vendorSha256 = "sha256-s1c4E5bPal1YWCFIHy5CQSpGNbfM5lx2/Ri5linpTiw="; nativeBuildInputs = [ installShellFiles ]; -- cgit 1.4.1 From c92ffdd222ab8c10966c46970b163144228e7fb5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 18 Dec 2022 22:18:01 -0300 Subject: labwc: 0.5.3 -> 0.6.0 --- .../applications/window-managers/labwc/default.nix | 23 ++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index ba145b85286f6..8bd0691450c74 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -15,19 +15,23 @@ , scdoc , wayland , wayland-protocols -, wlroots +, wlroots_0_16 +, xcbutilwm , xwayland }: -stdenv.mkDerivation rec { +let + wlroots = wlroots_0_16; +in +stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "labwc"; - repo = pname; - rev = version; - hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY="; + repo = "labwc"; + rev = finalAttrs.version; + hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; }; nativeBuildInputs = [ @@ -49,10 +53,13 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots + xcbutilwm xwayland ]; - mesonFlags = [ "-Dxwayland=enabled" ]; + mesonFlags = [ + (lib.mesonEnable "xwayland" true) + ]; meta = with lib; { homepage = "https://github.com/labwc/labwc"; @@ -61,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a71bdc01d07f..4d384c6dd086e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30161,9 +30161,7 @@ with pkgs; lame = callPackage ../development/libraries/lame { }; - labwc = callPackage ../applications/window-managers/labwc { - wlroots = wlroots_0_15; - }; + labwc = callPackage ../applications/window-managers/labwc { }; larswm = callPackage ../applications/window-managers/larswm { }; -- cgit 1.4.1 From d97df2543e226059dbf146be82af7de1090d917c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 14:36:53 +0000 Subject: kubeseal: 0.19.2 -> 0.19.3 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 6bcde313e9ad6..da452e9769d6b 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-LluWV/GWBJ+dmn94GtqPNCIDTZk2zlNhrbcM2pALUpU="; + sha256 = "sha256-KssClU/jWdBH29TFhCeui6mN6t6IJlIKM3LzaWdPG7Q="; }; - vendorSha256 = "sha256-f7rznlRKEkHsU72QvRpOtvhg5rp9PuEoADhQOeD16rU="; + vendorSha256 = "sha256-58+MJMn687wh9c25qtwGQdy4uGcZN3T2bWK/cvxlLvQ="; subPackages = [ "cmd/kubeseal" ]; -- cgit 1.4.1 From 143ca825d96884e0852ff146ce292071a63fd400 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Dec 2022 13:07:38 +0000 Subject: sil-abyssinica: 2.100 -> 2.200 --- pkgs/data/fonts/sil-abyssinica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index 7cefdf077610b..b61af144dcc0a 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -1,12 +1,12 @@ { fetchzip, lib }: let - version = "2.100"; + version = "2.200"; in fetchzip rec { name = "sil-abyssinica-${version}"; url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - sha256 = "sha256-06olbIdSlhJ4hgblzzabqIs57FpsyWIdPDFXb9vK31A="; + sha256 = "sha256-Kvswqzw8remcu36QaVjeyk03cR4wW5BKQMDihiaxJoE="; postFetch = '' rm -rf $out/web -- cgit 1.4.1 From 4e830d14a5fece1d946164c75b35e3e072e218e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 17:37:20 +0000 Subject: k3sup: 0.12.10 -> 0.12.11 --- pkgs/applications/networking/cluster/k3sup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index ec7cdb3ecde6f..a866c9c859063 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-d9YZOrMZKwkHmo7/b0BE552OLnD/ETfF4n+jE7fQ4zA="; + sha256 = "sha256-SwbOXPpW4pQXZNYWkEmLl5ax2P+tjcoVTOV23fCigtk="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; -- cgit 1.4.1 From 7c7073946157ac5998650be5cbd5743be8b9fc3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 16:22:32 +0000 Subject: arkade: 0.8.50 -> 0.8.52 --- pkgs/applications/networking/cluster/arkade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 3b45321c6f26c..fe59539efb54d 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.50"; + version = "0.8.52"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-DPBQ+MisNgVh2DpaIF//fjIzGvfpNYRS4zpYeUVqLwg="; + sha256 = "sha256-fKLvWlGJmhTvjcihJOytPvSNqhWOtJhWxMgw9gpc2M0="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-Kr6m1qhVTiXllm5xaxXKsWAtWbnsDwbwWH0iqc0sKfM="; + vendorSha256 = "sha256-E2b0iJtOcRBOW4PEI/1ECM4fJa+s/LHtmRK/iYvJ358="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ -- cgit 1.4.1 From bb31220cca6d044baa6dc2715b07497a2a7c4bc7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 12 Dec 2022 14:12:04 -0600 Subject: nimPackages.c2nim: 0.9.18 -> 0.9.19 --- pkgs/development/nim-packages/c2nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/nim-packages/c2nim/default.nix b/pkgs/development/nim-packages/c2nim/default.nix index 408e4fbee96e7..c748883dbbc84 100644 --- a/pkgs/development/nim-packages/c2nim/default.nix +++ b/pkgs/development/nim-packages/c2nim/default.nix @@ -2,13 +2,13 @@ buildNimPackage rec { pname = "c2nim"; - version = "0.9.18"; + version = "0.9.19"; nimBinOnly = true; src = fetchFromGitHub { owner = "nim-lang"; repo = pname; rev = version; - hash = "sha256-127ux36mfC+PnS2HIQffw+z0TSvzdQXnKRxqYV3XahU="; + hash = "sha256-E8sAhTFIWAnlfWyuvqK8h8g7Puf5ejLEqgLNb5N17os="; }; meta = with lib; src.meta // { -- cgit 1.4.1