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-21 07:09:24 +00:00
committed by GitHub
parent 3257fe5d31 20fea3886c
commit fe3c344a2f
13 changed files with 59 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+7
View File
@@ -15156,6 +15156,13 @@
githubId = 158568;
name = "Matthias C. M. Troffaes";
};
mcparland = {
email = "john@mcpar.land";
github = "mcpar-land";
githubId = 55669980;
name = "John McParland";
keys = [ { fingerprint = "39D2 171D D733 C718 DD21 285E B326 E14B 05D8 7A4E"; } ];
};
McSinyx = {
email = "cnx@loang.net";
github = "McSinyx";
pkgs/applications/version-management/git-recent/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-recent";
version = "1.1.1";
version = "2.0.1";
src = fetchFromGitHub {
owner = "paulirish";
repo = "git-recent";
rev = "v${version}";
sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";
sha256 = "sha256-KPM24DVwvLdHeOkq77fz1TJ6NxJ2h21bP0TrItCPamo=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ca/cargo-3ds/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-3ds";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "rust3ds";
repo = "cargo-3ds";
tag = "v${version}";
hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90=";
hash = "sha256-APi1K5LtdHFI5kjPfZUOFcsZ/xoQixjKq5xZxwlW9CE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-X2n7htrvRPLJkQKONz26hbgXmB8JYafdG1/a0LRGEgs=";
cargoHash = "sha256-2JpBm0ahgiL4KSM4J/nQRbdo3MDZgZj6EDg7Jr5ZanA=";
# Integration tests do not run in Nix build environment due to needing to
# create and build Cargo workspaces.
pkgs/by-name/ca/cargo-hack/package.nix
+3 -3
View File
@@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
version = "0.6.35";
version = "0.6.36";
src = fetchCrate {
inherit pname version;
hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI=";
hash = "sha256-AO4bB+aqAzGxFyPhuwaEQDAbL+fCIWY2rv3QFdBAq7s=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w=";
cargoHash = "sha256-fWKrHo5WdeEhnPxATbZ9Cjv+aiSxOh0pRDeeHHDk8u4=";
# some necessary files are absent in the crate version
doCheck = false;
pkgs/by-name/gi/git-who/package.nix
+28
View File
@@ -0,0 +1,28 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "git-who";
version = "0.6";
src = fetchFromGitHub {
owner = "sinclairtarget";
repo = "git-who";
rev = "v${version}";
hash = "sha256-/MCvFmZNEVnSrSezTiwH3uWPbh/a7mVxmKduc63E3LA=";
};
vendorHash = "sha256-VdQw0mBCALeQfPMjQ4tp3DcLAzmHvW139/COIXSRT0s=";
# some automated tests require submodule to clone and will fail.
# see project readme
doCheck = false;
meta = {
description = "Git blame for file trees";
homepage = "https://github.com/sinclairtarget/git-who";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mcparland ];
};
}
pkgs/by-name/gl/glance/package.nix
+1 -1
View File
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
ldflags = [
"-s"
"-w"
"-X github.com/glanceapp/glance/internal/glance.buildVersion=${finalAttrs.version}"
"-X github.com/glanceapp/glance/internal/glance.buildVersion=v${finalAttrs.version}"
];
excludedPackages = [ "scripts/build-and-ship" ];
pkgs/by-name/nc/nc4nix/package.nix
+1 -1
View File
@@ -26,6 +26,6 @@ buildGoModule {
homepage = "https://github.com/helsinki-systems/nc4nix";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ onny ];
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
}
pkgs/by-name/pl/platypus/package.nix
-53
View File
@@ -1,53 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
python27,
htslib,
zlib,
makeWrapper,
}:
let
python = python27.withPackages (ps: with ps; [ cython ]);
in
stdenv.mkDerivation {
pname = "platypus-unstable";
version = "2018-07-22";
src = fetchFromGitHub {
owner = "andyrimmer";
repo = "Platypus";
rev = "3e72641c69800da0cd4906b090298e654d316ee1";
sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
htslib
python
zlib
];
buildPhase = ''
patchShebangs .
make
'';
installPhase = ''
mkdir -p $out/libexec/platypus
cp -r ./* $out/libexec/platypus
mkdir -p $out/bin
makeWrapper ${python}/bin/python $out/bin/platypus --add-flags "$out/libexec/platypus/bin/Platypus.py"
'';
meta = with lib; {
description = "Platypus variant caller";
license = licenses.gpl3;
homepage = "https://github.com/andyrimmer/Platypus";
maintainers = with maintainers; [ jbedo ];
platforms = platforms.x86_64;
};
}
pkgs/by-name/sw/swaylock/package.nix
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "swaylock";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swaylock";
tag = "v${version}";
hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg=";
hash = "sha256-bzsgjRyyQudf3odrvJ5wdM49VjUgWxfoaU876A2sYus=";
};
strictDeps = true;
pkgs/development/interpreters/wasmtime/default.nix
+3 -3
View File
@@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "30.0.2";
version = "31.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-crVetjCSdwMotVvlIB2fJIFDrGrRE72LmRRw9DwYmyc=";
hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
useFetchCargoVendor = true;
cargoHash = "sha256-YupZr9jturuiFICubrXeOpAeFRvvdX4iRrarBkGL2s0=";
cargoHash = "sha256-zMDpbJoOaKJ974Ln43JtY3f3WOq2dEmdgX9TubYdlow=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];
pkgs/development/libraries/mesa/default.nix
+1 -5
View File
@@ -215,9 +215,6 @@ in stdenv.mkDerivation {
# Required for OpenCL
(lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")
# Clover, old OpenCL frontend
(lib.mesonOption "gallium-opencl" "icd")
# Rusticl, new OpenCL frontend
(lib.mesonBool "gallium-rusticl" true)
@@ -321,9 +318,8 @@ in stdenv.mkDerivation {
moveToOutput bin/vtn_bindgen $cross_tools
moveToOutput "lib/lib*OpenCL*" $opencl
# Construct our own .icd files that contain absolute paths.
# Construct our own .icd file that contains an absolute path.
mkdir -p $opencl/etc/OpenCL/vendors/
echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd
echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd
moveToOutput bin/spirv2dxil $spirv2dxil
pkgs/development/tools/rust/cargo-codspeed/default.nix
+7 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-codspeed";
version = "2.4.0";
version = "2.9.1";
src = fetchFromGitHub {
owner = "CodSpeedHQ";
repo = "codspeed-rust";
rev = "v${version}";
hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY=";
hash = "sha256-q5xsZ8KHuC/Qm+o4xcWbW9Y9VrxHZ+/AxUO8TYEbE74=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-xHA6fe1/0p/PHGV6JcyVir5uGAqJ7qkHObjVqDPGwSY=";
cargoHash = "sha256-Ance7Hfl0EOmMfZf3ZqvawrK7scot7WpefLtemHKb+U=";
nativeBuildInputs = [
curl
@@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p=cargo-codspeed" ];
cargoTestFlags = cargoBuildFlags;
checkFlags = [
# requires an extra dependency, blit
"--skip=test_package_in_deps_build"
];
env = {
LIBGIT2_NO_VENDOR = 1;
pkgs/top-level/aliases.nix
+1
View File
@@ -1206,6 +1206,7 @@ mapAliases {
pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
pltScheme = racket; # just to be sure