Merge master into staging-next
This commit is contained in:
@@ -22033,12 +22033,6 @@
|
||||
githubId = 1810487;
|
||||
name = "Rika";
|
||||
};
|
||||
rileyinman = {
|
||||
email = "rileyminman@gmail.com";
|
||||
github = "rileyinman";
|
||||
githubId = 37246692;
|
||||
name = "Riley Inman";
|
||||
};
|
||||
rinx = {
|
||||
email = "rintaro.okamura@gmail.com";
|
||||
github = "rinx";
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./disk.nix
|
||||
./keyboard.nix
|
||||
./system.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
facterLib = import ./lib.nix lib;
|
||||
|
||||
inherit (config.hardware.facter) report;
|
||||
in
|
||||
{
|
||||
options.hardware.facter.detected.boot.disk.kernelModules = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = lib.uniqueStrings (
|
||||
facterLib.collectDrivers (
|
||||
# A disk might be attached.
|
||||
(report.hardware.firewire_controller or [ ])
|
||||
# definitely important
|
||||
++ (report.hardware.disk or [ ])
|
||||
++ (report.hardware.storage_controller or [ ])
|
||||
)
|
||||
);
|
||||
defaultText = "hardware dependent";
|
||||
description = ''
|
||||
List of kernel modules that are needed to access the disk.
|
||||
'';
|
||||
};
|
||||
|
||||
config = {
|
||||
boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
facterLib = import ./lib.nix lib;
|
||||
|
||||
inherit (config.hardware.facter) report;
|
||||
in
|
||||
{
|
||||
options.hardware.facter.detected.boot.keyboard.kernelModules = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.usb_controller or [ ]));
|
||||
defaultText = "hardware dependent";
|
||||
example = [ "usbhid" ];
|
||||
description = ''
|
||||
List of kernel modules to include in the initrd to support the keyboard.
|
||||
'';
|
||||
};
|
||||
|
||||
config = {
|
||||
boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules;
|
||||
};
|
||||
}
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.25";
|
||||
hash = "sha256-I4z39qCDraRbpFlgUPW6KQcuALZYRqlLT6poJzs/8d8=";
|
||||
version = "2.0.26";
|
||||
hash = "sha256-5wEIWlqKVBs7pwzsIAFtAjGWHTjlLI/LzCs+8M0LL9Q=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
mainProgram = "streamlink-twitch-gui";
|
||||
maintainers = with maintainers; [ rileyinman ];
|
||||
maintainers = [ ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
|
||||
@@ -30,16 +30,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "caesura";
|
||||
version = "0.25.2";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RogueOneEcho";
|
||||
repo = "caesura";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rpaOFmD/0/c5F6TIS7vGn7G3+rLOoBZKMW/HuzroUxM=";
|
||||
hash = "sha256-atB7IrG9KchFOc1EXChlsqlrZs7mQ9tiXmdw1SptLI0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-agdhYEhhw3gMdZmYiQZVeLARkMsYQ/AWLTrpiaH0mtA=";
|
||||
cargoHash = "sha256-Iz/RYmuCc5XuyktYIN/zDrbyPpRU2eps0yqExPu+5J8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "chirpstack-rest-api";
|
||||
version = "4.14.1";
|
||||
version = "4.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-rest-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DHDrnChRikVDJhdCcoHlFn3sYfjEvWpzUsMkuIoqQiw=";
|
||||
hash = "sha256-YSMdE0f3usedyUItSvdtJ77L/x4rwrgIJa1TTg9ODek=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BthdLFhzrAiZTI/afsNgKhgCj1QQHabU37sH9ovIDdU=";
|
||||
vendorHash = "sha256-+lAfgFb45WxZYh5fzONECRwTlXA64nl58rfstOPsDEg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.25",
|
||||
"version": "2.0.26",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.25",
|
||||
"version": "2.0.26",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.25";
|
||||
version = "2.0.26";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-ix/JSPBLnvCPtyqJ6beAaOpuimphpkrkIw5HCdeeGkM=";
|
||||
hash = "sha256-4roXnR6y3jFr7uCZFKTFOyahPjnhJuyVFXunQ89flL4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-NjmCmOwepKaSZ+vji0sUlZ1nSkcG02kNokGe37YYtX0=";
|
||||
npmDepsHash = "sha256-fEXaPqT9TxDb3uWJRRGIJMP2NffUBDGpPY2uJc6DP0k=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "cloud-nuke";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TDZiX4Ik07Ysz3I7gdEF8SVJnt+EBPlH0RBIaE7+1KQ=";
|
||||
hash = "sha256-6lbEThaszG3yw1HKqtHWKRpcmb7933mAlU1fra+h19c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qml8P9m8quUZAarsS7h3TGbcXBCJ2fRD3uyi8Do+lAw=";
|
||||
|
||||
@@ -4,25 +4,32 @@
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codesnap";
|
||||
version = "0.10.9";
|
||||
version = "0.12.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistricky";
|
||||
repo = "CodeSnap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EtMEUtLSgYrb0izPPCh432uX2p/8Ykf2caAR+8ZdxhU=";
|
||||
owner = "codesnap-rs";
|
||||
repo = "codesnap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BIdqSEsQIV5Z2mYMgoW0gtBaMNxhEsAbZbs/KDJEK4E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-atvSygt1Xi+rPxcJb0zdRBnL6SpSkyCcGxs1z2hWXGA=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoHash = "sha256-xenMTuCy3ABEBddH759m0AgMJUlsS0eFj473Y6qjzkY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"codesnap-cli"
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
@@ -35,9 +42,9 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Command-line tool for generating beautiful code snippets";
|
||||
homepage = "https://github.com/mistricky/CodeSnap";
|
||||
changelog = "https://github.com/mistricky/CodeSnap/releases/tag/v${version}";
|
||||
changelog = "https://github.com/mistricky/CodeSnap/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nartsiss ];
|
||||
mainProgram = "codesnap";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "deterministic-zip";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timo-reymann";
|
||||
repo = "deterministic-zip";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qLVeliB2+qRhF+iRE0zHyhBOTB7q31ZGCEH7kbSLSBA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.GitSha=${finalAttrs.src.rev}"
|
||||
"-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Simple (almost drop-in) replacement for zip that produces deterministic files";
|
||||
mainProgram = "deterministic-zip";
|
||||
homepage = "https://github.com/timo-reymann/deterministic-zip";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
maintainers = with lib.maintainers; [ rhysmdnz ];
|
||||
};
|
||||
})
|
||||
@@ -11,6 +11,7 @@
|
||||
libbpf,
|
||||
zlib,
|
||||
elfutils,
|
||||
intel-ipsec-mb,
|
||||
jansson,
|
||||
openssl,
|
||||
libpcap,
|
||||
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
|
||||
jansson
|
||||
libbpf
|
||||
elfutils
|
||||
intel-ipsec-mb
|
||||
libpcap
|
||||
numactl
|
||||
openssl.dev
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ejsonkms";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "envato";
|
||||
repo = "ejsonkms";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qsPn9opDyahyYSOXO9GB2RSHNZupXlAUIxPJRyVgqQo=";
|
||||
hash = "sha256-IQZYpxY6t7W9a3PKc9o7+MbOOxsa0Hs1H8HneilrdBs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DovbNZBdJxLpdggaxbe90pqHjl4fp4D7IZT9Z/j3yLI=";
|
||||
vendorHash = "sha256-xOp02g7F1rb3Zq8lbjvDrYrFrcT+msv/KUqQd2qVKdA=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${version}"
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fleet";
|
||||
version = "4.73.5";
|
||||
version = "4.75.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fleetdm";
|
||||
repo = "fleet";
|
||||
tag = "fleet-v${finalAttrs.version}";
|
||||
hash = "sha256-66ABReCDIxL+uwwK3IWnKR+UPJd5DBSE+bNUk+2LbQA=";
|
||||
hash = "sha256-0vnGdcCq3sHTS7CxlnYMYxr0KZr9exrrU+4lIeGkv+0=";
|
||||
};
|
||||
vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4=";
|
||||
vendorHash = "sha256-SMQskb2Sth1Wi02e/EwT/z+dUsxGBN7gd/H3f33Oq1M=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/fleet"
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "foundry";
|
||||
version = "1.4.1";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foundry-rs";
|
||||
repo = "foundry";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aqJzroRXUT1zO+RyH5QE9ZedapfkIwRmZtAfn0GYEX4=";
|
||||
hash = "sha256-SrkFfc9+cb3nDqEOj3gRkQq9aKOSfk3s7a3EGka5ACw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wmHC6Jpd+6VUjb21cCQEg11kLW0J4EM+FTQn/boQxRI=";
|
||||
cargoHash = "sha256-PoPfuMNeK6ArZddBd0lsR2r8UrvRieqkxYZ8jCCxw5o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-DO6IJbTESDnRtwHw0o+VkjjZiRBSynfPQ179qbNFBO0=";
|
||||
hash = "sha256-rrPRIOnVPC7Moh+ewRbsV81oO7WridpUUoaOnEqm43o=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-Tmnl9TagqphoDSMKu0Ny3guJZgEkd8IvdxlmQ+s7378=";
|
||||
hash = "sha256-IfgeeH+vNjIi0adrmXIjjX41qUxIWpoH2eX+Bd7h9AA=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.5.243";
|
||||
version = "5.5.244";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ghostty-bin";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";
|
||||
hash = "sha256-gSuOOWZUzKKihCGmqEnieJJ8iP4xFeoSQIL536ka454=";
|
||||
hash = "sha256-817pHxFuKAJ6ufje9FCYx1dbRLQH/4g6Lc0phcSDIGs=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -38,7 +38,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghostty";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ghostty-org";
|
||||
repo = "ghostty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BTIH8G1GKrcoMasvlA3fje8f1vZvr4uuAUHfvZq6LVY=";
|
||||
hash = "sha256-0tmLOJCrrEnVc/ZCp/e646DTddXjv249QcSwkaukL30=";
|
||||
};
|
||||
|
||||
deps = callPackage ./deps.nix {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gtree";
|
||||
version = "1.11.8";
|
||||
version = "1.11.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IBsfE0Y/LzXIaQdbXv1ZOslwj2U5fAhYIo67BixwDMY=";
|
||||
hash = "sha256-JLYHFSlT6mSkBmpOD9ls80uC0lGaCYmcLeRaUc+NqjE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jGFEKwe0eglsj3U2jdlfMKYsMvwSu/z0EX+heCKQP0c=";
|
||||
vendorHash = "sha256-vgwop6QaYsUp65WHxQeZd141Hz4z/pgIvZAJFx3Zztg=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gtree"
|
||||
|
||||
@@ -43,11 +43,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haproxy";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU=";
|
||||
hash = "sha256-Hwrp37CzGeLVy25M35MaCHetiOAJDEbPFvrwCPv1Qng=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nasm,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-ipsec-mb";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-ipsec-mb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k/NoPMKbiWZ25tdomsPpv2gfhQuBHxzX6KRT1UY88Ko=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/lib";
|
||||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"NOLDCONFIG=y"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Intel Multi-Buffer Crypto for IPsec Library";
|
||||
longDescription = ''
|
||||
Intel Multi-Buffer Crypto for IPsec Library provides software crypto
|
||||
acceleration primarily targeting packet processing applications.
|
||||
It supports a variety of use cases including IPsec, TLS, wireless (RAN), cable,
|
||||
and MPEG DRM.
|
||||
'';
|
||||
homepage = "https://github.com/intel/intel-ipsec-mb";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -148,7 +148,6 @@ buildNpmPackage rec {
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [
|
||||
ttuegel
|
||||
rileyinman
|
||||
lunik1
|
||||
];
|
||||
};
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k9s";
|
||||
version = "0.50.15";
|
||||
version = "0.50.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rTG2UtrVLlF+dFFJiNErYG6GL4ZQdwPlj1kdaLxh6TI=";
|
||||
hash = "sha256-PYaVzUAQuy5LBkyJ3otWX1iRYWSkt4sD3HIvpGTOiQY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-Djz23/Ef7T7giE/KDsnbWnihwW37o40jevwVt8CbiQE=";
|
||||
vendorHash = "sha256-KuF0CCabhEqF4yEtj3ARRM2DkYdXWWwCm4P0nruHjso=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lcm";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lcm-proj";
|
||||
repo = "lcm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs=";
|
||||
hash = "sha256-72fytJY+uXEHGdZ7N+0g+JK7ALb2e2ZtJuvhiGIMHiA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 ''
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isAarch32 ''
|
||||
patchShebangs lib/arm/arm2gnu.pl
|
||||
'';
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isArmv7 [
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch32 [
|
||||
# Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
|
||||
perl
|
||||
];
|
||||
|
||||
Generated
+18
-9
@@ -89,27 +89,36 @@ let
|
||||
in
|
||||
linkFarm name [
|
||||
{
|
||||
name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0";
|
||||
name = "clap-0.11.0-oBajB-HnAQDPCKYzwF7rO3qDFwRcD39Q0DALlTSz5H7e";
|
||||
path = fetchZigArtifact {
|
||||
name = "clap";
|
||||
url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz";
|
||||
hash = "sha256-cbPGmVlIXwIuRPIfQoFXzwLulT4XEv8rQWcJUl1ueyo=";
|
||||
url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.11.0.tar.gz";
|
||||
hash = "sha256-fDWd7EQYZuAlBlrpynBuznK89OiiX74xcZsekv84lkg=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zigini-0.3.1-BSkB7XJGAAB2E-sKyzhTaQCBlYBL8yqzE4E_jmSY99sC";
|
||||
name = "zigini-0.3.2-BSkB7WJJAADybd5DGd9MLCp6ikGGUq9wicxsjv0HF1Qc";
|
||||
path = fetchZigArtifact {
|
||||
name = "zigini";
|
||||
url = "https://github.com/Kawaii-Ash/zigini/archive/2ed3d417f17fab5b0ee8cad8a63c6d62d7ac1042.tar.gz";
|
||||
hash = "sha256-Zj9uU6EEHkNZ1cPIDgDj1E2CEpbmPmpJYjSSFnxxdf0=";
|
||||
url = "https://github.com/AnErrupTion/zigini/archive/96ca1d9f1a7ec741f07ceb104dae2b3a7bdfd48a.tar.gz";
|
||||
hash = "sha256-Hhc/+a8ToHI9RAJTIQ6Z3KZKQFvoPvd5ODz7HRbytdw=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAB9qAACwl56piR-krrhXSPxCvEskA52cmaTWXYk_";
|
||||
name = "ini-0.1.0-YCQ9YkUnAAA7SjpLwvomwrngMn3TConSAlNgo7Q8ibMZ";
|
||||
path = fetchZigArtifact {
|
||||
name = "ini";
|
||||
url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz";
|
||||
hash = "sha256-RQ6OPJBqqH7PCL+xiI58JT7vnIo6zbwpLWn+byZO5iM=";
|
||||
url = "https://github.com/AnErrupTion/ini/archive/ac6e656157b2ac6c98392283a139b47c44a85d54.tar.gz";
|
||||
hash = "sha256-rOXuHsd4WiLDODruQioADMWQ7UkNtx5LUdTcK2dve40=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAGcUBQAa5vov1Yi_9AXEffFQ1e2KsXaK4dgygRKq";
|
||||
path = fetchZigArtifact {
|
||||
name = "termbox2";
|
||||
url = "git+https://github.com/AnErrupTion/termbox2?ref=master#290ac6b8225aacfd16851224682b851b65fcb918";
|
||||
hash = "sha256-of95/wJeCTWI3p7NxvnUlb618qffUZv2YxgBgzp+crs=";
|
||||
rev = "290ac6b8225aacfd16851224682b851b65fcb918";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
linux-pam,
|
||||
libxcb,
|
||||
makeBinaryWrapper,
|
||||
zig_0_14,
|
||||
zig_0_15,
|
||||
callPackage,
|
||||
nixosTests,
|
||||
x11Support ? true,
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ly";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "AnErrupTion";
|
||||
owner = "fairyglade";
|
||||
repo = "ly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70=";
|
||||
hash = "sha256-2JOpC70uBvGk17edXDNeNhNqn2hHZBpOoQaUxN0IlLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
zig_0_14.hook
|
||||
zig_0_15.hook
|
||||
];
|
||||
buildInputs = [
|
||||
linux-pam
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
ln -s ${
|
||||
callPackage ./deps.nix {
|
||||
zig = zig_0_14;
|
||||
zig = zig_0_15;
|
||||
}
|
||||
} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
'';
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "TUI display manager";
|
||||
license = lib.licenses.wtfpl;
|
||||
homepage = "https://codeberg.org/AnErrupTion/ly";
|
||||
homepage = "https://codeberg.org/fairyglade/ly";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "ly";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
wrapGAppsHook3,
|
||||
pkg-config,
|
||||
@@ -27,15 +28,28 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "musescore";
|
||||
version = "4.6.2";
|
||||
version = "4.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3VpptHR9dt8lJeFhFygnPiP0XRf4R29SASC8AicLU5E=";
|
||||
hash = "sha256-WLzt/Ox6GrfWD0/l8/Ksc2ptg5LZSOXXnlsSnenfZtI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/musescore/MuseScore/pull/30422
|
||||
(fetchpatch {
|
||||
url = "https://github.com/musescore/MuseScore/commit/bda5eac091bca1db15fbe9546b2d71b7e8a126c8.patch";
|
||||
hash = "sha256-MTSFxmwBWaOXipeUqIFKP4Oek087oqW2MQvltV9vAgA=";
|
||||
})
|
||||
# https://github.com/musescore/MuseScore/pull/30691
|
||||
(fetchpatch {
|
||||
url = "https://github.com/musescore/MuseScore/commit/840f8b7ded19cdc5d2dc78d32e396494aaf8c4c0.patch";
|
||||
hash = "sha256-MfHLFQbgvgNTd5G3mxCMlS7bF8LrNWMLZUQ+A21l/RM=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMUSE_APP_BUILD_MODE=release"
|
||||
# Disable the build and usage of the `/bin/crashpad_handler` utility - it's
|
||||
|
||||
@@ -30,7 +30,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
rileyinman
|
||||
jk
|
||||
];
|
||||
};
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
xorg,
|
||||
}:
|
||||
let
|
||||
version = "2.19.1";
|
||||
version = "2.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J9e39c8AnEj+1lB+KrxsG3h4VjTo65an24IJ5mvACUE=";
|
||||
hash = "sha256-+GIDtV6jsY7ZA8CV4ZmVoffFVvaJxhfnau9vu/mr+CY=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "re-Isearch";
|
||||
version = "2.20220925.4.0a-unstable-2025-10-17";
|
||||
version = "2.20220925.4.0a-unstable-2025-10-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "re-Isearch";
|
||||
repo = "re-Isearch";
|
||||
rev = "4487eae1f59e9e9b4affdb612c217f63cf20b0ca";
|
||||
hash = "sha256-VZ7b/SOWDrDN3eN2ZpH+GxfCJVPABWTIKBUJkE1XFDM=";
|
||||
rev = "749fa527c3d70aba1d82e4e1376e1fefb84ac06b";
|
||||
hash = "sha256-AvptVlu3aU+vSYfoeHsUryHTixLnlq4HYkoisskBTdA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
let
|
||||
pname = "xremap";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xremap";
|
||||
repo = "xremap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-80Fzf5hnRBWx0NxV1z8majc7JbDNj0DZSRNkbPvI7Ck=";
|
||||
hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T/UMNRPGpXjrSqq+cNVtCckYRQbJJAF5tUwWnrIjj8M=";
|
||||
cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w=";
|
||||
|
||||
buildXremap =
|
||||
{
|
||||
|
||||
@@ -74,6 +74,7 @@ import ./default.nix
|
||||
aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118";
|
||||
powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337";
|
||||
powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6";
|
||||
powerpc64le-unknown-linux-musl = "88d370dec3c382db9f1227822c725bab88621904c60f8f950745fa2e903264a4";
|
||||
riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161";
|
||||
s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7";
|
||||
loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec";
|
||||
|
||||
@@ -19,6 +19,7 @@ PLATFORMS=(
|
||||
aarch64-apple-darwin
|
||||
powerpc64-unknown-linux-gnu
|
||||
powerpc64le-unknown-linux-gnu
|
||||
powerpc64le-unknown-linux-musl
|
||||
riscv64gc-unknown-linux-gnu
|
||||
s390x-unknown-linux-gnu
|
||||
loongarch64-unknown-linux-gnu
|
||||
|
||||
@@ -169,19 +169,10 @@ in
|
||||
};
|
||||
|
||||
wlroots_0_19 = generic {
|
||||
version = "0.19.1";
|
||||
hash = "sha256-Q4x6obwzYYncgoUzqFVzn/scjxsiUeAIlEWY43emdvA=";
|
||||
version = "0.19.2";
|
||||
hash = "sha256-8VOhSaH9D0GkqyIP42W3uGcDT5ixPVDMT/OLlMXBNXA=";
|
||||
extraBuildInputs = [
|
||||
lcms2
|
||||
];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5134
|
||||
# > backend, output: send commit events after applying all in wlr_backend_commit()
|
||||
# fixes potential crash in sway. Remove once a new release is made of wlroots
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/7392b3313a7b483c61f4fea648ba8f2aa4ce8798.patch";
|
||||
sha256 = "sha256-SK463pnIX2qjwRblCJRbvJeZTL6wAXho6wBIJ10OuNk=";
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,6 +27,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ihaveamac/pyctr";
|
||||
changelog = "https://github.com/ihaveamac/pyctr/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rileyinman ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -79,17 +79,12 @@ let
|
||||
inherit (lib) throwIfNot;
|
||||
|
||||
checked =
|
||||
throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." lib.foldr
|
||||
(x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.")
|
||||
(r: r)
|
||||
overlays
|
||||
throwIfNot
|
||||
(lib.isList crossOverlays)
|
||||
"The crossOverlays argument to nixpkgs must be a list."
|
||||
lib.foldr
|
||||
(x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.")
|
||||
(r: r)
|
||||
crossOverlays;
|
||||
(throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.")
|
||||
(throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.")
|
||||
(throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.")
|
||||
(
|
||||
throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions."
|
||||
);
|
||||
|
||||
localSystem = lib.systems.elaborate args.localSystem;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user