gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-12-10 06:01:17 +00:00
committed by GitHub
parent 718872a839 e8db6b459b
commit b2a2a5759e
80 changed files with 2492 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+1
View File
@@ -3695,6 +3695,7 @@
};
evils = {
email = "evils.devils@protonmail.com";
matrix = "@evils:nixos.dev";
github = "evils";
githubId = 30512529;
name = "Evils";
nixos/modules/virtualisation/qemu-vm.nix
+1
View File
@@ -835,6 +835,7 @@ in
# FIXME: Consolidate this one day.
virtualisation.qemu.options = mkMerge [
[ "-device virtio-keyboard" ]
(mkIf pkgs.stdenv.hostPlatform.isx86 [
"-usb" "-device usb-tablet,bus=usb-bus.0"
])
pkgs/applications/audio/pulseaudio-ctl/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@ let
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.69";
version = "1.70";
src = fetchFromGitHub {
owner = "graysky2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5WRhVIQlSwWuyvkzrnNW0rdVet9ZzM47gISJpznM8mU=";
sha256 = "sha256-ZB1jrr31PF7+vNB+Xo5CATJmYbuDAPwewpDxCVnAowY=";
};
postPatch = ''
pkgs/applications/blockchains/go-ethereum/default.nix
+3 -3
View File
@@ -9,17 +9,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.8";
version = "1.10.11";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-r4ifLa4CMZvp0MaCkxWo5rWLEnFdX//mYlC08hndXhQ=";
sha256 = "sha256-8kPaa2wRKUQBn4LFDnc7tEbLR62f99NS1HIVDeHHzto=";
};
runVend = true;
vendorSha256 = "sha256-e8aKQMVEEf0BzpdljkOBxznj5P1Go/6EbY9mdhDLyrw=";
vendorSha256 = "sha256-i2FOAN1ng3WNOWaFowiSSuYR4LA1Bo3tjkvgcClBXSU=";
doCheck = false;
pkgs/applications/editors/cpeditor/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, qtbase
, qttools
, wrapQtAppsHook
, cmake
, ninja
, python3
, runtimeShell
}:
stdenv.mkDerivation rec {
pname = "cpeditor";
version = "6.10.1";
src = fetchFromGitHub {
owner = "cpeditor";
repo = "cpeditor";
rev = version;
sha256 = "sha256-SIREoOapaZTLtqi0Z07lKmNqF9a9qIpgGxuhqaY3yfU=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook python3 ];
buildInputs = [ qtbase qttools ];
postPatch = ''
substituteInPlace src/Core/Runner.cpp --replace "/bin/bash" "${runtimeShell}"
'';
meta = with lib; {
description = "An IDE specially designed for competitive programming";
homepage = "https://cpeditor.org";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ rewine ];
};
}
pkgs/applications/misc/OSCAR/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
mkDerivation rec {
pname = "OSCAR";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitLab {
owner = "pholy";
repo = "OSCAR-code";
rev = "v${version}";
sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg";
sha256 = "sha256-oKKwX5HiT8RACiqzZegOxH6IHQn/u0N4ih/ubH6YYjg=";
};
buildInputs = [ qtbase qttools qtserialport libGLU ];
pkgs/applications/misc/privacyidea/default.nix
+11 -1
View File
@@ -25,6 +25,16 @@ let
sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
meta = meta // { broken = false; };
});
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = python3.pkgs.fetchPypi {
pname = "PyJWT";
inherit version;
sha256 = "sha256-jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY=";
};
# requires different testing dependencies, and privacyIDEA will test this as well
doCheck = false;
});
};
};
in
@@ -42,7 +52,7 @@ python3'.pkgs.buildPythonPackage rec {
propagatedBuildInputs = with python3'.pkgs; [
cryptography pyrad pymysql python-dateutil flask-versioned flask_script
defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
pydash ecdsa google-auth importlib-metadata
pkgs/applications/networking/browsers/links2/default.nix
+2 -2
View File
@@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
version = "2.23";
version = "2.25";
pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
sha256 = "sha256-ZmDSAvUh/Ri/UYTD8XMtH6dCahAzdCd60c245XzmrEU=";
sha256 = "sha256-LdeFCGmOgnnvTwmjoqIelZUEARNALabFU5dEFPtJ3Sw=";
};
buildInputs = with lib;
pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "scudcloud";
version = "1.63";
version = "1.65";
src = fetchFromGitHub {
owner = "raelgc";
repo = "scudcloud";
rev = "v${version}";
sha256 = "sha256-b8+MVjYKbSpnfM2ow2MNVY6MiT+urpNYDkFR/yUC7ik=";
sha256 = "1ffdy74igll74fwpmnn3brvcxbk4iianqscdzz18sx1pfqpw16cl";
};
propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ];
pkgs/applications/office/portfolio/default.nix
+2 -2
View File
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.55.0";
version = "0.56.2";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "0s7qb7z2wiypiahw1y1lz9pbhxcacj5myzy0qcqjrpnaq7ymvs05";
sha256 = "sha256-4iMLn0KTrH7MOlNduSl7BMOZKPakHhhQdR3NQXV2ZZU=";
};
nativeBuildInputs = [
pkgs/applications/science/math/calc/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.13.0.1";
version = "2.14.0.8";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-auU49XeFxXAacBEszwB6tVU6vTMq4t6q2vVk9AHHNK0=";
sha256 = "sha256-rWosRO7qfgbvylOE8Qf/rudWRAenR0181JKKU7Gig4Y=";
};
postPatch = ''
pkgs/applications/version-management/sublime-merge/common.nix
+1 -1
View File
@@ -17,7 +17,7 @@ let
archSha256 = sha256;
arch = "x64";
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl.out ];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
in let
binaryPackage = stdenv.mkDerivation {
pkgs/applications/version-management/sublime-merge/default.nix
+3 -3
View File
@@ -5,12 +5,12 @@ let
in {
sublime-merge = common {
buildVersion = "2063";
sha256 = "l6vxcOIQ3kQqNzLkf3PbuU3DpDfLh0tXCl/LnJsCt2k=";
sha256 = "0sdp0adrrjsz19blp1yb6yjc6kdrvdrpzr1j6wm49phhw9qg3awp";
} {};
sublime-merge-dev = common {
buildVersion = "2055";
sha256 = "0f5qmxs5cqgdp7gav223ibjwbcrh8bszk1yg1a6hpz8s8j3icvdi";
buildVersion = "2062";
sha256 = "035f4gxbg9mb8p8yynpc6a1id9b8krfnr0gl98ib09bdh96ddan3";
dev = true;
} {};
}
pkgs/desktops/pantheon/apps/elementary-files/default.nix
+9 -11
View File
@@ -32,23 +32,15 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.1.0";
repoName = "files";
version = "6.1.1";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "files";
rev = version;
sha256 = "sha256-aGiFEeSvDV5rPD2Ll/BuDoWclEPhR1UuoCxUSS9CGmw=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY=";
};
nativeBuildInputs = [
@@ -88,6 +80,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "File browser designed for elementary OS";
homepage = "https://github.com/elementary/files";
pkgs/development/compilers/go/1.17.nix
+2 -2
View File
@@ -50,11 +50,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.17.4";
version = "1.17.5";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-S+82mTge8J4HVihQQYdBZWXXEGYP7GWwV+3xzrGH/Es=";
sha256 = "sha256-Pe+5oJvtBCQDGV6HLcvIxvrhSFljMyJ5Zo7FLoCpWi0=";
};
# perl is used for testing go vet
pkgs/development/compilers/openjdk/darwin/11.nix
+20 -8
View File
@@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-11-lts&os=macos&package=jdk
# Note that the latest build may differ by platform
@@ -7,29 +13,34 @@ let
arch = "x64";
zuluVersion = "11.48.21";
jdkVersion = "11.0.11";
sha256 = "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6";
sha256 =
if enableJavaFX then "18bd9cd66d6abc6f8c627bc70278dc8fd4860e138e1dc9e170eddb89727ccc7b"
else "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "11.48.21";
jdkVersion = "11.0.11";
sha256 = "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc";
sha256 =
if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9"
else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc";
};
}."${stdenv.hostPlatform.system}";
jce-policies = fetchurl {
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) sha256;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
@@ -77,4 +88,5 @@ let
meta = import ./meta.nix lib;
};
in jdk
in
jdk
pkgs/development/compilers/openjdk/darwin/16.nix
+20 -8
View File
@@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-16-sts&os=macos&package=jdk
# Note that the latest build may differ by platform
@@ -7,29 +13,34 @@ let
arch = "x64";
zuluVersion = "16.30.15";
jdkVersion = "16.0.1";
sha256 = "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z";
sha256 =
if enableJavaFX then "cbb3b96d80a0675893f21dc51ba3f532049c501bd7dc4c8d1ee930e63032c745"
else "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "16.30.19";
jdkVersion = "16.0.1";
sha256 = "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w";
sha256 =
if enableJavaFX then "a49b23abfd83784d2ac935fc24e25ab7cb09b8ffc8e47c32ed446e05b8a21396"
else "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w";
};
}."${stdenv.hostPlatform.system}";
jce-policies = fetchurl {
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) sha256;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
@@ -77,4 +88,5 @@ let
meta = import ./meta.nix lib;
};
in jdk
in
jdk
pkgs/development/compilers/openjdk/darwin/8.nix
+20 -8
View File
@@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-8-lts&os=macos&package=jdk
# Note that the latest build may differ by platform
@@ -7,32 +13,37 @@ let
arch = "x64";
zuluVersion = "8.54.0.21";
jdkVersion = "8.0.292";
sha256 = "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in";
sha256 =
if enableJavaFX then "e671f8990229b1ca2a76faabb21ba2f1a9e1f7211392e0f657225559be9b05c8"
else "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "8.54.0.21";
jdkVersion = "8.0.292";
sha256 = "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c";
sha256 =
if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6"
else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c";
};
}."${stdenv.hostPlatform.system}";
jce-policies = fetchurl {
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
# @hlolli: Later version than 1.8.0_202 throws error when building jvmci.
# dyld: lazy symbol binding failed: Symbol not found: _JVM_BeforeHalt
# Referenced from: ../libjava.dylib Expected in: .../libjvm.dylib
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) sha256;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
@@ -75,4 +86,5 @@ let
meta = import ./meta.nix lib;
};
in jdk
in
jdk
pkgs/development/interpreters/metamath/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metamath";
version = "0.196";
version = "0.198";
nativeBuildInputs = [ autoreconfHook ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "metamath";
repo = "metamath-exe";
rev = "v${version}";
sha256 = "sha256-/ofH5fq7lUxbbRBAczsLNG3UPsOMbCdcxkB3el5OPcU=";
sha256 = "sha256-Cg1dgz+uphDlGhKH3mTywtAccWinC5+pwNv4TB3YAnI=";
};
meta = with lib; {
pkgs/development/libraries/libthreadar/default.nix
+2 -2
View File
@@ -3,12 +3,12 @@
with lib;
stdenv.mkDerivation rec {
version = "1.3.2";
version = "1.3.5";
pname = "libthreadar";
src = fetchurl {
url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
sha256 = "sha256-q5FiBlncbhdXDgRm7wgxcd4rkxqje/1ls9kPGqmomP0=";
sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8=";
};
outputs = [ "out" "dev" ];
pkgs/development/ocaml-modules/bitv/default.nix
+7 -5
View File
@@ -1,16 +1,18 @@
{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }:
{ stdenv, lib, fetchFromGitHub, autoreconfHook, which, ocaml, findlib }:
if !lib.versionAtLeast ocaml.version "4.02"
then throw "bitv is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-bitv-${version}";
pname = "ocaml${ocaml.version}-bitv";
version = "1.3";
src = fetchzip {
url = "https://github.com/backtracking/bitv/archive/${version}.tar.gz";
sha256 = "0vkh1w9fpi5m1sgiqg6r38j3fqglhdajmbyiyr91113lrpljm75i";
src = fetchFromGitHub {
owner = "backtracking";
repo = "bitv";
rev = version;
sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4=";
};
buildInputs = [ autoreconfHook which ocaml findlib ];
pkgs/development/ocaml-modules/comparelib/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{lib, buildOcaml, fetchurl, type_conv}:
{ lib, buildOcaml, fetchFromGitHub, type_conv }:
buildOcaml rec {
pname = "comparelib";
@@ -6,9 +6,11 @@ buildOcaml rec {
minimumSupportedOcamlVersion = "4.00";
src = fetchurl {
url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz";
sha256 = "02l343drgi4200flfx73nzdk61zajwidsqjk9n80b2d37lvhazlf";
src = fetchFromGitHub {
owner = "janestreet";
repo = "comparelib";
rev = version;
sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA=";
};
propagatedBuildInputs = [ type_conv ];
pkgs/development/ocaml-modules/cryptokit/default.nix
+7 -5
View File
@@ -1,14 +1,16 @@
{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }:
{ lib, buildDunePackage, fetchFromGitHub, zlib, dune-configurator, zarith, ncurses }:
buildDunePackage {
buildDunePackage rec {
pname = "cryptokit";
version = "1.16.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz";
sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c";
src = fetchFromGitHub {
owner = "xavierleroy";
repo = "cryptokit";
rev = "release${lib.replaceStrings ["."] [""] version}";
sha256 = "sha256-eDIzi16Al/mXCNos/lVqjZWCtdP9SllXnRfm4GBWMfA=";
};
# dont do autotools configuration, but do trigger findlib's preConfigure hook
pkgs/development/ocaml-modules/ctypes/default.nix
+11 -9
View File
@@ -1,28 +1,30 @@
{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }:
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }:
if !lib.versionAtLeast ocaml.version "4.02"
then throw "ctypes is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ctypes-${version}";
pname = "ocaml${ocaml.version}-ctypes";
version = "0.18.0";
src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz";
sha256 = "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks";
src = fetchFromGitHub {
owner = "ocamllabs";
repo = "ocaml-ctypes";
rev = version;
sha256 = "sha256-eu5RAuPYC97IM4XUsUw3HQ1BJlEHQ+eBpsdUE6hd+Q8=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib ncurses ];
propagatedBuildInputs = [ integers libffi bigarray-compat ];
buildPhase = ''
make XEN=false libffi.config ctypes-base ctypes-stubs
make XEN=false ctypes-foreign
buildPhase = ''
make XEN=false libffi.config ctypes-base ctypes-stubs
make XEN=false ctypes-foreign
'';
installPhase = ''
installPhase = ''
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
make install XEN=false
'';
pkgs/development/ocaml-modules/dolog/default.nix
+10 -9
View File
@@ -1,13 +1,14 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
let version = "3.0"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "ocaml-dolog";
inherit version;
src = fetchzip {
url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz";
sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb";
version = "3.0";
src = fetchFromGitHub {
owner = "UnixJunkie";
repo = "dolog";
rev = "v${version}";
sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8=";
};
buildInputs = [ ocaml findlib ocamlbuild ];
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/UnixJunkie/dolog";
description = "Minimalistic lazy logger in OCaml";
platforms = ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [ ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ vbgl ];
};
pkgs/development/ocaml-modules/easy-format/default.nix
+10 -10
View File
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchzip, ocaml, findlib }:
let
{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
stdenv.mkDerivation rec {
pname = "easy-format";
version = "1.2.0";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchzip {
url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz";
sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9";
src = fetchFromGitHub {
owner = "mjambon";
repo = "easy-format";
rev = "v${version}";
sha256 = "sha256-qf73+T9a+eDy78iZgpA08TjIo+lvjftfSkwyT3M96gE=";
};
nativeBuildInputs = [ ocaml findlib ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A high-level and functional interface to the Format module of the OCaml standard library";
homepage = "https://github.com/ocaml-community/${pname}";
homepage = "https://github.com/ocaml-community/easy-format";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};
pkgs/development/ocaml-modules/eliom/default.nix
+27 -12
View File
@@ -1,25 +1,40 @@
{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
lwt_react,
opaline, ppx_deriving, findlib
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
{ stdenv
, lib
, fetchFromGitHub
, which
, ocsigen_server
, ocaml
, lwt_react
, opaline
, ppx_deriving
, findlib
, js_of_ocaml-ocamlbuild
, js_of_ocaml-ppx
, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt
, js_of_ocaml-tyxml
, lwt_ppx
, ocamlnet
}:
stdenv.mkDerivation rec
{
stdenv.mkDerivation rec {
pname = "eliom";
version = "8.9.0";
src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
sha256 = "sha256:1b1vb3ilb54ffzb98mqa6zggqchsnjspbni8qxi6j42pbajp7p2l";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "eliom";
rev = version;
sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w=";
};
buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild
js_of_ocaml-ppx_deriving_json opaline
buildInputs = [
ocaml
which
findlib
js_of_ocaml-ocamlbuild
js_of_ocaml-ppx_deriving_json
opaline
ocamlnet
];
@@ -41,7 +56,7 @@ stdenv.mkDerivation rec
homepage = "http://ocsigen.org/eliom/";
description = "OCaml Framework for programming Web sites and client/server Web applications";
longDescription =''Eliom is a framework for programming Web sites
longDescription = ''Eliom is a framework for programming Web sites
and client/server Web applications. It introduces new concepts to
simplify programming common behaviours and uses advanced static
typing features of OCaml to check many properties of the Web site
pkgs/development/ocaml-modules/erm_xml/default.nix
+10 -9
View File
@@ -1,17 +1,18 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
if !lib.versionAtLeast ocaml.version "4.02"
then throw "erm_xml is not available for OCaml ${ocaml.version}"
else
let version = "0.3+20180112"; in
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-erm_xml";
version = "0.3+20180112";
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-erm_xml-${version}";
src = fetchzip {
url = "https://github.com/hannesm/xml/archive/bbabdade807d8281fc48806da054b70dfe482479.tar.gz";
sha256 = "1gawpmg8plip0wia0xq60m024dn7l3ykwbjpbqx9f9bdmx74n1rr";
src = fetchFromGitHub {
owner = "hannesm";
repo = "xml";
rev = "bbabdade807d8281fc48806da054b70dfe482479";
sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0=";
};
buildInputs = [ ocaml findlib ocamlbuild ];
@@ -21,7 +22,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/hannesm/xml";
description = "XML Parser for discrete data";
platforms = ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [ ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ vbgl ];
};
pkgs/development/ocaml-modules/herelib/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{lib, buildOcaml, fetchurl}:
{ lib, buildOcaml, fetchFromGitHub }:
buildOcaml rec {
version = "112.35.00";
@@ -6,9 +6,11 @@ buildOcaml rec {
minimumSupportedOcamlVersion = "4.00";
src = fetchurl {
url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz";
sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs";
src = fetchFromGitHub {
owner = "janestreet";
repo = "herelib";
rev = version;
sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI=";
};
meta = with lib; {
pkgs/development/ocaml-modules/iso8601/default.nix
+10 -9
View File
@@ -1,13 +1,14 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
let version = "0.2.4"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "ocaml-iso8601";
inherit version;
src = fetchzip {
url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz";
sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi";
version = "0.2.4";
src = fetchFromGitHub {
owner = "sagotch";
repo = "ISO8601.ml";
rev = version;
sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo=";
};
buildInputs = [ ocaml findlib ocamlbuild ];
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
homepage = "https://ocaml-community.github.io/ISO8601.ml/";
description = "ISO 8601 and RFC 3999 date parsing for OCaml";
license = lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [ ];
maintainers = with lib.maintainers; [ vbgl ];
};
}
pkgs/development/ocaml-modules/javalib/default.nix
+15 -7
View File
@@ -1,5 +1,11 @@
{ lib, stdenv, fetchzip, which, ocaml, findlib
, camlzip, extlib
{ lib
, stdenv
, fetchFromGitHub
, which
, ocaml
, findlib
, camlzip
, extlib
}:
if !lib.versionAtLeast ocaml.version "4.04"
@@ -7,12 +13,14 @@ then throw "javalib is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-javalib-${version}";
pname = "ocaml${ocaml.version}-javalib";
version = "3.2.1";
src = fetchzip {
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn";
src = fetchFromGitHub {
owner = "javalib-team";
repo = "javalib";
rev = "v${version}";
sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo=";
};
buildInputs = [ which ocaml findlib ];
@@ -26,7 +34,7 @@ stdenv.mkDerivation rec {
configureScript = "./configure.sh";
dontAddPrefix = "true";
dontAddStaticConfigureFlags = true;
configurePlatforms = [];
configurePlatforms = [ ];
propagatedBuildInputs = [ camlzip extlib ];
pkgs/development/ocaml-modules/lwt/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml
{ lib, fetchFromGitHub, pkg-config, ncurses, libev, buildDunePackage, ocaml
, cppo, dune-configurator, ocplib-endian, result
, mmap, seq
, ocaml-syntax-shims
@@ -12,9 +12,11 @@ buildDunePackage rec {
useDune2 = true;
src = fetchzip {
url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "lwt";
rev = version;
sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM=";
};
nativeBuildInputs = [ pkg-config cppo dune-configurator ];
pkgs/development/python-modules/aioesphomeapi/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "10.2.0";
version = "10.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SUM9P7qmP3LWANw8LiwMsT5sN1kZJvqeaBT/ZDmTtwE=";
sha256 = "1z9pybis8yi938i3cgzma4w452ik9vggyyhs3y542zpk4183d7xw";
};
propagatedBuildInputs = [
pkgs/development/python-modules/ascii-magic/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, colorama
, fetchPypi
, pillow
}:
buildPythonPackage rec {
pname = "ascii-magic";
version = "1.6";
src = fetchPypi {
pname = "ascii_magic";
inherit version;
sha256 = "sha256-faVRj3No5z8R4hUaDAYIBKoUniZ7Npt+52U/vXsEalE=";
};
propagatedBuildInputs = [
colorama
pillow
];
# Project is not tagging releases and tests are not shipped with PyPI source
doCheck = false;
pythonImportsCheck = [
"ascii_magic"
];
meta = with lib; {
description = "Python module to converts pictures into ASCII art";
homepage = "https://github.com/LeandroBarone/python-ascii_magic";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/baron/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "baron";
version = "0.9";
version = "0.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "0fib74nkqnl1i2zzlhbbfpw3whwc4951p9x61r2xrxhwp4r9yn5h";
sha256 = "af822ad44d4eb425c8516df4239ac4fdba9fdb398ef77e4924cd7c9b4045bc2f";
};
propagatedBuildInputs = [ rply ];
pkgs/development/python-modules/colorclass/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "colorclass";
version = "2.2.0";
version = "2.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b";
sha256 = "6d4fe287766166a98ca7bc6f6312daf04a0481b1eda43e7173484051c0ab4366";
};
# No tests in archive
pkgs/development/python-modules/deep-translator/default.nix
+33
View File
@@ -0,0 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, requests, click }:
buildPythonPackage rec {
pname = "deep-translator";
version = "1.5.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XARhzRsquvKcdhPcooGIEmhGN7QJOCubcvOrZB0nhxU=";
};
propagatedBuildInputs = [
beautifulsoup4
requests
click
];
# Initializing it during build won't work as it needs connection with
# APIs and the build environment is isolated (#148572 for details).
# After built, it works as intended.
#pythonImportsCheck = [ "deep_translator" ];
# Again, initializing an instance needs network connection.
# Tests will fail.
doCheck = false;
meta = with lib; {
description = "Flexible, free and unlimited Python tool to translate between different languages in a simple way using multiple translators";
homepage = "https://deep-translator.readthedocs.io";
license = licenses.mit;
maintainers = with maintainers; [ wolfangaukang ];
};
}
pkgs/development/python-modules/elmax-api/default.nix
+43
View File
@@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, httpx
, pyjwt
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "elmax-api";
version = "0.0.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "albertogeniola";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YUnLi8+ibUgWoMFMgZPSPbpr286bnWBefxjOV7JfCuY=";
};
propagatedBuildInputs = [
httpx
pyjwt
yarl
];
# Test require network access
doCheck = false;
pythonImportsCheck = [
"elmax_api"
];
meta = with lib; {
description = "Python library for interacting with the Elmax cloud";
homepage = "https://github.com/albertogeniola/elmax-api";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/google-cloud-dlp/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.3.1";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "c6cf11b2d5ddbb931ba11060d0d0daa9188994be3ec9122f9bf24fccae8c907a";
sha256 = "0b249fa87deb57f5c7107a7d5d303673590a6524a7f113fc95f87493f3328606";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
pkgs/development/python-modules/karton-autoit-ripper/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "karton-autoit-ripper";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "1bsqpf9w6d9fjysmnafaglg2w41gsafs2xz4dzcgc7n92shpcs8w";
sha256 = "1gclrrc0n72bfj4m55kk8d69zrfvnlwm9692ni9w7d2231mvv7bw";
};
propagatedBuildInputs = [
pkgs/development/python-modules/moonraker-api/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "moonraker-api";
version = "2.0.2";
version = "2.0.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = pname;
rev = "v${version}";
sha256 = "1ODfwuO8XeleOnpp/dD+8jfEAIesXT1BuImtXTn289U=";
sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61";
};
propagatedBuildInputs = [
pkgs/development/python-modules/nmapthon2/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib
, appdirs
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "nmapthon2";
version = "0.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6mGMB8nW6CqTPxgc1fveh6fJo/t+jpUS6rJ2VR2gU/g=";
};
# Tests are not part of the PyPI source and source is not tagged
# https://github.com/cblopez/nmapthon2/issues/3
doCheck = false;
pythonImportsCheck = [
"nmapthon2"
];
meta = with lib; {
description = "Python library to automate nmap";
homepage = "https://github.com/cblopez/nmapthon2";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/nunavut/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "nunavut";
version = "1.5.1";
version = "1.5.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "2c57a9ffe6d462b0ad1ea49ac3ce9ebb3e8d43b2adf653dbe47eaf1b13be3c3b";
sha256 = "12703306872404be556648ab2282dc1566f4e77bfb9f14747fb13294c9235081";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyjwt/1.nix
-38
View File
@@ -1,38 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, cryptography
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "PyJWT";
version = "1.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
};
postPatch = ''
substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest"
# drop coverage
sed -i '/pytest-cov/d' setup.py
sed -i '/--cov/d' setup.cfg
'';
propagatedBuildInputs = [
cryptography
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "JSON Web Token implementation in Python";
homepage = "https://github.com/jpadilla/pyjwt";
license = licenses.mit;
};
}
pkgs/development/python-modules/pysatochip/default.nix
+2 -2
View File
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "pysatochip";
version = "0.12.3";
version = "0.14.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "24db358a65c0402c299c0c62efcfbbfc98e494181cd30d3996949ac667d5b4d4";
sha256 = "eba800c82ea45e2524c0773a71c36e525d7c18148e6066e336950cef484555f5";
};
postPatch = ''
pkgs/development/python-modules/pysnooper/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "0.4.1";
version = "1.0.0";
pname = "pysnooper";
src = fetchPypi {
inherit version;
pname = "PySnooper";
sha256 = "1xngly13x3ylwwcdml2ns8skpxip2myzavp3b9ff2dpqaalf0hdl";
sha256 = "4804aed962f36db85fefdc33edbd109b96a13153e6ffed82d1e6023b4f483b64";
};
# test dependency python-toolbox fails with py27
pkgs/development/python-modules/spglib/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "spglib";
version = "1.16.1";
version = "1.16.3";
src = fetchPypi {
inherit pname version;
sha256 = "9fd2fefbd83993b135877a69c498d8ddcf20a9980562b65b800cfb4cdadad003";
sha256 = "ff1420967d64c2d4f0d747886116a6836d9b473454cdd73d560dbfe973a8a038";
};
propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/tesla-wall-connector/default.nix
+17 -10
View File
@@ -1,25 +1,28 @@
{ lib
, aiohttp
, backoff
, aioresponses
, aresponses
, backoff
, buildPythonPackage
, fetchPypi
, pytest-aiohttp
, pytestCheckHook
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "tesla-wall-connector";
version = "1.0.0";
version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "PVgM6tC8jy/tXytkAVC0Y4Oatap5YFA3vpkUgAdyTxM=";
src = fetchFromGitHub {
owner = "einarhauks";
repo = pname;
rev = version;
sha256 = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE=";
};
nativeBuildInputs = [
@@ -31,8 +34,12 @@ buildPythonPackage rec {
backoff
];
# https://github.com/einarhauks/tesla-wall-connector/issues/1
doCheck = false;
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"tesla_wall_connector"
pkgs/development/python-modules/trimesh/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.9.35";
version = "3.9.36";
src = fetchPypi {
inherit pname version;
sha256 = "1632a09c7b3c152170dbad05b796033540feba4746a8e9c4a437eaa563c47bc9";
sha256 = "f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e";
};
propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/types-pytz/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2021.3.1";
version = "2021.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3/138+/s07FVXxh6m/OmONVfrClnALgpxBvVHscqbrc=";
sha256 = "sha256-xO42Rm+u2a8zTRUJPQXOpBYyPS0EMVi7WCu5TAQav1E=";
};
# Modules doesn't have tests
pkgs/development/python-modules/wasabi/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "wasabi";
version = "0.8.2";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "b4a36aaa9ca3a151f0c558f269d442afbb3526f0160fd541acd8a0d5e5712054";
sha256 = "152245d892030a3a7b511038e9472acff6d0e237cfe4123fef0d147f2d3274fc";
};
checkInputs = [ pytestCheckHook ];
pkgs/development/python-modules/weconnect-mqtt/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, paho-mqtt
, weconnect
}:
buildPythonPackage rec {
pname = "weconnect-mqtt";
version = "0.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tillsteinbach";
repo = "WeConnect-mqtt";
rev = "v${version}";
sha256 = "sha256-RUOOHVX9IY24ZpDE7nQr//JxtQZgowcT5PrTgzaTK6Q=";
};
propagatedBuildInputs = [
paho-mqtt
weconnect
];
postPatch = ''
substituteInPlace weconnect_mqtt/__version.py \
--replace "develop" "${version}"
substituteInPlace pytest.ini \
--replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""
'';
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"weconnect_mqtt"
];
meta = with lib; {
description = "Python client that publishes data from Volkswagen WeConnect";
homepage = "https://github.com/tillsteinbach/WeConnect-mqtt";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/weconnect/default.nix
+58
View File
@@ -0,0 +1,58 @@
{ lib
, ascii-magic
, buildPythonPackage
, fetchFromGitHub
, pillow
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "weconnect";
version = "0.26.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tillsteinbach";
repo = "WeConnect-python";
rev = "v${version}";
sha256 = "sha256-30guJudGOY8WAYupX89hx6mFwfAPASnKMSa+0kDbtfQ=";
};
propagatedBuildInputs = [
ascii-magic
pillow
requests
];
checkInputs = [
pytest-httpserver
pytestCheckHook
];
postPatch = ''
substituteInPlace weconnect/__version.py \
--replace "develop" "${version}"
substituteInPlace setup.py \
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
substituteInPlace pytest.ini \
--replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""
'';
pythonImportsCheck = [
"weconnect"
];
meta = with lib; {
description = "Python client for the Volkswagen WeConnect Services";
homepage = "https://github.com/tillsteinbach/WeConnect-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/wtf-peewee/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "wtf-peewee";
version = "3.0.2";
version = "3.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "03qs6np5s9r0nmsryfzll29ajcqk27b18kcbgd9plf80ys3nb6kd";
sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15";
};
propagatedBuildInputs = [
pkgs/development/python-modules/xml2rfc/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.11.1";
version = "3.12.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-V1Epv5TJ4+Gnh096jeQIN0HOCj+GoCdQW/Pol5iBrFw=";
sha256 = "25deadb9ee95f0dc71376a60e9c1e34636b5016c1952ad5597a6246495e34464";
};
propagatedBuildInputs = [
pkgs/development/python-modules/xmlschema/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
version = "1.9.0";
version = "1.9.1";
pname = "xmlschema";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
sha256 = "0sfpylajab0xjpaqrlqmbwnby6w848y1y9fsv9xlqazxiyzwil46";
sha256 = "0z1mqjilnmbsdr8hw787irdk7419df2x8k765l9n5pb6ykdgz131";
};
propagatedBuildInputs = [
pkgs/development/python-modules/z3c-checkversions/default.nix
+2 -2
View File
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "z3c-checkversions";
version = "1.1";
version = "1.2";
src = fetchPypi {
inherit version;
pname = "z3c.checkversions";
sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d";
sha256 = "94c7ab0810ee6fdb66a4689b48e537b57e2dbee277cb1de2ece7a7f4d8c83001";
};
propagatedBuildInputs = [ zc-buildout ];
pkgs/development/web/postman/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "postman";
version = "9.1.4";
version = "9.3.1";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "bUhJ1vbesTibXF8rZuVWd5EY8uBbGaYGEbPKSXAVAsE=";
sha256 = "sha256-zHJOmvbg/z8tsor7y7vM0ECZjPaOqjNuBgcqtCCvqiE=";
name = "${pname}.tar.gz";
};
pkgs/games/gotypist/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gotypist";
version = "0.8.2";
src = fetchFromGitHub {
owner = "pb-";
repo = "gotypist";
rev = "${version}";
sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11";
};
vendorSha256 = null;
meta = with lib; {
description = "A touch-typing tutor";
longDescription = ''
A simple touch-typing tutor that follows Steve Yegge's methodology of
going in fast, slow, and medium cycles.
'';
homepage = "https://github.com/pb-/gotypist";
license = licenses.mit;
maintainers = [ "Paul Baecher" ];
};
}
pkgs/os-specific/linux/nvme-cli/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "nvme-cli";
version = "1.15";
version = "1.16";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${version}";
sha256 = "0qr1wa163cb7z6g083nl3zcc28mmlbxh1m97pd54bp3gyrhmdhhr";
sha256 = "sha256-/wDQxsN1sji56zfcvqx02iciYnyxjIbL85bNaRwrHYw=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/os-specific/linux/pam_u2f/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pam_u2f";
version = "1.1.1";
version = "1.2.0";
src = fetchurl {
url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
sha256 = "12p3pkrp32vzpg7707cgx8zgvgj8iqwhy39sm761k7plqi027mmp";
sha256 = "sha256-IwPm+Zsf3o7jw6sopN4tpt3SJclTaT6EXWstg4giH7M=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/servers/psitransfer/default.nix
+42
View File
@@ -0,0 +1,42 @@
# To update package version:
# 1. Change version string in node-package.json and this file
# 2. Run `./generate.sh` to rebuild node dependencies with node2nix
# 3. Build this package `nix-build -A psitransfer`
# 4. Profit
{ stdenv
, pkgs
, lib
, nodejs
, fetchzip
}:
let
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
psitransfer = lib.head (lib.attrValues nodePackages);
combined = psitransfer.override rec {
# version is not defined in source package.json
# version must also be maintained in node-packages.json for node2nix
version = "2.0.1";
# override node2nix package src to pull pre-built release of same version
src = fetchzip {
url = "https://github.com/psi-4ward/psitransfer/releases/download/v${version}/psitransfer-v${version}.tar.gz";
sha256 = "mfldWTVmfcIRa+1g8YDnQqem5YmrFRfCxJoitWcXvns=";
stripRoot = false;
};
meta = with lib; {
homepage = "https://github.com/psi-4ward/psitransfer";
description = "Simple open source self-hosted file sharing solution";
license = licenses.bsd2;
maintainers = with maintainers; [ hyshka ];
};
};
in
combined
pkgs/servers/psitransfer/generate.sh
Executable
+10
View File
@@ -0,0 +1,10 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
set -euo pipefail
node2nix \
--input node-packages.json \
--output node-packages.nix \
--composition node-composition.nix \
--node-env ../../development/node-packages/node-env.nix \
;
pkgs/servers/psitransfer/node-composition.nix
+17
View File
@@ -0,0 +1,17 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}
pkgs/servers/psitransfer/node-packages.json
+3
View File
@@ -0,0 +1,3 @@
[
{ "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.0.1" }
]
pkgs/servers/psitransfer/node-packages.nix
Generated
+1713
View File
File diff suppressed because it is too large Load Diff
pkgs/tools/admin/azure-cli/default.nix
+1 -2
View File
@@ -14,8 +14,7 @@ let
# put packages that needs to be overriden in the py package scope
py = import ./python-packages.nix {
inherit stdenv lib src version;
python = python3;
inherit stdenv lib src version python3;
};
in
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
pkgs/tools/admin/azure-cli/python-packages.nix
+4 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, python, lib, src, version }:
{ stdenv, python3, lib, src, version }:
let
buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage attrs;
@@ -25,7 +25,7 @@ let
pythonNamespaces = [ "azure.mgmt" ];
});
py = python.override {
py = python3.override {
packageOverrides = self: super: {
inherit buildAzureCliPackage;
@@ -38,6 +38,7 @@ let
propagatedBuildInputs = with self; [
adal
antlr4-python3-runtime
argcomplete
azure-common
azure-cli-telemetry
@@ -63,9 +64,7 @@ let
requests
six
tabulate
]
++ lib.optionals isPy3k [ antlr4-python3-runtime ]
++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ];
];
postPatch = ''
substituteInPlace setup.py \
pkgs/tools/graphics/pstoedit/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "pstoedit";
version = "3.75";
version = "3.78";
src = fetchurl {
url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz";
sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp";
sha256 = "sha256-jMKONLx/iNkTeA+AdOgT3VqqCsIFams21L8ASg6Q2AE=";
};
#
pkgs/development/python-modules/pre-commit/default.nix → pkgs/tools/misc/pre-commit/default.nix
+3 -14
View File
@@ -1,18 +1,6 @@
{ lib
, buildPythonPackage
, cfgv
, fetchPypi
, identify
, importlib-metadata
, importlib-resources
, nodeenv
, python
, pythonOlder
, pyyaml
, toml
, virtualenv
}:
{ lib, python3Packages }:
with python3Packages;
buildPythonPackage rec {
pname = "pre-commit";
version = "2.16.0";
@@ -28,6 +16,7 @@ buildPythonPackage rec {
patches = [
./languages-use-the-hardcoded-path-to-python-binaries.patch
./hook-tmpl.patch
];
propagatedBuildInputs = [
pkgs/tools/misc/pre-commit/hook-tmpl.patch
+15
View File
@@ -0,0 +1,15 @@
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
index 53d29f9..66a8ad3 100755
--- a/pre_commit/resources/hook-tmpl
+++ b/pre_commit/resources/hook-tmpl
@@ -10,9 +10,7 @@ ARGS=(hook-impl)
HERE="$(cd "$(dirname "$0")" && pwd)"
ARGS+=(--hook-dir "$HERE" -- "$@")
-if [ -x "$INSTALL_PYTHON" ]; then
- exec "$INSTALL_PYTHON" -mpre_commit "${ARGS[@]}"
-elif command -v pre-commit > /dev/null; then
+if command -v pre-commit > /dev/null; then
exec pre-commit "${ARGS[@]}"
else
echo '`pre-commit` not found. Did you forget to activate your virtualenv?' 1>&2
pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch → pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
View File
pkgs/tools/misc/wlc/default.nix
-1
View File
@@ -18,7 +18,6 @@ buildPythonPackage rec {
python-dateutil
requests
pyxdg
pre-commit
responses
twine
];
pkgs/tools/security/pcsctools/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "pcsc-tools";
version = "1.5.7";
version = "1.5.8";
src = fetchurl {
url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2";
sha256 = "17b9jxvcxmn007lavan20l25v4jvm6dqc4x9dlqzbg6mjs28zsp0";
sha256 = "sha256-h8HtvbjJc1Bj9oiqPgXjiTqI54syLcaa+AdX7ZAoIhI=";
};
postPatch = ''
pkgs/tools/security/pgpdump/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "pgpdump";
version = "0.33";
version = "0.34";
src = fetchFromGitHub {
owner = "kazu-yamamoto";
repo = "pgpdump";
rev = "v${version}";
sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23";
sha256 = "1vvxhbz8nqzw9gf7cdmas2shzziznsqj84w6w74h8zzgb4m3byzz";
};
buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ];
pkgs/tools/system/rocm-smi/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rocm-smi";
version = "4.3.1";
version = "4.5.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm_smi_lib";
rev = "rocm-${version}";
hash = "sha256-Ckno73Otkc9rHEUkSgNoOui+6ZHGUF+B9iAoe0NQH0c=";
hash = "sha256-zfsNGDAwBD91w0loWxd8AwuZ3kZSPCXMxxQnX6ktOiE=";
};
nativeBuildInputs = [ cmake wrapPython ];
pkgs/tools/text/mdbook-plantuml/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib, fetchFromGitHub, stdenv, rustPlatform, darwin, pkg-config, openssl
, libiconv, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "mdbook-plantuml";
version = "0.7.0";
src = fetchFromGitHub {
owner = "sytsereitsma";
repo = pname;
rev = "v${version}";
sha256 = "1m53sp3k387injn6mwk2c6rkzw16b12m4j7q0p69fdb3fiqbkign";
};
cargoSha256 = "0xi14k86ym3rfz6901lmj444y814m7vp90bwsyjmcph3hdv6mjp0";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
description = "mdBook preprocessor to render PlantUML diagrams to png images in the book output directory";
homepage = "https://github.com/sytsereitsma/mdbook-plantuml";
license = [ licenses.mit ];
maintainers = with maintainers; [ jcouyang ];
};
}
pkgs/top-level/all-packages.nix
+13 -1
View File
@@ -3140,6 +3140,8 @@ with pkgs;
gotify-desktop = callPackage ../tools/misc/gotify-desktop { };
gotypist = callPackage ../games/gotypist { };
gping = callPackage ../tools/networking/gping { };
gpu-burn = callPackage ../applications/misc/gpu-burn { };
@@ -7094,6 +7096,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdbook-plantuml = callPackage ../tools/text/mdbook-plantuml {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdcat = callPackage ../tools/text/mdcat {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (python3Packages) ansi2html;
@@ -8713,6 +8719,8 @@ with pkgs;
plex = callPackage ../servers/plex { };
plexRaw = callPackage ../servers/plex/raw.nix { };
psitransfer = callPackage ../servers/psitransfer { };
tab = callPackage ../tools/text/tab { };
tabview = with python3Packages; toPythonApplication tabview;
@@ -8797,7 +8805,7 @@ with pkgs;
pptpd = callPackage ../tools/networking/pptpd {};
pre-commit = with python3Packages; toPythonApplication pre-commit;
pre-commit = callPackage ../tools/misc/pre-commit { };
pretty-simple = callPackage ../development/tools/pretty-simple { };
@@ -24517,6 +24525,8 @@ with pkgs;
ffmpeg = ffmpeg-full;
};
cpeditor = libsForQt515.callPackage ../applications/editors/cpeditor { };
csa = callPackage ../applications/audio/csa { };
csound = callPackage ../applications/audio/csound { };
@@ -31230,6 +31240,8 @@ with pkgs;
deeptools = callPackage ../applications/science/biology/deeptools { python = python3; };
deep-translator = with python3Packages; toPythonApplication deep-translator;
delly = callPackage ../applications/science/biology/delly { };
diamond = callPackage ../applications/science/biology/diamond { };
pkgs/top-level/python-packages.nix
+18 -8
View File
@@ -550,6 +550,8 @@ in {
appdirs = callPackage ../development/python-modules/appdirs { };
appleseed = toPythonModule (pkgs.appleseed.override { python3 = self.python; });
applicationinsights = callPackage ../development/python-modules/applicationinsights { };
appnope = callPackage ../development/python-modules/appnope { };
@@ -608,6 +610,8 @@ in {
asana = callPackage ../development/python-modules/asana { };
ascii-magic = callPackage ../development/python-modules/ascii-magic { };
asciimatics = callPackage ../development/python-modules/asciimatics { };
asciitree = callPackage ../development/python-modules/asciitree { };
@@ -2015,6 +2019,8 @@ in {
deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };
deep-translator = callPackage ../development/python-modules/deep-translator { };
deezer-py = callPackage ../development/python-modules/deezer-py { };
deezer-python = callPackage ../development/python-modules/deezer-python { };
@@ -2469,6 +2475,8 @@ in {
elmax = callPackage ../development/python-modules/elmax { };
elmax-api = callPackage ../development/python-modules/elmax-api { };
emailthreads = callPackage ../development/python-modules/emailthreads { };
email_validator = callPackage ../development/python-modules/email-validator { };
@@ -5233,6 +5241,8 @@ in {
nltk = callPackage ../development/python-modules/nltk { };
nmapthon2 = callPackage ../development/python-modules/nmapthon2 { };
nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
nmigen = callPackage ../development/python-modules/nmigen { };
@@ -5452,10 +5462,10 @@ in {
opentracing = callPackage ../development/python-modules/opentracing { };
openvino = disabledIf isPy27 (toPythonModule (pkgs.openvino.override {
openvino = toPythonModule (pkgs.openvino.override {
inherit (self) python;
enablePython = true;
}));
});
openwebifpy = callPackage ../development/python-modules/openwebifpy { };
@@ -6087,8 +6097,6 @@ in {
prefixed = callPackage ../development/python-modules/prefixed { };
pre-commit = callPackage ../development/python-modules/pre-commit { };
pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { };
preggy = callPackage ../development/python-modules/preggy { };
@@ -6109,8 +6117,6 @@ in {
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { };
pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };
proboscis = callPackage ../development/python-modules/proboscis { };
process-tests = callPackage ../development/python-modules/process-tests { };
@@ -8215,9 +8221,9 @@ in {
recaptcha_client = callPackage ../development/python-modules/recaptcha_client { };
recoll = disabledIf (!isPy3k) (toPythonModule (pkgs.recoll.override {
recoll = toPythonModule (pkgs.recoll.override {
python3Packages = self;
}));
});
recommonmark = callPackage ../development/python-modules/recommonmark { };
@@ -10085,6 +10091,10 @@ in {
webthing = callPackage ../development/python-modules/webthing { };
weconnect = callPackage ../development/python-modules/weconnect { };
weconnect-mqtt = callPackage ../development/python-modules/weconnect-mqtt { };
werkzeug = callPackage ../development/python-modules/werkzeug { };
werkzeug1 = callPackage ../development/python-modules/werkzeug/1.nix { };
pkgs/top-level/python2-packages.nix
+7 -3
View File
@@ -12,7 +12,7 @@ with self; with super; {
inherit (pkgs) antlr4;
};
appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; });
appleseed = disabled super.appleseed;
application = callPackage ../development/python-modules/application { };
@@ -373,6 +373,8 @@ with self; with super; {
openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { };
openvino = disabled super.openvino;
openwrt-luci-rpc = disabled super.openwrt-luci-rpc;
opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { };
@@ -455,8 +457,6 @@ with self; with super; {
pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { };
pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { };
pykickstart = callPackage ../development/python-modules/pykickstart { };
pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { };
@@ -520,6 +520,8 @@ with self; with super; {
remotecv = callPackage ../development/python-modules/remotecv { };
recoll = disabled super.recoll;
rhpl = callPackage ../development/python-modules/rhpl { };
rivet = disabled super.rivet;
@@ -616,6 +618,8 @@ with self; with super; {
tarman = callPackage ../development/python-modules/tarman { };
tensorflow-bin = disabled super.tensorflow-bin;
thumbor = callPackage ../development/python-modules/thumbor { };
tmdb3 = callPackage ../development/python-modules/tmdb3 { };