mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 08:30:21 +02:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
c52815aa6d
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsp-plugins";
|
||||
version = "1.1.30";
|
||||
version = "1.1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sadko4u";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0g0nx05dyjwz2149v3pj6sa9divr26jyqvg2kk1qk48s2n4najkz";
|
||||
sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config php makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.11.1";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-m8sKu2QuEyCWQ975vDfLVWKgU7ydEp5/vRYRO3z1yio=";
|
||||
sha256 = "sha256-kvmBOw8fQZSC1jC8FRVq4v+i7mM6ol2IrDTqfJtuZYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alfis";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Revertron";
|
||||
repo = "Alfis";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh";
|
||||
sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80=";
|
||||
};
|
||||
|
||||
cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045";
|
||||
cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0=";
|
||||
|
||||
checkFlags = [
|
||||
# these want internet access, disable them
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017-10-27";
|
||||
pname = "deadpixi-sam-unstable";
|
||||
version = "2020-07-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadpixi";
|
||||
repo = "sam";
|
||||
rev = "51693780fb1457913389db6634163998f9b775b8";
|
||||
sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr";
|
||||
rev = "5d8acb35d78c327d76f00a54857cbd566ed9bc11";
|
||||
sha256 = "sha256-+vRh6nDPc3UnmEdqROHRel5Te0h5m4eiaERs492xciQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config.mk.def \
|
||||
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \
|
||||
--replace "CC=gcc" ""
|
||||
--replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc"
|
||||
'';
|
||||
|
||||
CFLAGS = "-D_DARWIN_C_SOURCE";
|
||||
|
|
@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/deadpixi/sam";
|
||||
description = "Updated version of the sam text editor";
|
||||
license = with licenses; lpl-102;
|
||||
license = licenses.lpl-102;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
, python3
|
||||
, zbar
|
||||
|
|
@ -78,6 +79,14 @@ python3.pkgs.buildPythonApplication {
|
|||
--replace "dnspython>=2.0,<2.1" "dnspython>=2.0"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# trezorlib 0.13 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch";
|
||||
sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook
|
||||
, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme
|
||||
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg
|
||||
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.3.3";
|
||||
version = "2.4.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -38,9 +38,19 @@ stdenv.mkDerivation rec {
|
|||
xorg.libX11
|
||||
] ++ checkInputs;
|
||||
|
||||
patches = [
|
||||
# Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355
|
||||
(fetchpatch {
|
||||
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
|
||||
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
# The build system uses custom logic - defined in
|
||||
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
|
||||
# library, which doesn't pick up the package in the nix store. We
|
||||
|
|
@ -56,11 +66,6 @@ stdenv.mkDerivation rec {
|
|||
NIX_LDFLAGS = "-ludev";
|
||||
|
||||
prePatch = ''
|
||||
# In nix ioctls.h isn't available from the standard kernel-headers package
|
||||
# like in other distributions. The copy in glibc seems to be identical to the
|
||||
# one in the kernel though, so we use that one instead.
|
||||
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp
|
||||
|
||||
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
|
||||
# now seems to be integrated into the main lib.
|
||||
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
|
||||
|
|
@ -69,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
sha256 = "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm";
|
||||
sha256 = "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz";
|
||||
rev = "version_${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ let
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = null;
|
||||
|
||||
# We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
|
||||
postInstall = null;
|
||||
separateDebugInfo = true;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, vala }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tiramisu";
|
||||
version = "unstable-2021-05-20";
|
||||
version = "2.0.20211107";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sweets";
|
||||
repo = "tiramisu";
|
||||
rev = "e53833d0b5b0ae41ceb7dc434d8e25818fe62291";
|
||||
sha256 = "sha256-F4oaTOAQQfOkEXeBVbGH+0CHc9v9Ac08GyzHliOdAfc=";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw";
|
||||
};
|
||||
|
||||
buildInputs = [ glib ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config vala ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.35.14";
|
||||
version = "0.35.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bK1xWzIowNF5gS4feRkCbTB1je/ttbmrqweaHplk8n8=";
|
||||
sha256 = "sha256-m32QhQUG3Dkh0odfqYhNmJ5Rrt0qf5wCvxePPusyRyI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg=";
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jmeter";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
|
||||
sha256 = "sha256-rtv68ACqLRnjU0zEBirLn5cwhxGy03upZWQyIqeECxA=";
|
||||
sha256 = "sha256-clISFMDLh9rFuXTBxug6F6AJx/03e1W/I1JcckA7He4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ with lib;
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nicotine-plus";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nicotine-Plus";
|
||||
repo = "nicotine-plus";
|
||||
rev = version;
|
||||
hash = "sha256-NfI2RfxAYhA1qefml1ayfYWjbkrzUL4l9p2Rm/ROnzQ=";
|
||||
hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext wrapGAppsHook ];
|
||||
|
|
@ -23,6 +23,12 @@ python3Packages.buildPythonApplication rec {
|
|||
mv $out/bin/nicotine $out/bin/nicotine-plus
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
|
||||
)
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unison";
|
||||
version = "2.51.4";
|
||||
version = "2.51.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bcpierce00";
|
||||
repo = "unison";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jcfq4X+r98bQqbQ3gRqJyryLdt1Y/2CLawqqIiUaQOo=";
|
||||
sha256 = "sha256-pi5uYwPpIy0lERmgATWQCO3EA3Pg5pnn7gxv49FaPug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tmpmail";
|
||||
version = "1.1.4";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdushantha";
|
||||
repo = "tmpmail";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y=";
|
||||
sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "21.18.0";
|
||||
version = "21.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "sha256-h/fwP4HyelE1jZ8GrW1nKuDNuFAchms3cKSCGiRe7gU=";
|
||||
sha256 = "sha256-xOtlJSUY7QLyggFXW0Ay3+6KNHIqljyDpyk0CP8jxWs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, perl
|
||||
, enableGui ? false, qt5
|
||||
, enableJupyter ? false, boost, jsoncpp, openssl, zmqpp
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, perl
|
||||
, enableGui ? false
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
, qtwebengine
|
||||
, enableJupyter ? true
|
||||
, boost
|
||||
, jsoncpp
|
||||
, openssl
|
||||
, zmqpp
|
||||
, enableJava ? false
|
||||
, openjdk
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -19,21 +34,53 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}"
|
||||
"-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}"
|
||||
"-DENABLE_JYACAS=${if enableJava then "ON" else "OFF"}"
|
||||
"-DENABLE_CYACAS_UNIT_TESTS=ON"
|
||||
];
|
||||
patches = [
|
||||
# upstream issue: https://github.com/grzegorzmazur/yacas/issues/340
|
||||
# Upstream patch which doesn't apply on 1.9.1 is:
|
||||
# https://github.com/grzegorzmazur/yacas/pull/342
|
||||
./jsoncpp-fix-include.patch
|
||||
# Fixes testing - https://github.com/grzegorzmazur/yacas/issues/339
|
||||
# PR: https://github.com/grzegorzmazur/yacas/pull/343
|
||||
(fetchpatch {
|
||||
url = "https://github.com/grzegorzmazur/yacas/commit/8bc22d517ecfdde3ac94800dc8506f5405564d48.patch";
|
||||
sha256 = "sha256-aPO5T8iYNkGtF8j12YxNJyUPJJPKrXje1DmfCPt317A=";
|
||||
})
|
||||
];
|
||||
preCheck = ''
|
||||
patchShebangs ../tests/test-yacas
|
||||
'';
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
# Perl is only for the documentation
|
||||
perl
|
||||
] ++ lib.optionals enableJava [
|
||||
openjdk
|
||||
];
|
||||
buildInputs = [
|
||||
] ++ lib.optionals enableGui [
|
||||
qtbase
|
||||
wrapQtAppsHook
|
||||
qtwebengine
|
||||
] ++ lib.optionals enableJupyter [
|
||||
boost
|
||||
jsoncpp
|
||||
openssl
|
||||
zmqpp
|
||||
];
|
||||
|
||||
# Perl is only for the documentation
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [
|
||||
] ++ lib.optionals enableGui (with qt5; [ qtbase qtwebkit ])
|
||||
++ lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ]
|
||||
;
|
||||
|
||||
meta = {
|
||||
description = "Easy to use, general purpose Computer Algebra System";
|
||||
description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
|
||||
homepage = "http://www.yacas.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [viric];
|
||||
maintainers = with lib.maintainers; [ viric ];
|
||||
platforms = with lib.platforms; linux;
|
||||
broken = enableGui || enableJupyter;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
pkgs/applications/science/math/yacas/fix-test-script.patch
Normal file
26
pkgs/applications/science/math/yacas/fix-test-script.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git i/tests/test-yacas w/tests/test-yacas
|
||||
index b375d78b..0e3a616b 100755
|
||||
--- i/tests/test-yacas
|
||||
+++ w/tests/test-yacas
|
||||
@@ -35,9 +35,9 @@ FAILED_TESTS="" # list of failed tests
|
||||
FAILURES=0 # number of failed tests
|
||||
TOTALTESTS=0 # total number of tests
|
||||
|
||||
-TESTFILE=/tmp/test-yacas.$$
|
||||
-TIMEFILE=/tmp/time-yacas.$$
|
||||
-VERSIONF=/tmp/version-yacas-$$.ys
|
||||
+TESTFILE="$(mktemp -t test-yacas.XXX)"
|
||||
+TIMEFILE="$(mktemp -t time-yacas.XXX)"
|
||||
+VERSIONF="$(mktemp -t version-yacas-XXX.ys)"
|
||||
LOGFILE=yacas-logfile.txt
|
||||
echo "Print(Version());" > $VERSIONF
|
||||
VERSION=`$CMD $VERSIONF`
|
||||
@@ -69,7 +69,7 @@ for scr in $SCRIPTS; do
|
||||
# fi
|
||||
echo "Running $scr"
|
||||
if [ -f $TESTFILE ]; then rm $TESTFILE ; fi
|
||||
- /bin/bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
|
||||
+ bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
|
||||
2> $TIMEFILE \
|
||||
|| (echo "Error -- User interrupt" > $TESTFILE)
|
||||
# cat $TIMEFILE
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
diff --git i/cyacas/yacas-kernel/CMakeLists.txt w/cyacas/yacas-kernel/CMakeLists.txt
|
||||
index fe1600aa..dcc329f8 100644
|
||||
--- i/cyacas/yacas-kernel/CMakeLists.txt
|
||||
+++ w/cyacas/yacas-kernel/CMakeLists.txt
|
||||
@@ -22,8 +22,9 @@ find_library (ZEROMQ_LIBRARY NAMES zmq)
|
||||
find_path (ZMQPP_INCLUDE_DIR zmqpp.hpp)
|
||||
find_library (ZMQPP_LIBRARY NAMES zmqpp)
|
||||
|
||||
-find_path (JSONCPP_INCLUDE_DIR json.h)
|
||||
-find_library (JSONCPP_LIBRARY NAMES jsoncpp)
|
||||
+# https://github.com/open-source-parsers/jsoncpp/wiki/Building#another-approach-for-cmake
|
||||
+find_package(jsoncpp REQUIRED)
|
||||
+get_target_property(JSON_INC_PATH jsoncpp_lib INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
find_package (OpenSSL)
|
||||
find_package (Boost REQUIRED date_time filesystem)
|
||||
@@ -31,6 +32,6 @@ find_package (Boost REQUIRED date_time filesystem)
|
||||
include_directories (include)
|
||||
|
||||
add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp src/base64.cpp)
|
||||
-target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} jsoncpp_lib ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS})
|
||||
|
||||
install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
diff --git i/cyacas/yacas-kernel/include/yacas_kernel.hpp w/cyacas/yacas-kernel/include/yacas_kernel.hpp
|
||||
index 91d36ac0..d12f905c 100644
|
||||
--- i/cyacas/yacas-kernel/include/yacas_kernel.hpp
|
||||
+++ w/cyacas/yacas-kernel/include/yacas_kernel.hpp
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "yacas_engine.hpp"
|
||||
|
||||
#include <boost/uuid/random_generator.hpp>
|
||||
-#include <jsoncpp/json/json.h>
|
||||
+#include <json/json.h>
|
||||
#include <zmqpp/zmqpp.hpp>
|
||||
|
||||
#include <map>
|
||||
diff --git i/cyacas/yacas-kernel/src/main.cpp w/cyacas/yacas-kernel/src/main.cpp
|
||||
index c31f17f2..832e9128 100644
|
||||
--- i/cyacas/yacas-kernel/src/main.cpp
|
||||
+++ w/cyacas/yacas-kernel/src/main.cpp
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#include "yacas_kernel.hpp"
|
||||
|
||||
-#include <jsoncpp/json/json.h>
|
||||
+#include <json/json.h>
|
||||
|
||||
#include <boost/dll/runtime_symbol_info.hpp>
|
||||
|
||||
diff --git i/cyacas/yacas-kernel/src/yacas_engine.cpp w/cyacas/yacas-kernel/src/yacas_engine.cpp
|
||||
index 6ed60ca3..18e9b3fd 100644
|
||||
--- i/cyacas/yacas-kernel/src/yacas_engine.cpp
|
||||
+++ w/cyacas/yacas-kernel/src/yacas_engine.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
* Created on November 7, 2015, 12:52 PM
|
||||
*/
|
||||
|
||||
-#include <jsoncpp/json/writer.h>
|
||||
+#include <json/writer.h>
|
||||
|
||||
#include "yacas_engine.hpp"
|
||||
|
||||
|
|
@ -117,6 +117,7 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-Drpath=ON"
|
||||
"-DCMAKE_CXX_STANDARD=17"
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-Dbuiltin_llvm=OFF"
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clapper";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rafostar";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gf4z9lib5rxi1xilkxxyywakm9zlq5915w2wib09jyh0if82ahr";
|
||||
sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -84,7 +84,8 @@ stdenv.mkDerivation rec {
|
|||
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
|
||||
|
||||
outputs = [ "out" "ga" ];
|
||||
separateDebugInfo = true;
|
||||
# On aarch64-linux we would shoot over the Hydra's 2G output limit.
|
||||
separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux);
|
||||
|
||||
patches = [
|
||||
./fix-qemu-ga.patch
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchurl }:
|
||||
|
||||
let
|
||||
version = "13.001";
|
||||
version = "14.000";
|
||||
in fetchurl {
|
||||
name = "last-resort-${version}";
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ in fetchurl {
|
|||
'';
|
||||
|
||||
recursiveHash = true;
|
||||
sha256 = "08mi65j46fv6a3y3pqnglqdjxjnbzg25v25f7c1zyk3c285m14hq";
|
||||
sha256 = "sha256-rb69V4oExSFx4GpedpyVvGuS6o+MxmxTCSZhoe9kUhI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fallback font of last resort";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tela-icon-theme";
|
||||
version = "2021-11-05";
|
||||
version = "2021-12-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mvkgHBdZm6vF+/DS3CRLl1m14U0Lj4Xtz4J/vpJUTQM=";
|
||||
sha256 = "sha256-qlt9jv3lCPVFBeN4aQd4r9NE0YAxWQavMoo13cvhv6E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
|
|
|||
|
|
@ -1701,6 +1701,8 @@ self: super: {
|
|||
# Issue reported upstream, no bug tracker url yet.
|
||||
darcs = doJailbreak super.darcs;
|
||||
|
||||
# Too strict verion bounds on cryptonite and github.
|
||||
# PRs are merged, will be fixed next release or Hackage revision.
|
||||
nix-thunk = appendPatches [
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/obsidiansystems/nix-thunk/commit/49d27a85dd39cd9413c99958c67e596756a502b5.patch";
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmer";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasmerio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8aNJDu3MuXWcPp/nW1ly9+82YSfiMWc75Q4nQD6eUaA=";
|
||||
sha256 = "sha256-uD+JH42AxXxLMLqBurNDfYc7tLlBlEmaLB5rbip+/D4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-l/Se0ijSX5zkAoedorsJvj5EhCuwgI4jE+S8lHZh6+4=";
|
||||
cargoSha256 = "sha256-eiX5p2qWUZgoHzoHYXDsp9N6foiX3JovKO6MpoJOXFo=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
# Can't use test-jit:
|
||||
# error: Package `wasmer-workspace v2.1.0 (/build/source)` does not have the feature `test-jit`
|
||||
# error: Package `wasmer-workspace v2.1.1 (/build/source)` does not have the feature `test-jit`
|
||||
checkFeatures = [ "test-cranelift" ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplctag";
|
||||
version = "2.4.6";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libplctag";
|
||||
repo = "libplctag";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e7WDXaFu4ujrxqSvAq2Y2MbUR1ItlKOYm9dNSPbdaMo=";
|
||||
sha256 = "sha256-DLx9VBmyn5L30i6qPK4LD+3cOo7zG2YLOui6+krU9So=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
|
|||
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
|
||||
, bison, cups ? null, harfbuzz, libGL, perl
|
||||
, gstreamer, gst-plugins-base, gtk3, dconf
|
||||
, llvmPackages_5, darwin
|
||||
, darwin
|
||||
|
||||
# options
|
||||
, developerBuild ? false
|
||||
|
|
@ -30,8 +30,6 @@ let
|
|||
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
|
||||
mirror = "https://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
|
||||
# Community port of the now unmaintained upstream qtwebkit.
|
||||
|
|
@ -129,7 +127,7 @@ let
|
|||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
stdenv.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
|
|
@ -144,7 +142,7 @@ let
|
|||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
|
||||
mkDerivation = mkDerivationWith stdenv.mkDerivation;
|
||||
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
|
|
@ -193,7 +191,6 @@ let
|
|||
inherit (darwin.apple_sdk.libs) sandbox;
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
|
||||
ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication;
|
||||
stdenv = stdenvActual;
|
||||
};
|
||||
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
|
||||
qtwebkit = callPackage ../modules/qtwebkit.nix {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
|
|||
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
|
||||
, bison, cups ? null, harfbuzz, libGL, perl
|
||||
, gstreamer, gst-plugins-base, gtk3, dconf
|
||||
, llvmPackages_5, darwin
|
||||
, darwin
|
||||
|
||||
# options
|
||||
, developerBuild ? false
|
||||
|
|
@ -30,8 +30,6 @@ let
|
|||
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
|
||||
mirror = "https://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
|
||||
# qtwebkit does not have an official release tarball on the qt mirror and is
|
||||
|
|
@ -130,7 +128,7 @@ let
|
|||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
stdenv.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
|
|
@ -145,7 +143,7 @@ let
|
|||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
|
||||
mkDerivation = mkDerivationWith stdenv.mkDerivation;
|
||||
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Check for any minor version changes.
|
|||
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
|
||||
, bison, cups ? null, harfbuzz, libGL, perl
|
||||
, gstreamer, gst-plugins-base, gtk3, dconf
|
||||
, llvmPackages_5, darwin
|
||||
, darwin
|
||||
|
||||
# options
|
||||
, developerBuild ? false
|
||||
|
|
@ -25,8 +25,6 @@ let
|
|||
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
|
||||
patches = {
|
||||
qtbase = lib.optionals stdenv.isDarwin [
|
||||
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
|
||||
|
|
@ -92,7 +90,7 @@ let
|
|||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
stdenv.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
|
|
@ -107,7 +105,7 @@ let
|
|||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
|
||||
mkDerivation = mkDerivationWith stdenv.mkDerivation;
|
||||
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
|
|
|
|||
|
|
@ -362,7 +362,12 @@ stdenv.mkDerivation {
|
|||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin && (compareVersion "5.9.0" < 0);
|
||||
# Qt5 is broken on aarch64-darwin
|
||||
# the build ends up with the following error:
|
||||
# error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc'
|
||||
# note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64
|
||||
# it seems the qmake/cmake passes x86_64 as preferred architecture somewhere
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -241,6 +241,10 @@ qtModule {
|
|||
platforms = platforms.unix;
|
||||
# This build takes a long time; particularly on slow architectures
|
||||
timeout = 24 * 3600;
|
||||
broken = stdenv.isDarwin && (lib.versionAtLeast qtCompatVersion "5.14"); # requires a newer SDK
|
||||
# we are still stuck with MacOS SDK 10.12 on x86_64-darwin
|
||||
# and qtwebengine 5.14+ requires at least SDK 10.14
|
||||
# (qtwebengine 5.12 is fine with SDK 10.12)
|
||||
# on aarch64-darwin we are already at MacOS SDK 11.0
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64 && (lib.versionAtLeast qtCompatVersion "5.14");
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "6.26.1";
|
||||
version = "6.27.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Tx809Q/Mn5C9LbtmTlJN9eDGWPDpJSRhnyNxA4Kq1Fc=";
|
||||
sha256 = "sha256-s3vBW/vN6lUvOp3vlx/Wo2ZrzobZ2s8MHujFouSU2NM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ with lib;
|
|||
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sope";
|
||||
version = "5.3.0";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
repo = pname;
|
||||
rev = "SOPE-${version}";
|
||||
sha256 = "0xqa7fsf60acbri5dd9x8nmf1zdkalxnmkm559w4xz7sdi569ssa";
|
||||
sha256 = "sha256-jOF429Gaf1Qo3bx9mUogBQ0u/tBUxnX7VZxJjxF24Rg=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu
|
||||
, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
|
||||
, pcre, harfbuzz
|
||||
, pcre, harfbuzz, icu
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
buildInputs = [
|
||||
boost doxygen qt48Full libharu
|
||||
pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
|
||||
openssl pcre harfbuzz
|
||||
openssl pcre harfbuzz icu
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -45,12 +45,12 @@ let
|
|||
};
|
||||
in {
|
||||
wt3 = generic {
|
||||
version = "3.5.0";
|
||||
sha256 = "1xcwzldbval5zrf7f3n2gkpscagg51cw2jp6p3q1yh6bi59haida";
|
||||
version = "3.7.1";
|
||||
sha256 = "19gf5lbrc5shpvcdyzjh20k8zdj4cybxqvkhwqfl9rvhw89qr11k";
|
||||
};
|
||||
|
||||
wt4 = generic {
|
||||
version = "4.5.0";
|
||||
sha256 = "16svzdma2mc2ggnpy5z7m1ggzhd5nrccmmj8xnc7bd1dd3486xwv";
|
||||
version = "4.6.1";
|
||||
sha256 = "04pv4kb8d576bfnd9kjc3cfjls9cm3cgpaiabwb3iyq9z0w585gh";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-migrate-parsetree";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj";
|
||||
url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "sha256:02mzh1rcvc2xpq4iz01z7kvzsgxns3774ggxi96f147i8yr2d08h";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
|
||||
let
|
||||
pname = "composer";
|
||||
version = "2.1.14";
|
||||
version = "2.2.1";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getcomposer.org/download/${version}/composer.phar";
|
||||
sha256 = "sha256-1EqQRSD5qqdm6LSwXS2admrZpvA/oaSFGCJKrXAwYaQ=";
|
||||
sha256 = "sha256-HSBnzYpN9UZJiwSBew+jgn8pHVZLzeKSVOjW0tsV+JY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "pcov";
|
||||
|
||||
version = "1.0.10";
|
||||
sha256 = "sha256-M0oPauqLPNR8QmcGHxR9MDP9rd0vj2iLMj6Wlm2a+Zw=";
|
||||
version = "1.0.11";
|
||||
sha256 = "sha256-rSLmTNOvBlMwGCrBQsHDq0Dek0SCzUAPi9dgZBMKwkI=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "swoole";
|
||||
|
||||
version = "4.8.3";
|
||||
sha256 = "sha256-Oa/SnmmMc/KZXyP/qX9BT7V1xPa4EWJa/GUNngpA4pw=";
|
||||
version = "4.8.4";
|
||||
sha256 = "sha256-gqDXcbjnsmo2XdrrRPeRrAD1yXtLkY8fZtu9OaiDq6s=";
|
||||
|
||||
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
|
||||
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ if isPyPy then null else buildPythonPackage rec {
|
|||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
|
||||
"-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing";
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isMusl;
|
||||
# Lots of tests fail on aarch64-darwin due to "Cannot allocate write+execute memory":
|
||||
# * https://cffi.readthedocs.io/en/latest/using.html#callbacks
|
||||
doCheck = !stdenv.hostPlatform.isMusl && !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "9.1.4";
|
||||
version = "9.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0e4c9178635d47b18ca12284c8ba970747e0b2e2fb7dd6f0a06d35788e81cb91";
|
||||
sha256 = "26b88b1d8fdacf5226cf9c1924fae974c955ccbfe2fdcd08574327007bdcbdd9";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "funcy";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2775409b7dc9106283f1224d97e6df5f2c02e7291c8caed72764f5a115dffb50";
|
||||
sha256 = "40b9b9a88141ae6a174df1a95861f2b82f2fdc17669080788b73a3ed9370e968";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
|
|
|||
|
|
@ -1,5 +1,13 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, pytest
|
||||
, ecdsa , mnemonic, protobuf, hidapi, trezor }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, ecdsa
|
||||
, hidapi
|
||||
, libusb1
|
||||
, mnemonic
|
||||
, protobuf
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "keepkey";
|
||||
|
|
@ -12,9 +20,7 @@ buildPythonPackage rec {
|
|||
sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf hidapi trezor ];
|
||||
|
||||
buildInputs = [ ecdsa mnemonic ];
|
||||
propagatedBuildInputs = [ ecdsa hidapi libusb1 mnemonic protobuf ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mnemonic";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trezor";
|
||||
repo = "python-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rs3szdikkgypiwn43ad3lwh7zvpccw39j5ggkziq6v7pnw3isaq";
|
||||
sha256 = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "schema-salad";
|
||||
version = "8.2.20211116214159";
|
||||
version = "8.2.20211222191353";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0c737af600e0a03dd97c93b9867e862463b65d95580ba711fd22f542bc80ad00";
|
||||
sha256 = "bae31897a9f5c16546081811728cc20296455dc805ffd0bac0064de6cbbcbf88";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "shamir-mnemonic";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
|
@ -18,14 +18,9 @@ buildPythonPackage rec {
|
|||
owner = "trezor";
|
||||
repo = "python-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mi1n01yw8yycbiv1l0xnfzlhhq2arappyvyi2jm5yq65jln77kg";
|
||||
sha256 = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "click>=7,<8" "click"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
click
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trezor";
|
||||
version = "0.12.4";
|
||||
version = "0.13.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3e180d9f9f8b69176b5ef36311b6161f5b793b538eb2dfd4babbb4d3fb1e374e";
|
||||
sha256 = "4571aa09dbfe88b31eb2f16c7c359b4809621b75a04b7b5bc9dbffe17046c99a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -56,6 +56,10 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_stellar.py" # requires stellar-sdk
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
mkdir completions
|
||||
_TREZORCTL_COMPLETE=source_bash $out/bin/trezorctl > completions/trezorctl || true
|
||||
|
|
|
|||
|
|
@ -24,6 +24,12 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ];
|
||||
|
||||
# relax dependency constraint
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "trezor[hidapi]>=0.12.0,<0.13" "trezor[hidapi]>=0.12.0,<0.14"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "libagent" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
pname = "xmlschema";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z1mqjilnmbsdr8hw787irdk7419df2x8k765l9n5pb6ykdgz131";
|
||||
sha256 = "1d18x150g0jz3nw5al5dygizwkjgzdnmd5kf46v8ribfz48iirr6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
common = { scalaVersion, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ammonite";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
|
|
@ -83,10 +83,10 @@ let
|
|||
in {
|
||||
ammonite_2_12 = common {
|
||||
scalaVersion = "2.12";
|
||||
sha256 = "5n9q/7d/PwDJfBPITYyDua24+fci6bi1oG5dSw8A244=";
|
||||
sha256 = "sha256-JTW1xb+eCb0yhzrA1ntmalP88JoUo+KrjOBvs+cuE/A=";
|
||||
};
|
||||
ammonite_2_13 = common {
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "RIuNyWvwNM39/rczUH328K5ky5hePflokW/VP603j+I=";
|
||||
sha256 = "sha256-l5kGPP8tuYi16t6u8ZeAY54yqAWJZR5UuopSGQ69v9Y=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.690";
|
||||
version = "2.0.692";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DF528R5cJQ5CRieEXz9Wm/71bWLon/RBVInhlty/UEQ=";
|
||||
sha256 = "sha256-mzqSnddcZAVwgm8SJSkgcU8bYvEy2Rw+5vDl1uPTjbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.166.1";
|
||||
version = "0.168.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n07P7C+RehZJ+s7ZAgtHBMUwG62rxbjcXKLjKJf+rDA=";
|
||||
sha256 = "sha256:0bd5xja547gwjh7zn26l52mssp6l9djd0lfc581zj30yx07aimi5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.34.0";
|
||||
version = "0.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MdA1bS8ZPsfwnmnmIKBissuvwWY9HHxoLJEfGcJQ3j0=";
|
||||
sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y+bPFCjgTu+C5Cx85lYRjUbLd6c5PcckXRpg102d1zk=";
|
||||
vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -125,33 +125,33 @@ rec {
|
|||
headers = "0v1n8izy83qq3ljs6191a7mzr6nnda5ib9ava1cjddkshl8pampq";
|
||||
};
|
||||
|
||||
electron_14 = mkElectron "14.2.2" {
|
||||
armv7l-linux = "185613c0141fb57b716a0fe421aab91100586fb312a92c66785b956f54451b92";
|
||||
aarch64-linux = "8e54ef999d85454d0fa1679bece3143a72086e540eb910f4f2a8a84ea07ef003";
|
||||
x86_64-linux = "e419d1fb786f828aa3f679647e7ece889a6dcc830612909c45f4adc2f976348a";
|
||||
i686-linux = "76e77d9e45c8d94605313bba1fea87c0b76f2f95c317ef2470cc4f4d88f1b195";
|
||||
x86_64-darwin = "117377067dc5afca00db6380461c98870632cbcb97dc5dcc8aa015a9f42b969d";
|
||||
aarch64-darwin = "ac03eb8fa1781e675b5a55d83438184d86e5faa6b93d008796fa8f151a31fd14";
|
||||
headers = "0l2mwi1cn1v7pnl3l56mq0qi8cif39r5s2lkgzi2nsr71qr9f369";
|
||||
electron_14 = mkElectron "14.2.3" {
|
||||
armv7l-linux = "d4ed85690c49b6ec1b532256bd63ccfb670d14da9bb5ccf706e03da2f5fe377e";
|
||||
aarch64-linux = "ac8be1a06ad4b3da16438cc9c257b3c443417d5d9272830b0d51c1f2c9b14f52";
|
||||
x86_64-linux = "c72ce5943e9e5e9b10b0822b3e60de74612db81c4ebaf475e5fa8735af344b22";
|
||||
i686-linux = "9dec585682c0a08f048f1eda6a931cad3c85d47842786aae565af930a7ef7b51";
|
||||
x86_64-darwin = "fb90d61855b63ac1115a60683d476931a6b6bf194e77867192d927bbb9051070";
|
||||
aarch64-darwin = "035e6e2e8d50e867eee37b0631fc95b3f0e8760294af71c23bc73c0f3fc99f83";
|
||||
headers = "0m03nb1nlwd03wn765rs06yiqzkxlk9jafab0zaxywsq94z5np0y";
|
||||
};
|
||||
|
||||
electron_15 = mkElectron "15.3.3" {
|
||||
armv7l-linux = "658d72e65891191dd47f9d93b56406401c0c425d1d1941ff6f78c33660426398";
|
||||
aarch64-linux = "27fd7a94ab09d2ad2e4907e9df587ed40060065f7e867552b77da2302abdcc0f";
|
||||
x86_64-linux = "88dc16239f4821bee8674ef79c3ebab36a263638ec660b4b84ce38b9ad8d4f7a";
|
||||
i686-linux = "61dabd62dfb5a74bdd07291c20d96fc4dc895b72a65ca5b1aab15c17e20cd6d5";
|
||||
x86_64-darwin = "c556d993d8be7064c7014e877cbd8a3d057052c4bc37599a203f4c4a9fe8793f";
|
||||
aarch64-darwin = "14f7672ab31d47ef1a38f96cdaf76eef79293b3e3594be67eded90d7dcd27a8e";
|
||||
headers = "0vfv3yapjrmlg3rabl7iwq08h1mnij0mr5p8jilhfylmyjsalgbg";
|
||||
electron_15 = mkElectron "15.3.4" {
|
||||
armv7l-linux = "caff953cbffdac63307b75a3b78be82ea6003782e981edfdcba14da5ee48b8b6";
|
||||
aarch64-linux = "dba1e09b3e4924148b57539d86840fa22e5500f3e15a694dcd2e26b830c1f780";
|
||||
x86_64-linux = "5e13b64c3b1b025ddea92b3bda577e00fc533902a9cf92bfd87b976637f7b59a";
|
||||
i686-linux = "1253e837e98fc41c14f6b71f0f917b8f42a0777bd2554046567b512f747240d8";
|
||||
x86_64-darwin = "ea1cb757f9c8c4c99c840357ecab42a0bcbe8c7a6a3a1265106c238088ad18f1";
|
||||
aarch64-darwin = "65b9b3235efdb681e3a4db85068dc9fe6dfbcb7fbb146053c0a534e4b44a2f7a";
|
||||
headers = "1xnbzskvf8p5a07bha41qqnw1hb68f019qrda3z2jn96m3qnj46r";
|
||||
};
|
||||
|
||||
electron_16 = mkElectron "16.0.4" {
|
||||
armv7l-linux = "f077c8a2ee0ea2a02fc2a45902e2b13fcf0ba80a9859ab8967302f5f0bdcc406";
|
||||
aarch64-linux = "ac47ece501e8844e03d2abab99afc27952c194f11a039107bb7620bee683f95d";
|
||||
x86_64-linux = "47fada0883bd62a5f47831abf70f5d41f44559de576e44accedf8489e8c5dd6b";
|
||||
i686-linux = "825cda3a9c89c5f44990f1e68f25d7871d04277468ccbc9cc29a1472b81d5fa2";
|
||||
x86_64-darwin = "0a4621c1137ce158cf396af30b732df72fa61a4ea04bc55d3d9f9915267fe8e9";
|
||||
aarch64-darwin = "0c047fd840bc7d77d36d3b0c4a6b6b8331ce0786527fa33455a7b3ee47eb0020";
|
||||
headers = "11fni4ax71c1p6yhdl402r2884anyzwd1iw8dypwvrs7gcd913k2";
|
||||
electron_16 = mkElectron "16.0.5" {
|
||||
armv7l-linux = "16381d22f6f3c7990435598fc50addf8addde2fa749ab23672733ec90b8d53ef";
|
||||
aarch64-linux = "6274bdf2a3894ce9ddb70800df497a034893e1be5e2d07763e339550009d53b6";
|
||||
x86_64-linux = "2830a9f8fc5e7fa4f70997e11d55b250e90db511b29da22699e1fe23b153128c";
|
||||
i686-linux = "363e2588f57f3d31e506e759f723768b543baf248dfb518d06747ffa0a8d8ab1";
|
||||
x86_64-darwin = "0bb7f2c506d8c3e9ef7ec4049baf87a3365cbf80c569f6eb98ddc1a2ddb653e6";
|
||||
aarch64-darwin = "de4eac412a942a0b238792a38c0c80691d1a7ef2eba850c15619c0db9da89f1a";
|
||||
headers = "1pdi86sq60z9bqd81fvgl14c3bk21wk9mwkqyn653yq4zk0mqpi5";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.14.10";
|
||||
version = "3.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K/Nptw0AEP7awS/xXCg6T2Ff3WQc7fKTUB/uEg1WOA4=";
|
||||
sha256 = "sha256-XUG9Md6T0/+yn3KGqJO09FFlpuli2wJqOf/SEIVKXac=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
let
|
||||
# Poetry2nix version
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
|
||||
inherit (poetryLib) isCompatible readTOML moduleName;
|
||||
|
||||
|
|
@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: {
|
|||
|
||||
__toPluginAble = toPluginAble self;
|
||||
|
||||
inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook;
|
||||
inherit (hooks) pipBuildHook removePathDependenciesHook removeGitDependenciesHook poetry2nixFixupHook wheelUnpackHook;
|
||||
} // lib.optionalAttrs (! super ? setuptools-scm) {
|
||||
# The canonical name is setuptools-scm
|
||||
setuptools-scm = super.setuptools_scm;
|
||||
|
|
@ -313,7 +313,10 @@ lib.makeScope pkgs.newScope (self: {
|
|||
|
||||
app = py.pkgs.buildPythonPackage (
|
||||
passedAttrs // inputAttrs // {
|
||||
nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [ py.pkgs.removePathDependenciesHook ];
|
||||
nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [
|
||||
py.pkgs.removePathDependenciesHook
|
||||
py.pkgs.removeGitDependenciesHook
|
||||
];
|
||||
} // {
|
||||
pname = moduleName pyProject.tool.poetry.name;
|
||||
version = pyProject.tool.poetry.version;
|
||||
|
|
|
|||
|
|
@ -21,9 +21,28 @@ in
|
|||
substitutions = {
|
||||
inherit pythonInterpreter;
|
||||
yj = "${buildPackages.yj}/bin/yj";
|
||||
pyprojectPatchScript = "${./pyproject-without-path.py}";
|
||||
pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
|
||||
fields = [ "path" ];
|
||||
kind = "path";
|
||||
};
|
||||
} ./remove-path-dependencies.sh
|
||||
} ./remove-special-dependencies.sh
|
||||
)
|
||||
{ };
|
||||
|
||||
removeGitDependenciesHook = callPackage
|
||||
({}:
|
||||
makeSetupHook
|
||||
{
|
||||
name = "remove-git-dependencies.sh";
|
||||
deps = [ ];
|
||||
substitutions = {
|
||||
inherit pythonInterpreter;
|
||||
yj = "${buildPackages.yj}/bin/yj";
|
||||
pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
|
||||
fields = [ "git" "branch" "rev" "tag" ];
|
||||
kind = "git";
|
||||
};
|
||||
} ./remove-special-dependencies.sh
|
||||
)
|
||||
{ };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# Patch out path dependencies from a pyproject.json file
|
||||
|
||||
import json
|
||||
import sys
|
||||
|
||||
data = json.load(sys.stdin)
|
||||
|
||||
|
||||
def get_deep(o, path):
|
||||
for p in path.split('.'):
|
||||
o = o.get(p, {})
|
||||
return o
|
||||
|
||||
|
||||
for dep in get_deep(data, 'tool.poetry.dependencies').values():
|
||||
if isinstance(dep, dict):
|
||||
try:
|
||||
del dep['path'];
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
dep['version'] = '*'
|
||||
|
||||
json.dump(data, sys.stdout, indent=4)
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
#!/usr/bin/env python
|
||||
# Patch out special dependencies (git and path) from a pyproject.json file
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
|
||||
|
||||
def main(input, output, fields_to_remove):
|
||||
data = json.load(input)
|
||||
|
||||
try:
|
||||
deps = data["tool"]["poetry"]["dependencies"]
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
for dep in deps.values():
|
||||
if isinstance(dep, dict):
|
||||
any_removed = False
|
||||
for field in fields_to_remove:
|
||||
any_removed |= dep.pop(field, None) is not None
|
||||
if any_removed:
|
||||
dep["version"] = "*"
|
||||
|
||||
json.dump(data, output, separators=(",", ":"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
p = argparse.ArgumentParser()
|
||||
p.add_argument(
|
||||
"-i",
|
||||
"--input",
|
||||
type=argparse.FileType("r"),
|
||||
default=sys.stdin,
|
||||
help="Location from which to read input JSON",
|
||||
)
|
||||
p.add_argument(
|
||||
"-o",
|
||||
"--output",
|
||||
type=argparse.FileType("w"),
|
||||
default=sys.stdout,
|
||||
help="Location to write output JSON",
|
||||
)
|
||||
p.add_argument(
|
||||
"-f",
|
||||
"--fields-to-remove",
|
||||
nargs="+",
|
||||
help="The fields to remove from the dependency's JSON",
|
||||
)
|
||||
|
||||
args = p.parse_args()
|
||||
main(args.input, args.output, args.fields_to_remove)
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
remove-path-dependencies-hook() {
|
||||
if ! test -f pyproject.toml; then
|
||||
return
|
||||
fi
|
||||
|
||||
# Tell poetry not to resolve the path dependencies. Any version is fine!
|
||||
@yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json
|
||||
@yj@ -jt < pyproject.json > pyproject.toml
|
||||
rm pyproject.json
|
||||
}
|
||||
|
||||
postPatchHooks+=(remove-path-dependencies-hook)
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
remove-@kind@-dependencies-hook() {
|
||||
if ! test -f pyproject.toml; then
|
||||
return
|
||||
fi
|
||||
|
||||
echo "Removing @kind@ dependencies"
|
||||
|
||||
# Tell poetry not to resolve special dependencies. Any version is fine!
|
||||
@yj@ -tj < pyproject.toml | \
|
||||
@pythonInterpreter@ \
|
||||
@pyprojectPatchScript@ \
|
||||
--fields-to-remove @fields@ > pyproject.json
|
||||
@yj@ -jt < pyproject.json > pyproject.toml
|
||||
|
||||
rm pyproject.json
|
||||
|
||||
echo "Finished removing @kind@ dependencies"
|
||||
}
|
||||
|
||||
postPatchHooks+=(remove-@kind@-dependencies-hook)
|
||||
|
|
@ -119,8 +119,10 @@ pythonPackages.callPackage
|
|||
pythonPackages.poetry2nixFixupHook
|
||||
]
|
||||
++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
|
||||
++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
|
||||
;
|
||||
++ lib.optionals (format == "pyproject") [
|
||||
pythonPackages.removePathDependenciesHook
|
||||
pythonPackages.removeGitDependenciesHook
|
||||
];
|
||||
|
||||
buildInputs = (
|
||||
baseBuildInputs
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@ self: super:
|
|||
astroid = super.astroid.overridePythonAttrs (
|
||||
old: rec {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
|
||||
doCheck = false;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -162,6 +161,14 @@ self: super:
|
|||
}
|
||||
);
|
||||
|
||||
cloudflare = super.cloudflare.overridePythonAttrs (
|
||||
old: {
|
||||
postPatch = ''
|
||||
rm -rf examples/*
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
colour = super.colour.overridePythonAttrs (
|
||||
old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ];
|
||||
|
|
@ -184,10 +191,22 @@ self: super:
|
|||
old: {
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ])
|
||||
++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
|
||||
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
|
||||
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi
|
||||
++ lib.optional (lib.versionAtLeast old.version "3.5")
|
||||
(with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
|
||||
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.5") rec {
|
||||
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
|
||||
src = old.src;
|
||||
sourceRoot = "${old.pname}-${old.version}/${cargoRoot}";
|
||||
name = "${old.pname}-${old.version}";
|
||||
# This hash could no longer be valid for cryptography versions
|
||||
# different from 3.5.0
|
||||
sha256 = "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI=";
|
||||
};
|
||||
cargoRoot = "src/rust";
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -345,6 +364,12 @@ self: super:
|
|||
}
|
||||
);
|
||||
|
||||
filelock = super.filelock.overridePythonAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
|
||||
'';
|
||||
});
|
||||
|
||||
fiona = super.fiona.overridePythonAttrs (
|
||||
old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
|
||||
|
|
@ -845,7 +870,10 @@ self: super:
|
|||
# is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
|
||||
stdenv.buildPlatform.is64bit
|
||||
# Derivation fails to build since v0.900 if mypyc is enabled.
|
||||
&& lib.strings.versionOlder old.version "0.900";
|
||||
&& (
|
||||
lib.strings.versionOlder old.version "0.900"
|
||||
|| lib.strings.versionAtLeast old.version "0.910"
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -968,28 +996,6 @@ self: super:
|
|||
}
|
||||
);
|
||||
|
||||
# Work around https://github.com/nix-community/poetry2nix/issues/244
|
||||
# where git deps are not picked up as they should
|
||||
pip =
|
||||
if lib.versionAtLeast super.pip.version "20.3" then
|
||||
super.pip.overridePythonAttrs
|
||||
(old:
|
||||
let
|
||||
pname = "pip";
|
||||
version = "20.2.4";
|
||||
in
|
||||
{
|
||||
name = pname + "-" + version;
|
||||
inherit version;
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "pypa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
|
||||
name = "${pname}-${version}-source";
|
||||
};
|
||||
}) else super.pip;
|
||||
|
||||
platformdirs = super.platformdirs.overridePythonAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
|
||||
|
|
@ -1201,7 +1207,6 @@ self: super:
|
|||
pylint = super.pylint.overridePythonAttrs (
|
||||
old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
|
||||
doCheck = false;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -1369,7 +1374,6 @@ self: super:
|
|||
postPatch = old.postPatch or "" + ''
|
||||
sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
|
||||
'';
|
||||
doCheck = false;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -1700,7 +1704,7 @@ self: super:
|
|||
if (!enableCuda) then ''
|
||||
export USE_CUDA=0
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${cudatoolkit}/targets/x86_64-linux/lib"
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cudatoolkit}/targets/x86_64-linux/lib"
|
||||
'';
|
||||
preFixup = lib.optionalString (!enableCuda) ''
|
||||
# For some reason pytorch retains a reference to libcuda even if it
|
||||
|
|
@ -1739,9 +1743,9 @@ self: super:
|
|||
];
|
||||
preConfigure =
|
||||
if (enableCuda) then ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${self.torch}/${self.python.sitePackages}/torch/lib:${lib.makeLibraryPath [ cudatoolkit "${cudatoolkit}" ]}"
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${self.torch}/${self.python.sitePackages}/torch/lib:${lib.makeLibraryPath [ cudatoolkit "${cudatoolkit}" ]}"
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${self.torch}/${self.python.sitePackages}/torch/lib"
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${self.torch}/${self.python.sitePackages}/torch/lib"
|
||||
'';
|
||||
}))
|
||||
{ };
|
||||
|
|
@ -1854,13 +1858,14 @@ self: super:
|
|||
if lib.versionAtLeast super.zipp.version "2.0.0" then
|
||||
(
|
||||
super.zipp.overridePythonAttrs (
|
||||
old: {
|
||||
old:
|
||||
if (old.format or "pyproject") != "wheel" then {
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py --replace \
|
||||
'setuptools.setup()' \
|
||||
'setuptools.setup(version="${super.zipp.version}")'
|
||||
'';
|
||||
}
|
||||
} else old
|
||||
)
|
||||
) else super.zipp
|
||||
).overridePythonAttrs (
|
||||
|
|
@ -2080,9 +2085,8 @@ self: super:
|
|||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.flit-core ];
|
||||
});
|
||||
|
||||
virtualenv = super.virtualenv.overridePythonAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace 'platformdirs>=2,<3' 'platformdirs'
|
||||
'';
|
||||
uwsgi = super.uwsgi.overridePythonAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ncurses ];
|
||||
sourceRoot = ".";
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -274,11 +274,15 @@ python-versions = "*"
|
|||
|
||||
[[package]]
|
||||
name = "filelock"
|
||||
version = "3.0.12"
|
||||
version = "3.2.1"
|
||||
description = "A platform independent file lock."
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
|
||||
|
||||
[package.extras]
|
||||
docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
|
||||
testing = ["coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"]
|
||||
|
||||
[[package]]
|
||||
name = "funcsigs"
|
||||
|
|
@ -343,7 +347,7 @@ six = "*"
|
|||
|
||||
[[package]]
|
||||
name = "identify"
|
||||
version = "2.2.15"
|
||||
version = "2.3.0"
|
||||
description = "File identification library for Python"
|
||||
category = "dev"
|
||||
optional = false
|
||||
|
|
@ -624,7 +628,7 @@ dev = ["pre-commit", "tox"]
|
|||
|
||||
[[package]]
|
||||
name = "poetry-core"
|
||||
version = "1.0.6"
|
||||
version = "1.0.7"
|
||||
description = "Poetry PEP 517 Build Backend"
|
||||
category = "main"
|
||||
optional = false
|
||||
|
|
@ -1004,7 +1008,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
|
|||
|
||||
[[package]]
|
||||
name = "virtualenv"
|
||||
version = "20.8.0"
|
||||
version = "20.8.1"
|
||||
description = "Virtual Python Environment builder"
|
||||
category = "main"
|
||||
optional = false
|
||||
|
|
@ -1296,8 +1300,8 @@ enum34 = [
|
|||
{file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"},
|
||||
]
|
||||
filelock = [
|
||||
{file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"},
|
||||
{file = "filelock-3.0.12.tar.gz", hash = "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"},
|
||||
{file = "filelock-3.2.1-py2.py3-none-any.whl", hash = "sha256:7f07b08d731907441ff40d0c5b81f9512cd968842e0b6264c8bd18a8ce877760"},
|
||||
{file = "filelock-3.2.1.tar.gz", hash = "sha256:9cdd29c411ab196cf4c35a1da684f7b9da723696cb356efa45bf5eb1ff313ee3"},
|
||||
]
|
||||
funcsigs = [
|
||||
{file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"},
|
||||
|
|
@ -1322,8 +1326,8 @@ httpretty = [
|
|||
{file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"},
|
||||
]
|
||||
identify = [
|
||||
{file = "identify-2.2.15-py2.py3-none-any.whl", hash = "sha256:de83a84d774921669774a2000bf87ebba46b4d1c04775f4a5d37deff0cf39f73"},
|
||||
{file = "identify-2.2.15.tar.gz", hash = "sha256:528a88021749035d5a39fe2ba67c0642b8341aaf71889da0e1ed669a429b87f0"},
|
||||
{file = "identify-2.3.0-py2.py3-none-any.whl", hash = "sha256:d1e82c83d063571bb88087676f81261a4eae913c492dafde184067c584bc7c05"},
|
||||
{file = "identify-2.3.0.tar.gz", hash = "sha256:fd08c97f23ceee72784081f1ce5125c8f53a02d3f2716dde79a6ab8f1039fea5"},
|
||||
]
|
||||
idna = [
|
||||
{file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
|
||||
|
|
@ -1435,8 +1439,8 @@ pluggy = [
|
|||
{file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
|
||||
]
|
||||
poetry-core = [
|
||||
{file = "poetry-core-1.0.6.tar.gz", hash = "sha256:dd3c97003579242236890306836f2acc86d9741e6bea320dda6f844f16b0d845"},
|
||||
{file = "poetry_core-1.0.6-py2.py3-none-any.whl", hash = "sha256:4ef68b4a55a8a95a60e6a312317e5a2f2af7590cf3d46b6bfe648c1e5f13cc48"},
|
||||
{file = "poetry-core-1.0.7.tar.gz", hash = "sha256:98c11c755a16ef6c5673c22ca94a3802a7df4746a0853a70b6fae8b9f5cac206"},
|
||||
{file = "poetry_core-1.0.7-py2.py3-none-any.whl", hash = "sha256:4f8a7f5390d772f42c4c4c3f188e6424b802cb4b57466c6633a1b9ac36f18a43"},
|
||||
]
|
||||
pre-commit = [
|
||||
{file = "pre_commit-2.15.0-py2.py3-none-any.whl", hash = "sha256:a4ed01000afcb484d9eb8d504272e642c4c4099bbad3a6b27e519bd6a3e928a6"},
|
||||
|
|
@ -1589,8 +1593,8 @@ urllib3 = [
|
|||
{file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"},
|
||||
]
|
||||
virtualenv = [
|
||||
{file = "virtualenv-20.8.0-py2.py3-none-any.whl", hash = "sha256:a4b987ec31c3c9996cf1bc865332f967fe4a0512c41b39652d6224f696e69da5"},
|
||||
{file = "virtualenv-20.8.0.tar.gz", hash = "sha256:4da4ac43888e97de9cf4fdd870f48ed864bbfd133d2c46cbdec941fed4a25aef"},
|
||||
{file = "virtualenv-20.8.1-py2.py3-none-any.whl", hash = "sha256:10062e34c204b5e4ec5f62e6ef2473f8ba76513a9a617e873f1f8fb4a519d300"},
|
||||
{file = "virtualenv-20.8.1.tar.gz", hash = "sha256:bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8"},
|
||||
]
|
||||
wcwidth = [
|
||||
{file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[tool.poetry]
|
||||
name = "poetry"
|
||||
version = "1.1.10"
|
||||
version = "1.1.11"
|
||||
description = "Python dependency management and packaging made easy."
|
||||
authors = [
|
||||
"Sébastien Eustace <sebastien@eustace.io>"
|
||||
|
|
@ -24,7 +24,7 @@ classifiers = [
|
|||
[tool.poetry.dependencies]
|
||||
python = "~2.7 || ^3.5"
|
||||
|
||||
poetry-core = "~1.0.6"
|
||||
poetry-core = "~1.0.7"
|
||||
cleo = "^0.8.1"
|
||||
clikit = "^0.6.2"
|
||||
crashtest = { version = "^0.3.0", python = "^3.6" }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"owner": "python-poetry",
|
||||
"repo": "poetry",
|
||||
"rev": "ebc5484d72fb719a6ffe949cbe95acd98f5c249b",
|
||||
"sha256": "S2HwolO7cU2c90ZcxPEiGjQ5PrOzZ6US22WLcWUJ0R8=",
|
||||
"rev": "10d555984485088cf5d55979c1b235286de8e456",
|
||||
"sha256": "ncZPVqW/z76BNHAZ1+xM1DNqt41z1QSFY9tqsdUbfrg=",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vala-language-server";
|
||||
version = "0.48.3";
|
||||
version = "0.48.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Prince781";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-MhVwK4RtEAJcwcJe71ganCaXQHa9jzxyknzc9kJi274=";
|
||||
sha256 = "sha256-vCQ/j0DxG9sSEquPh9TtZ5hTADPh0d8sDIDSJdUDK4s=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -10,21 +10,22 @@
|
|||
, vala
|
||||
, gettext
|
||||
, wrapGAppsHook
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vala-lint-unstable";
|
||||
version = "2021-02-17";
|
||||
pname = "vala-lint";
|
||||
version = "unstable-2021-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vala-lang";
|
||||
repo = "vala-lint";
|
||||
rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30";
|
||||
sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8=";
|
||||
rev = "2db018056befba76136e6c69a78d905a128a6165";
|
||||
sha256 = "sha256-bQaj2bETzl6ykgrpE2iLAvx691aGDLFteL/ulfoKuEk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build against vala-0.54+. Pull fix pending upstream
|
||||
# Fix build against vala-0.54.3+. Pull fix pending upstream
|
||||
# inclusion: https://github.com/vala-lang/vala-lint/pull/155
|
||||
(fetchpatch {
|
||||
name = "vala-0.54.patch";
|
||||
|
|
@ -48,6 +49,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/vala-lang/vala-lint.git";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/vala-lang/vala-lint";
|
||||
description = "Check Vala code files for code-style errors";
|
||||
|
|
@ -58,5 +65,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
mainProgram = "io.elementary.vala-lint";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wrangler";
|
||||
version = "1.19.5";
|
||||
version = "1.19.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r8Ni6r1NpHJ0UVEV+aG1RkGn0GQijTiWWZyQWJRXPi8=";
|
||||
sha256 = "sha256-eFrILGq6rlm/u8RAxGHRaFgOT88I8T4inAKCoJpqPYA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GWBY4diq6VFpBcb1ROmJcXX/zJGwanja8eoaxxm+ij8=";
|
||||
cargoSha256 = "sha256-8JgtaSROcS9DwcnK7Yky8Ol8AJPI7guU08iaz9yPC8g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Crossplatform mud client";
|
||||
homepage = "http://mudlet.org/";
|
||||
homepage = "https://mudlet.org";
|
||||
maintainers = [ maintainers.wyvie maintainers.pstn ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@
|
|||
, vulkan-loader
|
||||
, shaderc
|
||||
|
||||
, testVersion
|
||||
, warzone2100
|
||||
|
||||
, withVideos ? false
|
||||
}:
|
||||
|
||||
|
|
@ -39,11 +42,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "4.2.3";
|
||||
version = "4.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
|
||||
sha256 = "sha256-nmHl/Qk8Knck9kDF8cuPUzOUxNNx0Vk/g1NW/H82vo0=";
|
||||
sha256 = "sha256-IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -100,6 +103,14 @@ stdenv.mkDerivation rec {
|
|||
cp ${sequences_src} $out/share/warzone2100/sequences.wz
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testVersion {
|
||||
package = warzone2100;
|
||||
# The command always exits with code 1
|
||||
command = "(warzone2100 --version || [ $? -eq 1 ])";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free RTS game, originally developed by Pumpkin Studios";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xlockmore";
|
||||
version = "5.67";
|
||||
version = "5.68";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz";
|
||||
sha256 = "sha256-qGB+Fw4N9K+PcH07OPfOsNDhKHc9fhdeICCSaV9/I0w=";
|
||||
sha256 = "sha256-MHMf3LID8W61wcQ8BdQuRSrQ60VVyXxVVmpuyxh3zW4=";
|
||||
curlOpts = "--user-agent 'Mozilla/5.0'";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,23 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acpid";
|
||||
version = "2.0.32";
|
||||
version = "2.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz";
|
||||
sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj";
|
||||
sha256 = "sha256-CFb3Gz6zShtmPQqOY2Pfy8UZ5j2EczBJiJhljily2+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
# remove when https://sourceforge.net/p/acpid2/code/merge-requests/1/ is merged
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace "AC_FUNC_MALLOC" "" \
|
||||
--replace "AC_FUNC_REALLOC" "" \
|
||||
--replace "strrchr strtol" "strrchr strtol malloc realloc"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/acpid2/";
|
||||
description = "A daemon for delivering ACPI events to userspace programs";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "firmware-linux-nonfree";
|
||||
version = "20211027";
|
||||
version = "20211216";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "00vv617ngr8rfrm1rw98xxgc453zb8cb5p8ssz5s3khynpqqg08x";
|
||||
sha256 = "sha256-Q5TPtSbETDDRVKFfwQOp+GGsTGpTpGU5PQ5QkJCtWcM=";
|
||||
};
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
|
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "1bll1drjp2y8grcxwh1mynxa6qaj1n58mh51ialm7pbryrvsla1c";
|
||||
outputHash = "sha256-nyhxyDVO7tWkCD7fMjwiFNuMSh5e/z5w71CIZw3SJH8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Binary firmware collection packaged by kernel.org";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, stdenv
|
||||
, zlib
|
||||
, lib
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with builtins;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtraceevent";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
|
||||
rev = "libtraceevent-${version}";
|
||||
sha256 = "1x36qsrcssjywjpwkgyp9hz6y878kivma9pz7zrhxdsrqv2d2zs1";
|
||||
sha256 = "sha256-ysdsuJ9MvmNY0/XSV+aO7Gh8buWed25DQhBE/5HIASU=";
|
||||
};
|
||||
|
||||
# Don't build and install html documentation
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "21.8.8.29";
|
||||
version = "21.8.12.29";
|
||||
|
||||
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "ClickHouse";
|
||||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1hvsnh3fzbh1vl7cki0sbpd5ar6cxdc7k3mfqby0xxv3zfywmmr2";
|
||||
sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2021-12-02";
|
||||
version = "unstable-2021-12-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "051133f81c9b9b9fff6df6716038f8c0b7105c69";
|
||||
sha256 = "sha256-Exc8Q+D/2OQkan/qY10jxiH+tVSWW6biN9auejWpsGk=";
|
||||
rev = "247cd753e283e70a9949e76d0ba669d99c0eb144";
|
||||
sha256 = "sha256-65wxhE/XqNK6ly+fxZFLjtImvpJlgU54RStUve40CJA=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/klippy";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fts-xapian";
|
||||
version = "1.4.14";
|
||||
pname = "dovecot-fts-xapian";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grosjo";
|
||||
repo = "fts-xapian";
|
||||
rev = version;
|
||||
sha256 = "sha256-Banyg10AiM1Jw6Zfl4Dcpc0/6Km48lLVuQ3xRLylE7k=";
|
||||
sha256 = "1ap4jb43gvy7caa8lg2hg811q0n5c2gqbmcjl4126wz44hb7waa1";
|
||||
};
|
||||
|
||||
buildInputs = [ dovecot xapian icu64 ];
|
||||
|
|
@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
"--with-dovecot=${dovecot}/lib/dovecot"
|
||||
"--without-dovecot-install-dirs"
|
||||
"--with-moduledir=$(out)/lib/dovecot"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -59,16 +59,17 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uwsgi";
|
||||
version = "2.0.19.1";
|
||||
version = "2.0.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn";
|
||||
sha256 = "1yfz5h07rxzrqf1rdj5fzhk47idgglxj7kqr8zl8lgcpv1kriaw8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./no-ext-session-php_session.h-on-NixOS.patch
|
||||
./additional-php-ldflags.patch
|
||||
./missing-arginfo-php8.patch # https://github.com/unbit/uwsgi/issues/2356
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config ];
|
||||
|
|
@ -96,6 +97,9 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace "$f" \
|
||||
--replace pkg-config "$PKG_CONFIG"
|
||||
done
|
||||
${lib.optionalString (lib.versionAtLeast php.version "8") ''
|
||||
sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
|
||||
''}
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
49
pkgs/servers/uwsgi/missing-arginfo-php8.patch
Normal file
49
pkgs/servers/uwsgi/missing-arginfo-php8.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
|
||||
index ca0ef6c1..00c39b09 100644
|
||||
--- a/plugins/php/php_plugin.c
|
||||
+++ b/plugins/php/php_plugin.c
|
||||
@@ -257,6 +257,9 @@ PHP_MINIT_FUNCTION(uwsgi_php_minit) {
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
|
||||
+ZEND_END_ARG_INFO()
|
||||
+
|
||||
PHP_FUNCTION(uwsgi_version) {
|
||||
RETURN_STRING(UWSGI_VERSION);
|
||||
}
|
||||
@@ -488,20 +491,20 @@ PHP_FUNCTION(uwsgi_signal) {
|
||||
}
|
||||
|
||||
zend_function_entry uwsgi_php_functions[] = {
|
||||
- PHP_FE(uwsgi_version, NULL)
|
||||
- PHP_FE(uwsgi_setprocname, NULL)
|
||||
- PHP_FE(uwsgi_worker_id, NULL)
|
||||
- PHP_FE(uwsgi_masterpid, NULL)
|
||||
- PHP_FE(uwsgi_signal, NULL)
|
||||
-
|
||||
- PHP_FE(uwsgi_rpc, NULL)
|
||||
-
|
||||
- PHP_FE(uwsgi_cache_get, NULL)
|
||||
- PHP_FE(uwsgi_cache_set, NULL)
|
||||
- PHP_FE(uwsgi_cache_update, NULL)
|
||||
- PHP_FE(uwsgi_cache_del, NULL)
|
||||
- PHP_FE(uwsgi_cache_clear, NULL)
|
||||
- PHP_FE(uwsgi_cache_exists, NULL)
|
||||
+ PHP_FE(uwsgi_version, arginfo_void)
|
||||
+ PHP_FE(uwsgi_setprocname, arginfo_void)
|
||||
+ PHP_FE(uwsgi_worker_id, arginfo_void)
|
||||
+ PHP_FE(uwsgi_masterpid, arginfo_void)
|
||||
+ PHP_FE(uwsgi_signal, arginfo_void)
|
||||
+
|
||||
+ PHP_FE(uwsgi_rpc, arginfo_void)
|
||||
+
|
||||
+ PHP_FE(uwsgi_cache_get, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_set, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_update, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_del, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_clear, arginfo_void)
|
||||
+ PHP_FE(uwsgi_cache_exists, arginfo_void)
|
||||
{ NULL, NULL, NULL},
|
||||
};
|
||||
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
, oathToolkit }:
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "SOGo";
|
||||
version = "5.3.0";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
repo = pname;
|
||||
rev = "SOGo-${version}";
|
||||
sha256 = "0f09b2ga43xdd8w14llclrsdxc1y8xb3g1h15lahxq82xkvixjjl";
|
||||
sha256 = "0fwc9ia84f4ijnl5ymn4f6s1n8v3g7rqvpqaaadyw8jwj9x26a6k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "elvish";
|
||||
version = "0.16.3";
|
||||
version = "0.17.0";
|
||||
|
||||
excludedPackages = [ "website" ];
|
||||
|
||||
|
|
@ -12,10 +12,10 @@ buildGoModule rec {
|
|||
owner = "elves";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1na2fswqp4rbgvlagz9nj3cmlxavlhi2gj6k6jpjq05mcbkxr3bd";
|
||||
sha256 = "sha256-F6yjfsEEBrD6kXUgbMrz+1mxrz0z+sdfeoyztpy7rEk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "06rx09vs08d9arim53al73z22hb40xj2101kbvafz6wbyp6pqws1";
|
||||
vendorSha256 = "sha256-810YVxO1rjeDV1XWvE4RmJjGOMdTlicnv7YbvKtoDbM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "stripe-cli";
|
||||
version = "1.7.8";
|
||||
version = "1.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stripe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QxfMfuqSxuyvzNC79sr4U0tdj2pSvGKQ28V3E523z+U=";
|
||||
sha256 = "sha256-rCo3iHLfiEH/+APNztKKSdoJerz161jF7sNx8qTFw3U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gcsfuse";
|
||||
version = "0.37.0";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlecloudplatform";
|
||||
repo = "gcsfuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X7EZKHdSWQ9HKaXtoeDGNnzsBmffqHvZ6rfQXpjYTB8=";
|
||||
sha256 = "sha256-5qn20Vqtvuld9/IBW/3j+8C3ac8xJ9kRMTiL6GsOrrE=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vips";
|
||||
version = "8.11.4";
|
||||
version = "8.12.1";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ];
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cPg5pH7/N40D9lvya/t+6wwelrvmbf28OwSZnnGSfo8=";
|
||||
sha256 = "sha256-Zo1Y4pYa+o55+ASrAiDUO7SAC4zpcAniEKkTFvIoU6o=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
extraPostFetch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kak-lsp";
|
||||
version = "11.0.1";
|
||||
version = "11.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rSUXMQF4V+ToYw3RIfEZd2AfAiHoRPDC3DZBAg2zeKo=";
|
||||
sha256 = "sha256-li7djFP5luEnbKUF+rynEiQbx704KNUJw8/AqwxPRnI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vcq+WVHmGFrZFLzNWyHU7qN6cDSKP9pAzxZNs2+8jR8=";
|
||||
cargoSha256 = "sha256-X1Qe86U4zlN1umRQOiRPRcbgCayqF6GILSt/nM8m1Yg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ xorg,
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.29.5";
|
||||
version = "1.29.6";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
|
@ -84,7 +84,7 @@ let
|
|||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-2nzbWflONhBzzxsk+uxFP4/E2fORJatwNcbrG3xhaPc=";
|
||||
sha256 = "sha256-yLbuHvZrI8C4X/burIo5cI+H8KEv++4FyRgtISpmPxE=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hg9GvHB2eTcOUUC/WLpks9TUWivoV6KxXcWWBWne5Lg=";
|
||||
sha256 = "sha256-P/Fys9/V71+VL5Az3EGGaW+tdeQbr2wO+jvVSVZmJT0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-akMUJcAoUGHz3FzDJlMUYtHXrtvU0JMiRfqhTm4IEpA=";
|
||||
vendorSha256 = "sha256-PYaq74NNEOJ1jZ6PoS6zcTiUN4JA9JDjO7GB9tqgT6c=";
|
||||
|
||||
# tests are failing for no obvious reasons
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "svtplay-dl";
|
||||
version = "4.9";
|
||||
version = "4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "01jbhydj6q1zgzsrs9prpsc3ycqzisx4jqm70dikkmsr5b64hhni";
|
||||
sha256 = "sha256-JK/JtGDmmTJ+g0kmM7mSJi7+/N552GKtlMkh7quOBjo=";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
|
|
|||
32
pkgs/tools/misc/woeusb-ng/default.nix
Normal file
32
pkgs/tools/misc/woeusb-ng/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, python3Packages, fetchFromGitHub, p7zip, parted, grub2 }:
|
||||
with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "woeusb-ng";
|
||||
version = "0.2.10";
|
||||
|
||||
propagatedBuildInputs = [ p7zip parted grub2 termcolor wxPython_4_0 six ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WoeUSB";
|
||||
repo = "WoeUSB-ng";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nsdk3SMRzj1fqLrp5Na5V3rRDMcIReL8uDb8K2GQNWI=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
# TODO: the gui requires additional polkit-actions to work correctly, therefore it is currently disabled
|
||||
rm $out/bin/woeusbgui
|
||||
'';
|
||||
|
||||
# checks fail, because of polkit-actions and should be reenabled when the gui is fixed.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to create a Windows USB stick installer from a real Windows DVD or image";
|
||||
homepage = "https://github.com/WoeUSB/WoeUSB-ng";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zoxide";
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ajeetdsouza";
|
||||
repo = "zoxide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-afjEqHUoLYS+IOMnWocT5dVkjWdWGavJn7q9Fqjliss=";
|
||||
sha256 = "sha256-5syCq2Qjjk/XoYqW4MGoSSTRLqzgBwadBJwZDDdWNgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
--replace '"fzf"' '"${fzf}/bin/fzf"'
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-CgbjSP8QotCxQ8n8SLVuLpkg8hLuRYZwsl/9HsrkCt8=";
|
||||
cargoSha256 = "sha256-egZqMiN53k2R1b1dbCn4j0KEJqb27TdE25YYEZ4Nvao=";
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/*
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.12.4";
|
||||
version = "1.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "sha256-gPeikQ6a7GFgjGIwcufMCnGgqqVzHkMbQIgIPpBuOLE=";
|
||||
sha256 = "sha256-whPaFb+4mYOWmtFc/a+NkH9avCfOnGnAvqz3UFTt+RY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8qt8uapiFMhmPnbihqWoBalGV6LLsgg0pfxzw+gi4TI=";
|
||||
cargoSha256 = "sha256-w7AqNsa9lolPEiHEv7E4XGaFV/UbCeYvmWekr9YzO6Q=";
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tgt";
|
||||
version = "1.0.80";
|
||||
version = "1.0.81";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fujita";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5qBqCHbkL6yw/iT2AtSumw8V0bV74TEyYMRgcPHW2lg=";
|
||||
sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "iSCSI Target daemon with RDMA support";
|
||||
homepage = "http://stgt.sourceforge.net/";
|
||||
homepage = "https://github.com/fujita/tgt";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wrk";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wg";
|
||||
repo = "wrk";
|
||||
rev = version;
|
||||
sha256 = "0dblb3qdg8mbgb8iiks0g420pza13npbr33b2xkc5dgv7kcwmvqj";
|
||||
sha256 = "sha256-nCfA444p7krXOB3qRtDKWxWj9tsrDZsGf03ThtE1dXM=";
|
||||
};
|
||||
|
||||
buildInputs = [ luajit openssl perl ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-doc";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "lf-";
|
||||
repo = "nix-doc";
|
||||
sha256 = "0yx5y90shdjwihbjrvv2m3bycgpdalafc9q4acfczfaymag8ggad";
|
||||
sha256 = "sha256-P4AX8ERsMHGkGowc05M7xE5HTFSmaJvD2z0Prz4emeQ=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "11bcn111j4iqwqwpp26w7rnycasbhiixaqb1rq4ry2402hvl90j7";
|
||||
cargoSha256 = "sha256-RxsH4bSAzBslK8MVGmCJxduf6MYOtQEKxt9QjgUCg1o=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interactive Nix documentation tool";
|
||||
|
|
|
|||
|
|
@ -12,23 +12,15 @@
|
|||
}:
|
||||
mkDerivation rec {
|
||||
pname = "echidna";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crytic";
|
||||
repo = "echidna";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eFhL8Zn8204JRrF69ibPtd7VpFW63i1iVXoGwXHlqps=";
|
||||
sha256 = "sha256-NkAAXYa1bbCNUO0eDM7LQbyC3//RRFAKmEHGH2Dhl/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "update-hevm-to-0.47.0.patch";
|
||||
url = "https://github.com/crytic/echidna/commit/25dfdad93d0e0dd822f22a1c1e63a0ecf2b22a23.patch";
|
||||
sha256 = "sha256-dj3Ie+Z4zE1fgROE/KuWZXaH9knsXJi1ai3gu5zyw/E=";
|
||||
})
|
||||
];
|
||||
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
|
|
|||
|
|
@ -11021,6 +11021,8 @@ with pkgs;
|
|||
|
||||
woeusb = callPackage ../tools/misc/woeusb { };
|
||||
|
||||
woeusb-ng = callPackage ../tools/misc/woeusb-ng { };
|
||||
|
||||
wslu = callPackage ../tools/system/wslu { };
|
||||
|
||||
chase = callPackage ../tools/system/chase { };
|
||||
|
|
@ -14662,7 +14664,6 @@ with pkgs;
|
|||
ffuf = callPackage ../tools/security/ffuf { };
|
||||
|
||||
flow = callPackage ../development/tools/analysis/flow {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_10;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
|
|
@ -19436,7 +19437,7 @@ with pkgs;
|
|||
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit llvmPackages_5 darwin;
|
||||
inherit darwin;
|
||||
});
|
||||
|
||||
qt514 = recurseIntoAttrs (makeOverridable
|
||||
|
|
@ -19445,7 +19446,7 @@ with pkgs;
|
|||
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit llvmPackages_5 darwin;
|
||||
inherit darwin;
|
||||
});
|
||||
|
||||
qt515 = recurseIntoAttrs (makeOverridable
|
||||
|
|
@ -19454,7 +19455,7 @@ with pkgs;
|
|||
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit llvmPackages_5 darwin;
|
||||
inherit darwin;
|
||||
});
|
||||
|
||||
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
|
||||
|
|
@ -27121,6 +27122,7 @@ with pkgs;
|
|||
|
||||
monotone = callPackage ../applications/version-management/monotone {
|
||||
lua = lua5;
|
||||
boost = boost170;
|
||||
};
|
||||
|
||||
monotoneViz = callPackage ../applications/version-management/monotone-viz {
|
||||
|
|
@ -32234,7 +32236,12 @@ with pkgs;
|
|||
|
||||
yad = callPackage ../tools/misc/yad { };
|
||||
|
||||
yacas = callPackage ../applications/science/math/yacas { };
|
||||
yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
|
||||
|
||||
yacas-gui = yacas.override {
|
||||
enableGui = true;
|
||||
enableJupyter = false;
|
||||
};
|
||||
|
||||
speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
|
||||
|
||||
|
|
@ -32956,7 +32963,7 @@ with pkgs;
|
|||
|
||||
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { };
|
||||
|
||||
nix-doc = callPackage ../tools/package-management/nix-doc { nix = nix_2_3; };
|
||||
nix-doc = callPackage ../tools/package-management/nix-doc { };
|
||||
|
||||
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
|
||||
|
||||
|
|
|
|||
|
|
@ -277,6 +277,7 @@ let
|
|||
meta = {
|
||||
description = "Gumbo parser library";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -5159,6 +5160,7 @@ let
|
|||
description = "MessagePack serializing/deserializing";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.sgo ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -5403,6 +5405,7 @@ let
|
|||
description = "A selection of utilities for data and data types";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
homepage = "https://github.com/gfx/Perl-Data-Util";
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -6208,6 +6211,10 @@ let
|
|||
propagatedBuildInputs = [ DBI ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
DBFile = buildPerlPackage {
|
||||
|
|
@ -8523,6 +8530,7 @@ let
|
|||
meta = {
|
||||
description = "Determine MIME types of data or files using libmagic";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -9358,6 +9366,7 @@ let
|
|||
homepage = "http://gtk2-perl.sourceforge.net";
|
||||
description = "Perl interface to the 2.x series of the GNOME libraries";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gnome2Canvas.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -9656,6 +9665,7 @@ let
|
|||
meta = {
|
||||
description = "Create user interfaces directly from Glade XML files";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2GladeXML.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -9669,6 +9679,7 @@ let
|
|||
propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ];
|
||||
meta = {
|
||||
license = lib.licenses.gpl2;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -9719,6 +9730,7 @@ let
|
|||
meta = {
|
||||
description = "Use single instance applications";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -9912,6 +9924,7 @@ let
|
|||
meta = {
|
||||
description = "Efficient shared mutable hash";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HashSharedMem.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -9984,6 +9997,7 @@ let
|
|||
homepage = "https://github.com/tokuhirom/HTML-Escape";
|
||||
description = "Extremely fast HTML escaping";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -10517,7 +10531,9 @@ let
|
|||
url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz";
|
||||
sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59";
|
||||
};
|
||||
meta.broken = stdenv.isi686; # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080)
|
||||
meta.broken =
|
||||
stdenv.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080)
|
||||
|| stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin
|
||||
};
|
||||
|
||||
HTTPHeadersFast = buildPerlModule {
|
||||
|
|
@ -10750,6 +10766,7 @@ let
|
|||
meta = {
|
||||
description = "Perl interface to the C library \"libpng\"";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -11483,6 +11500,7 @@ let
|
|||
'';
|
||||
|
||||
license = lib.licenses.artistic2;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -13492,6 +13510,7 @@ let
|
|||
meta = {
|
||||
description = "Fast XS implementation of MaxMind DB reader";
|
||||
license = with lib.licenses; [ artistic2 ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -13508,6 +13527,7 @@ let
|
|||
meta = {
|
||||
description = "Create MaxMind DB database files";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -16259,6 +16279,7 @@ let
|
|||
meta = {
|
||||
description = "Perl interface to freedb server(s)";
|
||||
license = with lib.licenses; [ artistic1 ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -17522,6 +17543,7 @@ let
|
|||
description = "Communicate with a smart card using PC/SC";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.pcscperl.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -20710,6 +20732,9 @@ let
|
|||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
|
||||
perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
|
||||
meta = {
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
TAPParserSourceHandlerpgTAP = buildPerlModule {
|
||||
|
|
@ -21199,6 +21224,7 @@ let
|
|||
meta = {
|
||||
description = "A new and improved test harness with better Test2 integration";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -21826,6 +21852,7 @@ let
|
|||
description = "A LWP::UserAgent suitable for simulating and testing network calls";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent";
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestLWPUserAgent.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -21901,6 +21928,7 @@ let
|
|||
meta = {
|
||||
description = "assert that code does not cause growth in memory usage";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestMemoryGrowth.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -23022,6 +23050,9 @@ let
|
|||
url = "mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz";
|
||||
sha256 = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3";
|
||||
};
|
||||
meta = {
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
TestInDistDir = buildPerlPackage {
|
||||
|
|
@ -23404,6 +23435,9 @@ let
|
|||
};
|
||||
# https://rt.cpan.org/Public/Bug/Display.html?id=124815
|
||||
NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF";
|
||||
meta = {
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
TextUnidecode = buildPerlPackage {
|
||||
|
|
@ -24464,6 +24498,9 @@ let
|
|||
substituteInPlace t/cgi-bin/script.cgi \
|
||||
--replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
|
||||
'';
|
||||
meta = {
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.WWWMechanizeCGI.x86_64-darwin
|
||||
};
|
||||
};
|
||||
|
||||
WWWRobotRules = buildPerlPackage {
|
||||
|
|
|
|||
Loading…
Reference in a new issue