Merge master into staging-nixos
This commit is contained in:
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "contact";
|
||||
version = "1.4.16";
|
||||
version = "1.4.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdxlocations";
|
||||
repo = "contact";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-8osQvow6VWl19k8hGaUZx9Q9mZXWkwJqXtEUNP2Lh2E=";
|
||||
hash = "sha256-EQNKljdySxujpoAaA43jHfh39K2BW5/Autt06dlijpk=";
|
||||
};
|
||||
|
||||
dependencies = [ python3Packages.meshtastic ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.4.15";
|
||||
version = "0.4.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
@@ -22,11 +22,11 @@ buildGoModule rec {
|
||||
cd "$out"
|
||||
git rev-parse HEAD > COMMIT
|
||||
'';
|
||||
hash = "sha256-2xl4dAP+9kTPkhFfXLNw00krB7zC10em1vAULTBKqvQ=";
|
||||
hash = "sha256-tXumQuaIs3vIhZGIf9wClqH4j2sy3dFp+AgAMzTUfSE=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-xVRLH1H7HhxaR9L+N+qE4kwqjMyie+JjeXpXvwRKa5A=";
|
||||
vendorHash = "sha256-6J4xoGBcJK828Yz5KlfvebS8KrQH+gs1UFPDbYKOS/M=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gefyra";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
|
||||
hash = "sha256-p75lJMg5U/cuoOMK+Vf76XhSu1oCKXTPokPCJphuwUw=";
|
||||
hash = "sha256-YHU39Ti1PezdHrB9EIwUpF85YiWEmkZsCQU7pEWY+G4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -23,24 +23,15 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "linux-firmware";
|
||||
version = "20260221";
|
||||
version = "20260309";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
tag = version;
|
||||
hash = "sha256-QHoS9+WS9IjRVhTJEFF/X8+4ZKjKwpJAvf7EqsV+qEY=";
|
||||
hash = "sha256-IG7RN7m+VwFkdGRNv2FZSLumlo0FT47PBE16o8Xahxg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# amdnpu: Restore old NPU firmware for compatibility
|
||||
# https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/935
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/kernel-firmware/linux-firmware/-/commit/58cf579b98c0c4878deeda1acb5db70e699875b5.patch";
|
||||
hash = "sha256-2UO9CxGM2Asb/fRAST4zRlMBSVjM+N/87NzSkSoQrQ0=";
|
||||
})
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pueue";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = "pueue";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-r28l6I12pJFRPZgVHhDEe+kPu6UXT/+j2EdeXBeTpFE=";
|
||||
hash = "sha256-6/Q0+ME1wwHZI5MwMULzS+2iWK2R3JiTM5I+spSjd30=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TbZ6rXj6CE0hMasvsMyHrtOQdtjVKxIUjj1LjWNct7c=";
|
||||
cargoHash = "sha256-l2i57DU8NVg7DtQqOkS/DDBJpfn7NSkgI5Wik+sKhfM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "spotify-qt";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kraxarn";
|
||||
repo = "spotify-qt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GItr7Zxc6qzuB64UvfPB4wEzhts7E61oBN+re/M8jU4=";
|
||||
hash = "sha256-gvSNgXUciO9U20iC9ZtyPPoFYLPzXjoRCIPkenYPe70=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch, # Added for applying patch
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
@@ -65,6 +66,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-7FbQkXazsf6FkkNbE+Q6ilKACFa/CoOL2Q1oXHuaVX8=";
|
||||
};
|
||||
|
||||
# Backport for https://gitlab.freedesktop.org/wayland/weston/-/issues/1100
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "weston-upstream-assertion-fix.patch";
|
||||
url = "https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1993.patch";
|
||||
hash = "sha256-705GIM7drTzv0N5Hk5dO18LWBnhhi1VoX8sfITHRYc4=";
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
|
||||
@@ -15,13 +15,13 @@ let
|
||||
}:
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "rekor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yOagWlUs5u9HebKxgtK8hPsm9kGxaR7hJpZdG9cOI54=";
|
||||
hash = "sha256-ZaeacpzdBG3QBGPQ0rTW8cJyTe5S8ff6OIVv1/VcbL4=";
|
||||
# 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;
|
||||
@@ -34,7 +34,7 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LHTq5Y0WvlyO48mVD1NxnKX7L7pdRY/xnsZCV5OR71U=";
|
||||
vendorHash = "sha256-xrsiFrC8o4l1nPvxNzsXPY9nshKsy5sVei8yHAee46s=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user