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 branch 'release-24.11' into staging-next-24.11

Browse Source
This commit is contained in:
Vladimír Čunát
2025-03-27 09:46:39 +01:00
parent 35bd211ab8 e90d260670
commit ef02a5fd7e
7 changed files with 637 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1238
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
View File

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "136.0.2";
version = "136.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "50dfbedb6bd513a3c6cf90558d7c6993cc78558cccc69fcc882f8e54eb8e8bec9779dce6fb7211c1a0234ac4a189438c5fa55ee9d0d06fcbae5cf44778af2ef1";
sha512 = "59cb54bc946aecea810169970aad4ba3f7b3092e56f15f86ff3d51fa2752c89632a057a1bda016f0005665ec5099d9b9f9a4786b9c02e3f5656eb2003b6a1747";
};
meta = {

4
pkgs/by-name/ex/extra-container/package.nix
View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "extra-container";
version = "0.12";
version = "0.13";
src = fetchFromGitHub {
owner = "erikarvstedt";
repo = pname;
rev = version;
hash = "sha256-/5wPv962ZHvZoZMOr4nMz7qcvbzlExRYS2nrnay/PU8=";
hash = "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=";
};
buildCommand = ''

10
pkgs/by-name/sy/systemtap-sdt/package.nix Normal file
View File

@@ -0,0 +1,10 @@
{ linuxPackages }:
linuxPackages.systemtap.override {
withStap = false;
}
// {
meta = linuxPackages.systemtap.meta // {
description = "Build USDT tracepoints with the 'dtrace' executable on Linux";
mainProgram = "dtrace";
};
}

2
pkgs/development/libraries/glib/default.nix
View File

@@ -46,7 +46,7 @@ let
else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll"
else "2.0-0.lib";
systemtap' = buildPackages.linuxPackages.systemtap.override { withStap = false; };
systemtap' = buildPackages.systemtap-sdt;
withDtrace =
lib.meta.availableOn stdenv.buildPlatform systemtap' &&
# dtrace support requires sys/sdt.h header

4
pkgs/development/tools/pnpm/default.nix
View File

@@ -16,8 +16,8 @@ let
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
};
"10" = {
version = "10.6.5";
hash = "sha256-R8i8pCtLSFNLWxso1XPFBnc5N7AvaOUpkvvYJpExxcg=";
version = "10.7.0";
hash = "sha256-NcqyaVO/kIR+eYg521jJoqgtUmt68Xn9KhA8GCQsrcY=";
};
};

2
pkgs/development/tools/profiling/systemtap/default.nix
View File

@@ -11,7 +11,7 @@
gnumake,
python3,
nixosTests,
withStap ? true, # avoid cyclic dependency with glib
withStap ? true, # avoid cyclic dependency with glib, reduce closure size substantially
}:
let