nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-20 00:16:43 +00:00
committed by GitHub
parent a4cdb54da8 7c1857ab19
commit cc8dcfdec7
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View File

@@ -22,6 +22,10 @@ let
'';
systemdBootBuilder = pkgs.substituteAll rec {
name = "systemd-boot";
dir = "bin";
src = checkedSource;
isExecutable = true;
@@ -82,7 +86,7 @@ let
finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
#!${pkgs.runtimeShell}
${systemdBootBuilder} "$@"
${systemdBootBuilder}/bin/systemd-boot "$@"
${cfg.extraInstallCommands}
'';
in {

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -3,7 +3,7 @@ let
versions =
if stdenv.isLinux then {
stable = "0.0.67";
ptb = "0.0.103";
ptb = "0.0.105";
canary = "0.0.483";
development = "0.0.28";
} else {
@@ -21,7 +21,7 @@ let
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
hash = "sha256-BYzISVHSlKqVN0Egkw5su1wJnrGjQYbxYV840bDCakM=";
hash = "sha256-u/4wWssZxKlHrRW/Vd9pqUfqN2VQGYv1SDktpRsOayM=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

2
pkgs/desktops/gnome/core/sushi/default.nix
View File

@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
homepage = "https://en.wikipedia.org/wiki/Sushi_(software)";
homepage = "https://gitlab.gnome.org/GNOME/sushi";
description = "A quick previewer for Nautilus";
mainProgram = "sushi";
maintainers = teams.gnome.members;

12
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -4,8 +4,8 @@
"hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy"
},
"6.1": {
"version": "6.1.110",
"hash": "sha256:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly"
"version": "6.1.111",
"hash": "sha256:1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"
},
"5.15": {
"version": "5.15.167",
@@ -24,8 +24,8 @@
"hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
},
"6.6": {
"version": "6.6.51",
"hash": "sha256:1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w"
"version": "6.6.52",
"hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"
},
"6.8": {
"version": "6.8.12",
@@ -36,8 +36,8 @@
"hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
},
"6.10": {
"version": "6.10.10",
"hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6"
"version": "6.10.11",
"hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv"
},
"6.11": {
"version": "6.11",

6
pkgs/os-specific/linux/nct6687d/default.nix
View File

@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "nct6687d";
version = "0-unstable-2024-02-23";
version = "0-unstable-2024-09-02";
src = fetchFromGitHub {
owner = "Fred78290";
repo = "nct6687d";
rev = "0ee35ed9541bde22fe219305d1647b51ed010c5e";
hash = "sha256-g81U+ngnsOslBDCQP51uDDyHPpCv9T/j+KmFUAQfz/M=";
rev = "f45b72a6ca335e20f8a2df5ee5d4e130916150d0";
hash = "sha256-2sAL6aXUafmm2DKIhqEoTSPZVmzu/lnTkpPznJndX3o=";
};
setSourceRoot = ''

4
pkgs/servers/sql/patroni/default.nix
View File

@@ -6,13 +6,13 @@
pythonPackages.buildPythonApplication rec {
pname = "patroni";
version = "3.3.2";
version = "3.3.3";
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-7Tq7i6AH6tt9Uyx276rVBwvbxxETRyVKnhhTijW02sU=";
sha256 = "sha256-LIdW62LLEmsQZJMbInb1vbKaKgEEBBU1HGyLLNitjjg=";
};
propagatedBuildInputs = with pythonPackages; [