mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 20:03:16 +00:00
Merge staging-next into staging
This commit is contained in:
commit
47cad0dc22
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbatticon";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FGCT3gP+KL71Am4cd+f71iY8EwDPRZJ4+FDgQqjZK1M=";
|
||||
sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ];
|
||||
|
@ -14,12 +14,11 @@ assert withMediaPlayback -> gst_all_1 != null;
|
||||
let
|
||||
python3Packages = python3.pkgs;
|
||||
pdfjs = let
|
||||
version = "2.8.335";
|
||||
version = "2.14.305";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "pdfjs-${version}";
|
||||
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
|
||||
sha256 = "1zschfpxnhdinn9nasl5in4s62ad0h1g369cglamjgxx36x27zly";
|
||||
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
|
||||
hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@ -33,12 +32,12 @@ let
|
||||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1zai8ivc9cqax2idspwvyp24dkis0x6sv29fia8ja3sp62i45171";
|
||||
hash = "sha256-5ohYhqhM0WamumM3lKWKTGfYccJxiBJ+XdvFJ2127bw=";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
@ -70,40 +70,9 @@ let
|
||||
removed = date: throw "removed from nixpkgs on ${date}";
|
||||
in
|
||||
lib.optionalAttrs config.allowAliases {
|
||||
arukas = archived "2022/01";
|
||||
chef = archived "2022/01";
|
||||
cherryservers = archived "2022/01";
|
||||
clc = archived "2022/01";
|
||||
cloudstack = removed "2022/01";
|
||||
cobbler = archived "2022/01";
|
||||
cohesity = archived "2022/01";
|
||||
dyn = archived "2022/01";
|
||||
genymotion = archived "2022/01";
|
||||
hedvig = archived "2022/01";
|
||||
ignition = archived "2022/01";
|
||||
incapsula = archived "2022/01";
|
||||
influxdb = archived "2022/01";
|
||||
jdcloud = archived "2022/01";
|
||||
kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
|
||||
librato = archived "2022/01";
|
||||
logentries = archived "2022/01";
|
||||
metalcloud = archived "2022/01";
|
||||
mysql = archived "2022/01";
|
||||
nixos = archived "2022/01";
|
||||
oneandone = archived "2022/01";
|
||||
packet = archived "2022/01";
|
||||
profitbricks = archived "2022/01";
|
||||
pureport = archived "2022/01";
|
||||
rancher = archived "2022/01";
|
||||
rightscale = archived "2022/01";
|
||||
runscope = archived "2022/01";
|
||||
segment = removed "2022/01";
|
||||
softlayer = archived "2022/01";
|
||||
telefonicaopencloud = archived "2022/01";
|
||||
teleport = removed "2022/01";
|
||||
terraform = archived "2022/01";
|
||||
ultradns = archived "2022/01";
|
||||
vthunder = throw "provider was renamed to thunder on 2022/01";
|
||||
opc = archived "2022/05";
|
||||
oraclepaas = archived "2022/05";
|
||||
template = archived "2022/05";
|
||||
};
|
||||
|
||||
# excluding aliases, used by terraform-full
|
||||
|
@ -73,13 +73,13 @@
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"auth0": {
|
||||
"owner": "alexkappa",
|
||||
"provider-source-address": "registry.terraform.io/alexkappa/auth0",
|
||||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.26.2",
|
||||
"sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw",
|
||||
"vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms",
|
||||
"version": "0.26.2"
|
||||
"rev": "v0.30.2",
|
||||
"sha256": "sha256-6+81QomUnKEbaqGHSRabLSb7O6lrrG+Fp9N8y8ZtS8A=",
|
||||
"vendorSha256": "sha256-4o+/iB853zXcEYgPKVZ8CVHdIOEZW+/OX+LDBHSNjUk=",
|
||||
"version": "0.30.2"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
@ -860,15 +860,6 @@
|
||||
"vendorSha256": null,
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"opc": {
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/opc",
|
||||
"repo": "terraform-provider-opc",
|
||||
"rev": "v1.4.1",
|
||||
"sha256": "1kylnjy7s5bkx6zjksbz8sfx77pxcc9ycbi8kd8axnrcmj4q01xc",
|
||||
"vendorSha256": null,
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"opennebula": {
|
||||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
@ -905,15 +896,6 @@
|
||||
"vendorSha256": null,
|
||||
"version": "0.6.10"
|
||||
},
|
||||
"oraclepaas": {
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oraclepaas",
|
||||
"repo": "terraform-provider-oraclepaas",
|
||||
"rev": "v1.5.3",
|
||||
"sha256": "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15",
|
||||
"vendorSha256": null,
|
||||
"version": "1.5.3"
|
||||
},
|
||||
"ovh": {
|
||||
"owner": "ovh",
|
||||
"provider-source-address": "registry.terraform.io/ovh/ovh",
|
||||
@ -1068,13 +1050,13 @@
|
||||
"version": "0.14.5"
|
||||
},
|
||||
"snowflake": {
|
||||
"owner": "chanzuckerberg",
|
||||
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.33.1",
|
||||
"sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=",
|
||||
"vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=",
|
||||
"version": "0.33.1"
|
||||
"rev": "v0.34.0",
|
||||
"sha256": "sha256-7FQp5lDm6WKFmtk9V8Sf+e5J4tLpAOfgMKpbcQRcfIE=",
|
||||
"vendorSha256": "sha256-HGukjbPQyQpFnVkgUnreQlNAW9nhLirnQnYIpBfFe+M=",
|
||||
"version": "0.34.0"
|
||||
},
|
||||
"sops": {
|
||||
"owner": "carlpett",
|
||||
@ -1121,15 +1103,6 @@
|
||||
"vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=",
|
||||
"version": "2.16.0"
|
||||
},
|
||||
"template": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/template",
|
||||
"repo": "terraform-provider-template",
|
||||
"rev": "v2.2.0",
|
||||
"sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2",
|
||||
"vendorSha256": null,
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem
|
||||
, qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk
|
||||
, libnl
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -21,31 +22,34 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [ qtbase protobuf libpcap qtscript libnl ];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
qmake
|
||||
];
|
||||
|
||||
patches = [ ./drone_ini.patch ];
|
||||
prePatch = ''
|
||||
sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItems = lib.singleton (makeDesktopItem {
|
||||
name = "ostinato";
|
||||
desktopName = "Ostinato";
|
||||
genericName = "Packet/Traffic Generator and Analyzer";
|
||||
comment = "Network packet and traffic generator and analyzer with a friendly GUI";
|
||||
categories = [ "Network" ];
|
||||
startupNotify = true;
|
||||
exec = "$out/bin/ostinato";
|
||||
exec = "@out@/bin/ostinato";
|
||||
icon = ostinatoIcon;
|
||||
extraConfig = {
|
||||
"GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete";
|
||||
"Comment[it]" = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole";
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
preFixup = ''
|
||||
substituteInPlace $out/share/applications/ostinato.desktop \
|
||||
--subst-var out
|
||||
|
||||
cat > $out/bin/ostinato.ini <<EOF
|
||||
WiresharkPath=${wireshark}/bin/wireshark
|
||||
@ -62,8 +66,8 @@ mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A packet traffic generator and analyzer";
|
||||
homepage = "https://ostinato.org";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://ostinato.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ rick68 ];
|
||||
platforms = with platforms; linux ++ darwin ++ cygwin;
|
||||
};
|
||||
|
@ -11,11 +11,22 @@ in fetchFromGitHub {
|
||||
rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
pushd $out
|
||||
|
||||
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
|
||||
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
|
||||
|
||||
# remove unrelated files
|
||||
for f in * .*; do
|
||||
case "$f" in
|
||||
share|.|..) ;;
|
||||
*) rm -rf "$f" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
popd
|
||||
'';
|
||||
sha256 = "0xhwa53aiz20763jb9nvbr2zq9k6jl69p07dc4b0apwrrwz0jfr1";
|
||||
sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The xkcd font";
|
||||
|
@ -17,6 +17,7 @@ let
|
||||
lxqt-build-tools = callPackage ./lxqt-build-tools {};
|
||||
libsysstat = callPackage ./libsysstat {};
|
||||
liblxqt = callPackage ./liblxqt {};
|
||||
qtxdg-tools = callPackage ./qtxdg-tools {};
|
||||
|
||||
### CORE 1
|
||||
libfm-qt = callPackage ./libfm-qt {};
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "libqtxdg";
|
||||
version = "3.9.0";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "llE4OxI4I/n0P8Pv5tKT3tXM7IfD3VMQSxdaLkBJ4Gk=";
|
||||
sha256 = "zrlaOiIsfbwjHFjqhYZ9lCo+oTsddICxl2UAum9Xoi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,6 +11,7 @@
|
||||
, kwindowsystem
|
||||
, liblxqt
|
||||
, libqtxdg
|
||||
, qtxdg-tools
|
||||
, procps
|
||||
, xorg
|
||||
, xdg-user-dirs
|
||||
@ -19,13 +20,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-session";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "urm4Ehd26fmssJwu/V9Uu/lZ0J8yDOtAA0DIihTPxng=";
|
||||
sha256 = "NOwuHz5SiygE/9cLrYPz24L5v8BE6Hwqp6uKD5SnOBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -42,6 +43,7 @@ mkDerivation rec {
|
||||
kwindowsystem
|
||||
liblxqt
|
||||
libqtxdg
|
||||
qtxdg-tools
|
||||
procps
|
||||
xorg.libpthreadstubs
|
||||
xorg.libXdmcp
|
||||
|
41
pkgs/desktops/lxqt/qtxdg-tools/default.nix
Normal file
41
pkgs/desktops/lxqt/qtxdg-tools/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, libqtxdg
|
||||
, lxqt-build-tools
|
||||
, lxqtUpdateScript
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtxdg-tools";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NUSeXEJ6zjTz6p/8R6YTVfPQEnk1ukZ2ikdDdkaPeSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lxqt-build-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libqtxdg
|
||||
];
|
||||
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/lxqt/qtxdg-tools";
|
||||
description = "libqtxdg user tools";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
@ -1,16 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
|
||||
, libX11, libXext, qttools, wrapQtAppsHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm";
|
||||
sha256 = "NPMqd7j9Unvw8p/cUNMYWmgrb2ysdMvSSGJ6lJWh4/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,6 +30,12 @@ stdenv.mkDerivation rec {
|
||||
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "libsForQt5.${pname}";
|
||||
rev-prefix = "V";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "SVG-based Qt5 theme engine plus a config tool and extra themes";
|
||||
homepage = "https://github.com/tsujan/Kvantum";
|
||||
|
51
pkgs/development/python-modules/aeppl/default.nix
Normal file
51
pkgs/development/python-modules/aeppl/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, aesara
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numdifftools
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aeppl";
|
||||
version = "0.0.31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fbBtjU2skvfDCnRRW+9PIObsEOfKhl15qSLw3TGhl4k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aesara
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
numdifftools
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aeppl"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for an Aesara-based PPL";
|
||||
homepage = "https://github.com/aesara-devs/aeppl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -1,30 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, scipy
|
||||
, filelock
|
||||
, cons
|
||||
, cython
|
||||
, etuples
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, logical-unification
|
||||
, minikanren
|
||||
, cons
|
||||
, numba
|
||||
, numba-scipy
|
||||
, libgpuarray
|
||||
, sympy
|
||||
, cython
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.5.3";
|
||||
version = "2.6.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
repo = "aesara";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
sha256 = "sha256-20nc70gNdcGjtGxv2WxmYxmswNH8v7yGLkToP2iazjc=";
|
||||
hash = "sha256-ChLMQCXw9EBR0hnNYGdkUbiLF+4oCqOxzsKsnsf22Jk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -32,28 +35,41 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
filelock
|
||||
cons
|
||||
etuples
|
||||
filelock
|
||||
logical-unification
|
||||
minikanren
|
||||
cons
|
||||
numba
|
||||
numba-scipy
|
||||
libgpuarray
|
||||
sympy
|
||||
numpy
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
numba
|
||||
numba-scipy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--durations=50" ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aesara" ];
|
||||
pythonImportsCheck = [
|
||||
"aesara"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't run the most compute-intense tests
|
||||
"tests/scan/"
|
||||
"tests/tensor/"
|
||||
"tests/sandbox/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arviz";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "arviz-devs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
|
||||
hash = "sha256-5P6EXXAAS1Q2eNQuj/5JrDg0lPHfA5K4WaYfKaaXm9s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,14 +8,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asteval";
|
||||
version = "0.9.26";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.9.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newville";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0l2iv51yclqn52w3yvyz3brpbca076ivv70h4gd6bkhwjbax1i2b";
|
||||
hash = "sha256-FxWs4l9bqZoqdyhpVRys8Mo9Wdtn1fm5XonisPscWEs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -28,7 +30,14 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asteval" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=asteval --cov-report xml" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asteval"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AST evaluator of Python expression using ast module";
|
||||
|
@ -37,6 +37,8 @@ buildPythonPackage rec {
|
||||
--replace "--cov --cov-report term-missing " ""
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "pysnmplib==5.0.10" "pysnmplib>=5.0.10"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
@ -15,6 +15,7 @@
|
||||
, pyct
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, nbsmoke
|
||||
, fastparquet
|
||||
, nbconvert
|
||||
@ -24,12 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8=";
|
||||
hash = "sha256-VKEDOJV2ITO1gxKLbFQbcem0gEd/fzTIo+QSmZVsMGI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6DHp8kz+CiZkzXDxPfT7KB4Yh11CwcEj3MTn5yd404Q=";
|
||||
sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-org-policy";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU=";
|
||||
sha256 = "sha256-i60DIRtWtB1MEB2/MuNycy7T9MFPnlRtJ7lnFhDVJbE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core proto-plus ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nats-py";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "nats-io";
|
||||
repo = "nats.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i197ZePxngAhGh7xzaJoo7m8el+7t7yJrvhO2CTmajU=";
|
||||
hash = "sha256-anQBy+TOEGJhAv1C5AvLL1KNLD/jiHA7Tze92Ir7Ie8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -4,15 +4,19 @@
|
||||
, scipy
|
||||
, numba
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numba-scipy";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ=";
|
||||
hash = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -21,14 +25,18 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3"
|
||||
# https://github.com/numba/numba-scipy/pull/76
|
||||
substituteInPlace setup.py \
|
||||
--replace "scipy>=0.16,<=1.6.2" "scipy>=0.16"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "numba" ];
|
||||
pythonImportsCheck = [
|
||||
"numba_scipy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extends Numba to make it aware of SciPy";
|
||||
|
@ -22,13 +22,13 @@
|
||||
let
|
||||
inherit (cudaPackages) cudatoolkit;
|
||||
in buildPythonPackage rec {
|
||||
version = "0.55.1";
|
||||
version = "0.55.2";
|
||||
pname = "numba";
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM=";
|
||||
hash = "sha256-5CjZ4R2bpZKEnMyfegCQA+t9MGEgB+Nlr+dDznEYxvQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -42,9 +42,18 @@ in buildPythonPackage rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
||||
|
||||
propagatedBuildInputs = [ numpy llvmlite setuptools ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
llvmlite
|
||||
setuptools
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudatoolkit
|
||||
cudatoolkit.lib
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath ];
|
||||
nativeBuildInputs = lib.optional cudaSupport [
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
patches = lib.optionals cudaSupport [
|
||||
(substituteAll {
|
||||
@ -69,12 +78,14 @@ in buildPythonPackage rec {
|
||||
# ImportError: cannot import name '_typeconv'
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "numba" ];
|
||||
pythonImportsCheck = [
|
||||
"numba"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compiling Python code using LLVM";
|
||||
homepage = "https://numba.pydata.org/";
|
||||
license = licenses.bsd2;
|
||||
description = "Compiling Python code using LLVM";
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
|
51
pkgs/development/python-modules/numdifftools/default.nix
Normal file
51
pkgs/development/python-modules/numdifftools/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numdifftools";
|
||||
version = "0.9.40";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbrod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YLi9cNHcZ/PlhrhvYOMfRTOt4kinQcfxvqInT8/0Qpg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
# Tests requires algopy and other modules which are optional and/or not available
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
# Remove optional dependencies
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "algopy>=0.4" "" \
|
||||
--replace "statsmodels>=0.6" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"numdifftools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to solve automatic numerical differentiation problems in one or more variables";
|
||||
homepage = "https://github.com/pbrod/numdifftools";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -9,15 +9,20 @@
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "persim";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ef0f0a247adcf6104ecac14117db0b24581710ea8a8d964816805395700b4975";
|
||||
sha256 = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -41,10 +46,26 @@ buildPythonPackage rec {
|
||||
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"persim"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
# AttributeError: module 'collections' has no attribute 'Iterable'
|
||||
"test_empyt_diagram_list"
|
||||
"test_empty_diagram_list"
|
||||
"test_fit_diagram"
|
||||
"test_integer_diagrams"
|
||||
"test_lists_of_lists"
|
||||
"test_mixed_pairs"
|
||||
"test_multiple_diagrams"
|
||||
"test_n_pixels"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Distances and representations of persistence diagrams";
|
||||
homepage = "https://persim.scikit-tda.org";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, importlib-metadata
|
||||
, passlib
|
||||
, pythonOlder
|
||||
, scramp
|
||||
@ -8,21 +9,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.28.0";
|
||||
format = "setuptools";
|
||||
version = "1.29.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Q1E949TjeOc6xEKpOQa6qdNWJFqmeqf2FgXFbjmn9ZE=";
|
||||
hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
passlib
|
||||
scramp
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed '/^\[metadata\]/a version = ${version}' setup.cfg
|
||||
'';
|
||||
|
||||
# Tests require a running PostgreSQL instance
|
||||
doCheck = false;
|
||||
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynndescent";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YfsxiFuqxGnWeTPix8k1tu3rsG7kmOLw+d/JfFnTclw=";
|
||||
hash = "sha256-7LOVJV+janSLWHC0ugMA6g99qLGWSGS47dYld6hN/X0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysensibo";
|
||||
version = "1.0.14";
|
||||
version = "1.0.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "andrey-git";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-r2YIQ6JPyRWzfXprj3tFwrsAR0NtmVLncWZAsLkAzSA=";
|
||||
hash = "sha256-TZjlMry9Ek/13gRKg54aCif/xbx9IEg+rsYnuOzwxRo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysnmplib";
|
||||
version = "5.0.10";
|
||||
version = "5.0.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "pysnmp";
|
||||
repo = "pysnmp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PsfsOVzeHCVdd1Bi+FYYi68Wzn1MI8dZUbRr/tmT+cA=";
|
||||
hash = "sha256-9HkS8oY9aHr8jXmryUMNz3z36BMWeYMuXLKdpEzCgZc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.16.2";
|
||||
version = "3.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-xecmza5Zsv6mJ4SCRl5VnGseKJG1yznBbLZ1tyBSjIE=";
|
||||
sha256 = "sha256-XyxvJsALAEuAJWORhIs4bGB4vYnCbFHecerA4gTr6ak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,32 +1,60 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, postgresql, testing-common-database
|
||||
, pg8000, pytestCheckHook, psycopg2, sqlalchemy }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pg8000
|
||||
, postgresql
|
||||
, psycopg2
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sqlalchemy
|
||||
, testing-common-database
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "testing.postgresql";
|
||||
pname = "testing-postgresql";
|
||||
# Version 1.3.0 isn't working so let's use the latest commit from GitHub
|
||||
version = "unstable-2017-10-31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tk0miya";
|
||||
repo = pname;
|
||||
repo = "testing.postgresql";
|
||||
rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8";
|
||||
sha256 = "1asqsi38di768i1sc1qm1k068dj0906ds6lnx7xcbxws0s25m2q3";
|
||||
sha256 = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
testing-common-database
|
||||
pg8000
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
psycopg2
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
# Add PostgreSQL to search path
|
||||
prePatch = ''
|
||||
substituteInPlace src/testing/postgresql.py \
|
||||
--replace "/usr/local/pgsql" "${postgresql}"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ testing-common-database pg8000 ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pg8000 >= 1.10" "pg8000"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"testing.postgresql"
|
||||
];
|
||||
|
||||
# Fix tests for Darwin build. See:
|
||||
# https://github.com/NixOS/nixpkgs/pull/74716#issuecomment-598546916
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
checkInputs = [ pytestCheckHook psycopg2 sqlalchemy ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Use temporary postgresql instance in testing";
|
||||
homepage = "https://github.com/tk0miya/testing.postgresql";
|
||||
|
@ -1,43 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, keras
|
||||
, numba
|
||||
, numpy
|
||||
, pynndescent
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, numba
|
||||
, pynndescent
|
||||
, tensorflow
|
||||
, tqdm
|
||||
, pytestCheckHook
|
||||
, keras
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "umap-learn";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmcinnes";
|
||||
repo = "umap";
|
||||
rev = version;
|
||||
sha256 = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";
|
||||
hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numba
|
||||
numpy
|
||||
pynndescent
|
||||
scikit-learn
|
||||
scipy
|
||||
numba
|
||||
pynndescent
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
tensorflow
|
||||
pytestCheckHook
|
||||
keras
|
||||
pytestCheckHook
|
||||
tensorflow
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
@ -52,6 +54,7 @@ buildPythonPackage rec {
|
||||
|
||||
# Flaky test. Fails with AssertionError sometimes.
|
||||
"test_sparse_hellinger"
|
||||
"test_densmap_trustworthiness_on_iris_supervised"
|
||||
|
||||
# tensorflow maybe incompatible? https://github.com/lmcinnes/umap/issues/821
|
||||
"test_save_load"
|
||||
@ -61,6 +64,6 @@ buildPythonPackage rec {
|
||||
description = "Uniform Manifold Approximation and Projection";
|
||||
homepage = "https://github.com/lmcinnes/umap";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
@ -34,17 +34,16 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
|
||||
# Full git clone required for test_doc_examples
|
||||
checkInputs = [ pytestCheckHook hypothesis ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Full git clone required for test_doc_examples
|
||||
"tests/test_doc_examples.py"
|
||||
# test_reinitialize_module segfaults python
|
||||
# https://github.com/mehcode/python-xmlsec/issues/203
|
||||
"tests/test_xmlsec.py"
|
||||
];
|
||||
|
||||
|
||||
pythonImportsCheck = [ "xmlsec" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexAkulov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dpVFDLDEqqW1u1afb3klpdqwOptudbjUfoFhFBc85Pg=";
|
||||
sha256 = "sha256-NlOYRgCsReEeP/X98fddVRLnTnkqsiwpCg6MpdRcfZ0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wj4N146iqj/YwyBI0XdrvBp1tqeK43Yq4kSpN594hRs=";
|
||||
vendorSha256 = "sha256-F+FfZESB/m/2m4RnYzFPs0PL5+8lyxzEwAdHMykrFsw=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
@ -21,7 +21,7 @@ if lib.versionAtLeast ocaml.version "4.02" then
|
||||
|
||||
buildDunePackage rec {
|
||||
inherit pname;
|
||||
version = "1.6.8";
|
||||
version = "1.6.9";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -29,7 +29,7 @@ buildDunePackage rec {
|
||||
owner = "ocaml-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0xjb1dnj8lvdcccskrhrakknd9q4vfy5330sjbqpf4h95dsz90k9";
|
||||
sha256 = "sha256-NdN2QnVRfRq9hEcSAnO2Wha7icDlf2Zg4JQqoEWmErE=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
@ -29,13 +29,13 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.5.6"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.7.3"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-NANdm2RK4U5sXPuGbC8KUGXsbYl/WwAoUep4JxJA5lI=";
|
||||
sha256 = "sha256-CM20zBuby1X+XOiphDDtWHUB08Mw7IYf0aZUWIvEAqI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -100,6 +100,6 @@ with py.pkgs; buildPythonApplication rec {
|
||||
changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";
|
||||
description = "Unified tool to manage your AWS services";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bhipple davegallant ];
|
||||
maintainers = with maintainers; [ bhipple davegallant bryanasdev000 ];
|
||||
};
|
||||
}
|
||||
|
48
pkgs/tools/graphics/vkdisplayinfo/default.nix
Normal file
48
pkgs/tools/graphics/vkdisplayinfo/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, meson
|
||||
, ninja
|
||||
, vulkan-loader
|
||||
, vulkan-headers
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkdisplayinfo";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ChristophHaag";
|
||||
repo = "vkdisplayinfo";
|
||||
rev = version;
|
||||
hash = "sha256-n6U7T5aOYTpgWE2WGPBPHtQKzitf9PxAoXJNWyz4rYw=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
install vkdisplayinfo -Dm755 -t $out/bin
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
($out/bin/vkdisplayinfo 2>&1 || true) | grep -q vkdisplayinfo
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-loader
|
||||
vulkan-headers
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Print displays and modes enumerated with the Vulkan function vkGetPhysicalDeviceDisplayPropertiesKHR";
|
||||
homepage = "https://github.com/ChristophHaag/vkdisplayinfo";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.boost;
|
||||
maintainers = [ maintainers.LunNova ];
|
||||
};
|
||||
}
|
@ -1,24 +1,45 @@
|
||||
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking
|
||||
, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsNoGuiHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, asciidoc
|
||||
, docbook_xml_dtd_45
|
||||
, docbook2x
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, curl
|
||||
, glib
|
||||
, fuse
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megatools";
|
||||
version = "1.10.3";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://megous.com/git/megatools";
|
||||
rev = "5581d06e447b84d0101d36dc96ab72920eec1017";
|
||||
sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4";
|
||||
rev = version;
|
||||
sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook pkg-config wrapGAppsNoGuiHook asciidoc libxml2
|
||||
docbook_xsl docbook_xml_dtd_45 libxslt
|
||||
asciidoc
|
||||
docbook_xml_dtd_45
|
||||
docbook2x
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [ glib glib-networking curl ]
|
||||
++ lib.optionals stdenv.isLinux [ fuse ];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
glib
|
||||
] ++ lib.optionals stdenv.isLinux [ fuse ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line client for Mega.co.nz";
|
||||
|
@ -45,7 +45,7 @@ let
|
||||
homepage = "https://honggfuzz.dev/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ cpu ];
|
||||
maintainers = with lib.maintainers; [ cpu chivay ];
|
||||
};
|
||||
};
|
||||
in honggfuzz
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "2.0.155";
|
||||
version = "2.0.156";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "armosec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZBjwgrF0Pkour1yXMcY4cZt3W2biCzmPd+EYcY4Ppz0=";
|
||||
hash = "sha256-bbTafsHllJQZ9Qn+qFnlr/AdU7NgB/vAvQGIgt/XDNQ=";
|
||||
};
|
||||
vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A=";
|
||||
|
||||
|
@ -1033,7 +1033,10 @@ with pkgs;
|
||||
stdenv = clangStdenv;
|
||||
};
|
||||
|
||||
honggfuzz = callPackage ../tools/security/honggfuzz { };
|
||||
honggfuzz = callPackage ../tools/security/honggfuzz {
|
||||
clang = clang_12;
|
||||
llvm = llvm_12;
|
||||
};
|
||||
|
||||
aflplusplus = callPackage ../tools/security/aflplusplus {
|
||||
clang = clang_9;
|
||||
@ -21003,6 +21006,8 @@ with pkgs;
|
||||
hdf5 = hdf5.override { usev110Api = true; };
|
||||
};
|
||||
|
||||
vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
|
||||
|
||||
vlock = callPackage ../misc/screensavers/vlock { };
|
||||
|
||||
vmime = callPackage ../development/libraries/vmime { };
|
||||
@ -29117,7 +29122,14 @@ with pkgs;
|
||||
|
||||
pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
|
||||
|
||||
pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { };
|
||||
pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview {
|
||||
# use the same stdenv as libsForQt514 to fix build
|
||||
boost = boost.override {
|
||||
stdenv = if stdenv.cc.isGNU
|
||||
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
|
||||
else stdenv;
|
||||
};
|
||||
};
|
||||
|
||||
puredata = callPackage ../applications/audio/puredata { };
|
||||
puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
|
||||
|
@ -209,6 +209,8 @@ in {
|
||||
|
||||
aenum = callPackage ../development/python-modules/aenum { };
|
||||
|
||||
aeppl = callPackage ../development/python-modules/aeppl { };
|
||||
|
||||
aesara = callPackage ../development/python-modules/aesara { };
|
||||
|
||||
aesedb = callPackage ../development/python-modules/aesedb { };
|
||||
@ -5860,6 +5862,8 @@ in {
|
||||
|
||||
numcodecs = callPackage ../development/python-modules/numcodecs { };
|
||||
|
||||
numdifftools = callPackage ../development/python-modules/numdifftools { };
|
||||
|
||||
numericalunits = callPackage ../development/python-modules/numericalunits { };
|
||||
|
||||
numexpr = callPackage ../development/python-modules/numexpr { };
|
||||
@ -9462,7 +9466,7 @@ in {
|
||||
|
||||
serverlessrepo = callPackage ../development/python-modules/serverlessrepo { };
|
||||
|
||||
service-identity = callPackage ../development/python-modules/service_identity { };
|
||||
service-identity = callPackage ../development/python-modules/service-identity { };
|
||||
|
||||
setproctitle = callPackage ../development/python-modules/setproctitle { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user