b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-12-19 06:01:52 +00:00 committed by GitHub
parent dc1fa2c776 87cf5fd4c2
commit dbe7622b0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 97 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/cluster/arkade/default.nix
View file

@ -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 = [

4
pkgs/applications/networking/cluster/k3sup/default.nix
View file

@ -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 ];

6
pkgs/applications/networking/cluster/kubeseal/default.nix
View file

@ -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" ];

23
pkgs/applications/window-managers/labwc/default.nix
View file

@ -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;
};
}
})

4
pkgs/data/fonts/sil-abyssinica/default.nix
View file

@ -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

7
pkgs/desktops/cinnamon/nemo/default.nix
View file

@ -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 = [

48
pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch Normal file
View file

@ -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);

4
pkgs/development/nim-packages/c2nim/default.nix
View file

@ -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 // {

4
pkgs/development/tools/sumneko-lua-language-server/default.nix
View file

@ -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;
};

6
pkgs/development/tools/yq-go/default.nix
View file

@ -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 ];

16
pkgs/tools/games/er-patcher/default.nix
View file

@ -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
''
}

4
pkgs/top-level/all-packages.nix
View file

@ -30163,9 +30163,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 { };