Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c72ffa864a
@ -7725,6 +7725,12 @@
|
||||
githubId = 42433779;
|
||||
name = "Rémy Grünblatt";
|
||||
};
|
||||
rguevara84 = {
|
||||
email = "fuzztkd@gmail.com";
|
||||
github = "rguevara84";
|
||||
githubId = 12279531;
|
||||
name = "Ricardo Guevara";
|
||||
};
|
||||
rht = {
|
||||
email = "rhtbot@protonmail.com";
|
||||
github = "rht";
|
||||
@ -9922,6 +9928,12 @@
|
||||
githubId = 43315;
|
||||
name = "William Roe";
|
||||
};
|
||||
wldhx = {
|
||||
email = "wldhx+nixpkgs@wldhx.me";
|
||||
github = "wldhx";
|
||||
githubId = 15619766;
|
||||
name = "wldhx";
|
||||
};
|
||||
wmertens = {
|
||||
email = "Wout.Mertens@gmail.com";
|
||||
github = "wmertens";
|
||||
|
||||
31
nixos/modules/hardware/network/ath-user-regd.nix
Normal file
31
nixos/modules/hardware/network/ath-user-regd.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
kernelVersion = config.boot.kernelPackages.kernel.version;
|
||||
linuxKernelMinVersion = "5.8";
|
||||
kernelPatch = pkgs.kernelPatches.ath_regd_optional // {
|
||||
extraConfig = ''
|
||||
ATH_USER_REGD y
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
options.networking.wireless.athUserRegulatoryDomain = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If enabled, sets the ATH_USER_REGD kernel config switch to true to
|
||||
disable the enforcement of EEPROM regulatory restrictions for ath
|
||||
drivers. Requires at least Linux ${linuxKernelMinVersion}.
|
||||
'';
|
||||
};
|
||||
|
||||
config = mkIf config.networking.wireless.athUserRegulatoryDomain {
|
||||
assertions = singleton {
|
||||
assertion = lessThan 0 (builtins.compareVersions kernelVersion linuxKernelMinVersion);
|
||||
message = "ATH_USER_REGD patch for kernels older than ${linuxKernelMinVersion} not ported yet!";
|
||||
};
|
||||
boot.kernelPatches = [ kernelPatch ];
|
||||
};
|
||||
}
|
||||
@ -52,6 +52,7 @@
|
||||
./hardware/ledger.nix
|
||||
./hardware/logitech.nix
|
||||
./hardware/mcelog.nix
|
||||
./hardware/network/ath-user-regd.nix
|
||||
./hardware/network/b43.nix
|
||||
./hardware/network/intel-2200bg.nix
|
||||
./hardware/nitrokey.nix
|
||||
|
||||
@ -50,11 +50,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inkscape";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
|
||||
sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng";
|
||||
sha256 = "sha256-2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo=";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "0.9.19";
|
||||
version = "0.9.20";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q";
|
||||
sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, poppler_utils
|
||||
@ -16,7 +17,7 @@
|
||||
, hyphen
|
||||
, unrarSupport ? false
|
||||
, chmlib
|
||||
, pythonPackages
|
||||
, python3Packages
|
||||
, libusb1
|
||||
, libmtp
|
||||
, xdg_utils
|
||||
@ -26,11 +27,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "4.23.0";
|
||||
version = "5.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Ft5RRzzw4zb5RqVyUaHk9Pu6H4V/F9j8FKoTLn61lRg=";
|
||||
sha256 = "18pnqxdyvgmw12yarxhvsgs4jk6c5hp05gf8khybcd78330954v9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -42,9 +43,20 @@ mkDerivation rec {
|
||||
# the unrar patch is not from debian
|
||||
] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
||||
escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5);
|
||||
platform_tag =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
"WS_MACX"
|
||||
else if stdenv.hostPlatform.isWindows then
|
||||
"WS_WIN"
|
||||
else
|
||||
"WS_X11";
|
||||
|
||||
prePatch = ''
|
||||
sed -i "/pyqt_sip_dir/ s:=.*:= '${pythonPackages.pyqt5}/share/sip/PyQt5':" \
|
||||
setup/build_environment.py
|
||||
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
|
||||
setup/build.py
|
||||
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${platform_tag}\"]/g" \
|
||||
setup/build.py
|
||||
|
||||
# Remove unneeded files and libs
|
||||
rm -rf resources/calibre-portable.* \
|
||||
@ -57,8 +69,6 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake removeReferencesTo ];
|
||||
|
||||
CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k;
|
||||
|
||||
buildInputs = [
|
||||
chmlib
|
||||
fontconfig
|
||||
@ -76,7 +86,7 @@ mkDerivation rec {
|
||||
sqlite
|
||||
xdg_utils
|
||||
] ++ (
|
||||
with pythonPackages; [
|
||||
with python3Packages; [
|
||||
apsw
|
||||
beautifulsoup4
|
||||
css-parser
|
||||
@ -92,11 +102,13 @@ mkDerivation rec {
|
||||
msgpack
|
||||
netifaces
|
||||
pillow
|
||||
pyqt-builder
|
||||
pyqt5
|
||||
pyqtwebengine
|
||||
python
|
||||
regex
|
||||
sip
|
||||
sip_5
|
||||
zeroconf
|
||||
# the following are distributed with calibre, but we use upstream instead
|
||||
odfpy
|
||||
] ++ lib.optional (unrarSupport) unrardll
|
||||
@ -114,11 +126,11 @@ mkDerivation rec {
|
||||
export FC_LIB_DIR=${fontconfig.lib}/lib
|
||||
export PODOFO_INC_DIR=${podofo.dev}/include/podofo
|
||||
export PODOFO_LIB_DIR=${podofo.lib}/lib
|
||||
export SIP_BIN=${pythonPackages.sip}/bin/sip
|
||||
export SIP_BIN=${python3Packages.sip}/bin/sip
|
||||
export XDG_DATA_HOME=$out/share
|
||||
export XDG_UTILS_INSTALL_MODE="user"
|
||||
|
||||
${pythonPackages.python.interpreter} setup.py install --root=$out \
|
||||
${python3Packages.python.interpreter} setup.py install --root=$out \
|
||||
--prefix=$out \
|
||||
--libdir=$out/lib \
|
||||
--staging-root=$out \
|
||||
@ -147,7 +159,7 @@ mkDerivation rec {
|
||||
# /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h
|
||||
preFixup = ''
|
||||
remove-references-to -t ${podofo.dev} \
|
||||
$out/lib/calibre/calibre/plugins${lib.optionalString pythonPackages.isPy3k "/3"}/podofo.so
|
||||
$out/lib/calibre/calibre/plugins/podofo.so
|
||||
|
||||
for program in $out/bin/*; do
|
||||
wrapProgram $program \
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "8.2";
|
||||
version = "8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "05wn4kmvsswwd2q2pffxbplb38capwv7iddsghix3r5zds13142z";
|
||||
sha256 = "sha256-D58Q9qZ7x2j//pOQa+oIgVK/9F0du2FUoZprSFEKViU=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jgmenu";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johanmalm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "00q4v31x4q7nm61wda4v0gznv18bm3qs8mp04pcns60qacdv9lkk";
|
||||
sha256 = "sha256-+JO/A7+6/yeYz0tP7vxSi04cS1bEet+3sAs7CYXKxI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchsvn
|
||||
, substituteAll
|
||||
, jdk
|
||||
, jre
|
||||
, ant
|
||||
@ -9,34 +9,27 @@
|
||||
, withExamples ? false
|
||||
}:
|
||||
let
|
||||
version = "4565";
|
||||
sha256 = "0cfh0msky5812l28mavy6p3k2zgyxb698xk79mvla9l45zcicnvw";
|
||||
|
||||
deps = import ./deps.nix { inherit fetchurl; };
|
||||
testInputs = import ./testinputs.nix { inherit fetchurl; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkgmap";
|
||||
inherit version;
|
||||
version = "4600";
|
||||
|
||||
src = fetchsvn {
|
||||
inherit sha256;
|
||||
url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
|
||||
rev = version;
|
||||
src = fetchurl {
|
||||
url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
|
||||
sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable automatic download of dependencies
|
||||
./build.xml.patch
|
||||
|
||||
# Fix testJavaRules test
|
||||
./fix-failing-test.patch
|
||||
(substituteAll {
|
||||
# Disable automatic download of dependencies
|
||||
src = ./build.xml.patch;
|
||||
inherit version;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = with deps; ''
|
||||
substituteInPlace build.xml \
|
||||
--subst-var-by version ${version}
|
||||
|
||||
mkdir -p lib/compile
|
||||
cp ${fastutil} lib/compile/${fastutil.name}
|
||||
cp ${osmpbf} lib/compile/${osmpbf.name}
|
||||
@ -65,8 +58,8 @@ stdenv.mkDerivation {
|
||||
checkPhase = "ant test";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm644 dist/mkgmap.jar $out/share/java/mkgmap/mkgmap.jar
|
||||
install -Dm644 dist/doc/mkgmap.1 $out/share/man/man1/mkgmap.1
|
||||
install -Dm644 dist/mkgmap.jar -t $out/share/java/mkgmap
|
||||
install -Dm644 dist/doc/mkgmap.1 -t $out/share/man/man1
|
||||
cp -r dist/lib/ $out/share/java/mkgmap/
|
||||
makeWrapper ${jre}/bin/java $out/bin/mkgmap \
|
||||
--add-flags "-jar $out/share/java/mkgmap/mkgmap.jar"
|
||||
@ -75,9 +68,12 @@ stdenv.mkDerivation {
|
||||
cp -r dist/examples $out/share/mkgmap/
|
||||
'';
|
||||
|
||||
passthru.updateScript = [ ./update.sh "mkgmap" meta.downloadPage ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data";
|
||||
homepage = "http://www.mkgmap.org.uk";
|
||||
downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (revision 4555)
|
||||
+++ a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java (working copy)
|
||||
@@ -125,7 +125,7 @@
|
||||
assertEquals("prim: different letter", -1, collator.compare("aaac", "aaad"));
|
||||
assertEquals("prim: different letter", 1, collator.compare("aaae", "aaad"));
|
||||
assertEquals(0, collator.compare("aaaa", "aaaa"));
|
||||
- assertEquals(0, collator.compare("aáÄâ", "aaaa"));
|
||||
+ //assertEquals(0, collator.compare("aáÄâ", "aaaa"));
|
||||
|
||||
collator.setStrength(Collator.SECONDARY);
|
||||
assertEquals(0, collator.compare("AabBb", "aabbb"));
|
||||
@@ -132,8 +132,8 @@
|
||||
assertEquals(0, collator.compare("aabBb", "aabBb"));
|
||||
assertEquals(0, collator.compare("aabbB", "aabBb"));
|
||||
assertEquals(1, collator.compare("aáÄâ", "aaaa"));
|
||||
- assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa"));
|
||||
- assertEquals(-1, collator.compare("aáÄâa", "aaaab"));
|
||||
+ //assertEquals("prim len diff", -1, collator.compare("aáÄâ", "aaaaa"));
|
||||
+ //assertEquals(-1, collator.compare("aáÄâa", "aaaab"));
|
||||
|
||||
collator.setStrength(Collator.TERTIARY);
|
||||
assertEquals("prim: different case", 1, collator.compare("AabBb", "aabbb"));
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchsvn
|
||||
, substituteAll
|
||||
, jdk
|
||||
, jre
|
||||
, ant
|
||||
@ -8,34 +8,30 @@
|
||||
, doCheck ? true
|
||||
}:
|
||||
let
|
||||
version = "597";
|
||||
sha256 = "1al3160amw0gdarrc707dsppm0kcai9mpkfak7ffspwzw9alsndx";
|
||||
|
||||
deps = import ../deps.nix { inherit fetchurl; };
|
||||
testInputs = import ./testinputs.nix { inherit fetchurl; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "splitter";
|
||||
inherit version;
|
||||
version = "597";
|
||||
|
||||
src = fetchsvn {
|
||||
inherit sha256;
|
||||
url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk";
|
||||
rev = version;
|
||||
src = fetchurl {
|
||||
url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
|
||||
sha256 = "0d928wvlpzqwdpfksmxyyfkqrhjsij21wx2538bs2i29siwyla61";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable automatic download of dependencies
|
||||
./build.xml.patch
|
||||
(substituteAll {
|
||||
# Disable automatic download of dependencies
|
||||
src = ./build.xml.patch;
|
||||
inherit version;
|
||||
})
|
||||
|
||||
# Fix func.SolverAndProblemGeneratorTest test
|
||||
./fix-failing-test.patch
|
||||
];
|
||||
|
||||
postPatch = with deps; ''
|
||||
substituteInPlace build.xml \
|
||||
--subst-var-by version ${version}
|
||||
|
||||
mkdir -p lib/compile
|
||||
cp ${fastutil} lib/compile/${fastutil.name}
|
||||
cp ${osmpbf} lib/compile/${osmpbf.name}
|
||||
@ -61,16 +57,19 @@ stdenv.mkDerivation {
|
||||
checkPhase = "ant run.tests && ant run.func-tests";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm644 dist/splitter.jar $out/share/java/splitter/splitter.jar
|
||||
install -Dm644 doc/splitter.1 $out/share/man/man1/splitter.1
|
||||
install -Dm644 dist/splitter.jar -t $out/share/java/splitter
|
||||
install -Dm644 doc/splitter.1 -t $out/share/man/man1
|
||||
cp -r dist/lib/ $out/share/java/splitter/
|
||||
makeWrapper ${jre}/bin/java $out/bin/splitter \
|
||||
--add-flags "-jar $out/share/java/splitter/splitter.jar"
|
||||
'';
|
||||
|
||||
passthru.updateScript = [ ../update.sh "mkgmap-splitter" meta.downloadPage ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility for splitting OpenStreetMap maps into tiles";
|
||||
homepage = "http://www.mkgmap.org.uk";
|
||||
downloadPage = "http://www.mkgmap.org.uk/download/splitter.html";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.all;
|
||||
|
||||
7
pkgs/applications/misc/mkgmap/update.sh
Executable file
7
pkgs/applications/misc/mkgmap/update.sh
Executable file
@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
version=$(curl -s $2 | sed -n 's#.*<span data-bind="text: current().version">\(.*\)</span>.*#\1#p')
|
||||
update-source-version $1 "$version"
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeseal";
|
||||
version = "0.13.1";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitnami-labs";
|
||||
repo = "sealed-secrets";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2";
|
||||
sha256 = "sha256-sUeXzmgSOkpqzqrX9+wNGj2X7gcf5QSpavXK4MJe8qE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,22 +1,15 @@
|
||||
{ lib, python3 }:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
tornado = super.tornado_5;
|
||||
};
|
||||
};
|
||||
in with python.pkgs; buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "luigi";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ];
|
||||
propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ];
|
||||
|
||||
# Requires tox, hadoop, and google cloud
|
||||
doCheck = false;
|
||||
|
||||
@ -25,11 +25,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "4.2";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
|
||||
sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n";
|
||||
sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ];
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dcmtk";
|
||||
version = "3.6.5";
|
||||
version = "3.6.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DCMTK";
|
||||
repo = pname;
|
||||
rev = "DCMTK-${version}";
|
||||
sha256 = "0i38k1s0wdpbxxpiwsx490mszhxi45wp0z67iksvh60wfkaw54na";
|
||||
sha256 = "sha256-bpvf2JJXikV/CqmXZb3w4Ua3VBEQcQk7PXw9ie0t8xo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.33.0";
|
||||
version = "1.34.0";
|
||||
|
||||
goPackagePath = "github.com/docker-slim/docker-slim";
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoPackage rec {
|
||||
owner = "docker-slim";
|
||||
repo = "docker-slim";
|
||||
rev = version;
|
||||
sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v";
|
||||
sha256 = "1ynpd6yb1xc18y528sshd5k9nkz48h1zifj2w4sjh5n0864lna7b";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
inherit name;
|
||||
extid = if fixedExtid == null then "nixos@${name}" else fixedExtid;
|
||||
passthru = {
|
||||
exitd=extid;
|
||||
inherit extid;
|
||||
};
|
||||
|
||||
builder = writeScript "xpibuilder" ''
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-terminal";
|
||||
version = "3.38.1";
|
||||
version = "3.38.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r";
|
||||
sha256 = "J73cnQumFMhuXstPVMdevDQV4oh6zZFEIFdUj9MgZhg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.38.3";
|
||||
version = "3.38.4";
|
||||
pname = "gpaste";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keruspe";
|
||||
repo = "GPaste";
|
||||
rev = "v${version}";
|
||||
sha256 = "10ag0mrr4r40414nyarghpgjawvf331asxgq47dqjfxr5w7bz6wc";
|
||||
sha256 = "sha256-CvrwVyx5QP9CeEraJsUInV2pG5puSJebpXQiLwnrFSs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames
|
||||
, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4
|
||||
, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd
|
||||
, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, zlib, zstd
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
@ -8,25 +8,25 @@ let
|
||||
arrow-testing = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "arrow-testing";
|
||||
rev = "860376d4e586a3ac34ec93089889da624ead6c2a";
|
||||
sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0";
|
||||
rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235";
|
||||
sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i";
|
||||
};
|
||||
|
||||
parquet-testing = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "parquet-testing";
|
||||
rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd";
|
||||
sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als";
|
||||
rev = "e31fe1a02c9e9f271e4bfb8002d403c52f1ef8eb";
|
||||
sha256 = "02f51dvx8w5mw0bx3hn70hkn55mn1m65kzdps1ifvga9hghpy0sh";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "arrow-cpp";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
||||
sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy";
|
||||
sha256 = "0yp2b02wrc3s50zd56fmpz4nhhbihp0zw329v4zizaipwlxwrhkk";
|
||||
};
|
||||
sourceRoot = "apache-arrow-${version}/cpp";
|
||||
|
||||
@ -67,6 +67,7 @@ in stdenv.mkDerivation rec {
|
||||
gtest
|
||||
lz4
|
||||
rapidjson
|
||||
re2
|
||||
snappy
|
||||
thrift
|
||||
utf8proc
|
||||
@ -115,6 +116,15 @@ in stdenv.mkDerivation rec {
|
||||
if doInstallCheck then "${arrow-testing}/data" else null;
|
||||
PARQUET_TEST_DATA =
|
||||
if doInstallCheck then "${parquet-testing}/data" else null;
|
||||
GTEST_FILTER =
|
||||
if doInstallCheck then let
|
||||
# Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398
|
||||
filteredTests = lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
"TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric"
|
||||
"TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric"
|
||||
"TestCompareKernel.PrimitiveRandomTests"
|
||||
];
|
||||
in "-${builtins.concatStringsSep ":" filteredTests}" else null;
|
||||
installCheckInputs = [ perl which ];
|
||||
installCheckPhase =
|
||||
let
|
||||
|
||||
@ -29,11 +29,11 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gjs";
|
||||
version = "1.66.1";
|
||||
version = "1.66.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld";
|
||||
sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.16";
|
||||
version = "0.7.17";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = version;
|
||||
sha256 = "1arw7p83s5yq36pw94b76zfiqsh90fjjnayni54a5wgm0zvbkki8";
|
||||
sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -9,11 +9,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hepmc3";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
|
||||
sha256 = "0h9dbsbbf3y7iia27ms9cy4pfk2yyrkdnxcqsbvkhkl0izvv930f";
|
||||
sha256 = "sha256-jKrazCyWmIPNH5lLYieV/IhftLFdrYyK5kvL2/DL1H0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
pname = "azure-mgmt-botservice";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "10sxllwvybjlp35h5mjdxhkw2wzpl4b03i08p4jnv8cswrc8h7dj";
|
||||
sha256 = "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -5,23 +5,25 @@
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-nspkg
|
||||
, azure-mgmt-core
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cdn";
|
||||
version = "6.0.0";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "590cd35c9f1556a2d93d93a88b5c5661f716de094f22db30f4d05dc58a131c84";
|
||||
sha256 = "f1216f505126483c568be511a3e0e654f886f13730dae5368609ff0573528cf2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-reservations";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1";
|
||||
sha256 = "1dc97f48f3edb67116da8604ab76ef93233319f56455532be307f323e9ebf0e6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,28 +1,25 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, freezegun
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cached-property";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
# conftest.py is missing in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydanny";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xh0pwmiikx0il9nnfyf034ydmlw6992s0d209agd9j5d3s2k5q6";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest freezegun ];
|
||||
checkInputs = [ pytestCheckHook freezegun ];
|
||||
|
||||
# https://github.com/pydanny/cached-property/issues/131
|
||||
checkPhase = ''
|
||||
py.test -k "not test_threads_ttl_expiry"
|
||||
'';
|
||||
disabledTests = [
|
||||
# https://github.com/pydanny/cached-property/issues/131
|
||||
"test_threads_ttl_expiry"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A decorator for caching properties in classes";
|
||||
|
||||
@ -34,6 +34,13 @@ buildPythonPackage rec {
|
||||
export PYARROW_PARALLEL=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
# Deselect a single test because pyarrow prints a 2-line error message where
|
||||
# only a single line is expected. The additional line of output comes from
|
||||
# the glog library which is an optional dependency of arrow-cpp that is
|
||||
# enabled in nixpkgs.
|
||||
# Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
|
||||
pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ];
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
preCheck = ''
|
||||
mv pyarrow/tests tests
|
||||
|
||||
25
pkgs/development/python-modules/pyqt-builder/default.nix
Normal file
25
pkgs/development/python-modules/pyqt-builder/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyqt-builder";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyQt-builder";
|
||||
inherit version;
|
||||
sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ packaging sip_5 ];
|
||||
|
||||
pythonImportsCheck = [ "pyqtbuild" ];
|
||||
|
||||
# There aren't tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "PEP 517 compliant build system for PyQt";
|
||||
homepage = "https://pypi.org/project/PyQt-builder/";
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.62.0";
|
||||
version = "0.63.0";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc=";
|
||||
sha256 = "sha256-g3ARa69FvCfs8a3vbQuse8JvRlPXT6ysfmvZAUYnnA4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
ast (2.4.1)
|
||||
ast (2.4.2)
|
||||
parallel (1.20.1)
|
||||
parser (3.0.0.0)
|
||||
ast (~> 2.4.1)
|
||||
rainbow (3.0.0)
|
||||
regexp_parser (2.0.3)
|
||||
rexml (3.2.4)
|
||||
rubocop (1.8.0)
|
||||
rubocop (1.9.0)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.0.0.0)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
@ -17,7 +17,7 @@ GEM
|
||||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.4.0)
|
||||
rubocop-ast (1.4.1)
|
||||
parser (>= 2.7.1.5)
|
||||
ruby-progressbar (1.11.0)
|
||||
unicode-display_width (2.0.0)
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
|
||||
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default"];
|
||||
@ -66,10 +66,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12arfnsj32126ps6mxbn7dwrw43cy70sq45rm0ib7qfrmhp5qyid";
|
||||
sha256 = "1wz0prg4kx36smbk7fib4a8cdxrj5b5b31c8bavm082vgcpfk759";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
@ -77,10 +77,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj";
|
||||
sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "chiaki";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~thestr4ng3r/chiaki";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892";
|
||||
sha256 = "1hgh2j71rch53cnpm3f195gpfgrb4hd0yqa810k3ikar8zl4h7sd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -57,7 +57,7 @@ mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://git.sr.ht/~thestr4ng3r/chiaki";
|
||||
description = "Free and Open Source PlayStation Remote Play Client";
|
||||
license = licenses.gpl3Plus;
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ delroth ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -1,6 +1,19 @@
|
||||
{ lib, fetchpatch, fetchurl }:
|
||||
|
||||
{
|
||||
ath_regd_optional = rec {
|
||||
name = "ath_regd_optional";
|
||||
patch = fetchpatch {
|
||||
name = name + ".patch";
|
||||
url = "https://github.com/openwrt/openwrt/raw/ed2015c38617ed6624471e77f27fbb0c58c8c660/package/kernel/mac80211/patches/ath/402-ath_regd_optional.patch";
|
||||
sha256 = "1ssDXSweHhF+pMZyd6kSrzeW60eb6MO6tlf0il17RC0=";
|
||||
postFetch = ''
|
||||
sed -i 's/CPTCFG_/CONFIG_/g' $out
|
||||
sed -i '/--- a\/local-symbols/,$d' $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
bridge_stp_helper =
|
||||
{ name = "bridge-stp-helper";
|
||||
patch = ./bridge-stp-helper.patch;
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "groonga";
|
||||
version = "10.0.9";
|
||||
version = "10.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
|
||||
sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k";
|
||||
sha256 = "sha256-9NKyY+oliGIJQaNHdHOs+1GAfdZ0sy+mbQFrRNXpjLM=";
|
||||
};
|
||||
|
||||
buildInputs = with lib;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "solr";
|
||||
version = "8.6.1";
|
||||
version = "8.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
|
||||
sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g";
|
||||
sha256 = "0mbbmamajamxzcvdlrzx9wmv26kg9nhg9bzazk176dhhx3rjajf2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -12,26 +12,20 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\
|
||||
if [[ -s "/etc/zpreztorc" ]]; then\
|
||||
source "/etc/zpreztorc"\
|
||||
fi' init.zsh
|
||||
sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh
|
||||
for i in runcoms/*; do
|
||||
sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp ./* $out/ -R
|
||||
mkdir -p $out/share/zsh-prezto
|
||||
cp -R ./ $out/share/zsh-prezto
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes";
|
||||
description = "The configuration framework for Zsh";
|
||||
longDescription = ''
|
||||
Prezto is the configuration framework for Zsh; it enriches
|
||||
the command line interface environment with sane defaults,
|
||||
aliases, functions, auto completion, and prompt themes.
|
||||
'';
|
||||
homepage = "https://github.com/sorin-ionescu/prezto";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ holymonson ];
|
||||
|
||||
@ -276,7 +276,7 @@ in rec {
|
||||
in [ "--cross-file=${crossFile}" ] ++ mesonFlags;
|
||||
} // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
|
||||
enableParallelChecking = attrs.enableParallelChecking or true;
|
||||
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
|
||||
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) {
|
||||
NIX_HARDENING_ENABLE = enabledHardeningOptions;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) {
|
||||
requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ];
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "2.17.1";
|
||||
version = "2.18.0";
|
||||
srcName = "azure-cli-${version}-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = srcName;
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
sha256 = "sha256-RTYCsdoZx1YQa9a8ZyvwQ9yTLEB6r7/mMgfecc/vGvM=";
|
||||
sha256 = "sha256-3qQKQePyLYwIS3yO3exHNd0uoPr7y4iZ12+GaiHfqz8=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overriden in the py package scope
|
||||
|
||||
@ -6,7 +6,6 @@ let
|
||||
prePatch = (attrs.prePatch or "") + ''
|
||||
rm -f azure_bdist_wheel.py tox.ini
|
||||
substituteInPlace setup.py \
|
||||
--replace "wheel==0.30.0" "wheel" \
|
||||
--replace "cryptography>=2.3.1,<3.0.0" "cryptography"
|
||||
sed -i "/azure-namespace-package/c\ " setup.cfg
|
||||
'';
|
||||
@ -137,6 +136,9 @@ let
|
||||
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
|
||||
"8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
|
||||
|
||||
azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.2.0" "zip"
|
||||
"sha256-sh2IWOaaoW0luQjEARah93PBJ+xN1gLLuFQuvzmlXYM=";
|
||||
|
||||
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
|
||||
"1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
|
||||
|
||||
@ -149,11 +151,11 @@ let
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
|
||||
"13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
|
||||
|
||||
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.3.0" "zip"
|
||||
"1bb95rlwfikfl3pgyga0v5lfgr1xyaybm1nq2498rncfcvdpkjhz";
|
||||
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip"
|
||||
"sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8=";
|
||||
|
||||
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip"
|
||||
"0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy";
|
||||
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip"
|
||||
"b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f";
|
||||
|
||||
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
|
||||
"059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
|
||||
@ -248,8 +250,8 @@ let
|
||||
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip"
|
||||
"0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf";
|
||||
|
||||
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip"
|
||||
"1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77";
|
||||
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip"
|
||||
"c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
|
||||
|
||||
azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip"
|
||||
"1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr";
|
||||
@ -414,12 +416,12 @@ let
|
||||
});
|
||||
|
||||
knack = super.knack.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "0.7.2";
|
||||
version = "0.8.0rc2";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "1jh81xyri7wb7vqa049imf6dfy3nc501bq3p0miaka8ffvvaxinz";
|
||||
sha256 = "sha256-4pzgVwOVcT5UsjbyGkE30xashMASUzoQe2OGHSnK5do=";
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.36.0";
|
||||
version = "0.36.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wjYO/tu+QrztGPvtz3YBZJ7/e+9TDEwJ542xIBuNaQo=";
|
||||
sha256 = "sha256-qAUJgQzC9dGeVePsLpZHt+Ogz5ty5+N8hKBtGozhRZM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-woEa/h6TKQD32BslmPBuILvBAObhWjT8XqnQmuweUx0=";
|
||||
|
||||
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "2.3.2";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr";
|
||||
sha256 = "sha256-YBSM3+3WsZxAHbzXXM12pTwgvHbEkDK6Mq+YoKXEle0=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
|
||||
96
pkgs/tools/security/pcsc-safenet/default.nix
Normal file
96
pkgs/tools/security/pcsc-safenet/default.nix
Normal file
@ -0,0 +1,96 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, gtk2
|
||||
, openssl
|
||||
, pcsclite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsc-safenet";
|
||||
version = "10.0.37-0";
|
||||
|
||||
# https://aur.archlinux.org/packages/sac-core/
|
||||
src = fetchurl {
|
||||
url = "https://storage.spidlas.cz/public/soft/safenet/SafenetAuthenticationClient-core-${version}_amd64.deb";
|
||||
sha256 = "1r9739bhal7ramj1rpawaqvik45xbs1c756l1da96din638gzy5l";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src .
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gtk2
|
||||
openssl
|
||||
pcsclite
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
openssl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
# Set up for pcsc drivers
|
||||
mkdir -p pcsc/drivers
|
||||
mv usr/share/eToken/drivers/* pcsc/drivers/
|
||||
rm -r usr/share/eToken/drivers
|
||||
|
||||
# Move binaries out
|
||||
mv usr/bin bin
|
||||
|
||||
# Move UI to bin
|
||||
mv usr/share/SAC/SACUIProcess bin/
|
||||
rm -r usr/share/SAC
|
||||
|
||||
mkdir $out
|
||||
cp -r {bin,etc,lib,pcsc,usr,var} $out/
|
||||
|
||||
cd "$out/lib/"
|
||||
ln -sf libeToken.so.10.0.37 libeTPkcs11.so
|
||||
ln -sf libeToken.so.10.0.37 libeToken.so.10.0
|
||||
ln -sf libeToken.so.10.0.37 libeToken.so.10
|
||||
ln -sf libeToken.so.10.0.37 libeToken.so
|
||||
ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10.0
|
||||
ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10
|
||||
ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so
|
||||
|
||||
cd $out/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/
|
||||
ln -sf libAksIfdh.so.10.0 libAksIfdh.so
|
||||
ln -sf libAksIfdh.so.10.0 libAksIfdh.so.10
|
||||
|
||||
ln -sf ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
|
||||
'';
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
# Patch DYN shared libraries (autoPatchElfHook only patches EXEC | INTERP).
|
||||
postFixup = ''
|
||||
autoPatchelf "$out"
|
||||
|
||||
runtime_rpath="${lib.makeLibraryPath runtimeDependencies}"
|
||||
|
||||
for mod in $(find "$out" -type f -name '*.so.*'); do
|
||||
mod_rpath="$(patchelf --print-rpath "$mod")"
|
||||
patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
|
||||
done;
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://safenet.gemalto.com/multi-factor-authentication/security-applications/authentication-client-token-management";
|
||||
description = "Safenet Authentication Client";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wldhx ];
|
||||
};
|
||||
}
|
||||
24
pkgs/tools/text/mark/default.nix
Normal file
24
pkgs/tools/text/mark/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = version;
|
||||
sha256 = "0za4n2caqr3gflfxr1hdd328g7r52h7x0ws7r9mjvdnmwjgc0b2b";
|
||||
};
|
||||
|
||||
vendorSha256 = "1hvizcg5b3y2qgjiw77rb795xz9w1dzr3b8q2ji48ihll27g9f0m";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for syncing your markdown documentation with Atlassian Confluence pages";
|
||||
homepage = "https://github.com/kovetskiy/mark";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rguevara84 ];
|
||||
};
|
||||
}
|
||||
@ -85,6 +85,8 @@ mapAliases ({
|
||||
buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26
|
||||
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
|
||||
bundler_HEAD = bundler; # added 2015-11-15
|
||||
calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13
|
||||
calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13
|
||||
caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02
|
||||
cantarell_fonts = cantarell-fonts; # added 2018-03-03
|
||||
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20
|
||||
@ -609,6 +611,7 @@ mapAliases ({
|
||||
smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04
|
||||
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
|
||||
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
|
||||
solr_8 = solr; # added 2021-01-30
|
||||
spectral = neochat; # added 2020-12-27
|
||||
sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
|
||||
|
||||
|
||||
@ -6939,6 +6939,8 @@ in
|
||||
|
||||
pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
|
||||
|
||||
pcsc-safenet = callPackage ../tools/security/pcsc-safenet { };
|
||||
|
||||
pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { };
|
||||
ifdnfc = callPackage ../tools/security/ifdnfc { };
|
||||
|
||||
@ -7911,8 +7913,6 @@ in
|
||||
sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { };
|
||||
|
||||
solr = callPackage ../servers/search/solr { };
|
||||
solr_7 = solr;
|
||||
solr_8 = solr;
|
||||
|
||||
solvespace = callPackage ../applications/graphics/solvespace { };
|
||||
|
||||
@ -21225,11 +21225,7 @@ in
|
||||
|
||||
calculix = callPackage ../applications/science/math/calculix {};
|
||||
|
||||
calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
|
||||
|
||||
calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
|
||||
|
||||
calibre = calibre-py3;
|
||||
calibre = libsForQt5.callPackage ../applications/misc/calibre { };
|
||||
|
||||
calligra = libsForQt5.callPackage ../applications/office/calligra {
|
||||
# Must use the same Qt version as Calligra itself:
|
||||
@ -23315,6 +23311,8 @@ in
|
||||
|
||||
markdown-pp = callPackage ../tools/text/markdown-pp { };
|
||||
|
||||
mark = callPackage ../tools/text/mark { };
|
||||
|
||||
marp = callPackage ../applications/office/marp { };
|
||||
|
||||
magnetico = callPackage ../applications/networking/p2p/magnetico { };
|
||||
@ -29556,7 +29554,7 @@ in
|
||||
|
||||
snowsql = callPackage ../applications/misc/snowsql {};
|
||||
|
||||
snowmachine = python3Packages.callPackage ../applications/snowmachine {};
|
||||
snowmachine = python3Packages.callPackage ../applications/misc/snowmachine {};
|
||||
|
||||
sidequest = callPackage ../applications/misc/sidequest {};
|
||||
|
||||
|
||||
@ -5763,6 +5763,8 @@ in {
|
||||
|
||||
pyqrcode = callPackage ../development/python-modules/pyqrcode { };
|
||||
|
||||
pyqt-builder = callPackage ../development/python-modules/pyqt-builder { };
|
||||
|
||||
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; };
|
||||
|
||||
pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; };
|
||||
@ -7778,7 +7780,7 @@ in {
|
||||
# Used by circus and grab-site, 2020-08-29
|
||||
tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };
|
||||
|
||||
# Used by luigi, 2020-08-29
|
||||
# Used by streamlit, graphite_beacon, 2021-01-29
|
||||
tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
|
||||
|
||||
towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user