nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +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-10-01 00:19:15 +00:00
committed by GitHub
parent 072c83a311 518c8863a4
commit 53eb2a9b05
14 changed files with 126 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
View File

@@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.24.1";
version = "7.26.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ=";
hash = "sha256-A9gTphQ7FQm1iCutrDxAD2wazihn+4ZafJrqdZ8Nahk=";
}

7
pkgs/by-name/ch/chess-clock/package.nix
View File

@@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "chess-clock";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = "v${version}";
hash = "sha256-wwNOop2V84vZO3JV0+VZ+52cKPx8xJg2rLkjfgc/+n4=";
hash = "sha256-XDOCHFZC3s3b/4kD1ZkhWar3kozW3vXc0pk7O6oQfiE=";
};
nativeBuildInputs = [
@@ -45,10 +45,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Time games of over-the-board chess";
mainProgram = "chess-clock";
homepage = "https://gitlab.gnome.org/World/chess-clock";
changelog = "https://gitlab.gnome.org/World/chess-clock/-/releases/v${version}";
license = licenses.gpl3Plus;
mainProgram = "chess-clock";
maintainers = with maintainers; [ michaelgrahamevans ];
};
}

36
pkgs/by-name/us/usage/package.nix Normal file
View File

@@ -0,0 +1,36 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
usage,
testers,
}:
rustPlatform.buildRustPackage rec {
pname = "jdx";
version = "0.3.1";
src = fetchFromGitHub {
owner = "jdx";
repo = "usage";
rev = "v${version}";
hash = "sha256-9zQ+gkBVhzjqSIieGjxoD9vc7999lfRQ7awkvlEkseE=";
};
cargoHash = "sha256-4ebjD1Tf7F2YyNrF7eEi2yKonctprnyu4nMf+vE2whY=";
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion { package = usage; };
};
meta = {
homepage = "https://usage.jdx.dev";
description = "Specification for CLIs";
changelog = "https://github.com/jdx/usage/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ konradmalik ];
mainProgram = "usage";
};
}

4
pkgs/development/libraries/nss/latest.nix
View File

@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.104";
hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw=";
version = "3.105";
hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ=";
}

2
pkgs/development/tools/misc/strace/default.nix
View File

@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
enableParallelBuilding = true;
# libunwind for -k.
# On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
# The build will silently fall back and -k will not work on RISC-V.

38
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -32,6 +32,13 @@ let
(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) ||
(stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit));
forceRust = features.rust or false;
kernelSupportsRust = lib.versionAtLeast version "6.7";
# Currently not enabling Rust by default, as upstream requires rustc 1.81
defaultRust = false;
withRust = (forceRust || defaultRust) && kernelSupportsRust;
options = {
debug = {
@@ -140,6 +147,7 @@ let
# Required to bring up some Bay Trail devices properly
I2C = yes;
I2C_DESIGNWARE_CORE = yes;
I2C_DESIGNWARE_PLATFORM = yes;
PMIC_OPREGION = whenAtLeast "5.10" yes;
INTEL_SOC_PMIC = whenAtLeast "5.10" yes;
@@ -487,14 +495,16 @@ let
DRM_VC4_HDMI_CEC = yes;
};
# Enables Rust support in the Linux kernel. This is currently not enabled by default, because it occasionally requires
# patching the Linux kernel for the specific Rust toolchain in nixpkgs. These patches usually take a bit
# of time to appear and this would hold up Linux kernel and Rust toolchain updates.
#
# Once Rust in the kernel has more users, we can reconsider enabling it by default.
rust = optionalAttrs ((features.rust or false) && versionAtLeast version "6.7") {
# Enable Rust and features that depend on it
rust = lib.optionalAttrs withRust {
RUST = yes;
GCC_PLUGINS = no;
# These don't technically require Rust but we probably want to get some more testing
# on the whole DRM panic setup before shipping it by default.
DRM_PANIC = whenAtLeast "6.12" yes;
DRM_PANIC_SCREEN = whenAtLeast "6.12" (freeform "kmsg");
DRM_PANIC_SCREEN_QR_CODE = whenAtLeast "6.12" yes;
};
sound = {
@@ -633,6 +643,7 @@ let
NFS_V4_1 = yes; # NFSv4.1 client support
NFS_V4_2 = yes;
NFS_V4_SECURITY_LABEL = yes;
NFS_LOCALIO = whenAtLeast "6.12" yes;
CIFS_XATTR = yes;
CIFS_POSIX = option yes;
@@ -884,6 +895,12 @@ let
ZRAM = module;
ZRAM_WRITEBACK = option yes;
ZRAM_MULTI_COMP = whenAtLeast "6.2" yes;
ZRAM_BACKEND_842 = whenAtLeast "6.12" yes;
ZRAM_BACKEND_DEFLATE = whenAtLeast "6.12" yes;
ZRAM_BACKEND_LZ4 = whenAtLeast "6.12" yes;
ZRAM_BACKEND_LZ4HC = whenAtLeast "6.12" yes;
ZRAM_BACKEND_LZO = whenAtLeast "6.12" yes;
ZRAM_BACKEND_ZSTD = whenAtLeast "6.12" yes;
ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes;
ZSWAP = option yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (mkOptionDefault yes);
@@ -962,7 +979,11 @@ let
THRUSTMASTER_FF = yes;
ZEROPLUS_FF = yes;
MODULE_COMPRESS = whenOlder "5.13" yes;
MODULE_COMPRESS = lib.mkMerge [
(whenOlder "5.13" yes)
(whenAtLeast "6.12" yes)
];
MODULE_COMPRESS_ALL = whenAtLeast "6.12" yes;
MODULE_COMPRESS_XZ = yes;
SYSVIPC = yes; # System-V IPC
@@ -1159,6 +1180,7 @@ let
LIRC = yes;
SCHED_CORE = whenAtLeast "5.14" yes;
SCHED_CLASS_EXT = whenAtLeast "6.12" yes;
LRU_GEN = whenAtLeast "6.1" yes;
LRU_GEN_ENABLED = whenAtLeast "6.1" yes;

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

@@ -1,11 +1,11 @@
{
"testing": {
"version": "6.11-rc7",
"hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy"
"version": "6.12-rc1",
"hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2"
},
"6.1": {
"version": "6.1.111",
"hash": "sha256:1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"
"version": "6.1.112",
"hash": "sha256:094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b"
},
"5.15": {
"version": "5.15.167",
@@ -24,8 +24,8 @@
"hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
},
"6.6": {
"version": "6.6.52",
"hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"
"version": "6.6.53",
"hash": "sha256:0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98"
},
"6.8": {
"version": "6.8.12",
@@ -36,11 +36,11 @@
"hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
},
"6.10": {
"version": "6.10.11",
"hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv"
"version": "6.10.12",
"hash": "sha256:1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j"
},
"6.11": {
"version": "6.11",
"hash": "sha256:0bnbvadm4wvnwzcq319gsgl03ijvvljn7mj8qw87ihpb4p0cdljm"
"version": "6.11.1",
"hash": "sha256:0ggfg3f8nkcgs2pg7y5ccfrcjzj7j7x4n41g59gzbsp1nirj6dra"
}
}

6
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.224-rt116"; # updated by ./update-rt.sh
version = "5.10.225-rt117"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "06nivms93yjbddv3gl88m7bdrr0676nm3p12iqvsdfr4fg39kc0r";
sha256 = "0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0d7dcbpn0b0nqmcr35z2f5gsknn4hmqsr01n6j35amzv9fd45iwl";
sha256 = "1c14gm4wzcbkhzgdm5lwq1as9is784yra7bc226bz3bqs3h7vmw2";
};
}; in [ rt-patch ] ++ kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.1.108-rt40"; # updated by ./update-rt.sh
version = "6.1.111-rt42"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "18lcd2b7ffwzqwqnmb948r7z95470bh7jiqps5nil8hfl24lwkiz";
sha256 = "1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1ki0rn2cp3jkfna60sjlf2qn77fwpy0l2hdjk3i5xpmavir4mhdj";
sha256 = "16yb962fkkvgppbx8glp5ph3h1jl2q1b4m2s8gsf3k9i9yim7v5c";
};
}; in [ rt-patch ] ++ kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.6.49-rt41"; # updated by ./update-rt.sh
version = "6.6.52-rt43"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1dyk5pr5g8s5ia7f1vnkid4jghi81pxvwlgn9rmw2n88nz1dlmic";
sha256 = "1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0aajxiwawk624y1r36l818m1ikgcl8szl6sapj70dcv95z9ach4i";
sha256 = "0g33n9idc3lhbj5z637zm3bgqh601a05cl1s8ji8zbnfh971jcgh";
};
}; in [ rt-patch ] ++ kernelPatches;

55
pkgs/servers/mastodon/gemset.nix
View File

@@ -610,10 +610,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
version = "1.2.3";
version = "1.3.4";
};
connection_pool = {
groups = ["default" "test"];
@@ -895,10 +895,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v";
sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj";
type = "gem";
};
version = "1.2.7";
version = "1.2.11";
};
excon = {
groups = ["default"];
@@ -1144,10 +1144,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq";
sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578";
type = "gem";
};
version = "1.8.1";
version = "1.11.1";
};
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
@@ -1881,10 +1881,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
type = "gem";
};
version = "1.16.6";
version = "1.16.7";
};
nsa = {
dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];
@@ -1913,10 +1913,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j";
sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y";
type = "gem";
};
version = "2.1.1";
version = "2.1.2";
};
omniauth-cas = {
dependencies = ["addressable" "nokogiri" "omniauth"];
@@ -1948,10 +1948,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n";
sha256 = "05idjrc01nmmqz4g7kv16xd9yfzzvyibxzfrxk8rcwd1p0zgsxnb";
type = "gem";
};
version = "2.1.0";
version = "2.1.2";
};
omniauth_openid_connect = {
dependencies = ["omniauth" "openid_connect"];
@@ -2127,10 +2127,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y";
sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
type = "gem";
};
version = "6.4.2";
version = "6.4.3";
};
pundit = {
dependencies = ["activesupport"];
@@ -2158,10 +2158,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
version = "1.7.3";
version = "1.8.1";
};
rack = {
groups = ["default" "development" "pam_authentication" "production" "test"];
@@ -2212,10 +2212,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis";
sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8";
type = "gem";
};
version = "3.0.5";
version = "3.0.6";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2435,15 +2435,14 @@
version = "3.1.0";
};
rexml = {
dependencies = ["strscan"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gccz5lixnddazvhksmj7l7hjwzjra2kz3qfyrzl2bz1q9h80bzh";
sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2";
type = "gem";
};
version = "3.3.5";
version = "3.3.7";
};
rotp = {
groups = ["default"];
@@ -2674,10 +2673,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s";
sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684";
type = "gem";
};
version = "1.15.0";
version = "1.17.0";
};
ruby2_keywords = {
groups = ["default"];
@@ -2946,16 +2945,6 @@
};
version = "0.8.0";
};
strscan = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
type = "gem";
};
version = "3.1.0";
};
swd = {
dependencies = ["activesupport" "attr_required" "httpclient"];
groups = ["default"];

4
pkgs/servers/mastodon/source.nix
View File

@@ -1,7 +1,7 @@
# This file was generated by pkgs.mastodon.updateScript.
{ fetchFromGitHub, applyPatches, patches ? [] }:
let
version = "4.2.12";
version = "4.2.13";
in
(
applyPatches {
@@ -9,7 +9,7 @@ in
owner = "mastodon";
repo = "mastodon";
rev = "v${version}";
hash = "sha256-q+j7zHJrIUOumJfk4w5BVu7eTUa1AjI5ho8XoOA2uJU=";
hash = "sha256-+HGu02fjYJ1x6Tk9AdqmFN7JHk3UnlvCdiQ/5yMu69M=";
};
patches = patches ++ [];
}) // {

6
pkgs/servers/web-apps/outline/default.nix
View File

@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "outline";
version = "0.79.0";
version = "0.80.2";
src = fetchFromGitHub {
owner = "outline";
repo = "outline";
rev = "v${version}";
hash = "sha256-uu0HlQ3LaVBjSharROKv+mS8/qONV5qND/5kMTsaGeQ=";
hash = "sha256-kmi6H2vdzg7ftUOrzs2b5e9n1bSFHiQ0wk6Q6T/lDdk=";
};
nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-S2vKYVIFsSlPqFbpLhBH9S43Invo3hsNLvfLX98922Y=";
hash = "sha256-Ibgn/J2OCP2F0hbPQi35uGAOfoZ2D5HD/E85oOTr6G0=";
};
configurePhase = ''

10
pkgs/tools/package-management/nvd/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchFromGitLab
{ fetchFromSourcehut
, installShellFiles
, lib
, python3
@@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: {
pname = "nvd";
version = "0.2.3";
src = fetchFromGitLab {
owner = "khumba";
src = fetchFromSourcehut {
owner = "~khumba";
repo = "nvd";
rev = "refs/tags/v${finalAttrs.version}";
rev = "v${finalAttrs.version}";
hash = "sha256-TmaXsyJLRkmIN9D77jOXd8fLj7kYPCBLg0AHIImAtgA=";
};
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Nix/NixOS package version diff tool";
homepage = "https://gitlab.com/khumba/nvd";
homepage = "https://khumba.net/projects/nvd";
license = lib.licenses.asl20;
mainProgram = "nvd";
maintainers = with lib.maintainers; [ khumba ];