mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-17 10:40:33 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
66ecbc9385
@ -6,16 +6,19 @@
|
||||
overlays = [];
|
||||
inherit system;
|
||||
},
|
||||
nixVersions ? import ../../tests/nix-for-tests.nix { inherit pkgs; },
|
||||
libpath ? ../..,
|
||||
# Random seed
|
||||
seed ? null,
|
||||
}:
|
||||
|
||||
pkgs.runCommand "lib-path-tests" {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
nix
|
||||
nativeBuildInputs = [
|
||||
nixVersions.stable
|
||||
] ++ (with pkgs; [
|
||||
jq
|
||||
bc
|
||||
];
|
||||
]);
|
||||
} ''
|
||||
# Needed to make Nix evaluation work
|
||||
export TEST_ROOT=$(pwd)/test-tmp
|
||||
|
||||
17
lib/tests/nix-for-tests.nix
Normal file
17
lib/tests/nix-for-tests.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ pkgs
|
||||
}:
|
||||
|
||||
# The aws-sdk-cpp tests are flaky. Since pull requests to staging
|
||||
# cause nix to be rebuilt, this means that staging PRs end up
|
||||
# getting false CI failures due to whatever is flaky in the AWS
|
||||
# SDK tests. Since none of our CI needs to (or should be able to)
|
||||
# contact AWS S3, let's just omit it all from the Nix that runs
|
||||
# CI. Bonus: the tests build way faster.
|
||||
#
|
||||
# See also: https://github.com/NixOS/nix/issues/7582
|
||||
|
||||
builtins.mapAttrs (_: pkg:
|
||||
if builtins.isAttrs pkg
|
||||
then pkg.override { withAWS = false; }
|
||||
else pkg)
|
||||
pkgs.nixVersions
|
||||
@ -1,8 +1,9 @@
|
||||
{ # The pkgs used for dependencies for the testing itself
|
||||
# Don't test properties of pkgs.lib, but rather the lib in the parent directory
|
||||
pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; },
|
||||
nix ? pkgs.nix,
|
||||
nixVersions ? [ pkgs.nixVersions.minimum nix pkgs.nixVersions.unstable ],
|
||||
nix ? pkgs-nixVersions.stable,
|
||||
nixVersions ? [ pkgs-nixVersions.minimum nix pkgs-nixVersions.unstable ],
|
||||
pkgs-nixVersions ? import ./nix-for-tests.nix { inherit pkgs; },
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -1225,6 +1225,11 @@
|
||||
githubId = 81317317;
|
||||
name = "Anna Aurora";
|
||||
};
|
||||
a-n-n-a-l-e-e = {
|
||||
github = "a-n-n-a-l-e-e";
|
||||
githubId = 150648636;
|
||||
name = "annalee";
|
||||
};
|
||||
anoa = {
|
||||
matrix = "@andrewm:amorgan.xyz";
|
||||
email = "andrew@amorgan.xyz";
|
||||
@ -14726,6 +14731,12 @@
|
||||
fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
|
||||
}];
|
||||
};
|
||||
qdlmcfresh = {
|
||||
name = "Philipp Urlbauer";
|
||||
email = "qdlmcfresh@gmail.com";
|
||||
github = "qdlmcfresh";
|
||||
githubId = 10837173;
|
||||
};
|
||||
qjoly = {
|
||||
email = "github@thoughtless.eu";
|
||||
github = "qjoly";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }:
|
||||
{ stdenv, lib, writeText, fetchurl, upx, libGL, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }:
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ];
|
||||
libPath = lib.makeLibraryPath [ stdenv.cc.cc libGL libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "kega-fusion";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config
|
||||
, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers, fetchpatch
|
||||
, Accelerate, CoreGraphics, CoreVideo
|
||||
}:
|
||||
|
||||
@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
autoconf-archive
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
leptonica
|
||||
libarchive
|
||||
libpng
|
||||
libtiff
|
||||
icu
|
||||
|
||||
@ -21,6 +21,9 @@ buildGoModule rec {
|
||||
# used at runtime, but not installed by default
|
||||
postInstall = ''
|
||||
cp -r ${src}/jsHelper $out/bin/jsHelper
|
||||
cp -r ${src}/CustomApps $out/bin/CustomApps
|
||||
cp -r ${src}/Extensions $out/bin/Extensions
|
||||
cp -r ${src}/Themes $out/bin/Themes
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
, at-spi2-atk
|
||||
, cairo
|
||||
, pango
|
||||
, pipewire
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, freetype
|
||||
@ -150,7 +151,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }"
|
||||
# Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043
|
||||
#--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
, glib
|
||||
, gst_all_1
|
||||
, gtk3
|
||||
, libayatana-appindicator
|
||||
, libgit2
|
||||
, libpulseaudio
|
||||
, libsodium
|
||||
@ -145,6 +146,10 @@ rustPlatform.buildRustPackage rec {
|
||||
install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --add-rpath "${libayatana-appindicator}/lib" "$out/lib/rustdesk/rustdesk"
|
||||
'';
|
||||
|
||||
env = {
|
||||
SODIUM_USE_PKG_CONFIG = true;
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gql";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmrDeveloper";
|
||||
repo = "GQL";
|
||||
rev = version;
|
||||
hash = "sha256-XqS2oG3/dPHBC/sWN9B7BliSv4IJ1iskrQRTh8vQNd4=";
|
||||
hash = "sha256-+f/OMU8fwwnlm8zTyE5XyIzfFwIB917tH9jaqSW8Skg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0mUkXez+5Z8UGKMrUUjt+aF4zv3EJKgnFoQ068gTlX0=";
|
||||
cargoHash = "sha256-A3o9OE8VO7z04WmbZL2rvlZRN/ZHOIGklKZQgiFSfxE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.23.0";
|
||||
version = "2.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-17TlUQNv/L+LZYF8vub2nI5TVF66OqTA8PrjEYjkz5o=";
|
||||
hash = "sha256-g8XaMvKt3tR7a7kq+n4ueDXx9iWuAu02ONb73W23ZGY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-zBogjMaVkLum1rQVEd+Rw8lRCNC/Dhi7cuz4YH3eCcg=";
|
||||
vendorHash = "sha256-BeW39XN1CvPCCq4otX+Il2dGGcjGrTMzc4iSXmQZFmw=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, appimageTools, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.9.9.5";
|
||||
version = "0.9.9.6";
|
||||
pname = "hifile";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hifile.app/files/HiFile-${version}.AppImage";
|
||||
hash = "sha256-Ks/NLPm5loo9q8pT0LdtfcrC38203beNE74sbEpyuJM=";
|
||||
hash = "sha256-qfBV4w4nChH2wUAHdcUFwVs+3OeqcKqMJ8WUucn31q4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -1,31 +1,44 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, cairo
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtk-layer-shell
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, xdg-utils }:
|
||||
, xdg-utils
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
let
|
||||
pname = "nwg-drawer";
|
||||
version = "0.3.9";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
repo = "nwg-drawer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg=";
|
||||
hash = "sha256-2/YI91Rcm+N8tNoKBRIDAQ3T2M6T7+kWngbCzyaXOCc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4=";
|
||||
vendorHash = "sha256-8s8+ukMQpciQmKt77fNE7r+3cm/UDxO8VtkrNYdKhM8=";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version src vendorHash;
|
||||
|
||||
buildInputs = [ cairo gtk3 gtk-layer-shell ];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ];
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
buildInputs = [
|
||||
cairo
|
||||
gtk-layer-shell
|
||||
gtk3
|
||||
];
|
||||
|
||||
doCheck = false; # Too slow
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/nwg-drawer
|
||||
@ -43,9 +56,9 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Application drawer for sway Wayland compositor";
|
||||
homepage = "https://github.com/nwg-piotr/nwg-drawer";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "nwg-drawer";
|
||||
maintainers = with maintainers; [ plabadens ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
, wayland-protocols
|
||||
, libxkbcommon
|
||||
, libglvnd
|
||||
, mpv
|
||||
, mpv-unwrapped
|
||||
, darwin
|
||||
, waylandSupport ? false
|
||||
}:
|
||||
@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dweymouth";
|
||||
repo = "supersonic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DVduZ1qPbcDlH+B5hibC2HUjwEUV+CpDDpMI8GdPwro";
|
||||
hash = "sha256-rNM3kQrEkqLAW6Dia+VsEi9etUG218AL8tO0amWXb34=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Dj6I+gt0gB5HWTWdFXCV5UpLuvg+HhuygRJAdvV/Yp8";
|
||||
vendorHash = "sha256-I4ZZmQfYTMtNT+3WCs6/g42uF4EKGSjGHCqG8Du5rCo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
@ -43,7 +43,7 @@ buildGoModule rec {
|
||||
|
||||
buildInputs = [
|
||||
libglvnd
|
||||
mpv
|
||||
mpv-unwrapped
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
xorg.libXxf86vm
|
||||
xorg.libX11
|
||||
|
||||
@ -8,17 +8,17 @@ Subject: [PATCH] adjust unit test for finding executables in path for NixOS
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor
|
||||
index 986c0564d2..f0772fdcc9 100644
|
||||
index acd5029..870537f 100644
|
||||
--- a/basis/io/standard-paths/unix/unix-tests.factor
|
||||
+++ b/basis/io/standard-paths/unix/unix-tests.factor
|
||||
@@ -5,12 +5,12 @@ sequences tools.test ;
|
||||
|
||||
@@ -5,13 +5,13 @@ sequences tools.test ;
|
||||
|
||||
{ f } [ "" find-in-path ] unit-test
|
||||
{ t } [
|
||||
- "ls" find-in-path { "/bin/ls" "/usr/bin/ls" } member?
|
||||
+ "ls" find-in-path not not
|
||||
] unit-test
|
||||
|
||||
|
||||
{ t } [
|
||||
"/sbin:" "PATH" os-env append "PATH" [
|
||||
"ps" find-in-path
|
||||
@ -26,6 +26,3 @@ index 986c0564d2..f0772fdcc9 100644
|
||||
+ not not
|
||||
] with-os-env
|
||||
] unit-test
|
||||
--
|
||||
2.19.2
|
||||
|
||||
|
||||
@ -83,8 +83,8 @@ let
|
||||
${wrapFactorScript { from = "./factor"; inherit runtimeLibs; }}
|
||||
ln -sf factor.image .factor-wrapped.image
|
||||
'';
|
||||
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
|
||||
version = "0.98";
|
||||
rev = "e10b64dbc53a8583098e73580a1eb9ff4ce0c709";
|
||||
version = "0.99";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -93,12 +93,12 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";
|
||||
sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
|
||||
sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./staging-command-line-0.98-pre.patch
|
||||
./workdir-0.98-pre.patch
|
||||
./staging-command-line-0.99-pre.patch
|
||||
./workdir-0.99-pre.patch
|
||||
./adjust-paths-in-unit-tests.patch
|
||||
];
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
inside = (self:
|
||||
let callPackage = pkgs.newScope self;
|
||||
in rec {
|
||||
interpreter = callPackage ./factor98.nix { inherit (pkgs) stdenv; };
|
||||
interpreter = callPackage ./factor99.nix { inherit (pkgs) stdenv; };
|
||||
|
||||
# Convenience access for using the returned attribute the same way as the
|
||||
# interpreter derivation. Takes a list of runtime libraries as its only
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
|
||||
index ec86089dbe..b146168ec9 100644
|
||||
index cfcca0d..87a2b01 100644
|
||||
--- a/basis/tools/deploy/backend/backend.factor
|
||||
+++ b/basis/tools/deploy/backend/backend.factor
|
||||
@@ -69,7 +69,7 @@ ERROR: can't-deploy-library-file library ;
|
||||
@@ -72,7 +72,7 @@ ERROR: can't-deploy-library-file library ;
|
||||
[ staging-image-name "-output-image=" prepend , ]
|
||||
[ " " join "-include=" prepend , ] bi
|
||||
[ join-words "-include=" prepend , ] bi
|
||||
] [
|
||||
- input-image-name "-i=" prepend ,
|
||||
+ input-image-name resource-path "-i=" prepend ,
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor
|
||||
index 2d382e49d1..d4d9228d6c 100644
|
||||
--- a/core/io/pathnames/pathnames.factor
|
||||
+++ b/core/io/pathnames/pathnames.factor
|
||||
@@ -144,7 +144,10 @@ GENERIC: vocab-path ( path -- newpath )
|
||||
GENERIC: absolute-path ( path -- path' )
|
||||
|
||||
M: string absolute-path
|
||||
- "resource:" ?head [
|
||||
+ "resource:work" ?head [
|
||||
+ trim-head-separators "/var/lib/factor" prepend-path
|
||||
+ absolute-path ]
|
||||
+ [ "resource:" ?head [
|
||||
trim-head-separators resource-path
|
||||
absolute-path
|
||||
] [
|
||||
@@ -158,6 +161,7 @@ M: string absolute-path
|
||||
] [
|
||||
current-directory get prepend-path
|
||||
] if ] if
|
||||
+ ] if
|
||||
] if ;
|
||||
|
||||
M: object normalize-path ( path -- path' )
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor
|
||||
index a172fe4..40858bc 100644
|
||||
--- a/core/io/pathnames/pathnames.factor
|
||||
+++ b/core/io/pathnames/pathnames.factor
|
||||
@@ -166,6 +166,8 @@ GENERIC: absolute-path ( path -- path' )
|
||||
|
||||
M: string absolute-path
|
||||
{
|
||||
+ { [ "resource:work" ?head ]
|
||||
+ [ trim-head-separators "/var/lib/factor" prepend-path absolute-path ] }
|
||||
{ [ "resource:" ?head ] [ trim-head-separators resource-path absolute-path ] }
|
||||
{ [ "vocab:" ?head ] [ trim-head-separators vocab-path absolute-path ] }
|
||||
{ [ "~" ?head ] [ trim-head-separators home prepend-path absolute-path ] }
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
# CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
|
||||
"-DCONFIG_RUNTIME_CPU_DETECT=0"
|
||||
] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [
|
||||
"-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as"
|
||||
"-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as"
|
||||
] ++ lib.optionals stdenv.isAarch32 [
|
||||
# armv7l-hf-multiplatform does not support NEON
|
||||
# see lib/systems/platform.nix
|
||||
|
||||
53
pkgs/development/libraries/libfprint-2-tod1-elan/default.nix
Normal file
53
pkgs/development/libraries/libfprint-2-tod1-elan/default.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchzip
|
||||
, libfprint-tod
|
||||
, openssl
|
||||
, gusb
|
||||
, glib
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libfprint-2-tod1-elan";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://download.lenovo.com/pccbbs/mobiles/r1slf01w.zip";
|
||||
hash = "sha256-GD/BebPto1fFLgyvpiitt+ngwEtdsnKsvdFNeSmVDmw=";
|
||||
# .so is in a subzip
|
||||
postFetch = ''
|
||||
unpackFile $out/*
|
||||
rm $out/*.zip
|
||||
mv * $out/
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook];
|
||||
|
||||
buildInputs = [
|
||||
libfprint-tod
|
||||
openssl
|
||||
gusb
|
||||
glib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm444 libfprint-2-tod1-elan.so -t "$out/lib/libfprint-2/tod-1/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.driverPath = "/lib/libfprint-2/tod-1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Elan(04f3:0c4b) driver module for libfprint-2-tod Touch OEM Driver";
|
||||
homepage = "https://support.lenovo.com/us/en/downloads/ds560939-elan-fingerprint-driver-for-ubuntu-2204-thinkpad-e14-gen-4-e15-gen-4";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ qdlmcfresh ];
|
||||
};
|
||||
}
|
||||
@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# logic was not fixed. So we must disable it.
|
||||
''
|
||||
substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs'
|
||||
substituteInPlace configure --replace 'cross_only="target-libgloss target-newlib' 'cross_only="'
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "18.5.2";
|
||||
version = "18.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY=";
|
||||
hash = "sha256-k4CqpvmsKBO42oLkzogfm0ALenxRJnngdgxt1HK5i+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flit-core
|
||||
@ -34,6 +35,11 @@ buildPythonPackage rec {
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# On darwin: Too many open files
|
||||
preCheck = lib.optionalString stdenv.isDarwin ''
|
||||
ulimit -n 1024
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# these tests raise circus.tests.support.TimeoutException
|
||||
"test_reload1"
|
||||
|
||||
@ -2,14 +2,15 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, click
|
||||
, setuptools
|
||||
, six
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geomet";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -17,9 +18,13 @@ buildPythonPackage rec {
|
||||
owner = "geomet";
|
||||
repo = "geomet";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw=";
|
||||
hash = "sha256-YfI29925nffzRBMJb6Gm3muvlpwP3zSw2YJ2vWcf+Bo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
six
|
||||
|
||||
@ -2,6 +2,10 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson-python
|
||||
, pkg-config
|
||||
, Accelerate
|
||||
, blas
|
||||
, lapack
|
||||
, numpy
|
||||
@ -12,19 +16,43 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scs";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bodono";
|
||||
repo = "scs-python";
|
||||
rev = version;
|
||||
hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM=";
|
||||
hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
lapack
|
||||
patches = [
|
||||
# needed for building against netlib's reference blas implementation and
|
||||
# the pkg-config patch. remove on next update
|
||||
(fetchpatch {
|
||||
name = "find-and-ld-lapack.patch";
|
||||
url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch";
|
||||
hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg=";
|
||||
})
|
||||
# add support for pkg-config. remove on next update
|
||||
(fetchpatch {
|
||||
name = "use-pkg-config.patch";
|
||||
url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch";
|
||||
hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson-python
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = if stdenv.isDarwin then [
|
||||
Accelerate
|
||||
] else [
|
||||
blas
|
||||
lapack
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -51,6 +79,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/cvxgrp/scs"; # upstream C package
|
||||
downloadPage = "https://github.com/bodono/scs-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
maintainers = with maintainers; [ a-n-n-a-l-e-e drewrisinger ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.219.5";
|
||||
version = "0.222.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cg0tqwvYQ43Nvu6fQHGEX002sjmDBcz2AGke+K5Gk7g=";
|
||||
sha256 = "sha256-IOy6zsDGUfiSeOalQnku/4uNyjqpz2bMcpmf7Vq9fyI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libgit2_1_6
|
||||
, rust-jemalloc-sys
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
libgit2_1_6
|
||||
rust-jemalloc-sys
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.7.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-xjmxikIcR3v5lpxq7w2p0bukPunUTYH/HTQhy9fAOz8=";
|
||||
hash = "sha256-Hh4SfmdR7hujc6Ty+ay8uyl1vkjYuxwa5J5RacqHOAE=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-fDh+6aBrHUqioNbgufFiD5c4i8SGAYrUuFXgTVmhrRE=";
|
||||
vendorHash = "sha256-SVChgkPgqhApWDNA1me41zS0hXd1G2oFrL/SsnFiIsg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-dist";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axodotdev";
|
||||
repo = "cargo-dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lh3nK3yj03pEurjw6/fMh70GnBawxUqilupUzfgryG0=";
|
||||
hash = "sha256-QN+fO8aH4z0gtbDhS3BLKpiWMFoYP1JjPehWHUjR9z4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lUeCMyH6qE76SVjubWVo/Hpj6J8PM6ndOqrJufcfByw=";
|
||||
cargoHash = "sha256-tNRZx5i5noahhoxJ15rBSnPxqoJ4MlBRjcuUYmrNDVg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.62";
|
||||
version = "0.9.63";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-GxDURkXmZvxaX9RLq/hlqtX1woWm2JKtv5x5goCY4ZU=";
|
||||
hash = "sha256-xAFpTcugAWUmHwWe2Ny1urxrIzRXyfxUMb9kBoGa3SA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zQB8sPeKT43qC5JjrHa7E41NyDyiQ3PGvBqgszs+tBI=";
|
||||
cargoHash = "sha256-ase0pfcDDkQGnTEtAD2ZTnBP7jdGS9pki1BoFbfUuFk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
2472
pkgs/development/tools/rust/humility/Cargo.lock
generated
2472
pkgs/development/tools/rust/humility/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "humility";
|
||||
version = "unstable-2022-09-15";
|
||||
version = "unstable-2023-11-08";
|
||||
|
||||
nativeBuildInputs = [ pkg-config cargo-readme ];
|
||||
buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [
|
||||
@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxidecomputer";
|
||||
repo = pname;
|
||||
rev = "d336c21c7b6da7f8203a9331c7657581de2bc6ad";
|
||||
sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY=";
|
||||
rev = "67d932edde8b32c11e5d6356a54e97d65f7b9b2b";
|
||||
sha256 = "sha256-3EVNlOAVfx/wUFn83VBKs1N5PanS4jVADUPlhCIok5M=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -31,15 +31,14 @@ rustPlatform.buildRustPackage rec {
|
||||
"capstone-0.10.0" = "sha256-x0p005W6u3QsTKRupj9HEg+dZB3xCXlKb9VCKv+LJ0U=";
|
||||
"hidapi-1.4.1" = "sha256-2SBQu94ArGGwPU3wJYV0vwwVOXMCCq+jbeBHfKuE+pA=";
|
||||
"hif-0.3.1" = "sha256-o3r1akaSARfqIzuP86SJc6/s0b2PIkaZENjYO3DPAUo=";
|
||||
"idol-0.2.0" = "sha256-T4wxeSTH2tFBR8L5wL5a0gLDfcRLpALyGBE0dYNQwLI=";
|
||||
"humpty-0.1.3" = "sha256-efeb+RaAjQs9XU3KkfVo8mVK2dGyv+2xFKSVKS0vyTc=";
|
||||
"idol-0.3.0" = "sha256-s6ZM/EyBE1eOySPah5GtT0/l7RIQKkeUPybMmqUpmt8=";
|
||||
"idt8a3xxxx-0.1.0" = "sha256-S36fS9hYTIn57Tt9msRiM7OFfujJEf8ED+9R9p0zgK4=";
|
||||
"libusb1-sys-0.5.0" = "sha256-7Bb1lpZvCb+OrKGYiD6NV+lMJuxFbukkRXsufaro5OQ=";
|
||||
"pmbus-0.1.0" = "sha256-KBc7gFwrN1jv1HXygda7qE3ZYNWAO10Wl3X6alc2JOE=";
|
||||
"probe-rs-0.12.0" = "sha256-L2kQNAdSvv5x1goELuy3pZZzmoUDc4tMX3OJ7A5rAD0=";
|
||||
"serialport-4.2.1-alpha.0" = "sha256-a2A2rKll2RTSyvohqRUSQ4Sw6puJdlTZoof5rePxPVE=";
|
||||
"pmbus-0.1.0" = "sha256-20peEHZl6aXcLhw/OWb4RHAXWRNqoMcDXXglwNP+Gpc=";
|
||||
"probe-rs-0.12.0" = "sha256-/L+85K6uxzUmz/TlLLFbMlyekoXC/ClO33EQ/yYjQKU=";
|
||||
"spd-0.1.0" = "sha256-X6XUx+huQp77XF5EZDYYqRqaHsdDSbDMK8qcuSGob3E=";
|
||||
"tlvc-0.1.0" = "sha256-SKaVDKFUveZ/iSbKUrVbFIbni7HxCZG4P7fZxkBxY1k=";
|
||||
"tlvc-text-0.1.0" = "sha256-uHPPyc3Ns5L1/EFNCzH8eBEoqLlJoqguZxwNCNxfM6Q=";
|
||||
"tlvc-0.2.0" = "sha256-HiqDRqmKOTxz6UQSXNMOZdWdc5W+cFGuKBkNrqFvIIE=";
|
||||
"vsc7448-info-0.1.0" = "sha256-otNLdfGIzuyu03wEb7tzhZVVMdS0of2sU/AKSNSsoho=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.1.117";
|
||||
version = "0.1.127";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cB1t7TKAqHuzbvrXkOMJPXtNXTqNB/TBDS3OHYX96ko=";
|
||||
hash = "sha256-ho2dbuejQWU7K4j107fV4Lf5r3grsePifaE+HbRdCys=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+mCOSgRmvfAXHwtLup3vYhLY0zTtXIJeOtYD69B4/7o=";
|
||||
vendorHash = "sha256-qo1P2PSiWco3oKqKOCmCuM6QOz6a9ov2d2MpggBU4N8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -102,16 +102,16 @@
|
||||
"version": "2.06"
|
||||
},
|
||||
"mailpoet": {
|
||||
"path": "mailpoet/tags/4.35.1",
|
||||
"rev": "2990976",
|
||||
"sha256": "0pf7r8q939420bzwd0mlv5zbnlkg824hg40vf3w082ryclzyiap5",
|
||||
"version": "4.35.1"
|
||||
"path": "mailpoet/tags/4.36.0",
|
||||
"rev": "2995974",
|
||||
"sha256": "1782z2b1bwg7mx9qzvyzpiymmkqiafd5ymb31q11i7ks19gxlmbw",
|
||||
"version": "4.36.0"
|
||||
},
|
||||
"merge-minify-refresh": {
|
||||
"path": "merge-minify-refresh/trunk",
|
||||
"rev": "2980433",
|
||||
"sha256": "0vx71g1dihlmxrrgmc8fa3glxxndgxcrysidbc23hz33xd18wcbh",
|
||||
"version": "1.15.1"
|
||||
"rev": "2997367",
|
||||
"sha256": "158i9pqn4qqa5mzn57pg4m9gsln35c0gfb8v7sg1y02hp9876shg",
|
||||
"version": "2.2"
|
||||
},
|
||||
"opengraph": {
|
||||
"path": "opengraph/tags/1.11.2",
|
||||
@ -131,6 +131,12 @@
|
||||
"sha256": "1mrwgqp1ril54xqr8k2gwgjcsbf4xv3671v15xawapwz730h2c4r",
|
||||
"version": "0.10.0"
|
||||
},
|
||||
"tc-custom-javascript": {
|
||||
"path": "tc-custom-javascript/tags/1.2.3",
|
||||
"rev": "2870386",
|
||||
"sha256": "0lcprrnf25p6a12mf5hkfnl6r470n35pgfdl9nizjh4q43qzdcam",
|
||||
"version": "1.2.3"
|
||||
},
|
||||
"webp-converter-for-media": {
|
||||
"path": "webp-converter-for-media/tags/5.11.4",
|
||||
"rev": "2995294",
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
, "opengraph"
|
||||
, "simple-login-captcha"
|
||||
, "static-mail-sender-configurator"
|
||||
, "tc-custom-javascript"
|
||||
, "webp-converter-for-media"
|
||||
, "webp-express"
|
||||
, "wordpress-seo"
|
||||
|
||||
@ -156,6 +156,9 @@ let
|
||||
# Two web browsers -- exercises almost the entire packageset
|
||||
pkgs.pkgsCross.aarch64-multiplatform.qt5.qutebrowser
|
||||
pkgs.pkgsCross.aarch64-multiplatform.firefox
|
||||
|
||||
# Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859
|
||||
pkgs.spike
|
||||
];
|
||||
|
||||
in {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "copilot-cli";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9+K1d35wghK/j4hp7tGRDvj/5s3wiwj/++wovUf6n4Q=";
|
||||
hash = "sha256-w63mNGDUc5YrlBrqsXRyy4SPC35kNKWhiHe6Sfc30tI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qV2uZX2In+NYpzlQRuTfRtmWhozYwviVaFxMC+4kf7I=";
|
||||
vendorHash = "sha256-8hZFsYMZQ8RxImEG2t0kfukbRjAJMEDSYF+ryLOZelc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -16,14 +16,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2023.11.1";
|
||||
version = "2023.11.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hdSWrKOht1McZxTJtgvy+vqN49bi/P54/D7WDxIRb4w=";
|
||||
hash = "sha256-7VYGrWoElc/urs+jomJrRt0dzdmJhCenRvb9bHCl6H4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripdrag";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nik012003";
|
||||
repo = "ripdrag";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GWNu970nyD4E2mWghOtHnuvVYGhgZ87zNCNxSpxOsgQ=";
|
||||
hash = "sha256-mU2S4DhS2KXO7uIMBhJvaTjLpkFCljyEVoPcq4b2jKc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aN+25hhE6LhI8M+enyzsfSTARIxbY36mdeP70rjBJQ8=";
|
||||
cargoHash = "sha256-PWFNLtEXIgZ0RheDS5j9/MMXgzFjgCJKMi/51Z2ta8I=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
|
||||
|
||||
@ -114,7 +114,5 @@ stdenvNoCC.mkDerivation rec {
|
||||
maintainers = with maintainers; [
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
# "Couldn't find any versions for \"node-gyp\" that matches \"latest\" in our cache (possible versions are \"\")
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,11 +18,11 @@ assert usePcre -> pcre != null;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haproxy";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-nsxv/mepd9HtJ5EHu9q3kNc64qYmvDju4j+h9nhqdZ4=";
|
||||
hash = "sha256-gbrL9Q7G0Pfsqq18A+WZeLADIvva1u1KmJ3TF1S28l0=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib libxcrypt ]
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
, gobject-introspection
|
||||
, python3
|
||||
, gtk3
|
||||
, libappindicator-gtk3
|
||||
, libayatana-appindicator
|
||||
, glib
|
||||
}:
|
||||
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
jansson
|
||||
glib
|
||||
glib-networking
|
||||
libappindicator-gtk3
|
||||
libayatana-appindicator
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
|
||||
@ -31,7 +31,5 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/norouter/norouter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ blaggacao ];
|
||||
# out is empty
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.cgsecurity.org/wiki/CmosPwd";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ t4ccer ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
})
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yqpSkKebhX3kszL4mSbKUd9JR7rJizLdrk7tHlh6zlc=";
|
||||
hash = "sha256-S8YU25JA1yBdbDQpy9kxl3I/4PkMN9BrueCiXrZXAEI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pekirk3nYXDLzoy4iBJblYvN9fkViyMUsRFC0Dx1r9M=";
|
||||
vendorHash = "sha256-4i6jLRe9yDxC6FPOpFrwaLWjg16HR9PqkHNamlwT3PA=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/nuclei/"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nix, rustPlatform, CoreServices }:
|
||||
{ lib, stdenv, fetchFromGitHub, nix, rustPlatform, CoreServices, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook";
|
||||
@ -13,8 +13,17 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-D0XhrweO0A1+81Je4JZ0lmnbIHstNvefpmogCyB4FEE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd mdbook \
|
||||
--bash <($out/bin/mdbook completions bash) \
|
||||
--fish <($out/bin/mdbook completions fish) \
|
||||
--zsh <($out/bin/mdbook completions zsh )
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit nix;
|
||||
|
||||
@ -22732,6 +22732,8 @@ with pkgs;
|
||||
|
||||
libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { };
|
||||
|
||||
libfprint-2-tod1-elan = callPackage ../development/libraries/libfprint-2-tod1-elan { };
|
||||
|
||||
libfpx = callPackage ../development/libraries/libfpx { };
|
||||
|
||||
libgadu = callPackage ../development/libraries/libgadu { };
|
||||
@ -33924,7 +33926,11 @@ with pkgs;
|
||||
|
||||
normalize = callPackage ../applications/audio/normalize { };
|
||||
|
||||
norouter = callPackage ../tools/networking/norouter { };
|
||||
norouter = callPackage ../tools/networking/norouter {
|
||||
# doesn't build with go 1.21
|
||||
# https://github.com/norouter/norouter/issues/165
|
||||
buildGoModule = buildGo120Module;
|
||||
};
|
||||
|
||||
nqptp = callPackage ../tools/networking/nqptp { };
|
||||
|
||||
@ -34064,8 +34070,6 @@ with pkgs;
|
||||
|
||||
nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { };
|
||||
|
||||
nwg-drawer = callPackage ../applications/misc/nwg-drawer { };
|
||||
|
||||
nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
|
||||
|
||||
nwg-look = callPackage ../applications/misc/nwg-look { };
|
||||
|
||||
@ -12683,7 +12683,9 @@ self: super: with self; {
|
||||
|
||||
scikit-survival = callPackage ../development/python-modules/scikit-survival { };
|
||||
|
||||
scs = callPackage ../development/python-modules/scs { };
|
||||
scs = callPackage ../development/python-modules/scs {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate;
|
||||
};
|
||||
|
||||
sdds = callPackage ../development/python-modules/sdds { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user