gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-03-19 06:05:04 +00:00
committed by GitHub
parent 1d4e3667f7 903d679a5a
commit 57c9709b21
13 changed files with 3163 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/nbstripout/default.nix
+17 -8
View File
@@ -2,25 +2,27 @@
lib,
python3,
fetchPypi,
fetchFromGitHub,
coreutils,
gitMinimal,
mercurial,
}:
python3.pkgs.buildPythonApplication rec {
version = "0.6.1";
version = "0.8.1";
pname = "nbstripout";
src = fetchPypi {
inherit pname version;
hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM=";
hash = "sha256-6qyLa05yno3+Hl3ywPi6RKvFoXplRI8EgBQfgL4jC7E=";
};
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
# force using the echo binary
postPatch = ''
substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo"
'';
testAssets = fetchFromGitHub {
owner = "kynan";
repo = "nbstripout";
rev = "${version}";
hash = "sha256-OSJLrWkYQIhcdyofS3Bo39ppsU6K3A4546UKB8Q1GGg=";
};
propagatedBuildInputs = with python3.pkgs; [
nbformat
@@ -33,14 +35,21 @@ python3.pkgs.buildPythonApplication rec {
mercurial
]
++ (with python3.pkgs; [
pytest-cram
pytestCheckHook
]);
checkInputs = [
testAssets
];
preCheck = ''
export HOME=$(mktemp -d)
export PATH=$out/bin:$PATH
git config --global init.defaultBranch main
cp -r --no-preserve=mode,ownership ${testAssets}/tests/e2e_notebooks $TMPDIR/e2e_notebooks
chmod -R +w $TMPDIR/e2e_notebooks
substituteInPlace tests/test_end_to_end.py --replace "tests/e2e_notebooks" "$TMPDIR/e2e_notebooks"
'';
meta = {
pkgs/by-name/be/below/package.nix
+15 -10
View File
@@ -11,19 +11,24 @@
rustPlatform.buildRustPackage rec {
pname = "below";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "below";
rev = "v${version}";
sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ=";
tag = "v${version}";
hash = "sha256-tPweJFqhZMOL+M08bDjW6HPmtuhr9IXJNP0c938O7Cg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-iRDe3zg7tfEYGLCRY6bJ6OdoT8ej0MB/vteCIf5xqNA=";
# Upstream forgot to commit an up-to-date lockfile.
cargoPatches = [ ./update-Cargo.lock.patch ];
prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service'';
useFetchCargoVendor = true;
cargoHash = "sha256-uNeWdsvJtkUz3E1NL10heDC7B55yKzDMMYzRhEE32EQ=";
prePatch = ''
sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service
'';
postInstall = ''
install -d $out/lib/systemd/system
install -t $out/lib/systemd/system etc/below.service
@@ -48,11 +53,11 @@ rustPlatform.buildRustPackage rec {
# needs /sys/fs/cgroup
doCheck = false;
meta = with lib; {
platforms = platforms.linux;
maintainers = with maintainers; [ globin ];
meta = {
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ globin ];
description = "Time traveling resource monitor for modern Linux systems";
license = licenses.asl20;
license = lib.licenses.asl20;
homepage = "https://github.com/facebookincubator/below";
mainProgram = "below";
};
pkgs/by-name/be/below/update-Cargo.lock.patch
+3079
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/co/conda/package.nix
+4 -4
View File
@@ -43,7 +43,7 @@
# $ conda-shell
# $ conda install spyder
let
version = "25.1.1";
version = "25.1.1-2";
src =
let
@@ -57,10 +57,10 @@ let
};
in
fetchurl {
url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-${arch}.sh";
url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-Linux-${arch}.sh";
hash = selectSystem {
x86_64-linux = "sha256-gy3ielo1t5Y/DYNGarraPrE45RmFJV8ZDg3DUEJ6ndE=";
aarch64-linux = "sha256-rp0+qD35fnj9UcRS0Lx1AFoo1QTCLbbxAAgiKT+Ra1Q=";
x86_64-linux = "sha256-R2bYW199I1ziUOmY67WoqCEMvU8rD+pNIXez7Z6oeIQ=";
aarch64-linux = "sha256-bQW5+bfzJ7kHl6TPVtaMgVeLqy9jJXo+eotyyw8OS10=";
};
};
pkgs/by-name/gh/ghostfolio/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.143.0";
version = "2.146.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-jOIt8JJghXaKsfwgR6aMfaXEHgIalc/gtwkGJ831bWI=";
hash = "sha256-8YZjstzpun+Vbc1ETBf5AwNAOFGyJFftSdyyGsyh6pY=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-K+SOl7wuxLhEOoM1A7QG3tB1Xiuz+hstiePIDjmzWVA=";
npmDepsHash = "sha256-6aOmDntqp3RPDkgwNwlRgVxoQygIBxMU3VIfYjvG3ho=";
nativeBuildInputs = [
prisma
pkgs/by-name/po/powershell-editor-services/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "powershell-editor-services";
version = "4.2.0";
version = "4.3.0";
src = fetchzip {
url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip";
hash = "sha256-HSLpgnCx871BuKcerX8NZIN+NbpEz+KQtm1HfUXr7kY=";
hash = "sha256-YiXxztfsYujJK6+56Lwi4QdRIZb7NH+dAUJTOYk8pGI=";
stripRoot = false;
};
pkgs/by-name/py/pywal16/package.nix
+2 -2
View File
@@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "pywal16";
version = "3.8.2";
version = "3.8.3";
pyproject = true;
src = fetchFromGitHub {
owner = "eylles";
repo = "pywal16";
tag = version;
hash = "sha256-3GowgiLZpQmAaR903sg+4MmzBkj5mS+D3556F6lxxfw=";
hash = "sha256-yF90HkRg44pPRO/7Gj5BEgj44Qgs4OIM+GR7inJVKMI=";
};
build-system = [ python3.pkgs.setuptools ];
pkgs/by-name/sh/shim-unsigned/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "shim";
version = "15.8";
version = "16.0";
src = fetchFromGitHub {
owner = "rhboot";
repo = "shim";
rev = version;
hash = "sha256-xnr9HBfYP035C7p2YTRZasx5SF4a2ZkOl9IpsVduNm4=";
hash = "sha256-KFpt//A4/T0FRBSPuTKQH/mEIqLVEiE+Lpvuq7ec6eo=";
fetchSubmodules = true;
};
pkgs/by-name/te/tealdeer/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
rustPlatform.buildRustPackage rec {
pname = "tealdeer";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "dbrgn";
repo = "tealdeer";
rev = "v${version}";
hash = "sha256-UYOAj6ft6FHQz06A+K2K+bK3WXQnF5U7TuN95WIXj+M=";
hash = "sha256-GZN7WE12f3MEoBfswag0O04UOCmZeYwt5CbYwddmwHs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-gIJWHqJk0epsPJm1QNOpbvDC1a0d/6AfcNlaT824vWA=";
cargoHash = "sha256-Zk2L4cq7j9CkSc+cnZRWwhtfWP6y5faiMVGFFNkBwwA=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/zk/zk/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "zk";
version = "0.14.2";
version = "0.15.0";
src = fetchFromGitHub {
owner = "zk-org";
repo = "zk";
rev = "v${version}";
sha256 = "sha256-h6qQcaAgxWeBzMjxGk7b8vrVu5NO/V6b/ZvZMWtZTpg=";
sha256 = "sha256-aFpn3luIp5tMp9jpBxVCmU+IU9eJg3/5UZFIklauFjI=";
};
vendorHash = "sha256-2PlaIw7NaW4pAVIituSVWhssSBKjowLOLuBV/wz829I=";
pkgs/development/compilers/julia/default.nix
+14 -14
View File
@@ -29,23 +29,23 @@ in
{ });
julia_110-bin = wrapJulia (callPackage
(import ./generic-bin.nix {
version = "1.10.8";
version = "1.10.9";
sha256 = {
x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735";
aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd";
x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f";
aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b";
x86_64-linux = "5a2d2c5224594b683c97e7304cb72407fbcf0be4a0187789cba1a2f73f0cbf09";
aarch64-linux = "be222882e3674f960f43b6842f7bbb52a369977e40d5dcd26498793e1cd2dfb6";
x86_64-darwin = "f80c93c30a18d8a5dc7f37d0cc94757fd3857651268e4a9e2d42d3b1ea3372f1";
aarch64-darwin = "e62e00b22408159cba3d669f2d9e8b60c1d23b5c2d1c22ec25f4957d15ca98ef";
};
})
{ });
julia_111-bin = wrapJulia (callPackage
(import ./generic-bin.nix {
version = "1.11.3";
version = "1.11.4";
sha256 = {
x86_64-linux = "7d48da416c8cb45582a1285d60127ee31ef7092ded3ec594a9f2cf58431c07fd";
aarch64-linux = "0c1f2f60c3ecc37ae0c559db325dc64858fb11d6729b25d63f23e5285f7906ef";
x86_64-darwin = "5220aade1b43db722fb4e287f1c5d25aa492267b86a846db1546504836cca1be";
aarch64-darwin = "554fb0ddb4d94d623c83ca5e9d309fe1a7a0924445cb18ec3b863fb3367b0ba8";
x86_64-linux = "fb3d3c5fccef82158a70677c0044ac5ae40410eceb0604cdc8e643eeff21df8d";
aarch64-linux = "859f1a8cc4bce6911bc912f0e226a6ba2b1c144110b9d559d88f5077513d0e37";
x86_64-darwin = "7e693914399f2ebe1fafe5c670af0373474145cfe2bfda661f370559a680720a";
aarch64-darwin = "5adfb4482bba9610405c0f9b5a3c1aa09cabf70c8751d75970f2dab0fa819488";
};
})
{ });
@@ -60,8 +60,8 @@ in
{ });
julia_110 = wrapJulia (callPackage
(import ./generic.nix {
version = "1.10.8";
hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc=";
version = "1.10.9";
hash = "sha256-u9by+X76fcXs+w159KTSvw43JeYwJ9Wvn0VyoEfniTM=";
patches = [
./patches/1.10/0002-skip-failing-and-flaky-tests.patch
# Revert https://github.com/JuliaLang/julia/pull/55354
@@ -77,8 +77,8 @@ in
{ });
julia_111 = wrapJulia (callPackage
(import ./generic.nix {
version = "1.11.3";
hash = "sha256-Ansli0e04agdHs3TVa3v/bbAGBya2YjnF/XkdaEqHeg=";
version = "1.11.4";
hash = "sha256-xJNlYtBRKIQtf+K+MHNDM1GeqUpUhhtdC/440QPpa1s=";
patches = [
./patches/1.11/0002-skip-failing-and-flaky-tests.patch
];
pkgs/os-specific/linux/kernel/common-config.nix
+19 -10
View File
@@ -43,16 +43,25 @@ let
);
forceRust = features.rust or false;
kernelSupportsRust = lib.versionAtLeast version "6.7";
# Architecture support collected from HAVE_RUST Kconfig definitions and the following table:
# https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/rust/arch-support.rst
rustByDefault = (
lib.versionAtLeast version "6.12"
&& (
stdenv.hostPlatform.isx86_64
|| stdenv.hostPlatform.isLoongArch64
|| stdenv.hostPlatform.isAarch64
|| (stdenv.hostPlatform.isRiscV64 && !stdenv.cc.isGNU)
)
);
# Currently only enabling Rust by default on kernel 6.12+,
# which actually has features that use Rust that we want.
defaultRust = lib.versionAtLeast version "6.12" && rustAvailable;
withRust =
assert lib.assertMsg (!(forceRust && !kernelSupportsRust)) ''
Kernels below 6.7 (the kernel being built is ${version}) don't support Rust.
'';
(forceRust || defaultRust) && kernelSupportsRust;
lib.warnIfNot (forceRust -> rustAvailable)
"force-enabling Rust for Linux without an available rustc"
lib.warnIfNot
(forceRust -> rustByDefault)
"force-enabling Rust for Linux on an unsupported kernel version, host platform or compiler"
(forceRust || (rustAvailable && rustByDefault));
options = {
@@ -1054,7 +1063,7 @@ let
HIDRAW = yes;
# Enable loading HID fixups as eBPF from userspace
HID_BPF = whenAtLeast "6.3" yes;
HID_BPF = whenAtLeast "6.3" (whenPlatformHasEBPFJit yes);
HID_ACRUX_FF = yes;
DRAGONRISE_FF = yes;
@@ -1281,7 +1290,7 @@ let
LIRC = yes;
SCHED_CORE = whenAtLeast "5.14" yes;
SCHED_CLASS_EXT = whenAtLeast "6.12" yes;
SCHED_CLASS_EXT = whenAtLeast "6.12" (whenPlatformHasEBPFJit yes);
LRU_GEN = whenAtLeast "6.1" yes;
LRU_GEN_ENABLED = whenAtLeast "6.1" yes;
pkgs/os-specific/linux/kernel/generic.nix
+1 -5
View File
@@ -109,11 +109,7 @@ let
commonStructuredConfig = import ./common-config.nix {
inherit lib stdenv version;
rustAvailable =
lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms
&& lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms
# Known to be broken: https://lore.kernel.org/lkml/31885EDD-EF6D-4EF1-94CA-276BA7A340B7@kernel.org/T/
&& !(stdenv.hostPlatform.isRiscV && stdenv.cc.isGNU);
rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc;
features = kernelFeatures; # Ensure we know of all extra patches, etc.
};