nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-24.05 into staging-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-16 00:19:49 +00:00
committed by GitHub
parent c283fc42f2 bc20bd3b52
commit 643578fbfe
6 changed files with 289 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/firefox-bin/update.nix
View File

@@ -79,7 +79,8 @@ writeScript "update-${pname}" ''
tr " " ":"`; do
# create an entry for every locale
cat >> $tmpfile <<EOF
{ url = "$url$version/`echo $line | cut -d":" -f3`";
{
url = "$url$version/`echo $line | cut -d":" -f3`";
locale = "`echo $line | cut -d":" -f3 | sed "s/$arch\///" | sed "s/\/.*//"`";
arch = "$arch";
sha256 = "`echo $line | cut -d":" -f1`";
@@ -88,7 +89,7 @@ writeScript "update-${pname}" ''
done
done
cat >> $tmpfile <<EOF
];
];
}
EOF

530
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@@ -91,8 +91,8 @@ rec {
};
thunderbird-128 = common {
version = "128.5.1esr";
sha512 = "1dfa0752a1dbfc4d7516beab13e188aa40c145f2eb0554441ecc4dff739cc862c15fdfdd8c0cc026d010ba3caa57d6168da35e484c04989fb6c81f5c09215831";
version = "128.5.2esr";
sha512 = "cbfd4b1a7245c2a2f6ef9b2cf69d95a8095eba855755d00fd397351b21ad504733084d6f41801f4114be7015332b8db65e5290bec45f5321efc753412b9acecc";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";

10
pkgs/by-name/go/google-chrome/package.nix
View File

@@ -166,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "131.0.6778.108";
version = "131.0.6778.139";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-DU9qaMnn7gM/8VR4lsetWlkYu/Gs5+i/9JPYY2sbCi0=";
hash = "sha256-JEJnOawnz6BIXm+pbjz0u1BQOUwm+2hBCMh5NnN2aII=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -266,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "131.0.6778.109";
version = "131.0.6778.140";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/adhpt2otqvd2vrh5vbgwgtydt7gq_131.0.6778.109/GoogleChrome-131.0.6778.109.dmg";
hash = "sha256-9pKGJa7UiDx1QPnWk0ONDQukUdRAPGz1PeYd7UoReoQ=";
url = "http://dl.google.com/release2/chrome/ijobeyqsjtnv35wplq3dh5ngae_131.0.6778.140/GoogleChrome-131.0.6778.140.dmg";
hash = "sha256-LK5OSVxPtqgKMvg+AS2Q36RLBT8C3XRuPelCWTogXgY=";
};
dontPatch = true;

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

@@ -4,35 +4,35 @@
"hash": "sha256:0ypnbp5k2xkfwk4xp5sfsgb3v29cjx278wwaa2csqpnki91hyhgp"
},
"6.1": {
"version": "6.1.119",
"hash": "sha256:0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf"
"version": "6.1.120",
"hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1"
},
"5.15": {
"version": "5.15.173",
"hash": "sha256:1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa"
"version": "5.15.174",
"hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3"
},
"5.10": {
"version": "5.10.230",
"hash": "sha256:0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d"
"version": "5.10.231",
"hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn"
},
"5.4": {
"version": "5.4.286",
"hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq"
"version": "5.4.287",
"hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd"
},
"4.19": {
"version": "4.19.322",
"hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
},
"6.6": {
"version": "6.6.64",
"hash": "sha256:1cbag4wzv5fpjdcl0rpp158ch1q17rfz2qxm1xjjyhnblqzxjpq6"
"version": "6.6.66",
"hash": "sha256:0lhy5waj330hmaxbqpfw2fxzkvvlxxs1nr325i8jy736qhvpjxcx"
},
"6.11": {
"version": "6.11.11",
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
},
"6.12": {
"version": "6.12.4",
"hash": "sha256:0lhisw9sy0b38j1nifcgjm8w9864qx3hg6b7f6z2311x8chzhdbg"
"version": "6.12.5",
"hash": "sha256:1k9bc0lpgg29bh7zqz3pm91hhjnfyl5aw6r6hph3ha743k77y81r"
}
}

2
pkgs/tools/admin/awsume/default.nix
View File

@@ -9,6 +9,7 @@
psutil,
pluggy,
pyyaml,
setuptools,
}:
buildPythonApplication rec {
@@ -32,6 +33,7 @@ buildPythonApplication rec {
psutil
pluggy
pyyaml
setuptools
];
postPatch = ''