Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-02-08 12:09:35 +00:00
committed by GitHub
71 changed files with 955 additions and 550 deletions
@@ -12,8 +12,6 @@ let
mkOption
mkIf
mkDefault
mkPackageOption
mkRemovedOptionModule
literalExpression
getExe
makeBinPath
@@ -22,6 +20,7 @@ let
;
cfg = config.services.displayManager.dms-greeter;
cfgDms = config.programs.dms-shell;
cfgAutoLogin = config.services.displayManager.autoLogin;
cacheDir = "/var/lib/dms-greeter";
@@ -69,7 +68,21 @@ in
options.services.displayManager.dms-greeter = {
enable = mkEnableOption "DankMaterialShell greeter";
package = mkPackageOption pkgs "dms-shell" { };
package = mkOption {
type = types.package;
default = if cfgDms.enable then cfgDms.package else pkgs.dms-shell;
defaultText = literalExpression ''
if config.programs.dms-shell.enable
then config.programs.dms-shell.package
else pkgs.dms-shell;
'';
description = ''
The DankMaterialShell package to use for the greeter.
Defaults to the package from `programs.dms-shell` if it is enabled,
otherwise defaults to `pkgs.dms-shell`.
'';
};
compositor = {
name = mkOption {
@@ -159,7 +172,21 @@ in
};
quickshell = {
package = mkPackageOption pkgs "quickshell" { };
package = mkOption {
type = types.package;
default = if cfgDms.enable then cfgDms.quickshell.package else pkgs.quickshell;
defaultText = literalExpression ''
if config.programs.dms-shell.enable
then config.programs.dms-shell.quickshell.package
else pkgs.quickshell;
'';
description = ''
The Quickshell package to use for the greeter.
Defaults to the quickshell package from `programs.dms-shell` if it is enabled,
otherwise defaults to `pkgs.quickshell`.
'';
};
};
logs = {
@@ -27,12 +27,12 @@ let
hash =
{
x86_64-linux = "sha256-NvICNng069Z6qvL3TnjLu82wyfGyjH8wK9aNw2YR2Jk=";
x86_64-darwin = "sha256-Ukms3L0tIw7tDfMqFctLjIzkUdr9rvXomKwhrGswMXk=";
aarch64-linux = "sha256-+6G7coqgPSOA3xFMKSOpZCDzb9Ssc7wqJnnlaW54e/I=";
aarch64-darwin = "sha256-49Zf51yiozdY9V5sPGnECXTUpNIO3OC2c//G2FQcCy0=";
armv7l-linux = "sha256-6l75xTqeUkDJW6/WTtkGrAsnmlcQPiVTmiEDRXDI/QA=";
loongarch64-linux = "sha256-PNPVAf6jh20jpFVhDGDgT5wo5xPZDQ2xdm4LO0/Vlzk=";
x86_64-linux = "sha256-lBCwKNJv9iNQyuEvg+Ht4haFZG/lozm2KgCguKYIwYI=";
x86_64-darwin = "sha256-29oFrRfdxcMkzppYkQDkKP0DmnzjwbSciKvGwDhf8q0=";
aarch64-linux = "sha256-53t+UvvECTANRzHnyMbmff7aS5cocpRC8QaSkLRQcLw=";
aarch64-darwin = "sha256-fIp2NH2AtpQ3KXFXvDFIw4Jx2QlXnwHE4WskJ0bLwNE=";
armv7l-linux = "sha256-+y4b1/2C2YTmF2kc16xvzM8MzU64OxMK9xEORwkfBWw=";
loongarch64-linux = "sha256-VKzGJytrcMjXihWIM/qjLeZzXHb/xxHnftnXQn8erfA=";
}
.${system} or throwSystem;
@@ -43,7 +43,7 @@ buildVscode rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.108.10359";
version = "1.108.20787";
pname = "vscodium";
executableName = "codium";
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2026-01-31";
version = "0-unstable-2026-02-07";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "abed0cb0f79e5cec6204869dab989d575d809744";
hash = "sha256-K2v0WJIbK7qBGhRu+kgnvkmjtAbiazl4kVW0xk8Fb5I=";
rev = "1ce9db0250501ff30219fe4255bdbf96c7043904";
hash = "sha256-tLXyy3AeRu5dVdvhfi0HTsZoZCkqQg9N3ZNAx76ytiQ=";
fetchSubmodules = true;
};
-1
View File
@@ -2,7 +2,6 @@
config,
lib,
stdenvNoCC,
writeText,
git,
git-lfs,
cacert,
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "abc-verifier";
version = "0.61";
version = "0.62";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "abc";
rev = "v${finalAttrs.version}";
hash = "sha256-j/JmEJa29mT/XQmVL/adVbj4S+AAgpga1jbEinCN16w=";
hash = "sha256-T6Hj8zrr3XuI3Eh0I5rJI3+DAsuQIMtWEsaBJ8a5Cag=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -34,14 +34,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "apt";
version = "3.1.14";
version = "3.1.15";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "apt-team";
repo = "apt";
rev = finalAttrs.version;
hash = "sha256-hGa+7sQ52PscYDlcB67czPXdoD1g1meu8zVUua5lrnw=";
hash = "sha256-PnI7Ggqc/Go5p+eXf93d5qhG61TKO2/8ZSjML37pyzY=";
};
# cycle detection; lib can't be split
+2 -3
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchFromGitea,
fetchFromCodeberg,
makeWrapper,
cmake,
ninja,
@@ -44,8 +44,7 @@ let
pname = "bolt-launcher";
version = "0.21.1";
src = fetchFromGitea {
domain = "codeberg.org";
src = fetchFromCodeberg {
owner = "AdamCake";
repo = "Bolt";
tag = finalAttrs.version;
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "cdncheck";
version = "1.2.21";
version = "1.2.22";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${finalAttrs.version}";
hash = "sha256-Y0+6SslkAP+5Gtu/AQx0qUrWET5TWUgcIPIYxSWu4ec=";
hash = "sha256-d6wdjSEjgZxV6LciZ6ruVPsuo/YgryHXUCAeR1tLHeE=";
};
vendorHash = "sha256-sVCmEMT6Y/9EPCbiUlstAw8FS4y+afeYeWNhT8aBXSE=";
vendorHash = "sha256-bYN119IyOkO9w+CWGwnCOXqpo4QHJV6iDuToMnTo0og=";
subPackages = [ "cmd/cdncheck/" ];
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "collabora-online";
version = "24.04.13-2";
version = "24.04.17-3";
src = fetchFromGitHub {
owner = "CollaboraOnline";
repo = "online";
tag = "cp-${finalAttrs.version}";
hash = "sha256-d6i/aSmbim7UAKz9VX1ClbtIQravMq0r8beZC9FD6as=";
hash = "sha256-KJ5E5jvV0MrWdpU4pU+9Y4ngRJ/kk3lcBntbWdQZFqY=";
};
nativeBuildInputs = [
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
hash = "sha256-0RnGt9NLgyARgbh2GOcz7H3l4vtij8PD5jmcdUDB/5Y=";
hash = "sha256-LzXU1WdayfXhkDOlKEtZ/pgYfFPNPml5TNXS9sJp2yI=";
};
npmRoot = "browser";
+10 -6
View File
@@ -9,12 +9,16 @@ cd "$PACKAGE_DIR/.."
while ! test -f default.nix; do cd .. ; done
NIXPKGS_DIR="$PWD"
new_version="$(
list-git-tags --url=https://github.com/CollaboraOnline/online \
| grep --perl-regex --only-matching '^cp-\K[0-9.-]+$' \
| sort --version-sort \
| tail -n1
)"
if [ "$1" ]; then
new_version=$1
else
new_version="$(
list-git-tags --url=https://github.com/CollaboraOnline/online \
| grep --perl-regex --only-matching '^cp-\K[0-9.-]+$' \
| sort --version-sort \
| tail -n1
)"
fi
cd "$NIXPKGS_DIR"
update-source-version collabora-online "$new_version"
+2 -2
View File
@@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "distrobox";
version = "1.8.2.3";
version = "1.8.2.4";
src = fetchFromGitHub {
owner = "89luca89";
repo = "distrobox";
tag = finalAttrs.version;
hash = "sha256-p/IQ6HWG01UPbiskp3u1UUm8YEnpY9jUGqqODrYS1Ck=";
hash = "sha256-bttJFHgmZgN0p6eT7vGzz2DsrrUgB+uGnnPz2Ep+eB4=";
};
dontConfigure = true;
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "dnsmonster";
version = "1.2.9";
version = "1.2.5";
src = fetchFromGitHub {
owner = "mosajjal";
repo = "dnsmonster";
tag = "v${finalAttrs.version}";
hash = "sha256-SDAD5OBactf0dynUmLgdrg+m0bZATh4wGW/NZ2gG+dI=";
hash = "sha256-Ae7SzImNHOOpaaVLFHdfLrwGhaHkvZBt+s/sRoHYwzk=";
};
vendorHash = "sha256-7rIBbaYr1dgC0ArcuwZelHKG5TLIQDV9JSBoYOcz+C0=";
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "go-jsonschema";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "omissis";
repo = "go-jsonschema";
tag = "v${finalAttrs.version}";
hash = "sha256-CS7Rkkj6Z5kEi4hzQF7uasdeTmcaz6niZvPpOY+av0w=";
hash = "sha256-ffrP4L5cfK75Tw/xfcdXAwGUP8WLL+81ltBDb/P5Gwo=";
};
vendorHash = "sha256-mCOJ8GROrbNXH7CSLLMZj/4wTa65hscTt8RzIxzgG+A=";
+3 -3
View File
@@ -13,12 +13,12 @@
}:
let
version = "2.2.3";
version = "2.2.4";
src = fetchFromCodeberg {
owner = "liske";
owner = "routerkit";
repo = "ifstate";
tag = version;
hash = "sha256-gDeMVnseOLBGpyyjE/L60ujp0LZGf3uzlKfPiQB4VHA=";
hash = "sha256-vxRzSZ/sb8n4itLTb+608DbuJ/jK1IIukCwxiBHimoE=";
};
docs = stdenv.mkDerivation {
pname = "ifstate-docs";
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "impl";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "josharian";
repo = "impl";
rev = "v${finalAttrs.version}";
hash = "sha256-0TSyg7YEPur+h0tkDxI3twr2PzT7tmo3shKgmSSJ6qk=";
hash = "sha256-E+QnG0rmr+xartUe3y7RLzOIRapphiB3cUijZER0zDs=";
};
vendorHash = "sha256-vTqDoM/LK5SHkayLKYig+tCrXLelOoILmQGCxlTWHog=";
@@ -7,15 +7,15 @@
}:
let
timestamp = "202601131729";
timestamp = "202601291528";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jdt-language-server";
version = "1.55.0";
version = "1.56.0";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
hash = "sha256-kGJ8nwNwTbtATzdlFiXQdRwHirdTQkYCPVOtzqFBG5E=";
hash = "sha256-mISS8aQ1C+Uqr75TjcBPXE2uCK0OHyqjUxdiLtLb48Y=";
};
sourceRoot = ".";
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "komari-agent";
version = "1.1.40";
version = "1.1.41";
src = fetchFromGitHub {
owner = "komari-monitor";
repo = "komari-agent";
tag = finalAttrs.version;
hash = "sha256-aWCsaiYkpj0D9hr7V3pxSk14pMD2E117vwemt9Ckqv0=";
hash = "sha256-GgvquOI5l+FiRNUJ5dvJc9frwwy4Zjq4s2h9bFhkchM=";
};
vendorHash = "sha256-5RL/dDR/Or9GRCPVQmUYKTV82q7xuN2Mqc4/86WmbqY=";
+82
View File
@@ -0,0 +1,82 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
qt6,
kdePackages,
nix-update-script,
git,
distrobox,
...
}:
stdenv.mkDerivation (finalAttrs: {
pname = "kontainer";
version = "1.3.0";
src = fetchFromGitHub {
owner = "DenysMb";
repo = "Kontainer";
tag = finalAttrs.version;
hash = "sha256-fHXpbQyNEX7jO+v81dVhGodlJ4OrbPn53mgAJbCiyWw=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "ecm_find_qmlmodule(org.kde.kirigami REQUIRED)" "ecm_find_qmlmodule(org.kde.kirigami)"
'';
nativeBuildInputs = [
cmake
ninja
kdePackages.extra-cmake-modules
qt6.wrapQtAppsHook
];
qtWrapperArgs = [
"--prefix PATH : ${
lib.makeBinPath [
distrobox
]
}"
];
buildInputs = [
qt6.qtbase
qt6.qtdeclarative
kdePackages.kirigami
kdePackages.kirigami-addons
kdePackages.ki18n
kdePackages.kcoreaddons
kdePackages.qqc2-desktop-style
kdePackages.kiconthemes
kdePackages.kio
git
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Manage Distrobox containers";
longDescription = ''
Kontainer is a graphical user interface (GUI) application built with KDE Kirigami that provides a user-friendly way to manage Distrobox containers.
*Container Management*: Create new containers from various Linux distributions, delete existing containers, upgrade containers and list and view all containers.
*Terminal Integration*: Open terminal sessions inside containers using the system default terminal emulator and execute commands within containers.
*Package Management*: Install package files inside containers and automatic detection of appropriate package managers based on container distribution.
*Desktop Integration*: Generate desktop shortcuts for containers, full integration with the host system through Distrobox and color-coded container listing based on distribution.
'';
homepage = "https://github.com/DenysMb/Kontainer";
changelog = "https://github.com/DenysMb/Kontainer/releases/tag/${finalAttrs.version}";
mainProgram = "kontainer";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
griffi-gh
];
platforms = lib.platforms.linux;
};
})
+8 -1
View File
@@ -23,7 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-lGq2iGt7c4h8HntEPeQcd7X+IykRLm0kvjrLswRWSSs=";
};
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit";
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_LDFLAGS = toString [
"-framework"
"CoreFoundation"
"-framework"
"IOKit"
];
};
passthru.updateScript = nix-update-script { };
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ libdvdcss ];
NIX_LDFLAGS = "-ldvdcss";
env.NIX_LDFLAGS = "-ldvdcss";
postInstall = ''
ln -s dvdread $out/include/libdvdread
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
xorgproto
];
NIX_LDFLAGS = "-lX11";
env.NIX_LDFLAGS = "-lX11";
meta = {
description = "X virtual keyboard library";
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
./configure-pkg-config.patch
];
NIX_LDFLAGS = "-lgif";
env.NIX_LDFLAGS = "-lgif";
outputs = [
"out"
+3 -1
View File
@@ -29,7 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
"man"
];
NIX_LDFLAGS = optionalString stdenv.hostPlatform.isLinux "-lasound";
env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
NIX_LDFLAGS = "-lasound";
};
enableParallelBuilding = true;
@@ -121,11 +121,11 @@ stdenv.mkDerivation (finalAttrs: {
CGO_ENABLED = "1"; # Needed for cross-compilation
GOFLAGS = "-trimpath"; # Don't include paths to Go stdlib to resulting binary
inherit (go) GOARCH GOOS;
NIX_LDFLAGS = toString [
"-L${lib.getLib libtirpc}/lib"
"-ltirpc"
];
};
NIX_LDFLAGS = [
"-L${lib.getLib libtirpc}/lib"
"-ltirpc"
];
nativeBuildInputs = [
pkg-config
+1 -1
View File
@@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: {
curl
];
NIX_LDFLAGS = [
env.NIX_LDFLAGS = toString [
"-lpthread" # fixes linker errors
];
+7 -6
View File
@@ -32,12 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
# Workaround build failure on -fno-common toolchains:
# ld: dnd.o:src/main.h:136: multiple definition of
# `MENU_EXT'; main.o:src/main.h:136: first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-lX11";
env = {
# Workaround build failure on -fno-common toolchains:
# ld: dnd.o:src/main.h:136: multiple definition of
# `MENU_EXT'; main.o:src/main.h:136: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-lX11";
};
nativeInstallCheckInputs = [
versionCheckHook
+6 -1
View File
@@ -15,7 +15,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libmatchbox ];
NIX_LDFLAGS = "-lX11 -L${libx11}/lib -lXext -L${libxext}/lib";
env.NIX_LDFLAGS = toString [
"-lX11"
"-L${libx11}/lib"
"-lXext"
"-L${libxext}/lib"
];
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${finalAttrs.version}/matchbox-window-manager-${finalAttrs.version}.tar.bz2";
+8 -3
View File
@@ -22,9 +22,14 @@ stdenv.mkDerivation {
bison
];
env.NIX_CFLAGS_COMPILE = "-Os -g -Wall";
NIX_LDFLAGS = [ "-lpthread" ];
env = {
NIX_CFLAGS_COMPILE = toString [
"-Os"
"-g"
"-Wall"
];
NIX_LDFLAGS = toString [ "-lpthread" ];
};
makeFlags = [ "prefix=" ];
+9 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "micropython";
version = "1.26.0";
version = "1.27.0";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
tag = "v${version}";
hash = "sha256-T0yaTXRQFEdx6lap+S68I2RRA2kQnjbKGz+YB6okJkY=";
hash = "sha256-q1lpWEZbguH9EbDKa121C1Rro2Rjn6duVKcwj8RZtdQ=";
fetchSubmodules = true;
# remove unused libraries from rp2 port's SDK. we leave this and the other
@@ -46,6 +46,13 @@ stdenv.mkDerivation rec {
})
./fix-cross-compilation.patch
./fix-mpy-cross-path.patch
# fix CVE-2026-1998
# https://github.com/micropython/micropython/issues/18639
# https://github.com/micropython/micropython/pull/18671
(fetchpatch {
url = "https://github.com/dpgeorge/micropython/commit/570744d06c5ba9dba59b4c3f432ca4f0abd396b6.patch";
hash = "sha256-j8xr4oqmrsYumJvyA71bx+/dg2HiUxSxdjKUR/2sclI=";
})
];
postPatch = ''
+1 -1
View File
@@ -31,7 +31,7 @@ buildNimPackage (finalAttrs: {
-exec sed 's|{\.passL:.*\.}|discard|g' -i {} \;
'';
NIX_LDFLAGS = [ "-lpcre" ];
env.NIX_LDFLAGS = toString [ "-lpcre" ];
meta = {
description = "Functional, concatenative programming language with a minimalist syntax";
+1 -1
View File
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
# Force linking to libEGL, which is always dlopen()ed, and to
# libwayland-client & libxkbcommon, which is dlopen()ed based on the
# winit backend.
NIX_LDFLAGS = [
env.NIX_LDFLAGS = toString [
"--push-state"
"--no-as-needed"
"-lEGL"
+9 -3
View File
@@ -42,9 +42,15 @@ stdenv.mkDerivation rec {
gettext # for darwin with clang
];
NIX_LDFLAGS =
"-lncurses"
+ lib.optionalString stdenv.hostPlatform.isDarwin " -L${python3}/lib -lpython${python3.pythonVersion}";
env.NIX_LDFLAGS = toString (
[
"-lncurses"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-L${python3}/lib"
"-lpython${python3.pythonVersion}"
]
);
preConfigure = ''
# If CPP is set explicitly, configure and make will not agree about which
+10 -10
View File
@@ -66,16 +66,16 @@ stdenv.mkDerivation {
cd ../../
'';
NIX_LDFLAGS = ''
-rpath ${zlib.out}/lib
-rpath ${curl.out}/lib
-rpath ${libjpeg.out}/lib
-rpath ${libpng.out}/lib
-rpath ${libvorbis.out}/lib
-rpath ${libtheora.out}/lib
-rpath ${libogg.out}/lib
-rpath ${libmodplug.out}/lib
'';
env.NIX_LDFLAGS = toString [
"-rpath ${zlib.out}/lib"
"-rpath ${curl.out}/lib"
"-rpath ${libjpeg.out}/lib"
"-rpath ${libpng.out}/lib"
"-rpath ${libvorbis.out}/lib"
"-rpath ${libtheora.out}/lib"
"-rpath ${libogg.out}/lib"
"-rpath ${libmodplug.out}/lib"
];
buildPhase = ''
cd sources/darkplaces/
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ngrep";
version = "1.48.3";
version = "1.49.0";
src = fetchFromGitHub {
owner = "jpr5";
repo = "ngrep";
tag = "v${finalAttrs.version}";
hash = "sha256-2fYv9iLS+YLFLMjTpi/K4BLRSLTbkLGATlToA2ivrTo=";
hash = "sha256-qlzxtIsim7ABRwZ4lVQosH+EXkiIK3pb2Ug0OdMZrHs=";
};
nativeBuildInputs = [ autoreconfHook ];
+4 -2
View File
@@ -59,8 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.hostPlatform.isMusl musl-fts
++ lib.optional withPcre pcre;
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include";
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";
env = lib.optionalAttrs stdenv.hostPlatform.isMusl {
NIX_CFLAGS_COMPILE = "-I${musl-fts}/include";
NIX_LDFLAGS = "-lfts";
};
makeFlags = [
"PREFIX=$(out)"
+1 -1
View File
@@ -31,7 +31,7 @@ buildNimPackage {
})
];
NIX_LDFLAGS = "-lpcre";
env.NIX_LDFLAGS = "-lpcre";
postFixup = ''
wrapProgram $out/bin/nrpl \
+5 -3
View File
@@ -75,8 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
libtirpc
];
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
NIX_LDFLAGS = [ "-ltirpc" ];
env = {
NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
NIX_LDFLAGS = toString [ "-ltirpc" ];
};
postPatch = ''
patchShebangs .
@@ -90,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace nx-X11/config/cf/Imake.tmpl --replace "clq" "cq"
'';
PREFIX = ""; # Don't install to $out/usr/local
env.PREFIX = ""; # Don't install to $out/usr/local
installPhase = ''
make DESTDIR="$out" install
# See:
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs --build build_odin.sh
'';
LLVM_CONFIG = lib.getExe' llvmPackages.llvm.dev "llvm-config";
env.LLVM_CONFIG = lib.getExe' llvmPackages.llvm.dev "llvm-config";
dontConfigure = true;
+7 -9
View File
@@ -52,15 +52,13 @@ stdenv.mkDerivation (finalAttrs: {
];
# JUCE dlopen's these at runtime, crashes without them
NIX_LDFLAGS = (
toString [
"-lX11"
"-lXext"
"-lXcursor"
"-lXinerama"
"-lXrandr"
]
);
env.NIX_LDFLAGS = toString [
"-lX11"
"-lXext"
"-lXcursor"
"-lXinerama"
"-lXrandr"
];
# JUCE wants to write to $HOME/.{lv2,vst3}
preConfigure = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
icu
];
NIX_LDFLAGS = lib.strings.concatStringsSep " " [
env.NIX_LDFLAGS = toString [
"-L${lib.getLib zlib}"
"-lz"
"-L${lib.getLib gtest}"
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
NIX_LDFLAGS = lib.strings.concatStringsSep " " [
env.NIX_LDFLAGS = toString [
"-L${lib.getLib gtest}"
"-lgtest"
];
+7 -3
View File
@@ -47,10 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
"--with-cplex-lib=-lcplex${cplex.libSuffix}"
];
NIX_LDFLAGS = lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}";
env = {
# Compile errors
NIX_CFLAGS_COMPILE = "-Wno-cast-qual";
}
// lib.optionalAttrs withCplex {
NIX_LDFLAGS = "-L${cplex}/cplex/bin/${cplex.libArch}";
};
# Compile errors
env.NIX_CFLAGS_COMPILE = "-Wno-cast-qual";
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
@@ -0,0 +1,94 @@
{
"@esbuild/aix-ppc64@npm:0.20.2": "1adff57daf20fac79c2968363d859a8866047f8ecb4981c729708905f8ea59186bce4bfc85d2491ae2c7ebfc7a0d3e0de0062f07711f4110aec7e7e83acaaaae",
"@esbuild/android-arm64@npm:0.20.2": "55801b49fa5c229acfb1b8211e94a8b4f4842ad06915fe1aa45ac8f7bd92e9ccedd26195c28a6fbd78c78cfa744f4d66573f301de4b7d003c2fd81cda011aa05",
"@esbuild/android-arm@npm:0.20.2": "49fa10d3e9a8e0a84040a0d8cbaf80a6a42103202da733fc432169f9fa989a4c9aee57c08a7b60c60cb74a79a2c498b3d97a8245a10153b431a3c122a64debd8",
"@esbuild/android-x64@npm:0.20.2": "94fd80d54397b0b80efc9450d7c852112f29c65a07f8dc7aa673b047417beb7936fced3175b405bc0f740f9f068a93c1c380aab931f152465d2a2886340c74d2",
"@esbuild/darwin-arm64@npm:0.20.2": "78cb8ab2b3a783ade149b35a87152e19c870ee2cd3df8a909783707fcf7c0590f699cc6094ecdce69fe207130f8bd6339bebc294e74ecc6a6502b78740a62d35",
"@esbuild/darwin-x64@npm:0.20.2": "43e9acc37b3bc42e63d5010401da3130e86b3f32e5149dc18f8d6160a64f25ae70c769d6e98e7be709522a953dba8771b66f2e89714283d989bb1cccbb31d010",
"@esbuild/freebsd-arm64@npm:0.20.2": "2fdd09cf9e0634ff6259f29e1ee933831e9540743b13df3d0521e98b47ac1f60cd224059919b84583919f4632e71a008aac407bb0235e572b82000e30779bdc1",
"@esbuild/freebsd-x64@npm:0.20.2": "257caf6f0893a2260cc23d7e75b6cb1bfd1d911986d023a619aa3262fb7bcbb8910c5430e1eb44c417e09c24c4ed7476a334b8fc6337b9876169ebff303bbe43",
"@esbuild/linux-arm64@npm:0.20.2": "264bc5c8c3a502025e1b9e5fda0819551422207267050ef65c3922071bed148d7e2c88103c9e21ad4bebdec6bf02db2d38dacf432aff0a555dd3a5a68fb865c2",
"@esbuild/linux-arm@npm:0.20.2": "4d111eedd995886dad5e642a0befd34b014027dbf9f1b638d3f69828c81fd99e08b1ab9411dcc786af6003141f14e30f738b4a0193197c7694558d45dab343e6",
"@esbuild/linux-ia32@npm:0.20.2": "b080e8b683cd47bd7a091a57bb77ac806e52a31ee4d8deb4c8dba9b084154ab44b4c423f66d2dd4100056612a403599c0378ab1d2520dd3fc6128ddab1fbaefd",
"@esbuild/linux-loong64@npm:0.20.2": "95e032fb778b8f87920471774c26dd2b2d005a587a46f82c51435752f5542d60e0b2d3328fab47ac61345863130df88d763366f247a590cb8e43d3972da0e4dc",
"@esbuild/linux-mips64el@npm:0.20.2": "6fb2aa4aff199874dbec2362abc24ac6665046291663c04bca7328bc87a4c54c3815a3e85db4a24d83b554422abfa76f8de5cfba1cf7469a3e4ec66a95780871",
"@esbuild/linux-ppc64@npm:0.20.2": "05da59622176758242012e2ae82ed6872a59dcf52bc38e8f27a602b3a76c5780d4a611ff9ee8ff85f8b01e83f9bc22774cf9aa7951710c544ce992fc2c24944f",
"@esbuild/linux-riscv64@npm:0.20.2": "f20d512a4e2ef67151f152dd4eab3fb662b3489a8a066c74473c885fc1b79451cc5adddf91a88b237db27f4a58e9b30560f0190ab1043f1f0d4f69e15d36fd15",
"@esbuild/linux-s390x@npm:0.20.2": "d1ad0b1455256d90cda81e036495774aeeff04f958e68226e2119e5f4ee9dc7fe49c63638245d7ca2449a4fcbde140ed398f34c2fd3ac205af080e91c516744f",
"@esbuild/linux-x64@npm:0.20.2": "45d2441f373a21f9a9ea2c25dc18c48ab637783e82cb9a4d36b1edfe675bd77e494db7497e6fc83aeb42cb5db6fb39a8fa70ed1461c8115bd20b622ef5c775d9",
"@esbuild/netbsd-x64@npm:0.20.2": "b56ec2bce62913e88dc0dbd9a9a0e5287e40199167a39658c734a3f2d4bb1f52fd193240cf283a175435d3794c86879e187a0a9cfbacf7b33b225e9facd553c3",
"@esbuild/openbsd-x64@npm:0.20.2": "de4c9471d07287c4eeb94a79b85797a5eee412259b45e45bdd6685ec8e9eb6d5f270eebc693d61ec49a7631fa3d586d4e6fcf075c25e2be34e7658b09238f40b",
"@esbuild/sunos-x64@npm:0.20.2": "d2913edcdde369caa2ced281e3759b58ba55ddcc076b87112333eb9e2388a6a17858e6cedf6fe3e1770f53ad7903c48e9d6e1c5b13a017d4194d39adf139a64d",
"@esbuild/win32-arm64@npm:0.20.2": "7af88a84ea6869ce14713336bb6f01b4285787fa3ed7170f9eadc179f4f5dae803ea5c5f4c14ee1ea4eb4bff7743f4b933f238dcc8018a8117a7e8535f7dbb1b",
"@esbuild/win32-ia32@npm:0.20.2": "c2e770938f2a21e169d09414bdcd8a564132a177a257b4c34ac8e794cdd2621b924479aaf9c4a3024fd54f9123253a1b1c86f12c453425cdbda203e7ae4c2104",
"@esbuild/win32-x64@npm:0.20.2": "56321c1938d6abaefbf4f6b32cd1bb83083059d22123420fd5a500512291e1daf143c7f607c6031710c0eeb3288ee51cc090560a32cfc6a209e63f91cd439bb4",
"@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": "f8d48613de17e5356d273745042bbc7c0d345e1e4e5e88ed1132a3ed9ca65db9f8b908a708383d7a58ede276c105e7c9a2887fad00d5e47892010466e5312b47",
"@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3": "270f8831d7f6d61ff36e7118e09ec13baa633bb22dd57fa3a9e6af67f7036a3fd1beec4c8aad1c72639522300364cef98bc5ba2cddf67a3832f8a35b7fc45502",
"@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3": "326c19865ead39017326dd8066cde30adaf87a62b968a22d5e5369691817086f681fc291be80b7c61c5496fe915f6df546f41e14ee18b896c54de5099cf147ac",
"@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": "115f627bcd7c290ddfa1d16405cc1ce388be0b295a26adb1ee2d774133a77809aa0bae83775d3c11f220544e77d34c01d607037bf9dfc6aaac67329cb5fe2818",
"@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": "ab74755aa2afd27ad8f5277c7cb7a0c721028ba63c3e3109458689340d76ed4c901aa2c71ae5950f3a2149ae9e835e711a12842db219864107cc0c5c1fbdc0da",
"@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": "edfea4f5455f71f608c15163467b98245d46fbd6078019347418e193968431afe632a11e8729ec39755a54563d86940899e2fe8f3d124393f91855956bd1d745",
"@oxlint-tsgolint/darwin-arm64@npm:0.1.6": "baef70546bf78b06700eeb7fc94a829d608c241b2980b53f709646255b24c90737b3da023a94c3f594fe9d6efc3f3abd4ca5664d465a9cc639941a287f6bb565",
"@oxlint-tsgolint/darwin-arm64@npm:0.8.6": "e10fe702dbbd7d824f1c2f993263ad448c351e34e87401e72994b68294df16c2b9f6cb4c0b77020937f68531b030168d302e811beb95475ec4b4296a3eda89f7",
"@oxlint-tsgolint/darwin-x64@npm:0.1.6": "9a10a02d8dd9183d3faf6735189b82e233f3fa5afe101ea62e710416fd47e5c134e9e6e4bc16d5f8a8baa1b15d49af25817ad1df5cfaea6a4819c721f3e30850",
"@oxlint-tsgolint/darwin-x64@npm:0.8.6": "9d56880e90b77727d2af88cf3724cb5109d029fff3a180b2d5dac563ac5f551cf0ee8adb3967392318a463aaec59059d499cabb3ee81a5fcd8e9084e974b1663",
"@oxlint-tsgolint/linux-arm64@npm:0.1.6": "57db59c580bde2340c0f5c5fd11179fda1627488779b579cecef18d5412ea2d5c26b1dde3f9e819dc3cfbdeaa680b66dfed81be78384f9cc273078539fc4de51",
"@oxlint-tsgolint/linux-arm64@npm:0.8.6": "ce9bf5f8656ba6a0b1d5ed9c57fd8401b0a66b21a8230ec6dc89c011ba81c1708c1f2d6a7850ec677617e52d4daa48603a5edd2f48def10aaf6234091817e311",
"@oxlint-tsgolint/linux-x64@npm:0.1.6": "fe5cf69f9da0337885891e6d7453c24187d2932f5177ef1e6a6fcd71b795f75ab3ce21d8c4ca15bd8119cd624726d67071195a21a5070c1878251fcd8da9aedc",
"@oxlint-tsgolint/linux-x64@npm:0.8.6": "231f59da81c55afaca4805012bfc8a83cf3f049e6bde2e0adbe133ebae6396b95b868a31a6c0c2840a98aa79eb2f7be2cadb7e7b50fdbdd2f8f301ef84d228e3",
"@oxlint-tsgolint/win32-arm64@npm:0.1.6": "bcad14cc57a0f063d67896e3e3b29700a8006d3dcb1c209f6ff27c7d711a0dcd7b4a19ccd95e57af453b89eaae4d7840991cffa8f24d12d876c9d50e432da122",
"@oxlint-tsgolint/win32-arm64@npm:0.8.6": "3f0b79f370d3cac3a5350d0528eb09c7adec77b077decf97e6bb703f73052e5bc797134b4b7e54309a7aeff203e71e9141e54f6176f7d6a0f7ce15a730dd0d99",
"@oxlint-tsgolint/win32-x64@npm:0.1.6": "3d757d4c2ab2815df173184f59d7d362832dc0e083a981c370337d1564e2212d1ff9306cc0d01437ddc17780cc8dfb637ab7de3f3a1897bf844b801c7c62f9b5",
"@oxlint-tsgolint/win32-x64@npm:0.8.6": "d383722598d5b70d0ce0a15200c032d2a7fff11db931240efe2230dbe76f62da4d75def233eec3d4bb2ee9628b0add844b697ab0a802a30375ae2a22bbe07516",
"@oxlint/darwin-arm64@npm:1.11.2": "9ed5adb21c132a41540c88dd1038934f9d830138fb14c118e875b2c41a9b19c0af30517924869d946c0f60e3d93d28b3329038c55142151433dc73a455c2a7c8",
"@oxlint/darwin-x64@npm:1.11.2": "17bace87db090deab84ba39ea73b1b51eb5248c0397ac6cace0c8e4daaf2ab52beebf900ecf6ba748508ea18ed003d5a0b58aba44a6ee6c65455826730812f82",
"@oxlint/linux-arm64-gnu@npm:1.11.2": "d271c27904c7765daad00f09a4b5350ef6ffa2edf5b07c7adecbf039e9f90dc2f3eafa9bc7e6c58458176d46345eec0aa41144aa92ac4fc7b0fe45e0763ee389",
"@oxlint/linux-arm64-musl@npm:1.11.2": "495d1cd094528925a72137e5480d09be3620e6e9f822a069a181ec30b96fc19f34613ab71fafbe92a8344b4c50acc6131439b8d97e3e084e4829241c81a5e883",
"@oxlint/linux-x64-gnu@npm:1.11.2": "f836220fa4cf46ac24c414088832a6fd389150a4e7a4390133d228487df48bd172a68e575d5da15c0171ac02db7f1ded0ec145944ca0012fc15c6fa3c003b6ae",
"@oxlint/linux-x64-musl@npm:1.11.2": "edef64a92e0fe0ff67f6dfc406430a36ed0d7ca2cc2c9dcac1fba5b129c0ea875920fbe8c3ef667fe8d899898a318a65442338fdf4d9ea861e8b98faa9d9af28",
"@oxlint/win32-arm64@npm:1.11.2": "ed08d845112afa85ed3eada6a3acc63d74f50670f3dd4547499ad2e375dc7212a103d4a6a83141257a3d48739604f419797cec039f689e47c18f0584a2acc24e",
"@oxlint/win32-x64@npm:1.11.2": "6ca1f364346f7ff8238ac0f874d1311d1a70bfd7f5094699600f875e03d783351f8ded0f2c451a59fcece8080c5370877fca6af037078ae8e8bf824bbef36529",
"@rolldown/binding-android-arm64@npm:1.0.0-beta.53": "e2972fe9399066bb418f659c24e7589e87d8373a3b4ec7dd01c06f516c90cd04ea2dc801f2739f05e714f002bd4ef8d505dabbb9ab55437ed3d5f8395db91df5",
"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53": "79587c0686dc0ee54368e4eeb0b8e8cc6f5786c3d55c3b0acd2ccea067b6ba21faffe82140268e7de7126192c3e54fa33742346d82ceaebf5d4c33a94c3575fc",
"@rolldown/binding-darwin-x64@npm:1.0.0-beta.53": "4b855c7208400453f29aac138c8c050fee3e3f08ff7d36afb3efd705abfc67b11e55bb12ead5d845ae9c464b9855c02380772592ed09e43434ade8dd4e32f703",
"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53": "98672b2ececbcab5bf8732033b9e38553f75a37d0c8198762af5609ea57b9809bc8d9c8ec3e5cc6df7c9535c1a08d063d106b984fa1dfda066dc71ae6e70350d",
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53": "0760612704b1381580c337eef6b0ef096902b81dca1ff2b536a8a4f529335465d9739ea3c0883d3f7b1548089d237e18a485f0ee2e3d2d9191b0a788f95c81f9",
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53": "a4e4e59a5d316f72c691360027e4a843db4fad1ccf9ddac736890f4182f59612c5bcb4286420b88454658a0735ca63d0692fbba93c2fcc8009e15b3126e62266",
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53": "4f465651c516cc78513fa2b6685667acf248b076a19809252063644512ad7949faf46a64738024c266a39c411cb4be15142aa4a352dcd01e1c65486f9f623578",
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53": "702a095a2c4b59a48da26be306172585ee01d284900984c56e663cd15b82748e90b7fa96c0d894651d98ca456ac59fe3e70ff88680a636b6c23353919a04d762",
"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53": "b410d862c88ec59e8e8a31934ab78ed81b31ed00ed69057038a232d44ee9b7942d1f29ee48991e3a0b2fbcbec889d7819166f77679c907271e7f9a381414d1db",
"@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53": "3dd98fa2c676472bfcf825ee561ac3e8046d48d87d4beab5cc312c871be65387e5b527977b9ac7e2c2d4c8f0e7249d2d536c7cd5124b5550e37bf295cb91729d",
"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53": "3645fc9eac2f4e8b6f5f1552154a8ae1ed5c1975a37f0da22bb4ec9d8dcd4b8d346feb013a927e9254c33bea7b2b4fc2ff5cfebe3c791f215663ac983bf03306",
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53": "d0ecd1a1fe4388ae11d7bacace91694ad0135cf25a0200f7b7ae3ce9fac637ff079c5140a680288d3f7fc35eea0100d1a176ed43db4d88c86429804cb6a800e1",
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53": "bbc80dbfb97a1780f0666ffd111f1fbe2b6b2cc1d60102cf41bb0fd03788e020552c94a5e82f95dc75b3696fe0f986a1a362fc7c62bcd899892986a4391fc63a",
"@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
"@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
"@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
"@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
"@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
"@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
"@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
"@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
"@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940",
"lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90",
"lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93",
"lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa",
"lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec",
"lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26",
"lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8",
"lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453",
"lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed",
"lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4",
"lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc",
"lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960"
}
@@ -2,60 +2,41 @@
stdenv,
lib,
fetchFromGitHub,
fetchYarnDeps,
makeWrapper,
nix-update-script,
prefetch-yarn-deps,
fixup-yarn-lock,
nodejs,
yarn,
nixosTests,
yarn-berry_4,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "outline";
version = "1.1.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "outline";
repo = "outline";
rev = "v${version}";
hash = "sha256-IaokSRFl2fOlDzLV0jNgKzATBCTwouLFG12Beeh6vI4=";
rev = "v${finalAttrs.version}";
hash = "sha256-AxTgD5zqJ9PFdhvfbiHLDjEHzhMLPOsjGtjrzTle4qw=";
};
missingHashes = ./missing-hashes.json;
nativeBuildInputs = [
makeWrapper
prefetch-yarn-deps
fixup-yarn-lock
];
buildInputs = [
yarn
nodejs
yarn-berry_4.yarnBerryConfigHook
yarn-berry_4
];
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-SLyEk78NEnMBFB0Wha9rot6j97l2/ZEGkc6Mtbn9/UM=";
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-GtuiC8/zlhWtXjSIEAIEzMbvUeXN6vUhi2CrRye2rus=";
};
configurePhase = ''
export HOME=$(mktemp -d)/yarn_home
'';
buildPhase = ''
runHook preBuild
export NODE_OPTIONS=--openssl-legacy-provider
yarn config --offline set yarn-offline-mirror $yarnOfflineCache
fixup-yarn-lock yarn.lock
yarn install --offline \
--frozen-lockfile \
--ignore-engines --ignore-scripts
patchShebangs node_modules/
# apply upstream patches with `patch-package`
yarn run postinstall
yarn build
yarn run build
runHook postBuild
'';
@@ -85,7 +66,7 @@ stdenv.mkDerivation rec {
};
updateScript = nix-update-script { };
# alias for nix-update to be able to find and update this attribute
offlineCache = yarnOfflineCache;
inherit (finalAttrs) offlineCache;
};
meta = {
@@ -101,4 +82,4 @@ stdenv.mkDerivation rec {
];
platforms = lib.platforms.linux;
};
}
})
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "postgres-language-server";
version = "0.19.0";
version = "0.20.0";
src = fetchgit {
url = "https://github.com/supabase-community/postgres-language-server";
tag = finalAttrs.version;
hash = "sha256-0zmH9hYwmKYTRR1MxaHZcm7B2SzgCxYjLM4GCK61c7s=";
hash = "sha256-d6h/Igh5DtpMHRFSCVbEooY/mqltXhT91iP4DrOH5SE=";
fetchSubmodules = true;
};
cargoHash = "sha256-2PEyKjHWEkGEgRy0l6nIhARN0qoR4CIv/Qo+xHucgEc=";
cargoHash = "sha256-JRWe0D+H9MhVDva5rY8iRr/icLbVYGMjbwa3KSAori4=";
nativeBuildInputs = [
rustPlatform.bindgenHook
+3 -3
View File
@@ -23,18 +23,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "resources";
version = "1.9.1";
version = "1.10.0";
src = fetchFromGitHub {
owner = "nokyan";
repo = "resources";
tag = "v${finalAttrs.version}";
hash = "sha256-AMBaXGF7Sf13JE/neBO32MqEO142w51wMnTrf4wTeKY=";
hash = "sha256-e8iUBmEqDlqwczpkkS9lI+oflyc95IxPhd8c9Vsw1LQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-IFZW0kg4bV1Msaly9sy4phz31TEIQhIdGlYG+rSA3hQ=";
hash = "sha256-6xIyLNblcTzB3V/LfbJkEEVB5KiR/RZccFG1l1ahlr0=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "rospo";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "ferama";
repo = "rospo";
tag = "v${finalAttrs.version}";
hash = "sha256-UPOWpI1MohJbuAETvbWW1BZv/P4DY/QknSEY4LFa5Qo=";
hash = "sha256-+SeNpP/JplHvqT3kJwBCddJRaSwsJ/gyt/3mvVThNA0=";
};
vendorHash = "sha256-KQYSsTiiFm3BwwjiUEL388FS/hnXRUCfRpnfBIUHTYM=";
vendorHash = "sha256-2Ldyh8RFRk/kCfj1Dv+KBBsEZDKOIgfGwyWV8UkqaDg=";
ldflags = [
"-s"
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "routedns";
version = "0.1.131";
version = "0.1.133";
src = fetchFromGitHub {
owner = "folbricht";
repo = "routedns";
rev = "v${finalAttrs.version}";
hash = "sha256-KrRazsjNBsHWdkmJYeNmHDNAorAV5NuneumevChEuDQ=";
hash = "sha256-nibq+wHwwyFodNjWFLu5V/y4IFUAm/exWJ1nUjyHHdw=";
};
vendorHash = "sha256-woInU618JPwVxGDJDZQ6+j9wY6qNSB5Xu8wXf7s2qvQ=";
@@ -4,18 +4,16 @@
fetchFromGitHub,
cmake,
}:
let
version = "14.0.3";
in
stdenv.mkDerivation (finalAttrs: {
pname = "source-meta-json-schema";
inherit version;
version = "14.7.1";
src = fetchFromGitHub {
owner = "sourcemeta";
repo = "jsonschema";
rev = "v${version}";
hash = "sha256-wRB/syj79pz5walyuefCYcfN/JoRbnxuwWHE2w3LKs8=";
tag = "v${finalAttrs.version}";
hash = "sha256-zQ9GyJBaSzDL7i/PurOW4yJR59pX/0CLZ2DgDJmA6+s=";
};
nativeBuildInputs = [
+18
View File
@@ -2,6 +2,7 @@
lib,
buildGoModule,
fetchFromGitHub,
stdenv,
versionCheckHook,
nix-update-script,
}:
@@ -24,6 +25,23 @@ buildGoModule (finalAttrs: {
"-w"
];
# Enable for upstream KCP and QUIC tests which require UDP binding on localhost
__darwinAllowLocalNetworking = true;
checkFlags =
let
skippedTests = [
# `quic.DialAddr` of `quic-go` invokes UDP writing with `sendmsg` from address `[::]`,
# causing these tests to fail even with the `__darwinAllowLocalNetworking` flag enabled.
"TestQUIC_InitialPacketSize"
"TestQUIC_RespectMTU"
"TestQUIC_CertValidation"
];
in
lib.optionals stdenv.hostPlatform.isDarwin [
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
];
doInstallCheck = true;
nativeCheckInputs = [
versionCheckHook
+3 -3
View File
@@ -9,11 +9,11 @@
}:
let
pname = "volanta";
version = "1.15.2";
build = "32c42adb";
version = "1.15.3";
build = "64ba2e0c";
src = fetchurl {
url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
hash = "sha256-2f6/zl+N3sZ6en50T8lo2EDMGi/sBk2SHKKBxm/oGQw=";
hash = "sha256-rTonFExYHXLuRWf98IsNE7KqGrRMRC+Hke6CGKJWLAA=";
};
appImageContents = appimageTools.extract { inherit pname version src; };
in
+26 -23
View File
@@ -43,6 +43,8 @@ let
)
);
LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";
qtVersion = lib.versions.major qtbase.version;
in
stdenv.mkDerivation rec {
@@ -95,29 +97,30 @@ stdenv.mkDerivation rec {
"bigide"
];
LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";
NIX_LDFLAGS = lib.concatStringsSep " " (
[
"-L${lib.getLib stdenv.cc.cc}/lib"
"-lX11"
"-lXext"
"-lXi"
"-latk-1.0"
"-lc"
"-lcairo"
"-lgcc_s"
"-lgdk-x11-2.0"
"-lgdk_pixbuf-2.0"
"-lglib-2.0"
"-lgtk-x11-2.0"
"-lpango-1.0"
]
++ lib.optionals withQt [
"-L${lib.getLib libqtpas}/lib"
"-lQt${qtVersion}Pas"
]
);
env = {
inherit LCL_PLATFORM;
NIX_LDFLAGS = toString (
[
"-L${lib.getLib stdenv.cc.cc}/lib"
"-lX11"
"-lXext"
"-lXi"
"-latk-1.0"
"-lc"
"-lcairo"
"-lgcc_s"
"-lgdk-x11-2.0"
"-lgdk_pixbuf-2.0"
"-lglib-2.0"
"-lgtk-x11-2.0"
"-lpango-1.0"
]
++ lib.optionals withQt [
"-L${lib.getLib libqtpas}/lib"
"-lQt${qtVersion}Pas"
]
);
};
preBuild = ''
mkdir -p $out/share "$out/lazarus"
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# The upstream fix for the input-files macro regression
(fetchpatch {
url = "https://github.com/acl2/acl2/commit/be39e7835f1c68008c17188d2f65eeaef61632fa.patch";
sha256 = "sha256-pZ/r0vlyJz7ymYfrVtHDxsLdw0M/MJStBH42ZLO7Fs4=";
hash = "sha256-pZ/r0vlyJz7ymYfrVtHDxsLdw0M/MJStBH42ZLO7Fs4=";
})
(replaceVars ./0001-path-changes-for-nix.patch {
+10 -5
View File
@@ -31,11 +31,16 @@ stdenv.mkDerivation {
"OUTPUT=$(libName)"
"HIDOBJ="
];
NIX_LDFLAGS = [
"-lpugixml"
"-lhidapi${hidapiDriver}"
];
env.NIX_CFLAGS_COMPILE = toString [ "-I${hidapi}/include/hidapi" ];
env = {
NIX_LDFLAGS = toString [
"-lpugixml"
"-lhidapi${hidapiDriver}"
];
NIX_CFLAGS_COMPILE = toString [
"-I${hidapi}/include/hidapi"
];
};
patches = [ ./bsl430.patch ];
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "agentic-threat-hunting-framework";
version = "0.5.2";
version = "0.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Nebulock-Inc";
repo = "agentic-threat-hunting-framework";
tag = "v${finalAttrs.version}";
hash = "sha256-0IlDOS9qWl0F9h3xWDioK/GhZ3HanAQMdAkH6mvvQCQ=";
hash = "sha256-45hig2DcN9Hpw8ev+iax7zfcCA6rs7cF3F0KDh7eRo4=";
};
build-system = [ setuptools ];
@@ -5,16 +5,16 @@
poetry-core,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "bhopengraph";
version = "1.3.0";
version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "p0dalirius";
repo = "bhopengraph";
tag = "v${version}";
hash = "sha256-rpJZhABYsiv3uZdb6zLEYGYMOv8Gyd6kZ9k0d9Ob1FQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-pT+xdcxFLQUrXpZxS0gmXjyhtR1jqDsBAPHgEhxX2R8=";
};
build-system = [ poetry-core ];
@@ -27,8 +27,8 @@ buildPythonPackage rec {
meta = {
description = "Library to create BloodHound OpenGraphs";
homepage = "https://github.com/p0dalirius/bhopengraph";
changelog = "https://github.com/p0dalirius/bhopengraph/releases/tag/${src.tag}";
changelog = "https://github.com/p0dalirius/bhopengraph/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.107";
version = "0.2.109";
pyproject = true;
src = fetchFromGitHub {
owner = "tschamm";
repo = "boschshcpy";
tag = version;
hash = "sha256-JHOaviN8pjG/VcYCZUk7vRTLKCfj5TMCQYo+dNDdX5I=";
hash = "sha256-CHACdcFYmtDgq2eGMa8f5nsIbl8murFsieG2xA5/tVc=";
};
build-system = [ setuptools ];
@@ -358,13 +358,13 @@
buildPythonPackage (finalAttrs: {
pname = "boto3-stubs";
version = "1.42.43";
version = "1.42.44";
pyproject = true;
src = fetchPypi {
pname = "boto3_stubs";
inherit (finalAttrs) version;
hash = "sha256-+TaFk0tiRRQiKXGvSNSZfvqLeXus+WrRIZsyf2RZoic=";
hash = "sha256-4eWmFFgtmgTeR1OTVv5h4t/1OicWKNblnUVaRrolv0g=";
};
build-system = [ setuptools ];
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "ffmpeg-progress-yield";
version = "1.1.1";
version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "slhck";
repo = "ffmpeg-progress-yield";
tag = "v${version}";
hash = "sha256-lAnTDA8YAqT7ZtRyxTtEZ8vK/OSz6mhpFXy6LURsU3E=";
hash = "sha256-Cy2ShWEwtfk/eDCXZL3qPrTRMJZtCtjOVHfmW0NbuN4=";
};
build-system = [ uv-build ];
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202602061";
version = "0.1.202602081";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-bsfzOI2CUzmYJF2jbgTmEd6TktbkXbkezqWgmBNu8So=";
hash = "sha256-qv5TRKaveJJR4pjSWeEifCJn/nP5PTk+K5YhQPJNihw=";
};
__darwinAllowLocalNetworking = true;
@@ -21,16 +21,16 @@
typeshed-client,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "jsonargparse";
version = "4.45.0";
version = "4.46.0";
pyproject = true;
src = fetchFromGitHub {
owner = "omni-us";
repo = "jsonargparse";
tag = "v${version}";
hash = "sha256-bp1oQAVlFSNecE2vOyekfA8ij5Pq2PK0fasTIpoKmqs=";
tag = "v${finalAttrs.version}";
hash = "sha256-YLryV70RV4TH86ysllMXyCsZp7xr1LRFwKU1PjvoilA=";
};
build-system = [ setuptools ];
@@ -79,8 +79,8 @@ buildPythonPackage rec {
meta = {
description = "Module to implement minimal boilerplate CLIs derived from various sources";
homepage = "https://github.com/omni-us/jsonargparse";
changelog = "https://github.com/omni-us/jsonargparse/blob/${src.tag}/CHANGELOG.rst";
changelog = "https://github.com/omni-us/jsonargparse/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -8,15 +8,15 @@
transformers,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "llama-index-llms-openai-like";
version = "0.5.3";
version = "0.6.0";
pyproject = true;
src = fetchPypi {
pname = "llama_index_llms_openai_like";
inherit version;
hash = "sha256-hL38iLtdnqgGvdG+S0N4NXeBwGN8eMVIJCqshX8WUJA=";
inherit (finalAttrs) version;
hash = "sha256-aTjP7WLHeHa6Q/JlGaq/VVd1/Y4Ofhry3fN6n8kdyjI=";
};
build-system = [ hatchling ];
@@ -38,4 +38,4 @@ buildPythonPackage rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -10,13 +10,13 @@
buildPythonPackage (finalAttrs: {
pname = "llama-index-workflows";
version = "2.13.1";
version = "2.14.1";
pyproject = true;
src = fetchPypi {
pname = "llama_index_workflows";
inherit (finalAttrs) version;
hash = "sha256-Vc08/5ySo3Jyq4ZRrXUCiKvDORZbAJBm8TDLDFxlmUs=";
hash = "sha256-eancEgxdy/FAGu1AwQva4L0tOf3JD27vRjGF6EZla+8=";
};
postPatch = ''
@@ -1170,8 +1170,8 @@ in
"sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";
mypy-boto3-sagemaker =
buildMypyBoto3Package "sagemaker" "1.42.36"
"sha256-fChgTJ4OGgn2eHV8xdKZrYCrgGHZ37s0JTn2MoawxUQ=";
buildMypyBoto3Package "sagemaker" "1.42.44"
"sha256-suSqZZnf8DCgfMZTBhIpXc6R/vgZ2KGmpX7zeIryy4o=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"
@@ -11,12 +11,12 @@
buildPythonPackage (finalAttrs: {
pname = "publicsuffixlist";
version = "1.0.2.20260204";
version = "1.0.2.20260207";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-PPciiXJRTyhMgJiZTrFYuAWrcbqb40tcahMTF9s/4sw=";
hash = "sha256-yit/A5RBoGdiY6IDc/2HnMl6QkAp4IGYywfCIo4cbZ8=";
};
postPatch = ''
@@ -10,12 +10,12 @@
buildPythonPackage (finalAttrs: {
pname = "pytransportnswv2";
version = "2.2.2";
version = "2.2.5";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-/dE1g+WG9aPDgi1qaCZ9YZTH89qW85P3ds8+iuh/8/M=";
hash = "sha256-U4R5PDXQGHomDTXceXZvyrFqh7+Ywa6IqbdnAbUZ2XQ=";
};
build-system = [ setuptools ];
@@ -5,17 +5,16 @@
poetry-core,
base58,
cryptography,
ecdsa,
}:
buildPythonPackage rec {
pname = "slip10";
version = "1.0.1";
version = "1.1.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-ArNQrlV7WReRQosXVR+V16xX6SEfN969yBTJC0oSOlQ=";
hash = "sha256-0kjT3ybxI/CEdDOcRfDyZCVPdK6aVlcjSh1euR8MTVQ=";
};
build-system = [ poetry-core ];
@@ -23,7 +22,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
base58
cryptography
ecdsa
];
pythonImportsCheck = [ "slip10" ];
@@ -7,14 +7,14 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "xkcdpass";
version = "1.20.0";
version = "1.30.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-tav9fStZzdpZ+Tf7IiEKxGSa0NLgnh+Hv+dKVOI60Yo=";
inherit (finalAttrs) pname version;
hash = "sha256-ijprYCVdpA0OXIEkWCgCeMgtLBy5DkivvWd327+HlcM=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -26,13 +26,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "xkcdpass" ];
disabledTests = [
# https://github.com/redacted/XKCD-password-generator/issues/138
"test_entropy_printout_valid_input"
# AssertionError: 29611 != 5670
"test_loadwordfile"
];
postInstall = ''
installManPage *.?
install -Dm444 -t $out/share/doc/${pname} README*
install -Dm444 -t $out/share/doc/${finalAttrs.pname} README*
'';
meta = {
@@ -42,4 +42,4 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ peterhoeg ];
mainProgram = "xkcdpass";
};
}
})
@@ -26,7 +26,8 @@ let
mkPrefetchScript =
tool: src: deps:
stdenv.mkDerivation {
name = "nix-prefetch-${tool}";
inherit (lib.trivial) version;
pname = "nix-prefetch-${tool}";
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
-7
View File
@@ -8460,13 +8460,6 @@ with pkgs;
nsdiff = perlPackages.nsdiff;
outline = callPackage ../servers/web-apps/outline (
lib.fix (super: {
yarn = yarn.override { inherit (super) nodejs; };
nodejs = nodejs_22;
})
);
openafs = callPackage ../servers/openafs/1.8 { };
openresty = callPackage ../servers/http/openresty {