Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -5,9 +5,9 @@ let
|
||||
in
|
||||
{
|
||||
sublime-merge = common {
|
||||
buildVersion = "2110";
|
||||
aarch64sha256 = "lG95VgRsicSRjve7ESTamU9dp/xBjR6yyLL+1wh6BXg=";
|
||||
x64sha256 = "v5CFqS+bB0Oe0fZ+vP0zxrJ2SUctNXKqODmB8M9XMIY=";
|
||||
buildVersion = "2112";
|
||||
aarch64sha256 = "XtJ4bAKiCZnBEG1ssXhViuyOsLNdeahHAkWZqqCRmvU=";
|
||||
x64sha256 = "rzk3PlGpGXDh3Ig3gKb9WSER6PzPKmp1PJJiD0sGVS4=";
|
||||
} { };
|
||||
|
||||
sublime-merge-dev = common {
|
||||
|
||||
@@ -31,7 +31,7 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.3.31";
|
||||
version = "16.3.33";
|
||||
pname = "jmol";
|
||||
|
||||
src =
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
in
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-VrxF3edZHEyaTfeSbBg8Po7/DOqEdtaXhdLg6KEu9kc=";
|
||||
hash = "sha256-U2UEK+ZjSErzgQAkcoZwoLZ9m3pI10pcdz79M7BmBB4=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "komga";
|
||||
version = "1.23.3";
|
||||
version = "1.23.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
|
||||
sha256 = "sha256-Q52u284BqN6IktMKOAbiwdM77ZOPQrHIzOkExz91Xeo=";
|
||||
sha256 = "sha256-mFcnD6QAuc3VGpa6AhJVfXF++yCaQ7irvftew33ImUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lasuite-meet-frontend";
|
||||
version = "0.1.33";
|
||||
version = "0.1.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y=";
|
||||
hash = "sha256-5RY/k9yuiV+JwLBoZpw9zNCTWXCEAnB1FU6njWpvdXk=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/frontend";
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit version src;
|
||||
sourceRoot = "source/src/frontend";
|
||||
hash = "sha256-s5HgGFY7yPct7P2nutYab1KsMbzHWBHKEm4W74qsgIw=";
|
||||
hash = "sha256-svCLdlX5GnVCoYlf6uzYBr5wIp3buURj6Op60VtGFjg=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "lasuite-meet";
|
||||
version = "0.1.33";
|
||||
version = "0.1.34";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y=";
|
||||
hash = "sha256-5RY/k9yuiV+JwLBoZpw9zNCTWXCEAnB1FU6njWpvdXk=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/backend";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2025-08-26";
|
||||
version = "0-unstable-2025-09-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "c9303dcc4d11fe5d37db9ef9a24c8eab4087c0c3";
|
||||
hash = "sha256-k/th5Ze/x48mTFZxEsSWCE4STnMSFXl3I0uMVmdMSxc=";
|
||||
rev = "10b7e86738a8c3eeff7114bcc4ef110d382dd0fd";
|
||||
hash = "sha256-Js8RdmP7wjWHK5Z5Yejy53dD04ehgeeH2dY0OjcNIVo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -33,11 +33,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mdk-sdk";
|
||||
version = "0.33.1";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux.tar.xz";
|
||||
hash = "sha256-4pxH9ZytnAAyBIRP72f64jBOBBSQ6MY0HpdkCy1kFHg=";
|
||||
hash = "sha256-qt17xZKuZIWmD8ck1IrHXa5i5tKElTYmbGQvqJTtTsY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nauty";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pallini.di.uniroma1.it/nauty${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] version
|
||||
}.tar.gz";
|
||||
sha256 = "sha256-eziDTHzv4X0l4F7vHvOIL6nNGTP1grnrnedHdBGVYFM=";
|
||||
sha256 = "sha256-SI+pBtEKNyxy0jZMXe5I4PcwcAT75SwrzlDFLejNhz4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
"dev"
|
||||
];
|
||||
|
||||
# HACK: starting from 2.9.0, the makefile tries to copy .libs/*.a files unconditionally
|
||||
# HACK: starting from 2.8.9, the makefile tries to copy .libs/*.a files unconditionally
|
||||
dontDisableStatic = true;
|
||||
|
||||
configureFlags = [
|
||||
@@ -50,10 +50,8 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.asl20;
|
||||
teams = [ teams.sage ];
|
||||
platforms = platforms.unix;
|
||||
# I'm not sure if the filename will remain the same for future changelog or
|
||||
# if it will track changes to minor releases. Lets see. Better than nothing
|
||||
# in any case.
|
||||
changelog = "https://pallini.di.uniroma1.it/changes24-28.txt";
|
||||
# The filename may change for future changelogs. Better than nothing in any case.
|
||||
changelog = "https://pallini.di.uniroma1.it/changes24-2${lib.versions.minor version}.txt";
|
||||
homepage = "https://pallini.di.uniroma1.it/";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rssguard";
|
||||
version = "4.8.5";
|
||||
version = "4.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = "rssguard";
|
||||
tag = version;
|
||||
sha256 = "sha256-JSw3zuKUPqxWbgzLVjLs41fOihQZcfU6PJGb4m6ua90=";
|
||||
sha256 = "sha256-2gwzk23t9WRHrXlASzba9HQRijHjH0nfWsBjMcqgq68=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ callPackage, commandLineArgs }:
|
||||
callPackage ./generic.nix { inherit commandLineArgs; } {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.64.0";
|
||||
version = "7.69.0";
|
||||
|
||||
libdir = "usr/lib64/signal-desktop";
|
||||
bindir = "usr/bin";
|
||||
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
|
||||
bsdtar -xf $downloadedFile -C "$out"
|
||||
'';
|
||||
|
||||
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09358233-signal-desktop/signal-desktop-7.64.0-1.fc42.aarch64.rpm";
|
||||
hash = "sha256-VWDw1eSYze23obCU/R4chesJvZZo1JbDGvR82Jg99og=";
|
||||
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09522003-signal-desktop/signal-desktop-7.69.0-1.fc42.aarch64.rpm";
|
||||
hash = "sha256-jvBSQZfP06tuhy1uhOPeHXkmYsMi/ptRe9P2mgTeAoU=";
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.64.0";
|
||||
version = "7.69.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-Ir0p2M3P8bUNi16i4aGO8RmUD20mYKbVD+4twHEOMJc=";
|
||||
hash = "sha256-iOp0ASFPsOncifoW7Bou/hLmer+rml0mtzYrH3R9Mf0=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ callPackage, commandLineArgs }:
|
||||
callPackage ./generic.nix { inherit commandLineArgs; } rec {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.64.0";
|
||||
version = "7.69.0";
|
||||
|
||||
libdir = "opt/Signal";
|
||||
bindir = libdir;
|
||||
extractPkg = "dpkg-deb -x $downloadedFile $out";
|
||||
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-3mibhZJpY/yo4RzZ6LQbI5xUlGgK6zGtB48Q8yDgflc=";
|
||||
hash = "sha256-QFK/6f+/NGHfKCu52EpbpW98dwOmCL52vjmDpxR3WXk=";
|
||||
}
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = "ticker";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SwQkoviJCPJmz//EIBRqvaWtg65xgTo98VnoiciwKHY=";
|
||||
hash = "sha256-sm/57kOiFI+mAH3VNAklXeTaZqfuJSZmLYXvj8cZQso=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XKl4bGWTz3AKl+hLFY0R0uT5ryOCHNzoeVHczMb32zo=";
|
||||
vendorHash = "sha256-EKc9QRDSOD4WetCXORjMUlaFqh0+B3Aa3m5SR1WiKN4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayasa520";
|
||||
repo = "waydroid-helper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O1QJzv1p+cBAxVB2YXC45EQMsbIC01StmiIXEGdzqGw=";
|
||||
hash = "sha256-iLBgryNb8NGsfjZmI0xxGFv+lAt0XFT2uXdEabTIRyA=";
|
||||
};
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "mediainfo.yazi";
|
||||
version = "25.5.31-unstable-2025-08-06";
|
||||
version = "25.5.31-unstable-2025-08-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "mediainfo.yazi";
|
||||
rev = "0e2ae47cfb2b7c7a32d714c753b1cebbaa75d127";
|
||||
hash = "sha256-CHigaujMHd1BuYyyxzI5B4ZYQhuH2YZptVVJToq39sY=";
|
||||
rev = "2093ab79d47d750c0b74759d2dd93aff8c7ee5c8";
|
||||
hash = "sha256-GObz6kpBTT1HuWgsAWlbbzCw2GxZGKLTWaUKKztiTaw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "recycle-bin.yazi";
|
||||
version = "1.0.0-unstable-2025-08-20";
|
||||
version = "0-unstable-2025-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uhs-robert";
|
||||
repo = "recycle-bin.yazi";
|
||||
rev = "52f6fe08f5f42cbae56d8c46abc368560e1e2d6e";
|
||||
hash = "sha256-krZAbL7JRRvJbT+23C6fw8Zbav+8I+bvIFAYrpeNuhw=";
|
||||
rev = "728c0af4111ad043f9361ce6373949b5f9dec4a3";
|
||||
hash = "sha256-XnDiWuKLyI1jszwKTaVnPR8AX3+9mdkkof+V6E8RkR4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "restore.yazi";
|
||||
version = "25.5.31-unstable-2025-08-12";
|
||||
version = "25.5.31-unstable-2025-08-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "restore.yazi";
|
||||
rev = "2a2ba2fbaee72f88054a43723becf66c3cfb892e";
|
||||
hash = "sha256-FqvQuKNH3jjXQ/7N7MsUsOoh9DTreZTjpdQ4lrr2iLk=";
|
||||
rev = "dc40509c03f1c33f1ef008330c6694effe674082";
|
||||
hash = "sha256-Lkt1TB07UqvuTU1JdwfHBSyn7/MOdd+iJawCSrPwXhw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,12 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "wl-clipboard.yazi";
|
||||
version = "0-unstable-2025-05-22";
|
||||
version = "0-unstable-2025-08-30";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r . $out
|
||||
mv $out/init.lua $out/main.lua
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -19,8 +18,8 @@ mkYaziPlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "grappas";
|
||||
repo = "wl-clipboard.yazi";
|
||||
rev = "c4edc4f6adf088521f11d0acf2b70610c31924f0";
|
||||
hash = "sha256-jlZgN93HjfK+7H27Ifk7fs0jJaIdnOyY1wKxHz1wX2c=";
|
||||
rev = "e9a38e47d07549968019702bdafdc4ed07151b7d";
|
||||
hash = "sha256-3PRQl4TvuOe5DwVi1gmtmfTOEVZWRayijIbnPgaR3L8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -90,11 +90,13 @@ in
|
||||
glut =
|
||||
old:
|
||||
(brokenOnDarwin old)
|
||||
// (addToCscOptions [
|
||||
"-I${(lib.getDev pkgs.libglut)}/include"
|
||||
"-I${(lib.getDev pkgs.libGL)}/include"
|
||||
"-I${(lib.getDev pkgs.libGLU)}/include"
|
||||
] old)
|
||||
// lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) (
|
||||
addToCscOptions [
|
||||
"-I${(lib.getDev pkgs.libglut)}/include"
|
||||
"-I${(lib.getDev pkgs.libGL)}/include"
|
||||
"-I${(lib.getDev pkgs.libGLU)}/include"
|
||||
] old
|
||||
)
|
||||
// (addToBuildInputs pkgs.libglut old);
|
||||
iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv);
|
||||
icu = addToBuildInputsWithPkgConfig pkgs.icu;
|
||||
|
||||
@@ -35,10 +35,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2025-06-14";
|
||||
version = "unstable-2025-09-06";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/e9e2ebd9ab5c89c6cd55dd2c568dd46086f2addb.tar.gz";
|
||||
sha256 = "0in0vab4vihamdhf0zs8y22dwm7h4fqzryq47cxb48cxg29rfz9y";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/fe1b21c9fb01f3f8a9028744499f20b7799cad38.tar.gz";
|
||||
sha256 = "0g9pa8914mdnbbhy3far689xckfblavwv0ylmzi0h4p7v8alrjx7";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
|
||||
@@ -771,15 +771,6 @@ builtins.intersectAttrs super {
|
||||
colour = dontCheck super.colour;
|
||||
spatial-rotations = dontCheck super.spatial-rotations;
|
||||
|
||||
# This package is marked broken, but it causes some evail failures for nixpkgs-review.
|
||||
# cabal2nix still adds opencv3, which has been removed. It makes no sense to add opencv4,
|
||||
# because the haskell package is only targeting opencv 3.x specifically.
|
||||
# TODO: Remove this package entirely from hackage-packages.nix. It's broken and has been last
|
||||
# updated in 2018.
|
||||
opencv = overrideCabal (drv: {
|
||||
libraryPkgconfigDepends = [ ];
|
||||
}) super.opencv;
|
||||
|
||||
LDAP = dontCheck (
|
||||
overrideCabal (drv: {
|
||||
librarySystemDepends = drv.librarySystemDepends or [ ] ++ [ pkgs.cyrus_sasl.dev ];
|
||||
|
||||
+12
-14
@@ -228958,6 +228958,7 @@ self: {
|
||||
gflags,
|
||||
ghc,
|
||||
ghci,
|
||||
glog,
|
||||
hashable,
|
||||
haskell-src-exts,
|
||||
hspec,
|
||||
@@ -228967,7 +228968,6 @@ self: {
|
||||
json,
|
||||
lens,
|
||||
libevent,
|
||||
libglog,
|
||||
lifted-base,
|
||||
mangle,
|
||||
monad-control,
|
||||
@@ -229055,8 +229055,8 @@ self: {
|
||||
double-conversion
|
||||
fmt
|
||||
gflags
|
||||
glog
|
||||
libevent
|
||||
libglog
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson
|
||||
@@ -229098,8 +229098,8 @@ self: {
|
||||
inherit (pkgs) double-conversion;
|
||||
inherit (pkgs) fmt;
|
||||
inherit (pkgs) gflags;
|
||||
inherit (pkgs) glog;
|
||||
inherit (pkgs) libevent;
|
||||
libglog = null;
|
||||
};
|
||||
|
||||
"fbmessenger-api" = callPackage (
|
||||
@@ -424503,7 +424503,7 @@ self: {
|
||||
base,
|
||||
bytestring,
|
||||
derive-storable,
|
||||
llama,
|
||||
llama-cpp,
|
||||
tasty,
|
||||
tasty-hunit,
|
||||
}:
|
||||
@@ -424516,7 +424516,7 @@ self: {
|
||||
bytestring
|
||||
derive-storable
|
||||
];
|
||||
librarySystemDepends = [ llama ];
|
||||
librarySystemDepends = [ llama-cpp ];
|
||||
testHaskellDepends = [
|
||||
base
|
||||
bytestring
|
||||
@@ -424529,7 +424529,7 @@ self: {
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}
|
||||
) { llama = null; };
|
||||
) { inherit (pkgs) llama-cpp; };
|
||||
|
||||
"llrbtree" = callPackage (
|
||||
{ mkDerivation, base }:
|
||||
@@ -491279,7 +491279,7 @@ self: {
|
||||
JuicyPixels,
|
||||
lens,
|
||||
linear,
|
||||
opencv3,
|
||||
opencv,
|
||||
primitive,
|
||||
QuickCheck,
|
||||
repa,
|
||||
@@ -491319,7 +491319,7 @@ self: {
|
||||
transformers
|
||||
vector
|
||||
];
|
||||
libraryPkgconfigDepends = [ opencv3 ];
|
||||
libraryPkgconfigDepends = [ opencv ];
|
||||
testHaskellDepends = [
|
||||
base
|
||||
bytestring
|
||||
@@ -491348,13 +491348,12 @@ self: {
|
||||
criterion
|
||||
repa
|
||||
];
|
||||
hardeningDisable = [ "bindnow" ];
|
||||
description = "Haskell binding to OpenCV-3.x";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}
|
||||
) { inherit (pkgs) opencv3; };
|
||||
) { inherit (pkgs) opencv; };
|
||||
|
||||
"opencv-extra" = callPackage (
|
||||
{
|
||||
@@ -500315,7 +500314,6 @@ self: {
|
||||
text
|
||||
yaml
|
||||
];
|
||||
doCheck = false;
|
||||
description = "Supports using pandoc with citeproc";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
@@ -734456,13 +734454,13 @@ self: {
|
||||
deepseq,
|
||||
digest,
|
||||
hashable,
|
||||
libxxhash,
|
||||
murmur-hash,
|
||||
QuickCheck,
|
||||
tasty,
|
||||
tasty-bench,
|
||||
tasty-quickcheck,
|
||||
text,
|
||||
xxHash,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "xxhash-ffi";
|
||||
@@ -734476,7 +734474,7 @@ self: {
|
||||
hashable
|
||||
text
|
||||
];
|
||||
libraryPkgconfigDepends = [ libxxhash ];
|
||||
libraryPkgconfigDepends = [ xxHash ];
|
||||
testHaskellDepends = [
|
||||
base
|
||||
bytestring
|
||||
@@ -734500,7 +734498,7 @@ self: {
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}
|
||||
) { libxxhash = null; };
|
||||
) { inherit (pkgs) xxHash; };
|
||||
|
||||
"xz" = callPackage (
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user