nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-01-17 06:06:19 +00:00
committed by GitHub
parent f974e40402 47cbf58ba8
commit d9c0ea7007
13 changed files with 45 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/display-managers/account-service-util.nix
View File

@@ -10,7 +10,7 @@
python3.pkgs.buildPythonApplication {
name = "set-session";
format = "other";
pyproject = false;
src = ./set-session.py;

41
pkgs/by-name/ar/archiver/package.nix
View File

@@ -1,41 +0,0 @@
{
buildGoModule,
fetchFromGitHub,
lib,
}:
buildGoModule rec {
pname = "archiver";
version = "3.5.1";
src = fetchFromGitHub {
owner = "mholt";
repo = "archiver";
tag = "v${version}";
hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8=";
};
vendorHash = "sha256-sTzjTKQ9m5BicDk6M1wR1EU+o9+87DbHCyGoF35Jm/g=";
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.commit=${src.rev}"
"-X main.date=unknown"
];
doCheck = false;
meta = {
description = "Easily create & extract archives, and compress & decompress files of various formats";
homepage = "https://github.com/mholt/archiver";
mainProgram = "arc";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kalbasit ];
knownVulnerabilities = [
"CVE-2024-0406"
"Package is unmaintained upstream"
];
};
}

26
pkgs/by-name/bl/blockbench/package.nix
View File

@@ -3,6 +3,7 @@
stdenv,
buildNpmPackage,
fetchFromGitHub,
fetchpatch,
makeWrapper,
imagemagick,
copyDesktopItems,
@@ -12,13 +13,13 @@
buildNpmPackage rec {
pname = "blockbench";
version = "5.0.6";
version = "5.0.7";
src = fetchFromGitHub {
owner = "JannisX11";
repo = "blockbench";
tag = "v${version}";
hash = "sha256-AQAyxNVt8PCDCU/jViYY3IlPdNiesgx5kT9W7yrNJ4I=";
hash = "sha256-JXOO2+UPMOGSuvez8ektbD5waPKatMggKn+MuH9Qkrs=";
};
nativeBuildInputs = [
@@ -29,14 +30,22 @@ buildNpmPackage rec {
copyDesktopItems
];
npmDepsHash = "sha256-OSrX/H1m89GLIznP8/Q1pVDgrlfp55ZUnYjyQIwlJi4=";
patches = [
(fetchpatch {
# fixes https://github.com/JannisX11/blockbench/issues/3237
name = "bump-electron-builder.patch";
url = "https://github.com/JannisX11/blockbench/commit/dee9ae271f252d4bb3f98c13c4a1abaaeedd1feb.patch";
hash = "sha256-XpdqeCKoWsUieOMWhxVsEQ2r0qR+iiXKnVRfNYERDQs=";
})
];
npmDepsHash = "sha256-T3yenZCkOrGOWJBxqe0RG39jWYfpsXStblf5Jx4dtF0=";
makeCacheWritable = true;
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
# disable code signing on Darwin
# disable notarization logic
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
export CSC_IDENTITY_AUTO_DISCOVERY=false
sed -i "/afterSign/d" package.json
'';
@@ -48,9 +57,10 @@ buildNpmPackage rec {
chmod -R u+w electron-dist
npm exec electron-builder -- \
--dir \
-c.electronDist=electron-dist \
-c.electronVersion=${electron.version}
--dir \
-c.electronDist=electron-dist \
-c.electronVersion=${electron.version} \
-c.mac.identity=null
'';
installPhase = ''

4
pkgs/by-name/ci/cinnamon/package.nix
View File

@@ -74,13 +74,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon";
version = "6.6.4";
version = "6.6.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
tag = version;
hash = "sha256-K1Saz0WY5Qwb7YF8fcH0yWNK071dFwzxuPZP2MuSvrs=";
hash = "sha256-i+eUSEz6Zgfm8HISSuxQ04lz86Rrp99NWaWAplJCLCs=";
};
patches = [

11
pkgs/by-name/mi/mint-l-theme/package.nix
View File

@@ -6,16 +6,15 @@
python3Packages,
}:
stdenvNoCC.mkDerivation {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mint-l-theme";
version = "2.0.5";
version = "2.0.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "mint-l-theme";
# They don't really do tags, this is just a named commit.
rev = "112daa4f76ccef08a9c4e3b107957ff862429516";
hash = "sha256-Y6rPrEG+Gh2V+TbLDTqVgPSYQMBXWKacYrS1FMzmQVo=";
tag = finalAttrs.version;
hash = "sha256-Lss8P0L6gxbP88MiTfv3VfOFkvkEUDXIPBoFHPxLWqE=";
};
nativeBuildInputs = [
@@ -43,4 +42,4 @@ stdenvNoCC.mkDerivation {
platforms = lib.platforms.linux;
teams = [ lib.teams.cinnamon ];
};
}
})

4
pkgs/by-name/mi/mint-themes/package.nix
View File

@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.3.7";
version = "2.3.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "mint-themes";
rev = version;
hash = "sha256-7/4mDcQ3B7keX9CusQUOOOYSrzxEKRcakA37VOU0+gE=";
hash = "sha256-cIXEg6Crq4DrHBeJUgwCF5k8A5bsR4trO0UC5wMZLpk=";
};
nativeBuildInputs = [

4
pkgs/by-name/mu/muffin/package.nix
View File

@@ -43,7 +43,7 @@
stdenv.mkDerivation rec {
pname = "muffin";
version = "6.6.1";
version = "6.6.2";
outputs = [
"out"
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = "muffin";
rev = version;
hash = "sha256-65XVmSz/p8MYj4vbONCPFG3wdt7sCtHSX9Kg8UcYUf0=";
hash = "sha256-UqN1KFGhjjn0NquOAqYILEn2MPqimTyWbi6dJEALYy8=";
};
patches = [

5
pkgs/by-name/pa/pagmo2/package.nix
View File

@@ -22,11 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-ido3e0hQLDEPT0AmsfAVTPlGbWe5QBkxgRO6Fg1wp/c=";
};
outputs = [
"out"
"dev"
];
nativeBuildInputs = [ cmake ];
buildInputs = [

4
pkgs/by-name/re/resterm/package.nix
View File

@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "resterm";
version = "0.17.1";
version = "0.18.5";
src = fetchFromGitHub {
owner = "unkn0wn-root";
repo = "resterm";
tag = "v${finalAttrs.version}";
sha256 = "sha256-+lYbSOLY0TF8aVx5pyjwVpibVPxMnWRrs1vdloc+JOk=";
sha256 = "sha256-YAicTu83IKw2reZefdCjNfhRwiOCtKieyq0vPJ510lQ=";
};
vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc=";

6
pkgs/by-name/xa/xapp-symbolic-icons/package.nix
View File

@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "xapp-symbolic-icons";
version = "1.0.8";
version = "1.0.9";
src = fetchFromGitHub {
owner = "xapp-project";
repo = "xapp-symbolic-icons";
tag = finalAttrs.version;
hash = "sha256-4Q+FHD3kYJGI4kZThb/ZVheaz8dMze9ZTgz8AFKy3HY=";
hash = "sha256-BcatNzhtPZW9EDPZ9FPU+fPDC8l1CVAjcBYJJUNCRZo=";
};
nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
homepage = "https://github.com/xapp-project/xapp-symbolic-icons";
description = "Set of symbolic icons for GTK applications and projects";
license = lib.licenses.gpl3Plus;
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.linux;
teams = [ lib.teams.cinnamon ];
};

6
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View File

@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "8.0.2";
version = "8.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "applications-menu";
rev = version;
sha256 = "sha256-uc+enFOeYL91fFWaDY+43EJ4VomGqZQ7uZ3+dYm66SI=";
tag = version;
hash = "sha256-3QdgMnYui3gXYH8dg7yqsQTkwJeVbEwty4herA1aQl0=";
};
patches = [

12
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@@ -72,12 +72,12 @@ rec {
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
production = generic {
version = "580.119.02";
sha256_64bit = "sha256-gCD139PuiK7no4mQ0MPSr+VHUemhcLqerdfqZwE47Nc=";
sha256_aarch64 = "sha256-eYcYVD5XaNbp4kPue8fa/zUgrt2vHdjn6DQMYDl0uQs=";
openSha256 = "sha256-l3IQDoopOt0n0+Ig+Ee3AOcFCGJXhbH1Q1nh1TEAHTE=";
settingsSha256 = "sha256-sI/ly6gNaUw0QZFWWkMbrkSstzf0hvcdSaogTUoTecI=";
persistencedSha256 = "sha256-j74m3tAYON/q8WLU9Xioo3CkOSXfo1CwGmDx/ot0uUo=";
version = "580.126.09";
sha256_64bit = "sha256-TKxT5I+K3/Zh1HyHiO0kBZokjJ/YCYzq/QiKSYmG7CY=";
sha256_aarch64 = "sha256-c5PEKxEv1vCkmOHSozEnuCG+WLdXDcn41ViaUWiNpK0=";
openSha256 = "sha256-ychsaurbQ2KNFr/SAprKI2tlvAigoKoFU1H7+SaxSrY=";
settingsSha256 = "sha256-4SfCWp3swUp+x+4cuIZ7SA5H7/NoizqgPJ6S9fm90fA=";
persistencedSha256 = "sha256-J1UwS0o/fxz45gIbH9uaKxARW+x4uOU1scvAO4rHU5Y=";
};
latest = selectHighestVersion production (generic {

1
pkgs/top-level/aliases.nix
View File

@@ -311,6 +311,7 @@ mapAliases {
archi = throw "'archi' has been removed, since its upstream maintainers do not want it packaged"; # Added 2025-11-18
archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15
archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01
archiver = throw "archiver has been removed, as it has been unmaintained upstream since November 2024"; # Added 2026-01-15
ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Added 2025-10-04
argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27
aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27