diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b69988a92b0c..a94b761de1d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -233,6 +233,7 @@
/pkgs/applications/blockchains @mmahut @RaghavSood
# Go
+/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index 45d85f1f99ec..7cbf51c8e373 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -29,8 +29,6 @@ pet = buildGoModule rec {
vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j";
- runVend = true;
-
meta = with lib; {
description = "Simple command-line snippet manager, written in Go";
homepage = "https://github.com/knqyf263/pet";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c657501c73cd..c78ac6d69b43 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8657,7 +8657,7 @@
};
noreferences = {
email = "norkus@norkus.net";
- github = "noreferences";
+ github = "jozuas";
githubId = 13085275;
name = "Juozas Norkus";
};
@@ -11634,6 +11634,12 @@
githubId = 280235;
name = "Terje Larsen";
};
+ terrorjack = {
+ email = "astrohavoc@gmail.com";
+ github = "TerrorJack";
+ githubId = 3889585;
+ name = "Cheng Shao";
+ };
tesq0 = {
email = "mikolaj.galkowski@gmail.com";
github = "tesq0";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index a57fd5186cbc..4b3eea55290e 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -81,6 +81,14 @@
services.maddy.
+
+
+ tetrd, share your
+ internet connection from your device to your PC and vice versa
+ through a USB cable. Available at
+ services.tetrd.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 804db667ecfb..b4caca17f720 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable).
+- [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable).
+
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dfdac4251a49..e8bbaacc2c5a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -563,7 +563,6 @@
./services/misc/mediatomb.nix
./services/misc/metabase.nix
./services/misc/moonraker.nix
- ./services/misc/mwlib.nix
./services/misc/mx-puppet-discord.nix
./services/misc/n8n.nix
./services/misc/nitter.nix
@@ -739,7 +738,6 @@
./services/networking/eternal-terminal.nix
./services/networking/fakeroute.nix
./services/networking/ferm.nix
- ./services/networking/firefox/sync-server.nix
./services/networking/fireqos.nix
./services/networking/firewall.nix
./services/networking/flannel.nix
@@ -1034,7 +1032,6 @@
./services/web-apps/sogo.nix
./services/web-apps/rss-bridge.nix
./services/web-apps/tt-rss.nix
- ./services/web-apps/trac.nix
./services/web-apps/trilium.nix
./services/web-apps/selfoss.nix
./services/web-apps/shiori.nix
diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 41db4f0136ef..8c10d7c4df39 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -74,8 +74,10 @@ in {
You will get file collisions if you put the actual application binary in
- the global environment and applications started via .desktop files are
- not wrapped if they specify the absolute path to the binary.
+ the global environment (such as by adding the application package to
+ environment.systemPackages), and applications started via
+ .desktop files are not wrapped if they specify the absolute path to the
+ binary.
'';
};
};
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index c290741da043..15c3a8dc1ab4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -21,8 +21,7 @@ with lib;
(mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
- (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
- (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
+ (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
@@ -38,6 +37,7 @@ with lib;
(mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
+ (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
(mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
deleted file mode 100644
index fedc1e5542a4..000000000000
--- a/nixos/modules/services/misc/mwlib.nix
+++ /dev/null
@@ -1,264 +0,0 @@
-{ config, lib, options, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.mwlib;
- opt = options.services.mwlib;
- pypkgs = pkgs.python27Packages;
-
- inherit (pypkgs) python mwlib;
-
- user = mkOption {
- default = "nobody";
- type = types.str;
- description = "User to run as.";
- };
-
-in
-{
-
- options.services.mwlib = {
-
- nserve = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Whether to enable nserve. Nserve is a HTTP
- server. The Collection extension is talking to
- that program directly. Nserve uses at least
- one qserve instance in order to distribute
- and manage jobs.
- '';
- }; # nserve.enable
-
- port = mkOption {
- default = 8899;
- type = types.port;
- description = "Specify port to listen on.";
- }; # nserve.port
-
- address = mkOption {
- default = "127.0.0.1";
- type = types.str;
- description = "Specify network interface to listen on.";
- }; # nserve.address
-
- qserve = mkOption {
- default = [ "${cfg.qserve.address}:${toString cfg.qserve.port}" ];
- defaultText = literalExpression ''
- [ "''${config.${opt.qserve.address}}:''${toString config.${opt.qserve.port}}"
- ]'';
- type = types.listOf types.str;
- description = "Register qserve instance.";
- }; # nserve.qserve
-
- inherit user;
- }; # nserve
-
- qserve = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- A job queue server used to distribute and manage
- jobs. You should start one qserve instance
- for each machine that is supposed to render pdf
- files. Unless you’re operating the Wikipedia
- installation, one machine should suffice.
- '';
- }; # qserve.enable
-
- port = mkOption {
- default = 14311;
- type = types.port;
- description = "Specify port to listen on.";
- }; # qserve.port
-
- address = mkOption {
- default = "127.0.0.1";
- type = types.str;
- description = "Specify network interface to listen on.";
- }; # qserve.address
-
- datadir = mkOption {
- default = "/var/lib/mwlib-qserve";
- type = types.path;
- description = "qserve data directory (FIXME: unused?)";
- }; # qserve.datadir
-
- allow = mkOption {
- default = [ "127.0.0.1" ];
- type = types.listOf types.str;
- description = "List of allowed client IPs. Empty means any.";
- }; # qserve.allow
-
- inherit user;
- }; # qserve
-
- nslave = {
- enable = mkOption {
- default = cfg.qserve.enable;
- defaultText = literalExpression "config.${opt.qserve.enable}";
- type = types.bool;
- description = ''
- Pulls new jobs from exactly one qserve instance
- and calls the zip and render programs
- in order to download article collections and
- convert them to different output formats. Nslave
- uses a cache directory to store the generated
- documents. Nslave also starts an internal http
- server serving the content of the cache directory.
- '';
- }; # nslave.enable
-
- cachedir = mkOption {
- default = "/var/cache/mwlib-nslave";
- type = types.path;
- description = "Directory to store generated documents.";
- }; # nslave.cachedir
-
- numprocs = mkOption {
- default = 10;
- type = types.int;
- description = "Number of parallel jobs to be executed.";
- }; # nslave.numprocs
-
- http = mkOption {
- default = {};
- description = ''
- Internal http server serving the content of the cache directory.
- You have to enable it, or use your own way for serving files
- and set the http.url option accordingly.
- '';
- type = types.submodule ({ config, options, ... }: {
- options = {
- enable = mkOption {
- default = true;
- type = types.bool;
- description = "Enable internal http server.";
- }; # nslave.http.enable
-
- port = mkOption {
- default = 8898;
- type = types.port;
- description = "Port to listen to when serving files from cache.";
- }; # nslave.http.port
-
- address = mkOption {
- default = "127.0.0.1";
- type = types.str;
- description = "Specify network interface to listen on.";
- }; # nslave.http.address
-
- url = mkOption {
- default = "http://localhost:${toString config.port}/cache";
- defaultText = literalExpression ''"http://localhost:''${toString config.${options.port}}/cache"'';
- type = types.str;
- description = ''
- Specify URL for accessing generated files from cache.
- The Collection extension of Mediawiki won't be able to
- download files without it.
- '';
- }; # nslave.http.url
- };
- }); # types.submodule
- }; # nslave.http
-
- inherit user;
- }; # nslave
-
- }; # options.services
-
- config = {
-
- systemd.services.mwlib-nserve = mkIf cfg.nserve.enable
- {
- description = "mwlib network interface";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "mwlib-qserve.service" ];
-
- serviceConfig = {
- ExecStart = concatStringsSep " " (
- [
- "${mwlib}/bin/nserve"
- "--port ${toString cfg.nserve.port}"
- "--interface ${cfg.nserve.address}"
- ] ++ cfg.nserve.qserve
- );
- User = cfg.nserve.user;
- };
- }; # systemd.services.mwlib-nserve
-
- systemd.services.mwlib-qserve = mkIf cfg.qserve.enable
- {
- description = "mwlib job queue server";
-
- wantedBy = [ "multi-user.target" ];
-
- preStart = ''
- mkdir -pv '${cfg.qserve.datadir}'
- chown -Rc ${cfg.qserve.user}:`id -ng ${cfg.qserve.user}` '${cfg.qserve.datadir}'
- chmod -Rc u=rwX,go= '${cfg.qserve.datadir}'
- '';
-
- serviceConfig = {
- ExecStart = concatStringsSep " " (
- [
- "${mwlib}/bin/mw-qserve"
- "-p ${toString cfg.qserve.port}"
- "-i ${cfg.qserve.address}"
- "-d ${cfg.qserve.datadir}"
- ] ++ map (a: "-a ${a}") cfg.qserve.allow
- );
- User = cfg.qserve.user;
- PermissionsStartOnly = true;
- };
- }; # systemd.services.mwlib-qserve
-
- systemd.services.mwlib-nslave = mkIf cfg.nslave.enable
- {
- description = "mwlib worker";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
-
- preStart = ''
- mkdir -pv '${cfg.nslave.cachedir}'
- chown -Rc ${cfg.nslave.user}:`id -ng ${cfg.nslave.user}` '${cfg.nslave.cachedir}'
- chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}'
- '';
-
- path = with pkgs; [ imagemagick pdftk ];
- environment = {
- PYTHONPATH = concatMapStringsSep ":"
- (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")
- [ "mwlib-rl" "mwlib-ext" "pygments" "pyfribidi" ];
- };
-
- serviceConfig = {
- ExecStart = concatStringsSep " " (
- [
- "${mwlib}/bin/nslave"
- "--cachedir ${cfg.nslave.cachedir}"
- "--numprocs ${toString cfg.nslave.numprocs}"
- "--url ${cfg.nslave.http.url}"
- ] ++ (
- if cfg.nslave.http.enable then
- [
- "--serve-files-port ${toString cfg.nslave.http.port}"
- "--serve-files-address ${cfg.nslave.http.address}"
- ] else
- [
- "--no-serve-files"
- ]
- ));
- User = cfg.nslave.user;
- PermissionsStartOnly = true;
- };
- }; # systemd.services.mwlib-nslave
-
- }; # config
-}
diff --git a/nixos/modules/services/networking/croc.nix b/nixos/modules/services/networking/croc.nix
index 9466adf71d8c..d044979e10df 100644
--- a/nixos/modules/services/networking/croc.nix
+++ b/nixos/modules/services/networking/croc.nix
@@ -51,7 +51,7 @@ in
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
- ProtectProc = "noaccess";
+ ProtectProc = "invisible";
ProtectSystem = "strict";
RemoveIPC = true;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
deleted file mode 100644
index 1ad573abfca3..000000000000
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.firefox.syncserver;
-
- defaultDbLocation = "/var/db/firefox-sync-server/firefox-sync-server.db";
- defaultSqlUri = "sqlite:///${defaultDbLocation}";
-
- syncServerIni = pkgs.writeText "syncserver.ini" ''
- [DEFAULT]
- overrides = ${cfg.privateConfig}
-
- [server:main]
- use = egg:gunicorn
- host = ${cfg.listen.address}
- port = ${toString cfg.listen.port}
-
- [app:main]
- use = egg:syncserver
-
- [syncserver]
- public_url = ${cfg.publicUrl}
- ${optionalString (cfg.sqlUri != "") "sqluri = ${cfg.sqlUri}"}
- allow_new_users = ${boolToString cfg.allowNewUsers}
-
- [browserid]
- backend = tokenserver.verifiers.LocalVerifier
- audiences = ${removeSuffix "/" cfg.publicUrl}
- '';
-
- user = "syncserver";
- group = "syncserver";
-in
-
-{
- meta.maintainers = with lib.maintainers; [ nadrieril ];
-
- options = {
- services.firefox.syncserver = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable a Firefox Sync Server, this give the opportunity to
- Firefox users to store all synchronized data on their own server. To use this
- server, Firefox users should visit the , and
- replicate the following change
-
-
- services.sync.tokenServerURI: http://localhost:5000/token/1.0/sync/1.5
-
-
- where corresponds to the
- public url of the server.
- '';
- };
-
- listen.address = mkOption {
- type = types.str;
- default = "127.0.0.1";
- example = "0.0.0.0";
- description = ''
- Address on which the sync server listen to.
- '';
- };
-
- listen.port = mkOption {
- type = types.port;
- default = 5000;
- description = ''
- Port on which the sync server listen to.
- '';
- };
-
- publicUrl = mkOption {
- type = types.str;
- default = "http://localhost:5000/";
- example = "http://sync.example.com/";
- description = ''
- Public URL with which firefox users can use to access the sync server.
- '';
- };
-
- allowNewUsers = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to allow new-user signups on the server. Only request by
- existing accounts will be honored.
- '';
- };
-
- sqlUri = mkOption {
- type = types.str;
- default = defaultSqlUri;
- example = "postgresql://scott:tiger@localhost/test";
- description = ''
- The location of the database. This URL is composed of
- ,
- where is a database name such as
- , , ,
- etc., and the name of a DBAPI, such as
- , , ,
- etc. The
- SQLAlchemy documentation provides more examples and describe the syntax of
- the expected URL.
- '';
- };
-
- privateConfig = mkOption {
- type = types.str;
- default = "/etc/firefox/syncserver-secret.ini";
- description = ''
- The private config file is used to extend the generated config with confidential
- information, such as the setting if it contains a
- password, and the setting is used by the server to
- generate cryptographically-signed authentication tokens.
-
- If this file does not exist, then it is created with a generated
- settings.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
-
- systemd.services.syncserver = {
- after = [ "network.target" ];
- description = "Firefox Sync Server";
- wantedBy = [ "multi-user.target" ];
- path = [
- pkgs.coreutils
- (pkgs.python.withPackages (ps: [ pkgs.syncserver ps.gunicorn ]))
- ];
-
- serviceConfig = {
- User = user;
- Group = group;
- PermissionsStartOnly = true;
- };
-
- preStart = ''
- if ! test -e ${cfg.privateConfig}; then
- mkdir -p $(dirname ${cfg.privateConfig})
- echo > ${cfg.privateConfig} '[syncserver]'
- chmod 600 ${cfg.privateConfig}
- echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
- fi
- chmod 600 ${cfg.privateConfig}
- chmod 755 $(dirname ${cfg.privateConfig})
- chown ${user}:${group} ${cfg.privateConfig}
-
- '' + optionalString (cfg.sqlUri == defaultSqlUri) ''
- if ! test -e $(dirname ${defaultDbLocation}); then
- mkdir -m 700 -p $(dirname ${defaultDbLocation})
- chown ${user}:${group} $(dirname ${defaultDbLocation})
- fi
-
- # Move previous database file if it exists
- oldDb="/var/db/firefox-sync-server.db"
- if test -f $oldDb; then
- mv $oldDb ${defaultDbLocation}
- chown ${user}:${group} ${defaultDbLocation}
- fi
- '';
-
- script = ''
- gunicorn --paste ${syncServerIni}
- '';
- };
-
- users.users.${user} = {
- inherit group;
- isSystemUser = true;
- };
-
- users.groups.${group} = {};
- };
-}
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 17828ca44ff2..e1a31a0c2ee0 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -224,7 +224,7 @@ let
i2pdSh = pkgs.writeScriptBin "i2pd" ''
#!/bin/sh
- exec ${pkgs.i2pd}/bin/i2pd \
+ exec ${cfg.package}/bin/i2pd \
${if cfg.address == null then "" else "--host="+cfg.address} \
--service \
--conf=${i2pdConf} \
@@ -253,6 +253,15 @@ in
'';
};
+ package = mkOption {
+ type = types.package;
+ default = pkgs.i2pd;
+ defaultText = literalExpression "pkgs.i2pd";
+ description = ''
+ i2pd package to use.
+ '';
+ };
+
logLevel = mkOption {
type = types.enum ["debug" "info" "warn" "error"];
default = "error";
diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix
new file mode 100644
index 000000000000..ead73c497764
--- /dev/null
+++ b/nixos/modules/services/networking/tetrd.nix
@@ -0,0 +1,96 @@
+{ config, lib, pkgs, ... }:
+
+{
+ options.services.tetrd.enable = lib.mkEnableOption pkgs.tetrd.meta.description;
+
+ config = lib.mkIf config.services.tetrd.enable {
+ environment = {
+ systemPackages = [ pkgs.tetrd ];
+ etc."resolv.conf".source = "/etc/tetrd/resolv.conf";
+ };
+
+ systemd = {
+ tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ];
+
+ services.tetrd = {
+ description = pkgs.tetrd.meta.description;
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ ExecStart = "${pkgs.tetrd}/opt/Tetrd/bin/tetrd";
+ Restart = "always";
+ RuntimeDirectory = "tetrd";
+ RootDirectory = "/run/tetrd";
+ DynamicUser = true;
+ UMask = "006";
+ DeviceAllow = "usb_device";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ NoNewPrivileges = true;
+ PrivateMounts = true;
+ PrivateNetwork = lib.mkDefault false;
+ PrivateTmp = true;
+ PrivateUsers = lib.mkDefault false;
+ ProtectClock = lib.mkDefault false;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+
+ SystemCallFilter = [
+ "@system-service"
+ "~@aio"
+ "~@chown"
+ "~@clock"
+ "~@cpu-emulation"
+ "~@debug"
+ "~@keyring"
+ "~@memlock"
+ "~@module"
+ "~@mount"
+ "~@obsolete"
+ "~@pkey"
+ "~@raw-io"
+ "~@reboot"
+ "~@swap"
+ "~@sync"
+ ];
+
+ BindReadOnlyPaths = [
+ builtins.storeDir
+ "/etc/ssl"
+ "/etc/static/ssl"
+ "${pkgs.nettools}/bin/route:/usr/bin/route"
+ "${pkgs.nettools}/bin/ifconfig:/usr/bin/ifconfig"
+ ];
+
+ BindPaths = [
+ "/etc/tetrd/resolv.conf:/etc/resolv.conf"
+ "/run"
+ "/var/log"
+ ];
+
+ CapabilityBoundingSet = [
+ "CAP_DAC_OVERRIDE"
+ "CAP_NET_ADMIN"
+ ];
+
+ AmbientCapabilities = [
+ "CAP_DAC_OVERRIDE"
+ "CAP_NET_ADMIN"
+ ];
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-apps/trac.nix b/nixos/modules/services/web-apps/trac.nix
deleted file mode 100644
index 207fb857438a..000000000000
--- a/nixos/modules/services/web-apps/trac.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
- cfg = config.services.trac;
-
- inherit (lib) mkEnableOption mkIf mkOption types;
-
-in {
-
- options = {
-
- services.trac = {
- enable = mkEnableOption "Trac service";
-
- listen = {
- ip = mkOption {
- type = types.str;
- default = "0.0.0.0";
- description = ''
- IP address that Trac should listen on.
- '';
- };
-
- port = mkOption {
- type = types.port;
- default = 8000;
- description = ''
- Listen port for Trac.
- '';
- };
- };
-
- dataDir = mkOption {
- default = "/var/lib/trac";
- type = types.path;
- description = ''
- The directory for storing the Trac data.
- '';
- };
-
- openFirewall = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Open ports in the firewall for Trac.
- '';
- };
- };
-
- };
-
- config = mkIf cfg.enable {
-
- systemd.services.trac = {
- description = "Trac server";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- DynamicUser = true;
- StateDirectory = baseNameOf cfg.dataDir;
- ExecStart = ''
- ${pkgs.trac}/bin/tracd -s \
- -b ${toString cfg.listen.ip} \
- -p ${toString cfg.listen.port} \
- ${cfg.dataDir}
- '';
- };
- preStart = ''
- if [ ! -e ${cfg.dataDir}/VERSION ]; then
- ${pkgs.trac}/bin/trac-admin ${cfg.dataDir} initenv Trac "sqlite:db/trac.db"
- fi
- '';
- };
-
- networking.firewall = mkIf cfg.openFirewall {
- allowedTCPPorts = [ cfg.listen.port ];
- };
-
- };
-}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 05b7870fc3a1..dc174c8b41d0 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -317,7 +317,7 @@ let
${optionalString (hasSSL && vhost.sslTrustedCertificate != null) ''
ssl_trusted_certificate ${vhost.sslTrustedCertificate};
''}
- ${optionalString (hasSSL && vhost.rejectSSL) ''
+ ${optionalString vhost.rejectSSL ''
ssl_reject_handshake on;
''}
${optionalString (hasSSL && vhost.kTLS) ''
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 42f9c07703d5..9f3e97ceb13d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -476,7 +476,6 @@ in
tinc = handleTest ./tinc {};
tinydns = handleTest ./tinydns.nix {};
tor = handleTest ./tor.nix {};
- trac = handleTest ./trac.nix {};
# traefik test relies on docker-containers
traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
trafficserver = handleTest ./trafficserver.nix {};
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
deleted file mode 100644
index d6914c100817..000000000000
--- a/nixos/tests/trac.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
- name = "trac";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ mmahut ];
- };
-
- nodes = {
- machine = { ... }: {
- services.trac.enable = true;
- };
- };
-
- testScript = ''
- start_all()
- machine.wait_for_unit("trac.service")
- machine.wait_for_open_port(8000)
- machine.wait_until_succeeds("curl -fL http://localhost:8000/ | grep 'Trac Powered'")
- '';
-})
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 2efd4c671841..87ae31aed3bf 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
stdenv.mkDerivation rec {
pname = "carla";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "falkTX";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-WxhG9X6jVcu10bl5p0f61+SYZmJw4W7DYvezbpAlNjg=";
+ sha256 = "sha256-faVLPHPQ4voR/RHiPpUwnZK+5Jx0u4rJWuH5zlydzwY=";
};
nativeBuildInputs = [
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "http://kxstudio.sf.net/carla";
+ homepage = "https://kx.studio/Applications:Carla";
description = "An audio plugin host";
longDescription = ''
It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3
diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix
index 00af572215ee..8963cff4d12a 100644
--- a/pkgs/applications/audio/zrythm/default.nix
+++ b/pkgs/applications/audio/zrythm/default.nix
@@ -137,6 +137,7 @@ stdenv.mkDerivation rec {
"-Denable_rtmidi=true"
"-Denable_rtaudio=true"
"-Denable_sdl=true"
+ "-Dcarla=enabled"
"-Dmanpage=true"
# "-Duser_manual=true" # needs sphinx-intl
"-Dlsp_dsp=disabled"
diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix
new file mode 100644
index 000000000000..5de0aed34049
--- /dev/null
+++ b/pkgs/applications/editors/xedit/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, autoreconfHook
+, pkg-config
+, utilmacros
+, libX11
+, libXaw
+, libXmu
+, libXt
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xedit";
+ version = "1.2.2";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "xorg/app";
+ repo = "xedit";
+ rev = "${pname}-${version}";
+ sha256 = "0b5ic13aasv6zh20v2k7zyxsqbnsxfq5rs3w8nwzl1gklmgrjxa3";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ];
+ buildInputs = [
+ libX11
+ libXaw
+ libXmu
+ libXt
+ ];
+
+ configureFlags = [
+ "--with-lispdir=$out/share/X11/xedit/lisp"
+ "--with-appdefaultdir=$out/share/X11/app-defaults"
+ ];
+
+ meta = with lib; {
+ description = "Simple graphical text editor using Athena Widgets (Xaw)";
+ homepage = "https://gitlab.freedesktop.org/xorg/app/xedit";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 50e26677377f..d62addea4fea 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,31 +1,117 @@
-{ lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook
-, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
-, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
-, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt
-, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome
-, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages, gmic, libavif, icu
+{ lib
+, stdenv
+, fetchurl
+, libsoup
+, graphicsmagick
+, json-glib
+, wrapGAppsHook
+, cairo
+, cmake
+, ninja
+, curl
+, perl
+, llvm_13
+, desktop-file-utils
+, exiv2
+, glib
+, ilmbase
+, gtk3
+, intltool
+, lcms2
+, lensfun
+, libX11
+, libexif
+, libgphoto2
+, libjpeg
+, libpng
+, librsvg
+, libtiff
+, openexr_3
+, osm-gps-map
+, pkg-config
+, sqlite
+, libxslt
+, openjpeg
+, pugixml
+, colord
+, colord-gtk
+, libwebp
+, libsecret
+, gnome
+, SDL2
+, ocl-icd
+, pcre
+, gtk-mac-integration
+, isocodes
+, llvmPackages
+, gmic
+, libavif
+, icu
+, jasper
+, libheif
+, libaom
+, portmidi
+, fetchpatch
+, lua5_4
+, ...
}:
stdenv.mkDerivation rec {
- version = "3.6.1";
+ version = "3.8.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "sha256-or/HwQO4JJRUV6m/7Z5S8Af6HQMPnbyz/wMnhRvkLRQ=";
+ sha256 = "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f";
};
- nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
+ nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
buildInputs = [
- cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif
- libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
- libsoup graphicsmagick json-glib openjpeg lua pugixml
- libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes gmic libavif icu
+ cairo
+ curl
+ exiv2
+ glib
+ gtk3
+ ilmbase
+ lcms2
+ lensfun
+ libexif
+ libgphoto2
+ libjpeg
+ libpng
+ librsvg
+ libtiff
+ openexr_3
+ sqlite
+ libxslt
+ libsoup
+ graphicsmagick
+ json-glib
+ openjpeg
+ pugixml
+ libwebp
+ libsecret
+ SDL2
+ gnome.adwaita-icon-theme
+ osm-gps-map
+ pcre
+ isocodes
+ gmic
+ libavif
+ icu
+ jasper
+ libheif
+ libaom
+ portmidi
+ lua5_4
] ++ lib.optionals stdenv.isLinux [
- colord colord-gtk libX11 ocl-icd
+ colord
+ colord-gtk
+ libX11
+ ocl-icd
] ++ lib.optional stdenv.isDarwin gtk-mac-integration
- ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
+ ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
cmakeFlags = [
"-DBUILD_USERMANUAL=False"
@@ -34,29 +120,39 @@ stdenv.mkDerivation rec {
"-DUSE_KWALLET=OFF"
];
+ patches = [
+ (fetchpatch {
+ # This is merged in darktable master and will hopefully be in 3.8.1
+ name = "cmake-fix.patch";
+ url = "https://github.com/darktable-org/darktable/commit/58d247f7ebea76c55fa2525beb9f5ce092c6670d.patch";
+ sha256 = "11fn6d2mwlapbf1zbyv6bhgv29kxcwrs7cnbway0rnl9nj8wimf2";
+ })
+ ];
# darktable changed its rpath handling in commit
# 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
# binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
# the wrappers:
- preFixup = let
- libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
- libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib";
- in ''
- for f in $out/share/darktable/kernels/*.cl; do
- sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f"
- done
+ preFixup =
+ let
+ libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
+ libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib";
+ in
+ ''
+ for f in $out/share/darktable/kernels/*.cl; do
+ sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f"
+ done
- gappsWrapperArgs+=(
- --prefix ${libPathEnvVar} ":" "${libPathPrefix}"
- )
- '';
+ gappsWrapperArgs+=(
+ --prefix ${libPathEnvVar} ":" "${libPathPrefix}"
+ )
+ '';
meta = with lib; {
description = "Virtual lighttable and darkroom for photographers";
homepage = "https://www.darktable.org";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ goibhniu flosse mrVanDalo ];
+ maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits ];
};
}
diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix
new file mode 100644
index 000000000000..dc2b7ab804ab
--- /dev/null
+++ b/pkgs/applications/misc/HentaiAtHome/default.nix
@@ -0,0 +1,37 @@
+{ buildGraalvmNativeImage, fetchzip, graalvm17-ce, lib }:
+
+buildGraalvmNativeImage rec {
+ pname = "HentaiAtHome";
+ version = "1.6.1";
+ src = fetchzip {
+ url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}.zip";
+ hash =
+ "sha512-nGGCuVovj4NJGrihKKYXnh0Ic9YD36o7r6wv9zSivZn22zm8lBYVXP85LnOw2z9DiJARivOctQGl48YFD7vxOQ==";
+ stripRoot = false;
+ };
+
+ jar = "${src}/HentaiAtHome.jar";
+ dontUnpack = true;
+
+ graalvm = graalvm17-ce;
+ extraNativeImageBuildArgs = [
+ "--enable-url-protocols=http,https"
+ "--install-exit-handlers"
+ "--no-fallback"
+ ];
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ pushd $(mktemp -d)
+ $out/bin/HentaiAtHome
+ popd
+ '';
+
+ meta = with lib; {
+ homepage = "https://ehwiki.org/wiki/Hentai@Home";
+ description =
+ "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ terrorjack ];
+ };
+}
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3e1bdaec9d39..e50c2918ed92 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -27,20 +27,25 @@
mkDerivation rec {
pname = "calibre";
- version = "5.33.2";
+ version = "5.34.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-wtt3ucCaFq9wLk79CeCz20tMM6AbLtZ4Ln6TxOx0dvI=";
+ hash = "sha256-1NQB7vrcU0hR308/8keUn/rHhdvJk5Ab0pOMPyiU1+M=";
};
- # https://sources.debian.org/patches/calibre/5.33.2+dfsg-1
+ # https://sources.debian.org/patches/calibre/${version}+dfsg-1
patches = [
# allow for plugin update check, but no calibre version check
(fetchpatch {
name = "0001-only-plugin-update.patch";
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch";
- sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA=";
+ sha256 = "sha256:1h2hl4z9qm17crms4d1lq2cq44cnxbga1dv6qckhxvcg6pawxg3l";
+ })
+ (fetchpatch {
+ name = "0007-Hardening-Qt-code.patch";
+ url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch";
+ sha256 = "sha256:18wps7fn0cpzb7gf78f15pmbaff4vlygc9g00hq7zynfa4pcgfdg";
})
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix
index 1ec288c678a2..ebc220e4029f 100644
--- a/pkgs/applications/misc/ddcui/default.nix
+++ b/pkgs/applications/misc/ddcui/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "ddcui";
- version = "0.1.2";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcui";
rev = "v${version}";
- sha256 = "0myma1zw6dlygv3xbin662d91zcnwss10syf12q2fppkrd8qdgqf";
+ sha256 = "sha256-dp6D5GHpo0PJILnzZDKLnEPgQQ7980dI/6RV5ws3RTU=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 12d4f62a7834..342700e67821 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2 }:
stdenv.mkDerivation rec {
- version = "2.4.2";
+ version = "2.4.5";
pname = "makeself";
src = fetchFromGitHub {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
repo = "makeself";
rev = "release-${version}";
fetchSubmodules = true;
- sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
+ sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g=";
};
postPatch = "patchShebangs test";
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index c840f7c72a07..782fc30f4d69 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
- version = "4.2.8";
+ version = "4.2.10";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
- sha256 = "sha256-bbGFSy2ZuUtFWyAgje6s+RSQ6S7NZGAhjvZMbIWfYhE=";
+ sha256 = "sha256-YxUozMrsR65A7+xeerMaYxkGALobG1wLguWGZnoQYcU=";
};
unpackPhase = ''
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index c125c2f75161..6ccaa8ff2e26 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "urlscan";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchFromGitHub {
owner = "firecat53";
repo = pname;
rev = version;
- sha256 = "sha256-Wg1QecSMyifID9uIvVWrmkHax4FbbwEcoXIZ8V8P3FU=";
+ sha256 = "sha256-KQXEiDg5KRCMFFyDlR8D6CQTxRdIZx4/U1csTFCr0sU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index e58e5dfbd511..16daa7c0b545 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -52,14 +52,44 @@ let
automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list;
# These are the providers that don't fall in line with the default model
- special-providers = {
+ special-providers = let archived = throw "the provider has been archived by upsteam"; in {
# Packages that don't fit the default model
gandi = callPackage ./gandi { };
libvirt = callPackage ./libvirt { };
teleport = callPackage ./teleport { };
vpsadmin = callPackage ./vpsadmin { };
} // (lib.optionalAttrs (config.allowAliases or false) {
+ arukas = archived; # added 2022/01
+ bitbucket = archived; # added 2022/01
+ chef = archived; # added 2022/01
+ cherryservers = archived; # added 2022/01
+ clc = archived; # added 2022/01
+ cobbler = archived; # added 2022/01
+ cohesity = archived; # added 2022/01
+ dyn = archived; # added 2022/01
+ genymotion = archived; # added 2022/01
+ hedvig = archived; # added 2022/01
+ ignition = archived; # added 2022/01
+ incapsula = archived; # added 2022/01
+ influxdb = archived; # added 2022/01
+ jdcloud = archived; # added 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; # added 2022/01
+ logentries = archived; # added 2022/01
+ metalcloud = archived; # added 2022/01
+ mysql = archived; # added 2022/01
+ nixos = archived; # added 2022/01
+ oneandone = archived; # added 2022/01
+ packet = archived; # added 2022/01
+ profitbricks = archived; # added 2022/01
+ pureport = archived; # added 2022/01
+ rancher = archived; # added 2022/01
+ rightscale = archived; # added 2022/01
+ runscope = archived; # added 2022/01
+ softlayer = archived; # added 2022/01
+ telefonicaopencloud = archived; # added 2022/01
+ terraform = archived; # added 2022/01
+ ultradns = archived; # added 2022/01
});
in
automated-providers // special-providers // { inherit mkProvider; }
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6bcb2aa85bfa..5ce726a4de01 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1,10 +1,12 @@
{
"aci": {
- "owner": "terraform-providers",
+ "owner": "CiscoDevNet",
+ "provider-source-address": "registry.terraform.io/CiscoDevNet/aci",
"repo": "terraform-provider-aci",
- "rev": "v0.2.3",
- "sha256": "0sk0pp178w03fhsb65b9mpim1l4wqfnv9r9x64kiapjnvfb1rz3j",
- "version": "0.2.3"
+ "rev": "v1.2.0",
+ "sha256": "1jxnamd701fjz0y62k229njrxa3ijmr1m1dszn0x3mpak5qgw7li",
+ "vendorSha256": null,
+ "version": "1.2.0"
},
"acme": {
"owner": "vancluever",
@@ -61,33 +63,32 @@
"vendorSha256": null,
"version": "2.2.0"
},
- "arukas": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-arukas",
- "rev": "v1.1.0",
- "sha256": "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99",
- "version": "1.1.0"
- },
"auth0": {
- "owner": "terraform-providers",
+ "owner": "alexkappa",
+ "provider-source-address": "registry.terraform.io/alexkappa/auth0",
"repo": "terraform-provider-auth0",
- "rev": "v0.11.0",
- "sha256": "1dkcgzvvwmw5z5q4146jk0gj5b1zrv51vvkhhjd8qh9ipinipn97",
- "version": "0.11.0"
+ "rev": "v0.25.0",
+ "sha256": "0ibscxhwj92k8p43apnxyl9sly7pldv0lgcikjfjj352084q4k62",
+ "vendorSha256": "0k6lylkcdvm0piaic8hdbhg1jf1vzc897w1sq7v57brx7586h3sc",
+ "version": "0.25.0"
},
"avi": {
- "owner": "terraform-providers",
+ "owner": "vmware",
+ "provider-source-address": "registry.terraform.io/vmware/avi",
"repo": "terraform-provider-avi",
- "rev": "v0.2.2",
- "sha256": "0dgpjg6iw21vfcn4i0x6x1l329a09wrd2jwghrjigwlq68wd835d",
- "version": "0.2.2"
+ "rev": "v21.1.2",
+ "sha256": "1j96k7yklaxykqj6v1yvxxib2zr2jyx37pkan34jxd8nk43lix67",
+ "vendorSha256": "0pz0n2ijmbhqzvhq41h1hs80yiphwwb0lf3zacifp6rxyv8aawlf",
+ "version": "21.1.2"
},
"aviatrix": {
- "owner": "terraform-providers",
+ "owner": "AviatrixSystems",
+ "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
"repo": "terraform-provider-aviatrix",
- "rev": "v2.14.1",
- "sha256": "137z7fgy5gp9n9fdvllyjh3nkbalrs2giqljfldbllymhvrv7xgr",
- "version": "2.14.1"
+ "rev": "v2.20.3",
+ "sha256": "1k3sdfn0np9nzvc0bfc2wi7ixbrv0ikmzwyh103jfppidkasy5yq",
+ "vendorSha256": null,
+ "version": "2.20.3"
},
"aws": {
"owner": "hashicorp",
@@ -126,67 +127,50 @@
"version": "0.10.0"
},
"baiducloud": {
- "owner": "terraform-providers",
+ "owner": "baidubce",
+ "provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
- "rev": "v1.2.0",
- "sha256": "1s2vk4vjni5nc50pdw60pm0grrf835xy551i6d4cmfxkkpqx3f6f",
- "version": "1.2.0"
+ "rev": "v1.12.0",
+ "sha256": "1m7cw08ld073q1dsa7njshps21nc71gsz0kp6qj0p638zqx62xn7",
+ "vendorSha256": null,
+ "version": "1.12.0"
},
"bigip": {
- "owner": "terraform-providers",
+ "owner": "F5Networks",
+ "provider-source-address": "registry.terraform.io/F5Networks/bigip",
"repo": "terraform-provider-bigip",
- "rev": "v1.2.0",
- "sha256": "0z0l4j8sn8yf6kw5sbyhp6s0046f738lsm650skcspqa5f63mbd9",
- "version": "1.2.0"
- },
- "bitbucket": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-bitbucket",
- "rev": "v1.2.0",
- "sha256": "11n4wpvmaab164g6k077n9dbdbhd5lwl7pxpha5492ks468nd95b",
- "version": "1.2.0"
+ "rev": "v1.12.1",
+ "sha256": "0dpgxcdcpv6y25ffs0gp2pvq8z9yfh7hdqll25d0b09z0pqgb61q",
+ "vendorSha256": null,
+ "version": "1.12.1"
},
"brightbox": {
- "owner": "terraform-providers",
+ "owner": "brightbox",
+ "provider-source-address": "registry.terraform.io/brightbox/brightbox",
"repo": "terraform-provider-brightbox",
- "rev": "v1.3.0",
- "sha256": "127l1ic70fkcqr0h23qhbpl1j2mzp44p9593x8jl936xz4ll8l70",
- "version": "1.3.0"
+ "rev": "v2.0.6",
+ "sha256": "0k3k6d0rnvs1r2fb22q37g10zi0wq9kvakvj6zw97hkfld9wrqfj",
+ "vendorSha256": "07mznpp2mr1n9izgk2s8aibfvqsamj533666s46x1k49p0sh7lqx",
+ "version": "2.0.6"
},
"checkpoint": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "CheckPointSW",
+ "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint",
"repo": "terraform-provider-checkpoint",
- "rev": "v1.0.2",
- "sha256": "0zypjcg1z8fkz31lfhysxx42lpw8ak4aqgdis6rxzqbnkk491fjp",
- "version": "1.0.2"
- },
- "chef": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-chef",
- "rev": "v0.2.0",
- "sha256": "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns",
- "version": "0.2.0"
- },
- "cherryservers": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-cherryservers",
- "rev": "v1.0.0",
- "sha256": "1z6ai6q8aw38kiy8x13rp0dsvb4jk40cv8pk5c069q15m4jab8lh",
- "version": "1.0.0"
+ "rev": "v1.6.0",
+ "sha256": "1sfvglyd5giwlfyix4klicli96yz7cp7ry6lbvjziw5xaxs5ramf",
+ "vendorSha256": "1jsy9ls04rkyl6kl98lp6av8y3clpyskqqhlm9vl5qsv6saqcry7",
+ "version": "1.6.0"
},
"ciscoasa": {
- "owner": "terraform-providers",
+ "owner": "CiscoDevNet",
+ "provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa",
"repo": "terraform-provider-ciscoasa",
- "rev": "v1.2.0",
- "sha256": "033pgy42qwjpmjyzylpml7sfzd6dvvybs56cid1f6sm4ykmxbal7",
- "version": "1.2.0"
- },
- "clc": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-clc",
- "rev": "v0.1.0",
- "sha256": "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf",
- "version": "0.1.0"
+ "rev": "v1.3.0",
+ "sha256": "0a7k9pvx4vfap484jyxxjba3a3n28pssnnjiwzlc7n1ja7h3hdy7",
+ "vendorSha256": null,
+ "version": "1.3.0"
},
"cloudflare": {
"owner": "cloudflare",
@@ -216,11 +200,13 @@
"version": "2.2.0"
},
"cloudscale": {
- "owner": "terraform-providers",
+ "owner": "cloudscale-ch",
+ "provider-source-address": "registry.terraform.io/cloudscale-ch/cloudscale",
"repo": "terraform-provider-cloudscale",
- "rev": "v2.1.2",
- "sha256": "052pa17a77fkmhvygfgmpz87xlc08qvz1apzc2scg2449xfdv7zb",
- "version": "2.1.2"
+ "rev": "v3.2.0",
+ "sha256": "1bczibhv2jr2h5mrqs41s6dlsi7i2pbrlbxv4m49q2xlq9lza4yk",
+ "vendorSha256": null,
+ "version": "3.2.0"
},
"cloudstack": {
"owner": "terraform-providers",
@@ -229,26 +215,14 @@
"sha256": "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw",
"version": "0.3.0"
},
- "cobbler": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-cobbler",
- "rev": "v1.1.0",
- "sha256": "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9",
- "version": "1.1.0"
- },
- "cohesity": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-cohesity",
- "rev": "v0.1.0",
- "sha256": "1yifipjf51n8q9xyqcmc4zjpszmpyzb330f4zas81hahjml78hgx",
- "version": "0.1.0"
- },
"constellix": {
- "owner": "terraform-providers",
+ "owner": "Constellix",
+ "provider-source-address": "registry.terraform.io/Constellix/constellix",
"repo": "terraform-provider-constellix",
- "rev": "v0.1.0",
- "sha256": "14y0v8ilbrjj0aymrw50fkz2mihnwyv83z8a9f8dh399s8l624w1",
- "version": "0.1.0"
+ "rev": "v0.3.11",
+ "sha256": "00amvk2d4nb029kjlbljjidmgs7irf7v0ss192csgiyxqi378k2c",
+ "vendorSha256": null,
+ "version": "0.3.11"
},
"consul": {
"owner": "hashicorp",
@@ -296,11 +270,13 @@
"version": "2.16.0"
},
"dme": {
- "owner": "terraform-providers",
+ "owner": "DNSMadeEasy",
+ "provider-source-address": "registry.terraform.io/DNSMadeEasy/dme",
"repo": "terraform-provider-dme",
- "rev": "v0.1.0",
- "sha256": "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv",
- "version": "0.1.0"
+ "rev": "v1.0.4",
+ "sha256": "01y4mmcsb3d27ir9bin2bsxvd0rhklx3vlldk6s0fbq3aggd99by",
+ "vendorSha256": null,
+ "version": "1.0.4"
},
"dns": {
"owner": "hashicorp",
@@ -312,32 +288,31 @@
"version": "3.2.1"
},
"dnsimple": {
- "owner": "terraform-providers",
+ "owner": "dnsimple",
+ "provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
"repo": "terraform-provider-dnsimple",
- "rev": "v0.4.0",
- "sha256": "1f1cpfa30frghp4yxp9n313yaf2mm1hnjq4kzmn6n9210prab9h1",
- "version": "0.4.0"
+ "rev": "v0.11.0",
+ "sha256": "0w5lz9lz5jfvpn87d7xzpjimvh6wnwqfwk6masrhiw88h10pgd7n",
+ "vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj",
+ "version": "0.11.0"
},
"docker": {
- "owner": "terraform-providers",
+ "owner": "kreuzwerker",
+ "provider-source-address": "registry.terraform.io/kreuzwerker/docker",
"repo": "terraform-provider-docker",
- "rev": "v2.7.1",
- "sha256": "1jqnlc3dfy354yjdkj8iyxv0vamyxgmwxmhjim11alwzwjafbv9s",
- "version": "2.7.1"
+ "rev": "v2.15.0",
+ "sha256": "0fk4i8hi0x40rgcnq40j4jv12wsn9kn974h8qwhzxnd66n0xbnv0",
+ "vendorSha256": "0ax2368nhi6hfs4zwf84dqnf5ijyy93gz0brlfk89m7d2a90gfkp",
+ "version": "2.15.0"
},
"dome9": {
- "owner": "terraform-providers",
+ "owner": "dome9",
+ "provider-source-address": "registry.terraform.io/dome9/dome9",
"repo": "terraform-provider-dome9",
- "rev": "v1.19.0",
- "sha256": "190q74aaa1v7n7pqcri8kib0g0d4njf9dzm3cygyzmsjs3pxj1lc",
- "version": "1.19.0"
- },
- "dyn": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-dyn",
- "rev": "v1.2.0",
- "sha256": "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48",
- "version": "1.2.0"
+ "rev": "v1.24.4",
+ "sha256": "01zvav3r25qbhq1dfxjwmcgyk377cisn1k6406xq66fsyijcf5rw",
+ "vendorSha256": null,
+ "version": "1.24.4"
},
"elasticsearch": {
"owner": "phillbaker",
@@ -349,11 +324,13 @@
"version": "2.0.0-beta.2"
},
"exoscale": {
- "owner": "terraform-providers",
+ "owner": "exoscale",
+ "provider-source-address": "registry.terraform.io/exoscale/exoscale",
"repo": "terraform-provider-exoscale",
- "rev": "v0.16.2",
- "sha256": "102z4v3shk0as76v90151j4c6p93wy16m1hzzk1yp50dlc8ffsks",
- "version": "0.16.2"
+ "rev": "v0.31.1",
+ "sha256": "1k6z7mi20ijn3lj734abrbpgcpa6lr5ziacg8h5xr99xs5r9g5yi",
+ "vendorSha256": null,
+ "version": "0.31.1"
},
"external": {
"owner": "hashicorp",
@@ -374,25 +351,22 @@
"version": "0.39.0"
},
"flexibleengine": {
- "owner": "terraform-providers",
+ "owner": "FlexibleEngineCloud",
+ "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
"repo": "terraform-provider-flexibleengine",
- "rev": "v1.12.1",
- "sha256": "0klxi40dd3a4dp7gjsjjwh6zv2m94hh6mk5m9g0dyhvn0r28w5j2",
- "version": "1.12.1"
+ "rev": "v1.26.0",
+ "sha256": "1n22jll76gw3cxnyi2xfzh3mh0g9912rmkqpps7fid0imaz5jlck",
+ "vendorSha256": null,
+ "version": "1.26.0"
},
"fortios": {
- "owner": "terraform-providers",
+ "owner": "fortinetdev",
+ "provider-source-address": "registry.terraform.io/fortinetdev/fortios",
"repo": "terraform-provider-fortios",
- "rev": "v1.2.0",
- "sha256": "0sqp23pyldxjkfw33xn5l5fqs4vn00kkfhy9wnl690wn0cwmldbx",
- "version": "1.2.0"
- },
- "genymotion": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-genymotion",
- "rev": "v1.1.0",
- "sha256": "02jpr3cm7rrf810c69sr6lcxzvxpnf7icc5z80gnvg67wwfg4ph4",
- "version": "1.1.0"
+ "rev": "v1.13.2",
+ "sha256": "042fn5jii9fx7vb6x4kcvmrmiccj7s13xqm91l3b2i9mzh4cgb3k",
+ "vendorSha256": null,
+ "version": "1.13.2"
},
"github": {
"owner": "integrations",
@@ -425,11 +399,12 @@
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
+ "proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v3.76.0",
- "sha256": "1bdhk4vfn8pn7ql5q8m4r8js8d73zyp3dbhrmh4p07g7i5z57pjq",
- "vendorSha256": "0cwvkzw45b057gwbj24z9gyldjpyfgv3fyr5x160spj0ksfn0ki0",
- "version": "3.76.0"
+ "rev": "v4.5.0",
+ "sha256": "17z2jy8b9gk0id8q0318a6k60fhcqps0p36s7d7kkqmr44shgzs4",
+ "vendorSha256": "0f18fh0qi1v1hkq3j8nrc8x2rah7vk6njjgdakxr1g1xxv8f0nhx",
+ "version": "4.5.0"
},
"grafana": {
"owner": "grafana",
@@ -441,11 +416,13 @@
"version": "1.17.0"
},
"gridscale": {
- "owner": "terraform-providers",
+ "owner": "gridscale",
+ "provider-source-address": "registry.terraform.io/gridscale/gridscale",
"repo": "terraform-provider-gridscale",
- "rev": "v1.6.0",
- "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq",
- "version": "1.6.0"
+ "rev": "v1.13.0",
+ "sha256": "0m4n1ih7fzwxrnd3b70i4xl0nrwbpw8f6hh1fpa02jv7znpdp7l8",
+ "vendorSha256": null,
+ "version": "1.13.0"
},
"hcloud": {
"owner": "hetznercloud",
@@ -456,13 +433,6 @@
"vendorSha256": "0g8cbkg5kcddd1x3p6d8mb6mqwsayqby0mrrifkw5icf7rlaa0sl",
"version": "1.32.2"
},
- "hedvig": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-hedvig",
- "rev": "v1.1.1",
- "sha256": "1gd26jm9frn52hy2vm5sv003lbai5sjgdign6akhjmw5sdsmfr05",
- "version": "1.1.1"
- },
"helm": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/helm",
@@ -473,11 +443,13 @@
"version": "2.4.1"
},
"heroku": {
- "owner": "terraform-providers",
+ "owner": "heroku",
+ "provider-source-address": "registry.terraform.io/heroku/heroku",
"repo": "terraform-provider-heroku",
- "rev": "v2.4.1",
- "sha256": "10dacnd0y8q952s53n5myy08slw349pbfddjz63wcblcjyhvq0df",
- "version": "2.4.1"
+ "rev": "v4.8.0",
+ "sha256": "12v0agcib8bziywaqzn6p04pwxnzyn74kqc5al8n572k0ndw3bps",
+ "vendorSha256": "183j20my61mqhch87cn455l938jqx4ssbnv8yl416i6bxgcpy6f9",
+ "version": "4.8.0"
},
"http": {
"owner": "hashicorp",
@@ -489,18 +461,22 @@
"version": "2.1.0"
},
"huaweicloud": {
- "owner": "terraform-providers",
+ "owner": "huaweicloud",
+ "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
- "rev": "v1.14.0",
- "sha256": "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z",
- "version": "1.14.0"
+ "rev": "v1.32.0",
+ "sha256": "1k5d4a488mrba6cvpcbhd9hqhhb977yi89p32wlfx266mf11w2yw",
+ "vendorSha256": null,
+ "version": "1.32.0"
},
"huaweicloudstack": {
- "owner": "terraform-providers",
+ "owner": "huaweicloud",
+ "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack",
"repo": "terraform-provider-huaweicloudstack",
- "rev": "v1.2.0",
- "sha256": "0jhx9rap4128j8sfkvpp8lbdmvdba0rkd3nxvy38wr3n18m7v1xg",
- "version": "1.2.0"
+ "rev": "v1.3.0",
+ "sha256": "0ywik9m2a69262ppsb1d97k7g5b1zwk84k05p7m573f5wakl68jr",
+ "vendorSha256": null,
+ "version": "1.3.0"
},
"hydra": {
"owner": "DeterminateSystems",
@@ -521,46 +497,22 @@
"version": "1.37.1"
},
"icinga2": {
- "owner": "terraform-providers",
+ "owner": "Icinga",
+ "provider-source-address": "registry.terraform.io/Icinga/icinga2",
"repo": "terraform-provider-icinga2",
- "rev": "v0.3.0",
- "sha256": "0xwjxb84glhp9viqykziwanj696w2prq4r7k0565k0w3qiaz440v",
- "version": "0.3.0"
- },
- "ignition": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-ignition",
- "rev": "v1.2.1",
- "sha256": "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql",
- "version": "1.2.1"
- },
- "incapsula": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-incapsula",
- "rev": "v2.1.0",
- "sha256": "12zw2m7j52rszfawywbiv9rgv976h1w6bp98012qn45d4ap2kvzy",
- "version": "2.1.0"
- },
- "influxdb": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-influxdb",
- "rev": "v1.3.0",
- "sha256": "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9",
- "version": "1.3.0"
+ "rev": "v0.5.0",
+ "sha256": "0s8a5i2sl7cp1v6v96s9fbhabrid7mv8hizq509flgzklk8smwv3",
+ "vendorSha256": null,
+ "version": "0.5.0"
},
"infoblox": {
- "owner": "terraform-providers",
+ "owner": "infobloxopen",
+ "provider-source-address": "registry.terraform.io/infobloxopen/infoblox",
"repo": "terraform-provider-infoblox",
- "rev": "v1.0.0",
- "sha256": "0p95y5w3fzddygmsjc0j60z0f4aazvy5iwbwszj0i8gs42qhda2f",
- "version": "1.0.0"
- },
- "jdcloud": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-jdcloud",
- "rev": "v1.1.0",
- "sha256": "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf",
- "version": "1.1.0"
+ "rev": "v2.0.1",
+ "sha256": "0xmlhm4lgb43f75300hajlq7zk3r1xqxi4dc2x0vlnkhgdj3hrfi",
+ "vendorSha256": null,
+ "version": "2.0.1"
},
"kafka": {
"owner": "Mongey",
@@ -590,11 +542,13 @@
"version": "3.6.0"
},
"ksyun": {
- "owner": "terraform-providers",
+ "owner": "kingsoftcloud",
+ "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
"repo": "terraform-provider-ksyun",
- "rev": "v1.0.0",
- "sha256": "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc",
- "version": "1.0.0"
+ "rev": "v1.3.41",
+ "sha256": "0p8fl7dkp2nfw73ij769svm83cpvi1rw3aykf0qx33n9si78m892",
+ "vendorSha256": "1pm4kld23mvgs14z54fpfdvnj0alm8frkkmf0851hi58nazc54dq",
+ "version": "1.3.41"
},
"kubectl": {
"owner": "gavinbunney",
@@ -615,25 +569,22 @@
"version": "2.7.1"
},
"launchdarkly": {
- "owner": "terraform-providers",
+ "owner": "launchdarkly",
+ "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
"repo": "terraform-provider-launchdarkly",
- "rev": "v1.3.2",
- "sha256": "0vgkivzbf6hcl9by6l0whpwidva7zmmgdabkshjjk0npl2cj8f9n",
- "version": "1.3.2"
- },
- "librato": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-librato",
- "rev": "v0.1.0",
- "sha256": "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923",
- "version": "0.1.0"
+ "rev": "v2.2.0",
+ "sha256": "06lhcimk368ll73vhs09d6lsmphbm2mvlxhiajc190db492nnjnl",
+ "vendorSha256": "05gx87dwh49zc5mlqnzcqn46pjf9q4wsv9l15pjr3spczzi11cnz",
+ "version": "2.2.0"
},
"linode": {
- "owner": "terraform-providers",
+ "owner": "linode",
+ "provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
- "rev": "v1.12.3",
- "sha256": "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp",
- "version": "1.12.3"
+ "rev": "v1.25.0",
+ "sha256": "11ybl1ny90y7w999hwjnwnmmdkqak5q8gbg1qqimhjvw69j0dr81",
+ "vendorSha256": "01146ds79clf2hn8ph4hx0g8chwhfawdy5cpslnppsm1w8v5arrm",
+ "version": "1.25.0"
},
"linuxbox": {
"owner": "numtide",
@@ -653,19 +604,15 @@
"vendorSha256": null,
"version": "2.1.0"
},
- "logentries": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-logentries",
- "rev": "v1.0.0",
- "sha256": "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq",
- "version": "1.0.0"
- },
"logicmonitor": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "logicmonitor",
+ "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",
"repo": "terraform-provider-logicmonitor",
- "rev": "v1.3.0",
- "sha256": "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1",
- "version": "1.3.0"
+ "rev": "v1.3.4",
+ "sha256": "1ypn9nlkijfjl8cjiabfx12ym8gg8n3xrib3xniz1j7xa3p5fdmp",
+ "vendorSha256": "12202jz15wn0xacgxhpcw3155742qpa25mbglljmbx2bzwq0nm1a",
+ "version": "1.3.4"
},
"lxd": {
"owner": "terraform-lxd",
@@ -677,18 +624,22 @@
"version": "1.6.0"
},
"mailgun": {
- "owner": "terraform-providers",
+ "owner": "wgebis",
+ "provider-source-address": "registry.terraform.io/wgebis/mailgun",
"repo": "terraform-provider-mailgun",
- "rev": "v0.4.1",
- "sha256": "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz",
- "version": "0.4.1"
+ "rev": "v0.7.1",
+ "sha256": "0sw4a5ch8izy9lw9qmbj6s5vxz7gxcarga1s1h3vlng9y1dpvp2r",
+ "vendorSha256": "1qwd3jwdh5pzq9sdb62lpkbspfn54jii725p2jgvzg93xarv4n58",
+ "version": "0.7.1"
},
"matchbox": {
"owner": "poseidon",
+ "provider-source-address": "registry.terraform.io/poseidon/matchbox",
"repo": "terraform-provider-matchbox",
- "rev": "v0.3.0",
- "sha256": "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3",
- "version": "0.3.0"
+ "rev": "v0.5.0",
+ "sha256": "0lzrs07kzx6bgmlahhgg6j7lpl9z2cbjy2880rwwzq89m8zhl6mz",
+ "vendorSha256": "0aacb973gisajv0wn00k50ddsma5rv7wy7mjz966a7pgpbmmi91f",
+ "version": "0.5.0"
},
"metal": {
"owner": "equinix",
@@ -699,33 +650,23 @@
"vendorSha256": null,
"version": "3.2.1"
},
- "metalcloud": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-metalcloud",
- "rev": "v2.2.0",
- "sha256": "0xii9gk96srzi9y4pbvlx2cvwypll4igvk89f9qrg18qrw72ags3",
- "version": "2.2.0"
- },
"mongodbatlas": {
- "owner": "terraform-providers",
+ "owner": "mongodb",
+ "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"repo": "terraform-provider-mongodbatlas",
- "rev": "v0.5.1",
- "sha256": "0sl5yd1bqj79f7pj49aqh7l3fvdrbf8r7a4g7cv15qbc8g3lr1dh",
- "version": "0.5.1"
- },
- "mysql": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-mysql",
- "rev": "v1.9.0",
- "sha256": "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g",
- "version": "1.9.0"
+ "rev": "v1.1.1",
+ "sha256": "0ifrpamajmrqa3fmsg4qyag1i7ghrswbhl0ixj8hgw7kzbzslsyd",
+ "vendorSha256": "1xrpgrzk5hr7qc5zm7nq5ljhc4sgzbsaxfszc8dlpc5y49j5q0ip",
+ "version": "1.1.1"
},
"ncloud": {
- "owner": "terraform-providers",
+ "owner": "NaverCloudPlatform",
+ "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",
"repo": "terraform-provider-ncloud",
- "rev": "v1.2.0",
- "sha256": "1h2fr0ss58dr3ypqj6kw90iyji6s83sz2i85vhs5z2adjbk7h8va",
- "version": "1.2.0"
+ "rev": "v2.2.1",
+ "sha256": "0igzwc1hycnlcvgi0il1z94xlb6rlklr1h7j909im1am3p6s3q1s",
+ "vendorSha256": "1799i4d32y22v6ywwklm3ncmzir5hg8cw23jzb8d28xiw8vswhs4",
+ "version": "2.2.1"
},
"netlify": {
"owner": "AegirHealth",
@@ -737,18 +678,13 @@
"version": "0.6.12"
},
"newrelic": {
- "owner": "terraform-providers",
+ "owner": "newrelic",
+ "provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
- "rev": "v1.19.0",
- "sha256": "0nmbgw4qyzsw8kxi7p8dy4j1lkxcz7qfs56qsvwf2w07y4qm382p",
- "version": "1.19.0"
- },
- "nixos": {
- "owner": "tweag",
- "repo": "terraform-provider-nixos",
- "rev": "v0.0.1",
- "sha256": "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf",
- "version": "0.0.1"
+ "rev": "v2.34.1",
+ "sha256": "1j7r6cac1ajp8f6h2492dnz7ihkxbdi8js535dv04kiah79r49d5",
+ "vendorSha256": "0qbrrh5qdbcnzmf69jilcd9qql526w9mf4ix8y8bi94w7m0nwxap",
+ "version": "2.34.1"
},
"nomad": {
"owner": "hashicorp",
@@ -760,18 +696,23 @@
"version": "1.4.16"
},
"ns1": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "ns1-terraform",
+ "provider-source-address": "registry.terraform.io/ns1-terraform/ns1",
"repo": "terraform-provider-ns1",
- "rev": "v1.8.3",
- "sha256": "18mq6r8sw2jjvngay0zyvzlfiln8c0xb8hcrl2wcmnpqv2iinbkl",
- "version": "1.8.3"
+ "rev": "v1.12.1",
+ "sha256": "0l72z92k71z48ls1dwy6apwhgi9xbs4czmryc0k65krh4hgjhhwk",
+ "vendorSha256": "0nk8xs24hwsarr22h5m1qcpixg7ijdkah5686wkp51y8cp69v25r",
+ "version": "1.12.1"
},
"nsxt": {
- "owner": "terraform-providers",
+ "owner": "vmware",
+ "provider-source-address": "registry.terraform.io/vmware/nsxt",
"repo": "terraform-provider-nsxt",
- "rev": "v2.0.0",
- "sha256": "0fka793r0c06sz8vlxk0z7vbm6kab5xzk39r5pznkq34004r17sl",
- "version": "2.0.0"
+ "rev": "v3.2.5",
+ "sha256": "0j5kspfmqxdnvk3sfb476rckkn9fdgpw5haf495901a114wynr2l",
+ "vendorSha256": null,
+ "version": "3.2.5"
},
"null": {
"owner": "hashicorp",
@@ -783,11 +724,14 @@
"version": "3.1.0"
},
"nutanix": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "nutanix",
+ "provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
- "rev": "v1.0.2",
- "sha256": "17sgsxsh8minirks08c6gz52cf7ndn220sx4xzi6bq64yi6qw2yc",
- "version": "1.0.2"
+ "rev": "v1.2.2",
+ "sha256": "08y5hxp28z5mhrbfs0mdwdj694k26gwl0qb80dggmmdil704ajwk",
+ "vendorSha256": "0s7yi00zskc4j7vnqjfd64pxk2bpk1cqmqgiyxfh7aqqzg22yqkz",
+ "version": "1.2.2"
},
"oci": {
"owner": "terraform-providers",
@@ -799,39 +743,41 @@
"version": "4.57.0"
},
"okta": {
- "owner": "terraform-providers",
+ "owner": "okta",
+ "provider-source-address": "registry.terraform.io/okta/okta",
"repo": "terraform-provider-okta",
- "rev": "v3.3.0",
- "sha256": "1z557z1yagp2caf85hmcr6sddax9a5h47jja17082qmmr1qy0i07",
- "version": "3.3.0"
+ "rev": "v3.20.2",
+ "sha256": "0qlm99m4dljnczsypn4gmw9n4vvxkfazi21hvkbkgy2v3wmhsms9",
+ "vendorSha256": "1dadvvkspb654pmxzb8vlp88vpnh2ssgfsvlcaiikyjqh2z7wbq4",
+ "version": "3.20.2"
},
"oktaasa": {
- "owner": "terraform-providers",
+ "owner": "oktadeveloper",
+ "provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa",
"repo": "terraform-provider-oktaasa",
- "rev": "v1.0.0",
- "sha256": "093d5r8dz8gryk8qp5var2qrrgkvs1gwgw3zqpxry9xc5cpn30w0",
- "version": "1.0.0"
- },
- "oneandone": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-oneandone",
- "rev": "v1.3.0",
- "sha256": "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn",
- "version": "1.3.0"
+ "rev": "v1.0.1",
+ "sha256": "0ibpa3bb7p5i02bliycg6bcak79gmixww7gc1k1z0aiaij173f6q",
+ "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.0",
- "sha256": "1yl8bbh4pf94wlmna294zcawylr9hiaix82wr321g9wb0vi3d5l8",
- "version": "1.4.0"
+ "rev": "v1.4.1",
+ "sha256": "1kylnjy7s5bkx6zjksbz8sfx77pxcc9ycbi8kd8axnrcmj4q01xc",
+ "vendorSha256": null,
+ "version": "1.4.1"
},
"opennebula": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "OpenNebula",
+ "provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
"repo": "terraform-provider-opennebula",
- "rev": "v0.1.1",
- "sha256": "048cqd89fz5xpji1w8ylg75nbzzcx1c5n89y1k0ra8d3g2208yb2",
- "version": "0.1.1"
+ "rev": "v0.3.0",
+ "sha256": "110mzxr2mk9hzw7nfisyl4in7r7q4m280szzgc3bzlp9sjvqgg3y",
+ "vendorSha256": "1wp9dk5kcrkmcx7mh5inbq3zd7qwp8sbl9hc0svaf44mf1p9446w",
+ "version": "0.3.0"
},
"openstack": {
"owner": "terraform-provider-openstack",
@@ -843,24 +789,30 @@
"version": "1.46.0"
},
"opentelekomcloud": {
- "owner": "terraform-providers",
+ "owner": "opentelekomcloud",
+ "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
- "rev": "v1.17.1",
- "sha256": "1d4w35hpvxy5wkb6n9wrh2nfcsy0xgk6d4jbk4sy7dn44w3nkqbg",
- "version": "1.17.1"
+ "rev": "v1.27.2",
+ "sha256": "1icfsjpch6plp9qbx0snn55kvkba0kvnd0skwdhzxi66xcdw0s9b",
+ "vendorSha256": "0dc4l5swfw666mpm5q67gm45abkm9zsvibqrja910h6rrp387576",
+ "version": "1.27.2"
},
"opsgenie": {
- "owner": "terraform-providers",
+ "owner": "opsgenie",
+ "provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
"repo": "terraform-provider-opsgenie",
- "rev": "v0.3.4",
- "sha256": "11pbkhn7yhz2mfa01ikn7rdajl28zwxfq9g9qdf9lvkdrv88gwh0",
- "version": "0.3.4"
+ "rev": "v0.6.7",
+ "sha256": "1dfp7s8zvnifnbka7azfxss42cj11s00mp92fj10bji4hkk0bvjq",
+ "vendorSha256": null,
+ "version": "0.6.7"
},
"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": {
@@ -872,33 +824,32 @@
"vendorSha256": null,
"version": "0.16.0"
},
- "packet": {
- "owner": "packethost",
- "repo": "terraform-provider-packet",
- "rev": "v3.2.0",
- "sha256": "sha256-YIv4OPRbR00YTVwz0iJ/y6qTbj50nsi5ylrWEx1kZck=",
- "version": "3.2.0"
- },
"pagerduty": {
- "owner": "terraform-providers",
+ "owner": "PagerDuty",
+ "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
"repo": "terraform-provider-pagerduty",
- "rev": "v1.7.2",
- "sha256": "1a8g8rpn52wibrxhnvhlda7ja38vw9aadgdc8nbj7zs50x4aj3ic",
- "version": "1.7.2"
+ "rev": "v2.2.1",
+ "sha256": "0nhn47bd9lqs14wvxjkvhsnzgm6iys5icy5ydmsma3p2fb90qgas",
+ "vendorSha256": null,
+ "version": "2.2.1"
},
"panos": {
- "owner": "terraform-providers",
+ "owner": "PaloAltoNetworks",
+ "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos",
"repo": "terraform-provider-panos",
- "rev": "v1.6.2",
- "sha256": "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5",
- "version": "1.6.2"
+ "rev": "v1.9.0",
+ "sha256": "0v2vydrljnaq47pkz6rfrhl7zsqa8lgjclpa6jy7nyc69c02d90c",
+ "vendorSha256": null,
+ "version": "1.9.0"
},
"pass": {
"owner": "camptocamp",
+ "provider-source-address": "registry.terraform.io/camptocamp/pass",
"repo": "terraform-provider-pass",
- "rev": "1.2.1",
- "sha256": "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk",
- "version": "1.2.1"
+ "rev": "v2.0.0",
+ "sha256": "1hzfz9ca01i8q9gc0aisklblkyfgzn9bqndis7l0964r1rdhsn44",
+ "vendorSha256": "0fsl27p2p6s4xnmhlzb8bxrg8kjaaim7arj0l6p5y0z9mhy8jpmi",
+ "version": "2.0.0"
},
"postgresql": {
"owner": "cyrilgdn",
@@ -910,25 +861,13 @@
"version": "1.14.0"
},
"powerdns": {
- "owner": "terraform-providers",
+ "owner": "pan-net",
+ "provider-source-address": "registry.terraform.io/pan-net/powerdns",
"repo": "terraform-provider-powerdns",
- "rev": "v1.4.0",
- "sha256": "1mfcj32v66w5gnzbrdkampydl3m9f1155vcdw8l1f2nba59irkgw",
- "version": "1.4.0"
- },
- "profitbricks": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-profitbricks",
- "rev": "v1.5.2",
- "sha256": "0gass4gzv8axlzn5rgg35nqvd61q82k041r0sr6x6pv6j8v1ixln",
- "version": "1.5.2"
- },
- "pureport": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-pureport",
- "rev": "v1.1.8",
- "sha256": "02vmqwjz5m5hj4zghwicjp27dxvc4qsiwj4gjsi66w6djdqnh4h1",
- "version": "1.1.8"
+ "rev": "v1.4.1",
+ "sha256": "1v1qs042jpin5454yqbdfp2xsgf68cgwlsqfah5hqy1qnq5zbl3z",
+ "vendorSha256": null,
+ "version": "1.4.1"
},
"rabbitmq": {
"owner": "cyrilgdn",
@@ -939,13 +878,6 @@
"vendorSha256": "sha256-wbnjAM2PYocAtRuY4fjLPGFPJfzsKih6Q0YCvFyMulQ=",
"version": "1.6.0"
},
- "rancher": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-rancher",
- "rev": "v1.5.0",
- "sha256": "0yhv9ahj6ajspgnl2f77gpyd6klq44dyl74lvl10bx6yy56abi2m",
- "version": "1.5.0"
- },
"rancher2": {
"owner": "rancher",
"provider-source-address": "registry.terraform.io/rancher/rancher2",
@@ -964,33 +896,23 @@
"vendorSha256": null,
"version": "3.1.0"
},
- "rightscale": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-rightscale",
- "rev": "v1.3.1",
- "sha256": "0abwxaghrxpahpsk6kd02fjh0rhck4xsdrzcpv629yh8ip9rzcaj",
- "version": "1.3.1"
- },
"rundeck": {
- "owner": "terraform-providers",
+ "owner": "rundeck",
+ "provider-source-address": "registry.terraform.io/rundeck/rundeck",
"repo": "terraform-provider-rundeck",
- "rev": "v0.4.0",
- "sha256": "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr",
- "version": "0.4.0"
- },
- "runscope": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-runscope",
- "rev": "v0.6.0",
- "sha256": "1fsph2cnyvzdwa5hwdjabfk4azmc3x8a7afpwpawxfdvqhgpr595",
- "version": "0.6.0"
+ "rev": "v0.4.2",
+ "sha256": "0447hsmdf8k4464m56c7ipn9a05rv6hlrjb7q8b1jdwh2j5yq8pr",
+ "vendorSha256": null,
+ "version": "0.4.2"
},
"scaleway": {
- "owner": "terraform-providers",
+ "owner": "scaleway",
+ "provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
- "rev": "v1.15.0",
- "sha256": "0bdhjrml14f5z4spkl7l305g0vdzpgama7ahngws8jhvl8yfa208",
- "version": "1.15.0"
+ "rev": "v2.2.0",
+ "sha256": "1l9cmdz46rhvbnlyxi3hyk8rszf44xphpz22w56mrbi91z1yr8c1",
+ "vendorSha256": "0f2nx0x6gpxw440s81mn7plg63zd0g4crnlbalmj6i2rjkpj48v5",
+ "version": "2.2.0"
},
"secret": {
"owner": "numtide",
@@ -1009,11 +931,13 @@
"version": "0.2.0"
},
"selectel": {
- "owner": "terraform-providers",
+ "owner": "selectel",
+ "provider-source-address": "registry.terraform.io/selectel/selectel",
"repo": "terraform-provider-selectel",
- "rev": "v3.3.0",
- "sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl",
- "version": "3.3.0"
+ "rev": "v3.7.1",
+ "sha256": "02sfzrs3k907djcyjz7qn42b21wccykw0fw65ms34h5vz5ld73mx",
+ "vendorSha256": null,
+ "version": "3.7.1"
},
"sentry": {
"owner": "jianyuan",
@@ -1034,25 +958,22 @@
"version": "1.7.10"
},
"signalfx": {
- "owner": "terraform-providers",
+ "owner": "splunk-terraform",
+ "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
- "rev": "v4.23.0",
- "sha256": "1v3whvqb6nilfvw4c0xziq6yrlkl96d2cya094c7bd7wp9hzif1l",
- "version": "4.23.0"
+ "rev": "v6.7.10",
+ "sha256": "113q9wwvz0lxn1l948g5mnwbpd76q8j2pm9q90nbkg1yvwsidsqi",
+ "vendorSha256": "124vw40rpnsmna6fkwb9qp8z31hlxn4dx7p7vgng32l1w7ddwmcp",
+ "version": "6.7.10"
},
"skytap": {
- "owner": "terraform-providers",
+ "owner": "skytap",
+ "provider-source-address": "registry.terraform.io/skytap/skytap",
"repo": "terraform-provider-skytap",
- "rev": "v0.14.1",
- "sha256": "0ygsdkv7czyhsjsx1q57rmmcl8x66d65yarhg40hlng5c7xpi52g",
- "version": "0.14.1"
- },
- "softlayer": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-softlayer",
- "rev": "v0.0.1",
- "sha256": "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq",
- "version": "0.0.1"
+ "rev": "v0.14.5",
+ "sha256": "1l73p0ii9pnbvdv2gi69782w4yvfkf15cx1zvx3k0961wav4f5gj",
+ "vendorSha256": null,
+ "version": "0.14.5"
},
"sops": {
"owner": "carlpett",
@@ -1064,39 +985,40 @@
"version": "0.6.3"
},
"spotinst": {
- "owner": "terraform-providers",
+ "owner": "spotinst",
+ "provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
- "rev": "v1.17.0",
- "sha256": "0pmbr2xdqrzkd66zv4gpyxzahs7p2m2xl5qyvqpg0apxn91z3ra7",
- "version": "1.17.0"
+ "rev": "v1.64.1",
+ "sha256": "0a0v1ydickmnn5gsv5lr97yv4lvhxf3q9mhhkl38ksijzd2radlz",
+ "vendorSha256": "1lv305kamb3xnw3a2q45ndn7a88ifnh8j8ngv7awc41028j539w4",
+ "version": "1.64.1"
},
"stackpath": {
- "owner": "terraform-providers",
+ "owner": "stackpath",
+ "provider-source-address": "registry.terraform.io/stackpath/stackpath",
"repo": "terraform-provider-stackpath",
- "rev": "v1.3.0",
- "sha256": "0gsr903v6fngaxm2r5h53g9yc3jpx2zccqq07rhzm9jbsfb6rlzn",
- "version": "1.3.0"
+ "rev": "v1.4.0",
+ "sha256": "1c9ad2hwglajs9qsbkm0d01qfvqzi2mf4i0cxynx1f560hg7sd4x",
+ "vendorSha256": "1i65k1j6yfma1m7lr8qs714pv6rqvy0i8zycpjpdbcbmw3h2xy8n",
+ "version": "1.4.0"
},
"statuscake": {
- "owner": "terraform-providers",
+ "owner": "StatusCakeDev",
+ "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake",
"repo": "terraform-provider-statuscake",
- "rev": "v1.0.0",
- "sha256": "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26",
- "version": "1.0.0"
+ "rev": "v1.0.1",
+ "sha256": "16pwsna1bkrdppxn2vjgbx552vsg4f2igykcb26mw3vp6n9piwfl",
+ "vendorSha256": null,
+ "version": "1.0.1"
},
"sumologic": {
- "owner": "terraform-providers",
+ "owner": "SumoLogic",
+ "provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
"repo": "terraform-provider-sumologic",
- "rev": "v2.0.3",
- "sha256": "0d7xsfdfs6dj02bh90bhwsa2jgxf84df3pqmsjlmxvpv65dv4vs8",
- "version": "2.0.3"
- },
- "telefonicaopencloud": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-telefonicaopencloud",
- "rev": "v1.0.0",
- "sha256": "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m",
- "version": "1.0.0"
+ "rev": "v2.11.5",
+ "sha256": "1k3z0rbnqfjrz4awrmid03g7lmalkya7m60l22qdhpsc6c6pg0mp",
+ "vendorSha256": "0jfzyzlfvpkbxi60439hmsrn2qqm86ghb859jl4mphd6g7p75zdj",
+ "version": "2.11.5"
},
"template": {
"owner": "hashicorp",
@@ -1108,25 +1030,22 @@
"version": "2.2.0"
},
"tencentcloud": {
- "owner": "terraform-providers",
+ "owner": "tencentcloudstack",
+ "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.36.0",
- "sha256": "1sqynm0g1al5hnxzccv8iiqcgd07ys0g828f3xfw53b6f5vzbhfr",
- "version": "1.36.0"
- },
- "terraform": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-terraform",
- "rev": "v1.0.2",
- "sha256": "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v",
- "version": "1.0.2"
+ "rev": "v1.60.25",
+ "sha256": "0ag0h9cxjzmzz3iqh6c9czmfqd6zxg82n13nahlcg7qg1b0c2rvv",
+ "vendorSha256": null,
+ "version": "1.60.25"
},
"tfe": {
- "owner": "terraform-providers",
+ "owner": "hashicorp",
+ "provider-source-address": "registry.terraform.io/hashicorp/tfe",
"repo": "terraform-provider-tfe",
- "rev": "v0.18.0",
- "sha256": "1cl83afm00fflsd3skynjvncid3r74fkxfznrs1v8qypcg1j79g1",
- "version": "0.18.0"
+ "rev": "v0.27.0",
+ "sha256": "00lra2d8dzczlmx74cblk7hglj2dvlkkgv30ndb85fbmaq2jqw0n",
+ "vendorSha256": "1g77ghz4928kfpidqd92cy6xkrqmz2y97x7g7lb55mw3mxg2bsx5",
+ "version": "0.27.0"
},
"time": {
"owner": "hashicorp",
@@ -1147,32 +1066,32 @@
"version": "3.1.0"
},
"triton": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "joyent",
+ "provider-source-address": "registry.terraform.io/joyent/triton",
"repo": "terraform-provider-triton",
- "rev": "v0.7.0",
- "sha256": "14wbdm2rlmjld9y7iizdinhk1fnx5s8fgjgd3jcs1b4g126s0pl0",
- "version": "0.7.0"
+ "rev": "v0.8.2",
+ "sha256": "0jhvslpv18yql5hz67hvagv5xdlnn6qsnvs91g0wf5rr4zbcmd9n",
+ "vendorSha256": "1a9a5jpbn8bikyya50zp1aaacj699gmk9p870a73ksh6w5lcgqjj",
+ "version": "0.8.2"
},
"turbot": {
- "owner": "terraform-providers",
+ "owner": "turbot",
+ "provider-source-address": "registry.terraform.io/turbot/turbot",
"repo": "terraform-provider-turbot",
- "rev": "v1.3.0",
- "sha256": "0z56s3kmx84raiwiny9jing8ac9msfd5vk8va24k8czwj2v5gb0f",
- "version": "1.3.0"
+ "rev": "v1.8.2",
+ "sha256": "16nxngn7mx7049mar7azj03pyslmf9wri50kwhimkfjva0k9zbl7",
+ "vendorSha256": null,
+ "version": "1.8.2"
},
"ucloud": {
- "owner": "terraform-providers",
+ "owner": "ucloud",
+ "provider-source-address": "registry.terraform.io/ucloud/ucloud",
"repo": "terraform-provider-ucloud",
- "rev": "v1.20.0",
- "sha256": "1s3xgdrngiy7slxwk5cmhij681yyfvc8185yig7jmrm21q2981f6",
- "version": "1.20.0"
- },
- "ultradns": {
- "owner": "terraform-providers",
- "repo": "terraform-provider-ultradns",
- "rev": "v0.1.0",
- "sha256": "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj",
- "version": "0.1.0"
+ "rev": "v1.30.0",
+ "sha256": "1difp4nkyr8hp9l3ik5vdxl3kxiq9i342mmpc0j3drmr341djf1s",
+ "vendorSha256": null,
+ "version": "1.30.0"
},
"vault": {
"owner": "hashicorp",
@@ -1184,18 +1103,23 @@
"version": "3.1.1"
},
"vcd": {
- "owner": "terraform-providers",
+ "owner": "vmware",
+ "provider-source-address": "registry.terraform.io/vmware/vcd",
"repo": "terraform-provider-vcd",
- "rev": "v2.8.0",
- "sha256": "0myj5a9mrh7vg6h3gk5f0wsdp6832nz0z10h184107sdchpv253n",
- "version": "2.8.0"
+ "rev": "v3.4.0",
+ "sha256": "0lvpcw4d70888c0dssvpzbx8n67a52yb66kanqzp4is0clw4943g",
+ "vendorSha256": "19lwrr28fknv098s82cvczdb7xrcblsrh0jmzpn69gym5axcc2v9",
+ "version": "3.4.0"
},
"venafi": {
- "owner": "terraform-providers",
+ "deleteVendor": true,
+ "owner": "Venafi",
+ "provider-source-address": "registry.terraform.io/Venafi/venafi",
"repo": "terraform-provider-venafi",
- "rev": "v0.9.2",
- "sha256": "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9",
- "version": "0.9.2"
+ "rev": "v0.13.0",
+ "sha256": "1gvr0g622ddc8sw7f1g6vqw6wvzmm26qqzw7dljmgbvch0xyal86",
+ "vendorSha256": "1hk8nwm29yfbvwy6h8lv136vvh8nynjnqifzjdriqv2ldxl6pykj",
+ "version": "0.13.0"
},
"vercel": {
"owner": "ondrejsika",
@@ -1207,11 +1131,13 @@
"version": "2.1.0"
},
"vra7": {
- "owner": "terraform-providers",
+ "owner": "vmware",
+ "provider-source-address": "registry.terraform.io/vmware/vra7",
"repo": "terraform-provider-vra7",
- "rev": "v1.0.1",
- "sha256": "0qmldgxmrv840c5rbmskdf4f9g4v52gg9v7magm6j2w2g0dp1022",
- "version": "1.0.1"
+ "rev": "v3.0.3",
+ "sha256": "0f4mc7gbjbzw4x6rw6cbhc9xrmkhwhvjdzcinvc96pfm2fy3cdxh",
+ "vendorSha256": null,
+ "version": "3.0.3"
},
"vsphere": {
"owner": "hashicorp",
@@ -1231,24 +1157,29 @@
},
"vultr": {
"owner": "vultr",
+ "provider-source-address": "registry.terraform.io/vultr/vultr",
"repo": "terraform-provider-vultr",
- "rev": "v2.1.3",
- "sha256": "sha256-fvqkzg3j2TYAMbPc8Ifh35sBe0D76LYH6Ut5Ugdyexg=",
- "version": "2.1.3"
+ "rev": "v2.8.1",
+ "sha256": "1dhfxr6a4kj1llalfw76w36iw6vcdk1p0nb90kfkpg2sh58a6rid",
+ "vendorSha256": null,
+ "version": "2.8.1"
},
"wavefront": {
- "owner": "terraform-providers",
+ "owner": "vmware",
+ "provider-source-address": "registry.terraform.io/vmware/wavefront",
"repo": "terraform-provider-wavefront",
- "rev": "v2.3.0",
- "sha256": "0aci96852bd4y8bi9y68p550jiji0c69kiw4zhf9qfld0sjz44j2",
- "version": "2.3.0"
+ "rev": "v3.0.0",
+ "sha256": "1awi74b7ny021krck0vp1gv6v93a4h0rgdl5xib82lf5pxnx4wgn",
+ "vendorSha256": "0gbwj4cqywip22irkx9hyghy6zx9dirm6gd3i70nclchvkg9dm1x",
+ "version": "3.0.0"
},
"yandex": {
"owner": "yandex-cloud",
+ "provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
"repo": "terraform-provider-yandex",
- "rev": "v0.54.0",
- "sha256": "0q9m7520zl7q1liri6x849xjp221wbc9l2w6dj19mmgfwspqv02l",
- "vendorSha256": "0rzldsb8gyhvnsd26wg9byqngzzj64pi86v2hb4i63rlfmnn77xi",
- "version": "0.54.0"
+ "rev": "v0.69.0",
+ "sha256": "0k4py0asibcpfl9w8q0bn3rfjxhxf6cs3g53j35qij3gakqf1w2i",
+ "vendorSha256": "0zx2lq9va0llrjlf3lk8pnx6f5knmi4jjxrnll89kp01imydjqv8",
+ "version": "0.69.0"
}
}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers
index 052c56742c5f..46f0ce1be561 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p jq
+#! nix-shell -I nixpkgs=../../../../.. -i bash -p jq
# shellcheck shell=bash
# Update all providers which have specified provider source address
@@ -14,9 +14,9 @@ providers=$(
)
echo "Will update providers:"
-echo "$providers"
+echo "${providers}"
-for provider in $providers; do
- echo "Updating $provider"
- ./update-provider "$provider"
+for provider in ${providers}; do
+ echo "Updating ${provider}"
+ ./update-provider "${provider}"
done
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider
index 03d92452ebc2..47206914f7a9 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-provider
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix
+#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix nix-prefetch
# shellcheck shell=bash
# vim: ft=sh
#
@@ -7,6 +7,7 @@
# provider source address.
#
set -euo pipefail
+shopt -s inherit_errexit
show_usage() {
cat <
read_attr() {
- jq -r ".\"$provider_name\".\"$1\"" providers.json
+ jq -r ".\"${provider_name}\".\"$1\"" providers.json
}
# Usage: update_attr
update_attr() {
- if [[ "$2" == "null" ]]; then
- jq -S ".\"$provider_name\".\"$1\" = null" providers.json | sponge providers.json
+ if [[ $2 == "null" ]]; then
+ jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json
else
- jq -S ".\"$provider_name\".\"$1\" = \"$2\"" providers.json | sponge providers.json
+ jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json
fi
}
@@ -96,23 +98,23 @@ prefetch_github() {
local owner=$1
local repo=$2
local rev=$3
- nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"
+ nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"
}
old_source_address="$(read_attr provider-source-address)"
old_vendor_sha256=$(read_attr vendorSha256)
old_version=$(read_attr version)
-if [[ $provider =~ ^[^/]+/[^/]+$ ]]; then
- source_address=registry.terraform.io/$provider
+if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then
+ source_address=registry.terraform.io/${provider}
else
- source_address=$old_source_address
+ source_address=${old_source_address}
fi
-if [[ "$source_address" == "null" ]]; then
- echo "Could not find the source address for provider: $provider"
+if [[ ${source_address} == "null" ]]; then
+ echo "Could not find the source address for provider: ${provider}"
exit 1
fi
-update_attr "provider-source-address" "$source_address"
+update_attr "provider-source-address" "${source_address}"
# The provider source address (used inside Terraform `required_providers` block) is
# used to compute the registry API endpoint
@@ -122,58 +124,43 @@ update_attr "provider-source-address" "$source_address"
# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API)
registry_response=$(curl -s https://"${source_address/\///v1/providers/}")
-version="$(jq -r '.version' <<< "$registry_response")"
-if [[ "$old_version" = "$version" && "$force" != 1 && -z "$vendorSha256" && "$old_vendor_sha256" != "$vendorSha256" ]]; then
- echo "$provider_name is already at version $version"
+version="$(jq -r '.version' <<<"${registry_response}")"
+if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then
+ echo "${provider_name} is already at version ${version}"
exit
fi
-update_attr version "$version"
+update_attr version "${version}"
-provider_source_url="$(jq -r '.source' <<< "$registry_response")"
+provider_source_url="$(jq -r '.source' <<<"${registry_response}")"
-org="$(echo "$provider_source_url" | cut -d '/' -f 4)"
-update_attr owner "$org"
-repo="$(echo "$provider_source_url" | cut -d '/' -f 5)"
-update_attr repo "$repo"
-rev="$(jq -r '.tag' <<< "$registry_response")"
-update_attr rev "$rev"
-sha256=$(prefetch_github "$org" "$repo" "$rev")
-update_attr sha256 "$sha256"
+org="$(echo "${provider_source_url}" | cut -d '/' -f 4)"
+update_attr owner "${org}"
+repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)"
+update_attr repo "${repo}"
+rev="$(jq -r '.tag' <<<"${registry_response}")"
+update_attr rev "${rev}"
+sha256=$(prefetch_github "${org}" "${repo}" "${rev}")
+update_attr sha256 "${sha256}"
repo_root=$(git rev-parse --show-toplevel)
-if [[ -z "$vendorSha256" ]]; then
- if [[ "$old_vendor_sha256" == null ]]; then
+if [[ -z ${vendorSha256} ]]; then
+ if [[ ${old_vendor_sha256} == null ]]; then
vendorSha256=null
- elif [[ -n "$old_vendor_sha256" || "$vendor" = 1 ]]; then
+ elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then
echo "=== Calculating vendorSha256 ==="
- update_attr vendorSha256 "0000000000000000000000000000000000000000000000000000000000000000"
- # Hackish way to find out the desired sha256. First build, then extract the
- # error message from the logs.
- set +e
- nix-build --no-out-link "$repo_root" -A "terraform-providers.$provider_name.go-modules" 2>vendor_log.txt
- set -e
- logs=$(< vendor_log.txt)
- if ! [[ $logs =~ got:\ +([^\ ]+) ]]; then
- echo "ERROR: could not find new hash in output:"
- cat vendor_log.txt
- rm -f vendor_log.txt
- exit 1
- fi
- rm -f vendor_log.txt
- # trim the results in case it they have a sha256: prefix or contain more than one line
- vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1)
+ vendorSha256=$(nix-prefetch "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
# Deal with nix unstable
- if [[ $vendorSha256 = sha256-* ]]; then
- vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "$vendorSha256")
+ if [[ ${vendorSha256} == sha256-* ]]; then
+ vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}")
fi
fi
fi
-if [[ -n "$vendorSha256" ]]; then
- update_attr vendorSha256 "$vendorSha256"
+if [[ -n ${vendorSha256} ]]; then
+ update_attr vendorSha256 "${vendorSha256}"
fi
# Check that the provider builds
-echo "=== Building terraform-providers.$provider_name ==="
-nix-build "$repo_root" -A "terraform-providers.$provider_name"
+echo "=== Building terraform-providers.${provider_name} ==="
+nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}"
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 88ac40b4134f..2e0a913705c9 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
- "version": "1.9.7",
+ "version": "1.9.8",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -52,9 +52,10 @@
"@types/auto-launch": "^5.0.1",
"@types/counterpart": "^0.18.1",
"@types/minimist": "^1.2.1",
- "@typescript-eslint/eslint-plugin": "^4.17.0",
- "@typescript-eslint/parser": "^4.17.0",
+ "@typescript-eslint/eslint-plugin": "^5.6.0",
+ "@typescript-eslint/parser": "^5.6.0",
"allchange": "^1.0.6",
+ "app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
"electron": "13.5",
@@ -75,7 +76,7 @@
"pacote": "^11.3.5",
"rimraf": "^3.0.2",
"tar": "^6.1.2",
- "typescript": "^4.1.3"
+ "typescript": "^4.5.3"
},
"hakDependencies": {
"matrix-seshat": "^2.3.0",
@@ -83,7 +84,6 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "13.5.2",
"files": [
"package.json",
{
diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json
index c711956791ac..b0dc0c2e739d 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.json
+++ b/pkgs/applications/networking/instant-messengers/element/pin.json
@@ -1,6 +1,6 @@
{
- "version": "1.9.7",
- "desktopSrcHash": "bUzIIPNVgK2whQJoEZOaoa+jsJx4No+xji6hXK6wxFY=",
- "desktopYarnHash": "1n9dqpvq31k94mx5s1dgqavaxdd0jrzcwdx106c5dnq6xnxs941p",
- "webHash": "1fx1nznqbwvs84kpc239ms9kpzy9p72hrz3qqbzay8p9x4gc1ws3"
+ "version": "1.9.8",
+ "desktopSrcHash": "o6SICu7QDdBv9WXDconkypQRj3TbrU4ZAxayO9yemvc=",
+ "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18",
+ "webHash": "141fqvh4d5lwm692yc8mfwrlvqnfixvc7vlbfis86qi557vq6ljq"
}
diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index a34d2c5d928a..2389aee53a99 100644
--- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -17,10 +17,10 @@ in
mkFranzDerivation' rec {
pname = "ferdi";
name = "Ferdi";
- version = "5.6.4";
+ version = "5.6.5";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
- sha256 = "sha256-y3kuhSWoGysGkvDTV+bze6LSXVO4uDfDOos64eSYFf0=";
+ sha256 = "sha256-JeFPvU4xXHcv6/ApCDkejYWfA8lqsxwoFXnqIiOQ0+Y=";
};
extraBuildInputs = [ xorg.libxshmfence ];
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index c80757384109..d1cf00969b10 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;
mkDerivation rec {
pname = "psi-plus";
- version = "1.5.1582";
+ version = "1.5.1596";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = version;
- sha256 = "sha256-ZMJxGxwDuY2fW+W68JiH0X+FpowdAPm70EQ9pHNnrG4=";
+ sha256 = "sha256-8GnENdoFgFa+pDN8C+W5qoFxsCE7tl3dUHf5TBipo5g=";
};
cmakeFlags = [
diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/applications/networking/tetrd/default.nix
new file mode 100644
index 000000000000..94e7950ecdbb
--- /dev/null
+++ b/pkgs/applications/networking/tetrd/default.nix
@@ -0,0 +1,85 @@
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, makeWrapper
+, c-ares
+, ffmpeg
+, libevent
+, libvpx
+, libxslt
+, xorg
+, minizip
+, nss
+, re2
+, snappy
+, libnotify
+, libappindicator-gtk3
+, libappindicator
+, udev
+, mesa # required for libgbm
+}:
+
+stdenv.mkDerivation rec {
+ pname = "tetrd";
+ version = "1.0.4";
+
+ src = fetchurl {
+ url = "https://web.archive.org/web/20211130190525/https://download.tetrd.app/files/tetrd.linux_amd64.pkg.tar.xz";
+ sha256 = "1bxp7rg2dm9nnvkgg48xd156d0jgdf35flaw0bwzkkh3zz9ysry2";
+ };
+
+ sourceRoot = ".";
+ dontConfigure = true;
+ dontBuild = true;
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ makeWrapper
+ ];
+
+ buildInputs = [
+ c-ares
+ ffmpeg
+ libevent
+ libvpx
+ libxslt
+ xorg.libXScrnSaver
+ xorg.libXdamage
+ xorg.libXtst
+ minizip
+ nss
+ re2
+ snappy
+ libnotify
+ libappindicator-gtk3
+ libappindicator
+ udev
+ mesa
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/opt
+ cp -r $sourceRoot/opt/Tetrd $out/opt
+ cp -r $sourceRoot/usr/share $out
+
+ wrapProgram $out/opt/Tetrd/tetrd \
+ --prefix LD_LIBRARY_PATH ":" ${lib.makeLibraryPath buildInputs}
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ substituteInPlace $out/share/applications/tetrd.desktop --replace /opt $out/opt
+ '';
+
+ meta = with lib; {
+ description = "Share your internet connection from your device to your PC and vice versa through a USB cable";
+ homepage = "https://tetrd.app";
+ license = licenses.unfree;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ Madouura ];
+ };
+}
diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix
index fb55672c4576..b5198f78b0aa 100644
--- a/pkgs/applications/radio/tqsl/default.nix
+++ b/pkgs/applications/radio/tqsl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tqsl";
- version = "2.5.7";
+ version = "2.5.9";
src = fetchurl {
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
- sha256 = "sha256-0QlTUNwKeuuR+n8eT04kiywAsY3hrPGPYH1A84MmxIs=";
+ sha256 = "sha256-flv7tI/SYAxxJsHFa3QUgnO0glAAQF87EgP4wyTWnNU=";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix
index 89ac4c49629e..5fcb367ce5cb 100644
--- a/pkgs/applications/science/biology/stacks/default.nix
+++ b/pkgs/applications/science/biology/stacks/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "stacks";
- version = "2.59";
+ version = "2.60";
src = fetchurl {
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
- sha256 = "sha256-pVFwb4EPba9wL9kDGN2gi7aeH+sPhDG/XLyHxqG4zd4=";
+ sha256 = "sha256-ppKG7Z1TyLwUyqRnGYk3QWPJqKeNcW04GMW7myPFSNM=";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/applications/science/biology/xenomapper/default.nix
index f5e538c70961..194db966915e 100644
--- a/pkgs/applications/science/biology/xenomapper/default.nix
+++ b/pkgs/applications/science/biology/xenomapper/default.nix
@@ -1,6 +1,6 @@
-{buildPythonPackage, lib, fetchFromGitHub, statistics}:
+{ python3, lib, fetchFromGitHub }:
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
pname = "xenomapper";
version = "1.0.2";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr";
};
- propagatedBuildInputs = [ statistics ];
+ propagatedBuildInputs = with python3.pkgs; [ statistics ];
meta = with lib; {
homepage = "https://github.com/genomematt/xenomapper";
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 3b757d40a694..400d636346c5 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, which }:
+{ lib, stdenv, fetchurl, which, enableHO ? false }:
stdenv.mkDerivation rec {
pname = "eprover";
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--exec-prefix=$(out)"
"--man-prefix=$(out)/share/man"
+ ] ++ lib.optionals enableHO [
+ "--enable-ho"
];
meta = with lib; {
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index e69c76352b90..32d89d7e22ae 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, veriT, rlwrap, makeDesktopItem }:
+{ lib, stdenv, fetchurl, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }:
# nettools needed for hostname
stdenv.mkDerivation rec {
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ perl polyml z3 veriT ]
+ buildInputs = [ polyml z3 veriT vampire eprover-ho ]
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
sourceRoot = dirname;
@@ -37,6 +36,17 @@ stdenv.mkDerivation rec {
ISABELLE_VERIT=${veriT}/bin/veriT
EOF
+ cat >contrib/e-*/etc/settings <contrib/vampire-*/etc/settings <contrib/polyml-*/etc/settings <>etc/settings
- for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-*; do
+ for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do
rm -rf $comp/x86*
done
'' + (if ! stdenv.isLinux then "" else ''
arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
- for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do
+ for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS}; do
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"
done
'');
diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index c80b9bf1f0c4..7eff519375f2 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -2,23 +2,16 @@
stdenv.mkDerivation rec {
pname = "libpoly";
- version = "0.1.10";
+ version = "0.1.11";
src = fetchFromGitHub {
owner = "SRI-CSL";
repo = "libpoly";
# they've pushed to the release branch, use explicit tag
rev = "refs/tags/v${version}";
- sha256 = "sha256-22Y4L5NFnCzKwZt0A/ChMuGPU4Dk1Qyke6mdvfN063w=";
+ sha256 = "sha256-vrYB6RQYShipZ0c0j1KcSTJR1h0rQKAAeJvODMar1GM=";
};
- # https://github.com/SRI-CSL/libpoly/pull/52
- postPatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/CMakeLists.txt --replace \
- '"utils/open_memstream.c ''${poly_SOURCES}"' \
- 'utils/open_memstream.c ''${poly_SOURCES}'
- '';
-
nativeBuildInputs = [ cmake ];
buildInputs = [ gmp python3 ];
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index b88544544462..307c75b272bc 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vampire";
- version = "4.5.1";
+ version = "4.6.1";
src = fetchFromGitHub {
owner = "vprover";
repo = "vampire";
- rev = version;
- sha256 = "0q9gqyq96amdnhxgwjyv0r2sxakikp3jvmizgj2h0spfz643p8db";
+ rev = "v${version}";
+ sha256 = "0z71nxjak3ibp842r8iv37w1x3cbkrmjs88lpvxqb4sgrbyk38zd";
};
buildInputs = [ z3 zlib ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
homepage = "https://vprover.github.io/";
description = "The Vampire Theorem Prover";
platforms = platforms.unix;
- license = licenses.unfree;
+ license = licenses.bsd3;
maintainers = with maintainers; [ gebner ];
};
}
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index c81d5a9ca618..fb14723241b8 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yices";
# We never want X.Y.${odd} versions as they are moving development tags.
- version = "2.6.2";
+ version = "2.6.4";
src = fetchFromGitHub {
owner = "SRI-CSL";
repo = "yices2";
rev = "Yices-${version}";
- sha256 = "1jx3854zxvfhxrdshbipxfgyq1yxb9ll9agjc2n0cj4vxkjyh9mn";
+ sha256 = "sha256-qdxh86CkKdm65oHcRgaafTG9GUOoIgTDjeWmRofIpNE=";
};
patches = [
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 4153ba5f66fc..a820539eb9a3 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -10,6 +10,7 @@
, ocaml ? null
, findlib ? null
, zarith ? null
+, writeScript
}:
assert javaBindings -> jdk != null;
@@ -19,13 +20,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "z3";
- version = "4.8.12";
+ version = "4.8.14";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = pname;
rev = "z3-${version}";
- sha256 = "1wbcdc7h3mag8infspvxxja2hiz4igjwxzvss2kqar1rjj4ivfx0";
+ sha256 = "jPSTVSndp/T7n+VxZ/g9Rjco00Up+9xeDIVkeLl1MTw=";
};
nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
@@ -67,6 +68,23 @@ stdenv.mkDerivation rec {
++ optional javaBindings "java"
++ optional ocamlBindings "ocaml";
+ passthru = {
+ updateScript = writeScript "update-z3" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p common-updater-scripts curl jq
+
+ set -eu -o pipefail
+
+ # Expect tags in format
+ # [{name: "Nightly", ..., {name: "z3-vv.vv.vv", ...].
+ # Below we extract frst "z3-vv.vv" and drop "z3-" prefix.
+ newVersion="$(curl -s https://api.github.com/repos/Z3Prover/z3/releases |
+ jq 'first(.[].name|select(startswith("z3-"))|ltrimstr("z3-"))' --raw-output
+ )"
+ update-source-version ${pname} "$newVersion"
+ '';
+ };
+
meta = with lib; {
description = "A high-performance theorem prover and SMT solver";
homepage = "https://github.com/Z3Prover/z3";
diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix
index 6688b6041e09..fc12b1addf6f 100644
--- a/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -26,7 +26,7 @@
rustPlatform.buildRustPackage rec {
pname = "wezterm";
- version = "20211204-082213-a66c61ee9";
+ version = "20220101-133340-7edc5b5a";
outputs = [ "out" "terminfo" ];
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
repo = pname;
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-QKtnOpAW4exDQEFSN0b04hA6TYuC+/C5nIYHCNzfuso=";
+ sha256 = "sha256-UZCvKbZdZ7K4RtvVLmr44M612tqd4rkrjF2tys0JHNM=";
};
postPatch = ''
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
rm -r wezterm-ssh/tests
'';
- cargoSha256 = "sha256-qSThjV6oBD6joDM0Eppo7z0SL8GHV5SaCaAwXmUIT3I=";
+ cargoSha256 = "1imil15n9mf1r71qdp4cb4q7kzrrc2cspml0d54825yqaq8vjhsc";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 68cf76153707..6d856caecd96 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.15.7";
+ version = "1.15.9";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-Ckg8XKCPnyp4a0kXJrqju2jAJvD4tzjomaeJxlFwYzg=";
+ sha256 = "sha256-DzPgAy7Curypc/66c1NqYSHFgtovpY5qEq/Le+0VYk4=";
};
unpackPhase = ''
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index ddd20d6b7914..d6b0467fb729 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -25,11 +25,11 @@ assert !withQT -> default != "qt5";
stdenv.mkDerivation rec {
pname = "avidemux";
- version = "2.7.8";
+ version = "2.8.0";
src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
- sha256 = "sha256-YopAT1If8oEnYHAK4+KqeOWBaw/z+2/QWsPnUkjZdAE=";
+ sha256 = "sha256-0exvUnflEijs8O4cqJ+uJMWR9SD4fOlvq+yIGNBN4zs=";
};
patches = [
diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
index 1ff78164ddc0..758e509b85d9 100644
--- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
- version = "19.0.1";
+ version = "19.0.2";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
- sha256 = "sha256-WeokXU4HY22SzL1djORzru5Hju58Ix0+InwZDr++FC8=";
+ sha256 = "sha256-iFAOoQvZAdvJvN8FBg2w+oZWtr8mYdBQ3QX58HLmBho=";
};
extraBuildInputs = [ jsoncpp libhdhomerun ];
diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
index 30f56b2c3c7b..e64f8c60e5c3 100644
--- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
- version = "19.0.3";
+ version = "19.0.4";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
- sha256 = "sha256-kO+wRFt4MudYP9UOTaruRCWs/QMla+BYTRfSUdlVpR8=";
+ sha256 = "sha256-WP/eaE3qO0NqN23dHkFOiOjoeKIglbbHofqnUsfxSfI=";
};
meta = with lib; {
diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
index 17811c162920..5aefffabc324 100644
--- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
@@ -6,13 +6,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
- version = "19.0.2";
+ version = "19.0.3";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
rev = "${version}-${rel}";
- sha256 = "sha256-WPLXESP5QvjroCygzMQc3+QKbsA05ri0oKvsqBQv8w0=";
+ sha256 = "sha256-LQP+yPHPOjgvW7LQmqrp15NWFBVdnrGOSGm37N8AsHg=";
};
extraBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
index 090e09d55ef6..632b421ccfab 100644
--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
+{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
buildKodiAddon rec {
pname = "youtube";
@@ -23,6 +23,15 @@ buildKodiAddon rec {
};
};
+ patches = [
+ # This patch can be removed once https://github.com/anxdpanic/plugin.video.youtube/pull/260 has been merged.
+ (fetchpatch {
+ name = "fix-addon-path";
+ url = "https://patch-diff.githubusercontent.com/raw/anxdpanic/plugin.video.youtube/pull/260.patch";
+ sha256 = "11c9sfwl5kvfll2jws5b4i46s60v6gkfns4al13p4m5ch9rk06hs";
+ })
+ ];
+
meta = with lib; {
homepage = "https://github.com/anxdpanic/plugin.video.youtube";
description = "YouTube is one of the biggest video-sharing websites of the world";
diff --git a/pkgs/applications/video/kodi/build-kodi-addon.nix b/pkgs/applications/video/kodi/build-kodi-addon.nix
index 572d5dda8053..8f9c05d8fa12 100644
--- a/pkgs/applications/video/kodi/build-kodi-addon.nix
+++ b/pkgs/applications/video/kodi/build-kodi-addon.nix
@@ -13,7 +13,7 @@ toKodiAddon (stdenv.mkDerivation ({
installPhase = ''
runHook preInstall
- cd $src/$sourceDir
+ cd ./$sourceDir
d=$out${addonDir}/${namespace}
mkdir -p $d
sauce="."
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index c6628dde0590..04911562a347 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -47,13 +47,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "63.0.0";
+ version = "64.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "0jniy2kkg4fkrgyw2k8jcpq872qzkrxkbpbc7ksadm2rdygsa3xh";
+ sha256 = "sha256-tg9rjTbprcVkzUUVWCKqF1dzIjFKjzIqrVADtuUU9Fk=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 10ba865eb343..0f50dc3311df 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
{ lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }:
mkDerivation rec {
- version = "21.7.0";
+ version = "21.10.0";
pname = "smtube";
src = fetchurl {
url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-d+R3eM2BPdrsY7XX+6IWpz6cKIy/L2x0iLZH0mTgfcc=";
+ sha256 = "sha256-ZQIUAi/YC+zsYHVhlprZ5K6NGvT6LojmdQ1Z+WCg1lU=";
};
makeFlags = [
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index b155d2deee19..da1e1de42701 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "sha256-RzAQnuOjT8eMH+rJm+/JrF96PZbCgzDVNPQYUeXPWnY=";
+ ldflags = ["-X github.com/docker/compose/v2/internal.Version=${version}"];
+
doCheck = false;
installPhase = ''
install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 7a29cf222b7d..2955b2272980 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -9,6 +9,7 @@
, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio
, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2, SDL2_image
+, jackSupport ? !stdenv.isDarwin && !nixosTestRunner, libjack2
, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
, vncSupport ? !nixosTestRunner, libjpeg, libpng
, smartcardSupport ? !nixosTestRunner, libcacard
@@ -35,7 +36,8 @@
let
audio = lib.optionalString alsaSupport "alsa,"
+ lib.optionalString pulseSupport "pa,"
- + lib.optionalString sdlSupport "sdl,";
+ + lib.optionalString sdlSupport "sdl,"
+ + lib.optionalString jackSupport "jack,";
in
@@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
++ lib.optionals alsaSupport [ alsa-lib ]
++ lib.optionals pulseSupport [ libpulseaudio ]
++ lib.optionals sdlSupport [ SDL2 SDL2_image ]
+ ++ lib.optionals jackSupport [ libjack2 ]
++ lib.optionals gtkSupport [ gtk3 gettext vte ]
++ lib.optionals vncSupport [ libjpeg libpng ]
++ lib.optionals smartcardSupport [ libcacard ]
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index 4773a1e2cf6e..ae7151c31c3c 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -8,6 +8,7 @@ args @ {
, extraInstallCommands ? ""
, meta ? {}
, passthru ? {}
+, extraBwrapArgs ? []
, unshareUser ? true
, unshareIpc ? true
, unsharePid ? true
@@ -23,7 +24,7 @@ let
buildFHSEnv = callPackage ./env.nix { };
env = buildFHSEnv (removeAttrs args [
- "runScript" "extraInstallCommands" "meta" "passthru" "dieWithParent"
+ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
]);
@@ -169,6 +170,7 @@ let
"''${ro_mounts[@]}"
"''${symlinks[@]}"
"''${auto_mounts[@]}"
+ ${concatStringsSep "\n " extraBwrapArgs}
${init runScript}/bin/${name}-init ${initArgs}
)
exec "''${cmd[@]}"
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 8ce69a7f1878..72af03e03d98 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -139,7 +139,7 @@ stdenvNoCC.mkDerivation {
# New-style output content requirements.
inherit (hash_) outputHashAlgo outputHash;
- SSL_CERT_FILE = if hash_.outputHash == ""
+ SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash)
then "${cacert}/etc/ssl/certs/ca-bundle.crt"
else "/no-cert-file.crt";
diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix
index 0f0a4d5fa15c..26d31a292119 100644
--- a/pkgs/data/misc/unicode-character-database/default.nix
+++ b/pkgs/data/misc/unicode-character-database/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "unicode-character-database";
- version = "13.0.0";
+ version = "14.0.0";
src = fetchurl {
url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
- sha256 = "0ld97ppkb5f8d5b3mlkxfwnr6f3inijyqias9xc4bbin9lxrfxig";
+ sha256 = "sha256-AzpSdrXXr4hEWJ+ONILzl3qDhecdEH03UFVGUXjCNgA=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix
index 4a30d434c04a..b5477cfeb0d8 100644
--- a/pkgs/desktops/cinnamon/pix/default.nix
+++ b/pkgs/desktops/cinnamon/pix/default.nix
@@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "pix";
- version = "2.8.0";
+ version = "2.8.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- sha256 = "sha256-m508pkbiSVuIaEx7EznOd5QTkpM66TBbpM5HRkjKRQA=";
+ sha256 = "sha256-yB8nLGvJZOViD+i4IkKN0yCDl5wRCvEbjzPDs7ZRMNA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index 88aa7f306691..26f7d9138cc3 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "adoptopenjdk-icedtea-web";
- version = "1.8.7";
+ version = "1.8.8";
src = fetchFromGitHub {
owner = "AdoptOpenJDK";
repo = "IcedTea-Web";
rev = "icedtea-web-${version}";
- sha256 = "sha256-XY6S1IvDqPxkYgFs7kB9AR0zQ4n3COVbS2lUT5mhTVc=";
+ sha256 = "sha256-hpEVWG9ltNDL/0EFJjgQRRce+BLcCO4ZERULYZxyC1o=";
};
nativeBuildInputs = [ autoreconfHook pkg-config bc ];
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
index 24ff50f558cd..e1b299f1e733 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "aspectj";
- version = "1.9.6";
+ version = "1.9.7";
builder = ./builder.sh;
src = let
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
in fetchurl {
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
- sha256 = "02jh66l3vw57k9a4dxlga3qh3487r36gyi6k2z2mmqxbpqajslja";
+ sha256 = "sha256-xrg88nLOcagaAsFSnnYChhlv6EKhdBqkJJTDzhUBvTo=";
};
inherit jre;
diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix
index 5cfb2de919f1..a71805f50563 100644
--- a/pkgs/development/interpreters/spidermonkey/68.nix
+++ b/pkgs/development/interpreters/spidermonkey/68.nix
@@ -78,6 +78,8 @@ in stdenv.mkDerivation rec {
"--target=${stdenv.hostPlatform.config}"
];
+ # mkDerivation by default appends --build/--host to configureFlags when cross compiling
+ # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
configurePlatforms = [];
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix
index cd745c5ba9e0..b4ed171eb78c 100644
--- a/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/pkgs/development/interpreters/spidermonkey/78.nix
@@ -92,6 +92,8 @@ stdenv.mkDerivation rec {
"--target=${stdenv.hostPlatform.config}"
];
+ # mkDerivation by default appends --build/--host to configureFlags when cross compiling
+ # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
configurePlatforms = [ ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix
index a8927e79f9a4..57e62e319d11 100644
--- a/pkgs/development/interpreters/spidermonkey/91.nix
+++ b/pkgs/development/interpreters/spidermonkey/91.nix
@@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
"--target=${stdenv.hostPlatform.config}"
];
+ # mkDerivation by default appends --build/--host to configureFlags when cross compiling
+ # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
+ configurePlatforms = [ ];
+
depsBuildBuild = [ buildPackages.stdenv.cc ];
# Remove unnecessary static lib
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix
index a98f3f55a488..b3e3a34973c0 100644
--- a/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/pkgs/development/libraries/audio/libsmf/default.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, glib, pkg-config }:
stdenv.mkDerivation rec {
version = "1.3";
pname = "libsmf";
- src = fetchurl {
- url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz";
- sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
+
+ src = fetchFromGitHub {
+ owner = "stump";
+ repo = "libsmf";
+ rev = "libsmf-${version}";
+ sha256 = "sha256-OJXJkXvbM2GQNInZXU2ldObquKHhqkdu1zqUDnVZN0Y=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 111a72972ed3..414634f07070 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
+{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
stdenv.mkDerivation rec {
pname = "lvtk";
version = "1.2.0";
- src = fetchurl {
- url = "https://github.com/lvtk/lvtk/archive/${version}.tar.gz";
- sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
+ src = fetchFromGitHub {
+ owner = "lvtk";
+ repo = "lvtk";
+ rev = version;
+ sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw=";
};
nativeBuildInputs = [ pkg-config python2 wafHook ];
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 64349b1e3cf3..80287f4f3140 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,18 +1,20 @@
-{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut, libX11, xorgproto
, libXi, pkg-config }:
stdenv.mkDerivation rec {
pname = "box2d";
version = "2.3.1";
- src = fetchurl {
- url = "https://github.com/erincatto/box2d/archive/v${version}.tar.gz";
- sha256 = "0p03ngsmyz0r5kbpiaq10ns4fxwkjvvawi8k6pfall46b93wizsq";
+ src = fetchFromGitHub {
+ owner = "erincatto";
+ repo = "box2d";
+ rev = "v${version}";
+ sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs=";
};
- sourceRoot = "box2d-${version}/Box2D";
+ sourceRoot = "source/Box2D";
- nativeBuildInputs = [ cmake unzip pkg-config ];
+ nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ];
cmakeFlags = [
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index cce14951c8be..adc52da1e560 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, pkg-config }:
stdenv.mkDerivation rec {
pname = "capstone";
version = "4.0.2";
- src = fetchurl {
- url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
- sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw";
+ src = fetchFromGitHub {
+ owner = "aquynh";
+ repo = "capstone";
+ rev = version;
+ sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";
};
# replace faulty macos detection
diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix
index 43d73ba200ce..5b2895a3f177 100644
--- a/pkgs/development/libraries/cmrt/default.nix
+++ b/pkgs/development/libraries/cmrt/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libdrm, libva }:
stdenv.mkDerivation rec {
pname = "cmrt";
version = "1.0.6";
- src = fetchurl {
- url = "https://github.com/intel/cmrt/archive/${version}.tar.gz";
- sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na";
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "cmrt";
+ rev = version;
+ sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 6c8bf6eb7223..56899b1f8978 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -1,14 +1,15 @@
-{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qtscript, cmake }:
mkDerivation rec {
pname = "grantlee";
version = "5.2.0";
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
- src = fetchurl {
- url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
- sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk";
- name = "${pname}-${version}.tar.gz";
+ src = fetchFromGitHub {
+ owner = "steveire";
+ repo = "grantlee";
+ rev = "v${version}";
+ sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk=";
};
buildInputs = [ qtbase qtscript ];
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index ee34afad4f74..8e9a34716f2a 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libamqpcpp";
- version = "4.3.12";
+ version = "4.3.15";
src = fetchFromGitHub {
owner = "CopernicaMarketingSoftware";
repo = "AMQP-CPP";
rev = "v${version}";
- sha256 = "sha256-veiD2RrJ08HYZ1Jy8EUe6ct2qh7a2xZCn3TTM+Hvu+0=";
+ sha256 = "sha256-S2/ecWC78Q4ihVLtDQ6DD8/qX1cDslnTjqd5IkKCjc4=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index f12409f271f9..b0d09a5f7491 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -1,40 +1,32 @@
{ lib
, stdenv
-, fetchurl
+, fetchFromGitHub
+, autoreconfHook
, imlib2
, libX11
, libXext
, ncurses
, pkg-config
-, x11Support ? !stdenv.isDarwin
, zlib
+, x11Support ? !stdenv.isDarwin
}:
stdenv.mkDerivation rec {
pname = "libcaca";
- version = "0.99.beta19";
+ version = "0.99.beta20";
- src = fetchurl {
- urls = [
- "http://fossies.org/linux/privat/${pname}-${version}.tar.gz"
- "http://caca.zoy.org/files/libcaca/${pname}-${version}.tar.gz"
- ];
- hash = "sha256-EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=";
+ src = fetchFromGitHub {
+ owner = "cacalabs";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
};
- outputs = [ "bin" "dev" "out" "man" ];
-
- configureFlags = [
- (if x11Support then "--enable-x11" else "--disable-x11")
- ];
-
- NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
-
- enableParallelBuilding = true;
-
nativeBuildInputs = [
+ autoreconfHook
pkg-config
];
+
buildInputs = [
ncurses
zlib
@@ -44,6 +36,14 @@ stdenv.mkDerivation rec {
libXext
];
+ outputs = [ "bin" "dev" "out" "man" ];
+
+ configureFlags = [
+ (if x11Support then "--enable-x11" else "--disable-x11")
+ ];
+
+ NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
+
postInstall = ''
mkdir -p $dev/bin
mv $bin/bin/caca-config $dev/bin/caca-config
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 50c41982450f..45bb7f5b60ed 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -2,17 +2,18 @@
stdenv.mkDerivation rec {
pname = "liblcf";
- version = "0.6.2";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "EasyRPG";
repo = "liblcf";
rev = version;
- sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c";
+ sha256 = "sha256-69cYZ8hJ92gK39gueaEoUM0K7BDWIQ/0NvcQ/6e3Sg8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ expat icu ];
+ enableParallelBuilding = true;
meta = with lib; {
description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 199ae0b685cf..bbd892c33ee8 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages
-, glib, jansson }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, python3
+, glib
+, jansson
+}:
stdenv.mkDerivation rec {
version = "3.2.0";
@@ -12,9 +19,19 @@ stdenv.mkDerivation rec {
sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = with python3Packages; [ python simplejson ];
- propagatedBuildInputs = [ glib jansson ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ python3
+ ];
+
+ propagatedBuildInputs = [
+ glib
+ jansson
+ ];
meta = with lib; {
homepage = "https://github.com/haiwen/libsearpc";
diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix
deleted file mode 100644
index f7a393e8fda9..000000000000
--- a/pkgs/development/libraries/libvirt/5.9.0.nix
+++ /dev/null
@@ -1,141 +0,0 @@
-{ lib, stdenv, fetchurl, fetchgit
-, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch
-, coreutils, libxml2, gnutls, perl, python2, attr
-, iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
-, libtasn1, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
-, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc
-, enableXen ? false, xen ? null
-, enableIscsi ? false, openiscsi
-, enableCeph ? false, ceph
-}:
-
-with lib;
-
-# if you update, also bump and SysVirt in
-let
- buildFromTarball = stdenv.isDarwin;
-in stdenv.mkDerivation rec {
- pname = "libvirt";
- version = "5.9.0";
-
- src =
- if buildFromTarball then
- fetchurl {
- url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
- sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il";
- }
- else
- fetchgit {
- url = "git://libvirt.org/libvirt.git";
- rev = "v${version}";
- sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk";
- fetchSubmodules = true;
- };
-
- nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ];
- buildInputs = [
- libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
- libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
- ] ++ optionals (!buildFromTarball) [
- libtool autoconf automake
- ] ++ optionals stdenv.isLinux [
- libpciaccess lvm2 util-linux systemd libnl numad zfs
- libapparmor libcap_ng numactl attr parted libtirpc
- ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
- xen
- ] ++ optionals enableIscsi [
- openiscsi
- ] ++ optionals enableCeph [
- ceph
- ] ++ optionals stdenv.isDarwin [
- libiconv gmp
- ];
-
- preConfigure = ''
- ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
- PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
- # the path to qemu-kvm will be stored in VM's .xml and .save files
- # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
- substituteInPlace src/lxc/lxc_conf.c \
- --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
- patchShebangs . # fixes /usr/bin/python references
- '';
-
- configureFlags = [
- "--localstatedir=/var"
- "--sysconfdir=/var/lib"
- "--with-libpcap"
- "--with-qemu"
- "--with-vmware"
- "--with-vbox"
- "--with-test"
- "--with-esx"
- "--with-remote"
- ] ++ optionals stdenv.isLinux [
- "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
- "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
- "CFLAGS=-I${libtirpc.dev}/include/tirpc"
- "--with-attr"
- "--with-apparmor"
- "--with-secdriver-apparmor"
- "--with-numad"
- "--with-macvtap"
- "--with-virtualport"
- "--with-storage-disk"
- ] ++ optionals (stdenv.isLinux && zfs != null) [
- "--with-storage-zfs"
- ] ++ optionals enableIscsi [
- "--with-storage-iscsi"
- ] ++ optionals enableCeph [
- "--with-storage-rbd"
- ] ++ optionals stdenv.isDarwin [
- "--with-init-script=none"
- ];
-
- installFlags = [
- "localstatedir=$(TMPDIR)/var"
- "sysconfdir=$(out)/var/lib"
- ];
-
-
- postInstall = let
- binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
- in ''
- substituteInPlace $out/libexec/libvirt-guests.sh \
- --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \
- --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
- --replace "$out/bin" '${gettext}/bin' \
- --replace 'lock/subsys' 'lock' \
- --replace 'gettext.sh' 'gettext.sh
- # Added in nixpkgs:
- gettext() { "${gettext}/bin/gettext" "$@"; }
- '
- '' + optionalString stdenv.isLinux ''
- substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
- rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
- wrapProgram $out/sbin/libvirtd \
- --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
- '';
-
- enableParallelBuilding = true;
-
- NIX_CFLAGS_COMPILE = "-fno-stack-protector";
-
- meta = {
- homepage = "http://libvirt.org/";
- repositories.git = "git://libvirt.org/libvirt.git";
- description = ''
- A toolkit to interact with the virtualization capabilities of recent
- versions of Linux (and other OSes)
- '';
- license = licenses.lgpl2Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ fpletz globin ];
- knownVulnerabilities = [
- "https://security.libvirt.org/2019/0008.html"
- "https://security.libvirt.org/2019/0009.html"
- "https://security.libvirt.org/2020/0001.html"
- ];
- };
-}
diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix
index 1fcb91a7fb39..66de5847d78e 100644
--- a/pkgs/development/libraries/libwpe/default.nix
+++ b/pkgs/development/libraries/libwpe/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "libwpe";
- version = "1.10.1";
+ version = "1.12.0";
src = fetchurl {
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
- sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA=";
+ sha256 = "sha256-6O7KIoprTDYpTPtj99O6mtpHpDCQSlqXOzyZyWpEwYw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix
index 11265c643f94..4f2f31d614c3 100644
--- a/pkgs/development/libraries/openbabel/2.nix
+++ b/pkgs/development/libraries/openbabel/2.nix
@@ -1,12 +1,14 @@
-{stdenv, lib, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
+{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "2.4.1";
- src = fetchurl {
- url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
- sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
+ src = fetchFromGitHub {
+ owner = "openbabel";
+ repo = "openbabel";
+ rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";
+ sha256 = "sha256-+pXsWMzex7rB1mm6dnTHzAcyw9jImgx1OZuLeCvbeJ0=";
};
patches = [
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 7ab64cf59c57..6ecc3606b96d 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "proj";
- version = "8.1.1";
+ version = "8.2.0";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = version;
- sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w=";
+ sha256 = "sha256-YXZ3txBWW5vUcdYLISJPxdFGCQpKi1vvJlX8rntujg8=";
};
patches = [
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 4b5f277fc531..aa9127b7aa12 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "range-v3";
@@ -13,13 +13,18 @@ stdenv.mkDerivation rec {
patches = [
./gcc10.patch
+ (fetchpatch {
+ url = "https://github.com/ericniebler/range-v3/commit/66e847d4e14be3a369b7e26a03a172b20e62c003.patch";
+ sha256 = "sha256-JOQptVqNicdMhcDhBrWQRf7MfskBv56cICwvMA8g88Y=";
+ })
];
nativeBuildInputs = [ cmake ];
# Building the tests currently fails on AArch64 due to internal compiler
# errors (with GCC 9.2):
- cmakeFlags = lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
+ cmakeFlags = [ "-DRANGES_ENABLE_WERROR=OFF" ]
+ ++ lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
doCheck = !stdenv.isAarch64;
checkTarget = "test";
diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix
index cd5bc5b7dcee..b8449b61d76d 100644
--- a/pkgs/development/libraries/reproc/default.nix
+++ b/pkgs/development/libraries/reproc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "reproc";
- version = "14.2.3";
+ version = "14.2.4";
src = fetchFromGitHub {
owner = "DaanDeMeyer";
repo = "reproc";
rev = "v${version}";
- sha256 = "sha256-bdZ7czkeoSl5znGit0AYQ9D4K8qE2Co+F2Z4jLJuQok=";
+ sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 22e818409913..17c2ee9efaef 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
+{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes
, derez, rez, setfile
, AGL, Cocoa, Kernel, WebKit
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
version = "3.0.5.1";
pname = "wxmac";
- src = fetchzip {
- url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
- sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
+ src = fetchFromGitHub {
+ owner = "wxWidgets";
+ repo = "wxWidgets";
+ rev = "v${version}";
+ sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
};
buildInputs = [
diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix
index 241b59f8230f..88f3426e512a 100644
--- a/pkgs/development/nim-packages/flatty/default.nix
+++ b/pkgs/development/nim-packages/flatty/default.nix
@@ -2,6 +2,6 @@
fetchNimble {
pname = "flatty";
- version = "0.2.1";
- hash = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0=";
+ version = "0.2.3";
+ hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
}
diff --git a/pkgs/development/nim-packages/packedjson/default.nix b/pkgs/development/nim-packages/packedjson/default.nix
index 9edad962d589..25579540c0b7 100644
--- a/pkgs/development/nim-packages/packedjson/default.nix
+++ b/pkgs/development/nim-packages/packedjson/default.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "Araq";
repo = "packedjson";
- rev = "7198cc8";
- sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1";
+ rev = "d11d167";
+ sha256 = "1302rn58277c3ic5sfq89c4mkn0d66bhilifh5xjf40x74ahir5x";
}
diff --git a/pkgs/development/nim-packages/redis/default.nix b/pkgs/development/nim-packages/redis/default.nix
index 1768bf1976f5..1cd7c68ecc94 100644
--- a/pkgs/development/nim-packages/redis/default.nix
+++ b/pkgs/development/nim-packages/redis/default.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "zedeus";
repo = "redis";
- rev = "94bcbf1";
- sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j";
+ rev = "d0a0e6f";
+ sha256 = "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f";
}
diff --git a/pkgs/development/nim-packages/redpool/default.nix b/pkgs/development/nim-packages/redpool/default.nix
index ef14854b32dc..6c4c8a8e193c 100644
--- a/pkgs/development/nim-packages/redpool/default.nix
+++ b/pkgs/development/nim-packages/redpool/default.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "zedeus";
repo = "redpool";
- rev = "57aeb25";
- sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q";
+ rev = "f880f49";
+ sha256 = "01n73bpgfdz2a3qvcfxsq4a6gxbhabf2n5np1ilzgdqkzcd4jf9b";
}
diff --git a/pkgs/development/nim-packages/regex/default.nix b/pkgs/development/nim-packages/regex/default.nix
index d89fbdd60538..091377eb1f2e 100644
--- a/pkgs/development/nim-packages/regex/default.nix
+++ b/pkgs/development/nim-packages/regex/default.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "nitely";
repo = "nim-regex";
- rev = "2e32fdc";
- sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8";
+ rev = "eeefb4f";
+ sha256 = "13gn0qhnxz07474kv94br5qlac9j8pz2555fk83538fiq83vgbm5";
}
diff --git a/pkgs/development/nim-packages/zippy/default.nix b/pkgs/development/nim-packages/zippy/default.nix
index 230892b68899..84008325bec8 100644
--- a/pkgs/development/nim-packages/zippy/default.nix
+++ b/pkgs/development/nim-packages/zippy/default.nix
@@ -2,6 +2,6 @@
fetchNimble {
pname = "zippy";
- version = "0.5.6";
- hash = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4=";
+ version = "0.7.3";
+ hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
}
diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix
deleted file mode 100644
index c6eb9543024b..000000000000
--- a/pkgs/development/python-modules/affinity/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
-
-buildPythonPackage rec {
- pname = "affinity";
- version = "0.1.0";
-
- # syntax error
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
- };
-
- meta = {
- description = "control processor affinity on windows and linux";
- homepage = "http://cheeseshop.python.org/pypi/affinity";
- license = with lib.licenses; [ psfl ];
- };
-}
diff --git a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix b/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
deleted file mode 100644
index aa18a0fe2907..000000000000
--- a/pkgs/development/python-modules/antlr4-python2-runtime/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, buildPythonPackage, isPy3k, python
-, antlr4
-}:
-
-buildPythonPackage rec {
- pname = "antlr4-python2-runtime";
- inherit (antlr4.runtime.cpp) version src;
- disabled = isPy3k;
-
- sourceRoot = "source/runtime/Python2";
-
- checkPhase = ''
- ${python.interpreter} tests/TestTokenStreamRewriter.py
- '';
-
- meta = with lib; {
- description = "Runtime for ANTLR";
- homepage = "https://www.antlr.org/";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
deleted file mode 100644
index 90b21baafdda..000000000000
--- a/pkgs/development/python-modules/application/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, zope_interface, isPy3k }:
-
-buildPythonPackage rec {
- pname = "python-application";
- version = "2.8.0";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "AGProjects";
- repo = pname;
- rev = "release-${version}";
- sha256 = "1xd2gbpmx2ghap9cnr1h6sxjai9419bdp3y9qp5lh67977m0qg30";
- };
-
- buildInputs = [ zope_interface ];
-
- # No tests upstream to run
- doCheck = false;
-
- meta = with lib; {
- description = "Basic building blocks for python applications";
- homepage = "https://github.com/AGProjects/python-application";
- changelog = "https://github.com/AGProjects/python-application/blob/master/ChangeLog";
- license = licenses.lgpl2Plus;
- };
-}
diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix
deleted file mode 100644
index cc702a525f95..000000000000
--- a/pkgs/development/python-modules/arrow/2.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, simplejson, backports_functools_lru_cache
-, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
- pname = "arrow";
- version = "0.17.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4";
- };
-
- propagatedBuildInputs = [ python-dateutil ]
- ++ lib.optionals isPy27 [ backports_functools_lru_cache ];
-
- checkInputs = [
- dateparser
- pytestCheckHook
- pytest-cov
- pytest-mock
- pytz
- simplejson
- sphinx
- ];
-
- # ParserError: Could not parse timezone expression "America/Nuuk"
- disabledTests = [
- "test_parse_tz_name_zzz"
- ];
-
- meta = with lib; {
- description = "Python library for date manipulation";
- homepage = "https://github.com/crsmithdev/arrow";
- license = licenses.asl20;
- maintainers = with maintainers; [ thoughtpolice ];
- };
-}
diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix
deleted file mode 100644
index 40b9b405aab1..000000000000
--- a/pkgs/development/python-modules/ase/3.17.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, fetchPypi
-, buildPythonPackage
-, numpy
-, scipy
-, matplotlib
-, flask
-, pillow
-, psycopg2
-}:
-
-buildPythonPackage rec {
- pname = "ase";
- version = "3.17.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
- };
-
- propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
-
- checkPhase = ''
- $out/bin/ase test
- '';
-
- # tests just hang most likely due to something with subprocesses and cli
- doCheck = false;
-
- meta = with lib; {
- description = "Atomic Simulation Environment";
- homepage = "https://wiki.fysik.dtu.dk/ase/";
- license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix
deleted file mode 100644
index 47c7e8f6eb3f..000000000000
--- a/pkgs/development/python-modules/astroid/1.6.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage
-, lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache
-, pytest
-}:
-
-buildPythonPackage rec {
- pname = "astroid";
- version = "1.6.6";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7";
- };
-
- # From astroid/__pkginfo__.py
- propagatedBuildInputs = [
- lazy-object-proxy
- six
- wrapt
- enum34
- singledispatch
- backports_functools_lru_cache
- ];
-
- checkInputs = [ pytest ];
-
- checkPhase = ''
- # test_builtin_help is broken
- pytest -k "not test_builtin_help and not test_namespace_and_file_mismatch and not test_namespace_package_pth_support and not test_nested_namespace_import" astroid
- '';
-
- meta = with lib; {
- description = "An abstract syntax tree for Python with inference support";
- homepage = "https://github.com/PyCQA/astroid";
- license = licenses.lgpl2;
- platforms = platforms.all;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix
deleted file mode 100644
index bf346f3a3ca1..000000000000
--- a/pkgs/development/python-modules/backports_lzma/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, xz
-, python
-, pythonOlder
-}:
-
-if !(pythonOlder "3.3") then null else buildPythonPackage rec {
- pname = "backports.lzma";
- version = "0.0.14";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "16d8b68e4d3cd4e6c9ddb059850452946da3914c8a8e197a7f2b0954559f2df4";
- };
-
- buildInputs = [ xz ];
-
- checkPhase = ''
- ${python.interpreter} test/test_lzma.py
- '';
-
- # Relative import does not seem to function.
- doCheck = false;
-
- meta = {
- description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";
- homepage = "https://github.com/peterjc/backports.lzma";
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix
deleted file mode 100644
index 214449708433..000000000000
--- a/pkgs/development/python-modules/backports_os/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools-scm
-, future
-, isPy3k
-, python
-, hypothesis
-}:
-
-buildPythonPackage rec {
- version = "0.1.1";
- pname = "backports.os";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630";
- };
-
- buildInputs = [ setuptools-scm ];
- checkInputs = [ hypothesis ];
- propagatedBuildInputs = [ future ];
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover tests
- '';
-
- meta = with lib; {
- homepage = "https://github.com/pjdelport/backports.os";
- description = "Backport of new features in Python's os module";
- license = licenses.mit;
- maintainers = [ maintainers.costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix
deleted file mode 100644
index df57eb3cd0c9..000000000000
--- a/pkgs/development/python-modules/bcrypt/3_1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, isPyPy, cffi, pytest, six }:
-
-buildPythonPackage rec {
- version = "3.1.7";
- pname = "bcrypt";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42";
- };
-
- checkInputs = [ pytest ];
-
- propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi;
-
- meta = with lib; {
- description = "Modern password hashing for your software and your servers";
- homepage = "https://github.com/pyca/bcrypt/";
- license = licenses.asl20;
- maintainers = with maintainers; [ domenkozar ];
- };
-}
diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix
deleted file mode 100644
index b874f1af525a..000000000000
--- a/pkgs/development/python-modules/bitbucket-api/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, requests_oauthlib, nose, sh }:
-
-buildPythonPackage rec {
- pname = "bitbucket-api";
- version = "0.5.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b541d9d7f234074a74214505aff1846eb21e5dd6d3915139e817d4675d34f4e3";
- };
-
- propagatedBuildInputs = [ requests_oauthlib nose sh ];
-
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/Sheeprider/BitBucket-api";
- description = "Python library to interact with BitBucket REST API";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
deleted file mode 100644
index fd97fa206480..000000000000
--- a/pkgs/development/python-modules/blivet/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
-, pyudev, six, libselinux, multipath-tools, lsof, util-linux
-}:
-
-buildPythonPackage rec {
- pname = "blivet";
- version = "0.67";
-
- src = fetchFromGitHub {
- owner = "dwlehman";
- repo = "blivet";
- rev = "${pname}-${version}";
- sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky";
- };
-
- postPatch = ''
- sed -i \
- -e 's|"multipath"|"${multipath-tools}/sbin/multipath"|' \
- -e '/^def set_friendly_names/a \ return False' \
- blivet/devicelibs/mpath.py
- sed -i -e '/"wipefs"/ {
- s|wipefs|${util-linux}/sbin/wipefs|
- s/-f/--force/
- }' blivet/formats/__init__.py
- sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
- sed -i -r -e 's|"(u?mount)"|"${util-linux}/bin/\1"|' blivet/util.py
- '';
-
- propagatedBuildInputs = [
- pykickstart pyparted pyblock pyudev libselinux
- six
- ];
-
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://fedoraproject.org/wiki/Blivet";
- description = "Module for management of a system's storage configuration";
- license = with licenses; [ gpl2Plus lgpl21Plus ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix
deleted file mode 100644
index e6f6a390f374..000000000000
--- a/pkgs/development/python-modules/box2d/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, swig2
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "Box2D";
- version = "2.3.2";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d1557dffdf9c1d6c796ec5df53e3d93227bb026c14b8411d22c295edaa2fb225";
- };
-
- postPatch = ''
- sed -i "s/'Box2D.tests' : 'tests'//" setup.py
- '';
-
- nativeBuildInputs = [ swig2 ];
-
- # tests not included with pypi release
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/pybox2d/pybox2d";
- description = ''
- A 2D game physics library for Python under
- the very liberal zlib license
- '';
- license = licenses.zlib;
- maintainers = with maintainers; [ sepi ];
- };
-}
diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
deleted file mode 100644
index 1c69d70a134a..000000000000
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, requests
-, urllib3
-}:
-
-buildPythonPackage rec {
- pname = "browsermob-proxy";
- version = "0.8.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v";
- };
-
- propagatedBuildInputs = [ (requests.override { urllib3 = urllib3.override {
- pyopenssl = null;
- cryptography = null;
- };}) ];
-
- meta = {
- description = "A library for interacting with Browsermob Proxy";
- homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix
deleted file mode 100644
index 84c1767bc29f..000000000000
--- a/pkgs/development/python-modules/cairocffi/0_9.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# FIXME: make gdk-pixbuf dependency optional
-{ stdenv
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, lib
-, substituteAll
-, makeFontsConf
-, freefont_ttf
-, pytest
-, pytest-runner
-, glibcLocales
-, cairo
-, cffi
-, withXcffib ? false, xcffib
-, python
-, glib
-, gdk-pixbuf
-}@args:
-
-import ./generic.nix ({
- version = "0.9.0";
- sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337";
- dlopen_patch = ./dlopen-paths-0.9.patch;
- inherit withXcffib;
-} // args)
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
deleted file mode 100644
index 307cb428c078..000000000000
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit 705dc9a55bd160625d9996e63fc7dc532d0ad0ab
-Author: Alexander V. Nikolaev
-Date: Sat Feb 6 08:09:06 2016 +0200
-
- Patch dlopen() to allow direct paths to all required libs
-
- This patch is NixOS specific
-
-diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
-index 718aa7f..1a1dcff 100644
---- a/cairocffi/__init__.py
-+++ b/cairocffi/__init__.py
-@@ -27,20 +27,22 @@ VERSION = '0.7.2'
- version = '1.10.0'
- version_info = (1, 10, 0)
-
-+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
-+_LIBS = {
-+ 'cairo': '@cairo@/lib/libcairo@ext@',
-+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
-+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
-+}
-
--def dlopen(ffi, *names):
-+def dlopen(ffi, name, *names):
- """Try various names for the same library, for different platforms."""
-- for name in names:
-- for lib_name in [name, 'lib' + name]:
-- try:
-- path = ctypes.util.find_library(lib_name)
-- if path:
-- lib = ffi.dlopen(path)
-- if lib:
-- return lib
-- except OSError:
-- pass
-- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
-+ path = _LIBS.get(name, None)
-+ if path:
-+ lib = ffi.dlopen(path)
-+ if lib:
-+ return lib
-+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
-
-
- cairo = dlopen(ffi, 'cairo', 'cairo-2')
diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix
deleted file mode 100644
index 3e1a67f8282b..000000000000
--- a/pkgs/development/python-modules/cairosvg/1_x.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig
-, cssselect2, defusedxml, pillow, tinycss2 }:
-
-# CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an
-# alternative
-buildPythonPackage rec {
- pname = "CairoSVG";
- version = "1.0.22";
-
- # PyPI doesn't include tests so use GitHub
- src = fetchFromGitHub {
- owner = "Kozea";
- repo = pname;
- rev = version;
- sha256 = "15z0cag5s79ghhrlgs5xc9ayvzzdr3v8151vf6k819f1drsfjfxl";
- };
-
- propagatedBuildInputs = [ cairocffi ];
-
- checkInputs = [ nose fontconfig cssselect2 defusedxml pillow tinycss2 ];
-
- # Almost all tests just fail. Not sure how to fix them.
- doCheck = false;
-
- # checkInputs = [ nose fontconfig cssselect2 defusedxml pillow tinycss2 ];
-
- # checkPhase = ''
- # FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf nosetests .
- # '';
-
- meta = with lib; {
- homepage = "https://cairosvg.org";
- license = licenses.lgpl3;
- description = "SVG converter based on Cairo";
- maintainers = with maintainers; [ jluttine ];
- };
-}
diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix
deleted file mode 100644
index 55d659376c61..000000000000
--- a/pkgs/development/python-modules/cddb/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, pkgs
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "CDDB";
- version = "1.4";
- disabled = isPy3k;
-
- buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
-
- src = pkgs.fetchurl {
- url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz";
- sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
- };
-
- meta = with lib; {
- homepage = "http://cddb-py.sourceforge.net/";
- description = "CDDB and FreeDB audio CD track info access";
- license = licenses.gpl2Plus;
- };
-
-}
diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix
deleted file mode 100644
index cf8890505904..000000000000
--- a/pkgs/development/python-modules/cdecimal/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchurl, isPy3k }:
-
-buildPythonPackage rec {
- pname = "cdecimal";
- version = "2.3";
-
- disabled = isPy3k;
-
- src = fetchurl {
- url="http://www.bytereef.org/software/mpdecimal/releases/${pname}-${version}.tar.gz";
- sha256 = "d737cbe43ed1f6ad9874fb86c3db1e9bbe20c0c750868fde5be3f379ade83d8b";
- };
-
- # Upstream tests are not included s. a. http://www.bytereef.org/mpdecimal/testing.html
- doCheck = false;
-
- meta = with lib; {
- description = "Fast drop-in replacement for decimal.py";
- homepage = "http://www.bytereef.org/mpdecimal/";
- license = licenses.bsd2;
- maintainers = [ maintainers.udono ];
- };
-}
diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix
deleted file mode 100644
index 2ae180a8bae6..000000000000
--- a/pkgs/development/python-modules/cherrypy/17.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
-, setuptools-scm
-, cheroot, contextlib2, portend, routes, six, zc_lockfile
-, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt
-}:
-
-buildPythonPackage rec {
- pname = "cherrypy";
- version = "17.4.2";
-
- src = fetchPypi {
- pname = "CherryPy";
- inherit version;
- sha256 = "ef1619ad161f526745d4f0e4e517753d9d985814f1280e330661333d2ba05cdf";
- };
-
- propagatedBuildInputs = [
- cheroot contextlib2 portend routes six zc_lockfile
- ];
-
- nativeBuildInputs = [ setuptools-scm ];
-
- checkInputs = [
- backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt
- ];
-
- checkPhase = ''
- pytest ${lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"}
- '';
-
- meta = with lib; {
- homepage = "https://www.cherrypy.org";
- description = "A pythonic, object-oriented HTTP framework";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix
deleted file mode 100644
index e410a37fcb42..000000000000
--- a/pkgs/development/python-modules/cliapp/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchgit
-, sphinx
-, isPy3k
-}:
-
-buildPythonPackage {
- pname = "cliapp";
- version = "1.20150305";
- disabled = isPy3k;
-
- src = fetchgit {
- url = "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp";
- rev = "569df8a5959cd8ef46f78c9497461240a5aa1123";
- sha256 = "882c5daf933e4cf089842995efc721e54361d98f64e0a075e7373b734cd899f3";
- };
-
- buildInputs = [ sphinx ];
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://liw.fi/cliapp/";
- description = "Python framework for Unix command line programs";
- license = licenses.gpl2;
- maintainers = [];
- };
-
-}
diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix
deleted file mode 100644
index 18782fb50bb1..000000000000
--- a/pkgs/development/python-modules/closure-linter/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchgit
-, isPy3k
-, gflags
-}:
-
-/* There is a project called "closure-linter" on PyPI that is the
- same as this, but it does not appear to be owned by Google.
- So we're pulling from Google's GitHub repo instead. */
-buildPythonPackage {
- pname = "closure-linter";
- version = "2.3.19";
-
- /* This project has no Python 3 support, as noted by
- https://github.com/google/closure-linter/issues/81 */
- disabled = isPy3k;
-
- src = fetchgit {
- url = "https://github.com/google/closure-linter";
- rev = "5c27529075bb88bdc45e73008f496dec8438d658";
- sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
- };
-
- propagatedBuildInputs = [ gflags ];
-
- meta = with lib; {
- description = "Checks JavaScript files against Google's style guide.";
- homepage = "https://developers.google.com/closure/utilities/";
- license = with licenses; [ asl20 ];
- };
-
-}
diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix
deleted file mode 100644
index 28d78203b6d4..000000000000
--- a/pkgs/development/python-modules/cmdtest/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, cliapp
-, ttystatus
-, markdown
-, isPy3k
-, isPyPy
-}:
-
-buildPythonPackage rec {
- pname = "cmdtest";
- version = "0.32";
- disabled = isPy3k || isPyPy;
-
- src = fetchurl {
- url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz";
- sha256 = "0scc47h1nkmbm5zlvk9bsnsg64kb9r4xadchdinf4f1mph9qpgn6";
- };
-
- propagatedBuildInputs = [ cliapp ttystatus markdown ];
-
- # TODO: cmdtest tests must be run before the buildPhase
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://liw.fi/cmdtest/";
- description = "Black box tests Unix command line tools";
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix
deleted file mode 100644
index b21ea193cbfa..000000000000
--- a/pkgs/development/python-modules/coilmq/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, stompclient, python-daemon, redis, pid, pytest, six, click, coverage
-, sqlalchemy }:
-
-buildPythonPackage rec {
- pname = "CoilMQ";
- version = "1.0.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d";
- };
-
- propagatedBuildInputs = [ stompclient python-daemon redis pid ];
- buildInputs = [ pytest six click coverage sqlalchemy ];
-
- # The teste data is not included in the distribution
- doCheck = false;
-
- meta = with lib; {
- description = "Simple, lightweight, and easily extensible STOMP message broker";
- homepage = "https://github.com/hozn/coilmq/";
- license = licenses.asl20;
- };
-}
diff --git a/pkgs/development/python-modules/convertdate/2.2.x.nix b/pkgs/development/python-modules/convertdate/2.2.x.nix
deleted file mode 100644
index 1145a61ca4f0..000000000000
--- a/pkgs/development/python-modules/convertdate/2.2.x.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pymeeus
-, pytz
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
- pname = "convertdate";
- version = "2.2.2";
-
- # Tests are not available in the PyPI tarball so use GitHub instead.
- src = fetchFromGitHub {
- owner = "fitnr";
- repo = pname;
- rev = "v${version}";
- sha256 = "07x1j6jgkmrzdpv2lhpp4n16621mpmlylvwdwsggdjivhzvc3x9q";
- };
-
- propagatedBuildInputs = [
- pymeeus
- pytz
- ];
-
- checkInputs = [
- pytestCheckHook
- ];
-
- meta = with lib; {
- homepage = "https://github.com/fitnr/convertdate";
- description = "Utils for converting between date formats and calculating holidays";
- license = licenses.mit;
- maintainers = with maintainers; [ jluttine ];
- };
-}
diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix
deleted file mode 100644
index c46337981bd7..000000000000
--- a/pkgs/development/python-modules/darcsver/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, mock }:
-
-buildPythonPackage rec {
- pname = "darcsver";
- version = "1.7.4";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6";
- };
-
- buildInputs = [ mock ];
-
- # Note: We don't actually need to provide Darcs as a build input.
- # Darcsver will DTRT when Darcs isn't available. See news.gmane.org
- # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a
- # discussion.
-
- # AttributeError: 'module' object has no attribute 'test_darcsver'
- doCheck = false;
-
- meta = with lib; {
- description = "Darcsver, generate a version number from Darcs history";
- homepage = "https://pypi.python.org/pypi/darcsver";
- license = "BSD-style";
- };
-}
diff --git a/pkgs/development/python-modules/dateparser/0.x.nix b/pkgs/development/python-modules/dateparser/0.x.nix
deleted file mode 100644
index 35125453e786..000000000000
--- a/pkgs/development/python-modules/dateparser/0.x.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, mock
-, parameterized
-, pytestCheckHook
-, python-dateutil
-, pytz
-, regex
-, tzlocal
-, convertdate
-, umalqurra
-, jdatetime
-, ruamel-yaml
-}:
-
-buildPythonPackage rec {
- pname = "dateparser";
- version = "0.7.6";
-
- src = fetchFromGitHub {
- owner = "scrapinghub";
- repo = "dateparser";
- rev = "v${version}";
- sha256 = "0j3sm4hlx7z0ci5fnjq5n9i02vvlfz0wxa889ydryfknjhy5apqw";
- };
-
- checkInputs = [
- mock
- parameterized
- pytestCheckHook
- ];
-
- pytestFlagsArray = [ "tests" ];
-
- disabledTestPaths = [
- "tests/test_dateparser_data_integrity.py" # ImportError: No module named ruamel.yaml
- ];
-
- propagatedBuildInputs = [
- # install_requires
- python-dateutil pytz regex tzlocal
- # extra_requires
- convertdate umalqurra jdatetime ruamel-yaml
- ];
-
- pythonImportsCheck = [ "dateparser" ];
-
- meta = with lib; {
- description = "Date parsing library designed to parse dates from HTML pages";
- homepage = "https://github.com/scrapinghub/dateparser";
- license = licenses.bsd3;
- maintainers = with maintainers; [ dotlambda ];
- };
-}
diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix
deleted file mode 100644
index a3e061ce3af5..000000000000
--- a/pkgs/development/python-modules/deskcon/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, buildPythonPackage
-, pyopenssl
-, pkgs
-, isPy3k
-, python
-}:
-
-buildPythonPackage {
- pname = "deskcon";
- version = "0.3";
- disabled = isPy3k;
-
- src = pkgs.fetchFromGitHub {
- owner= "screenfreeze";
- repo = "deskcon-desktop";
- rev = "267804122188fa79c37f2b21f54fe05c898610e6";
- sha256 ="0i1dd85ls6n14m9q7lkympms1w3x0pqyaxvalq82s4xnjdv585j3";
- };
-
- dontBuild = true;
- doCheck = false;
-
- pythonPath = [ pyopenssl pkgs.gtk3 ];
-
- installPhase = ''
- substituteInPlace server/deskcon-server --replace "python2" "python"
-
- mkdir -p $out/bin
- mkdir -p $out/lib/${python.libPrefix}/site-packages
- cp -r "server/"* $out/lib/${python.libPrefix}/site-packages
- mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server
-
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
- meta = with lib; {
- description = "Integrates an Android device into a desktop";
- homepage = "https://github.com/screenfreeze/deskcon-desktop";
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix
deleted file mode 100644
index 16358c54c1a7..000000000000
--- a/pkgs/development/python-modules/django_evolution/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, django
-}:
-
-buildPythonPackage rec {
- pname = "django_evolution";
- version = "2.1.2";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "28bad07b5e29a0ea4bd9727c6927cbee25d349d21606a553a0c748fbee0c073c";
- };
-
- propagatedBuildInputs = [ django ];
-
- meta = with lib; {
- description = "A database schema evolution tool for the Django web framework";
- homepage = "https://github.com/beanbaginc/django-evolution";
- license = licenses.bsd0;
- broken = true;
- };
-
-}
diff --git a/pkgs/development/python-modules/dnspython/1.nix b/pkgs/development/python-modules/dnspython/1.nix
deleted file mode 100644
index d4015f1f4ab6..000000000000
--- a/pkgs/development/python-modules/dnspython/1.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "dnspython";
- version = "1.16.0";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
- };
-
- # needs networking for some tests
- doCheck = false;
- pythonImportsCheck = [ "dns" ];
-
- meta = with lib; {
- description = "A DNS toolkit for Python";
- homepage = "http://www.dnspython.org";
- license = with licenses; [ isc ];
- };
-}
diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix
deleted file mode 100644
index a5d4675f9930..000000000000
--- a/pkgs/development/python-modules/dtopt/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "dtopt";
- version = "0.1";
- # Test contain Python 2 print
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f";
- };
-
- meta = with lib; {
- description = "Add options to doctest examples while they are running";
- homepage = "https://pypi.python.org/pypi/dtopt";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index fd360bfbd120..6e47e4eb389a 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -4,31 +4,23 @@
, numpy
, pandas
, pybind11
+, mypy
, setuptools-scm
-, pytest-runner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "duckdb";
inherit (duckdb) version src;
+ format = "setuptools";
- # build attempts to use git to figure out its own version. don't want to add
- # the dependency for something pointless.
- postPatch = ''
- substituteInPlace scripts/package_build.py --replace \
- "'git'" "'false'"
- '';
+ sourceRoot = "source/tools/pythonpkg";
- postConfigure = ''
- cd tools/pythonpkg
- export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
- '';
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
pybind11
setuptools-scm
- pytest-runner
];
propagatedBuildInputs = [
@@ -37,10 +29,13 @@ buildPythonPackage rec {
];
checkInputs = [
+ mypy
pytestCheckHook
];
- pythonImportsCheck = [ "duckdb" ];
+ pythonImportsCheck = [
+ "duckdb"
+ ];
meta = with lib; {
description = "Python binding for DuckDB";
diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix
deleted file mode 100644
index 9a09c7cc75dd..000000000000
--- a/pkgs/development/python-modules/dulwich/0_19.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
-, urllib3, certifi
-, gevent, geventhttpclient, mock, fastimport
-, git, glibcLocales }:
-
-buildPythonPackage rec {
- version = "0.19.16";
- pname = "dulwich";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "f74561c448bfb6f04c07de731c1181ae4280017f759b0bb04fa5770aa84ca850";
- };
-
- LC_ALL = "en_US.UTF-8";
-
- propagatedBuildInputs = [ urllib3 certifi ];
-
- # Only test dependencies
- checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ];
-
- doCheck = !stdenv.isDarwin;
-
- meta = with lib; {
- description = "Simple Python implementation of the Git file formats and protocols";
- homepage = "https://www.dulwich.io/";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ koral ];
- };
-}
diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix
deleted file mode 100644
index 4d4bff85842a..000000000000
--- a/pkgs/development/python-modules/eventlib/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, fetchdarcs
-, greenlet
-}:
-
-buildPythonPackage rec {
- pname = "python-eventlib";
- version = "0.2.4";
- # Judging from SyntaxError
- disabled = isPy3k;
-
- src = fetchdarcs {
- url = "http://devel.ag-projects.com/repositories/${pname}";
- rev = "release-${version}";
- sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z";
- };
-
- propagatedBuildInputs = [ greenlet ];
-
- doCheck = false;
-
- meta = with lib; {
- description = "Eventlib bindings for python";
- homepage = "https://ag-projects.com/";
- license = licenses.lgpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix
deleted file mode 100644
index f1588690a774..000000000000
--- a/pkgs/development/python-modules/faulthandler/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage }:
-
-buildPythonPackage rec {
- pname = "faulthandler";
- version = "3.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "08ybjjdrfp01syckksxzivqhn6b0yhmc17kdxh77h0lg6rvgvk8y";
- };
-
- # This may be papering over a real failure where the env var activation route
- # for faulthandler does not appear to work. That said, since all other tests
- # pass and since this module is python 2 only (it was upstreamed into the
- # interpreter itself as of python 3.3 and is disabled ) this just disables the
- # test to fix the build. From inspecting Hydra logs and git bisect, the commit
- # that broke it is this one:
- # https://github.com/NixOS/nixpkgs/commit/90be4c2c7875c9487508d95b5c638d97e2903ada
- patches = [ ./disable-env-test.patch ];
-
- meta = with lib; {
- description = "Dump the Python traceback";
- license = licenses.bsd2;
- maintainers = with maintainers; [ sauyon ];
- homepage = "https://faulthandler.readthedocs.io/";
- };
-}
diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix
deleted file mode 100644
index 413416c99a25..000000000000
--- a/pkgs/development/python-modules/fdint/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cython
-, numpy
-, python
-, isPy3k
-}:
-
-buildPythonPackage rec {
- version = "2.0.2";
- pname = "fdint";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "30db139684d362652670e2cd3206b5dd7b3b93b86c3aff37f4b4fd4a3f98aead";
- };
-
- buildInputs = [ cython ];
- propagatedBuildInputs = [ numpy ];
-
- # tests not included with pypi release
- doCheck = false;
-
- checkPhase = ''
- ${python.interpreter} -m fdint.tests
- '';
-
- meta = with lib; {
- homepage = "https://github.com/scott-maddox/fdint";
- description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals";
- license = licenses.mit;
- maintainers = [ maintainers.costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/feedparser/5.nix b/pkgs/development/python-modules/feedparser/5.nix
deleted file mode 100644
index 58cdad9884e9..000000000000
--- a/pkgs/development/python-modules/feedparser/5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "feedparser";
- version = "5.2.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
- };
-
- # lots of networking failures
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/kurtmckee/feedparser";
- description = "Universal feed parser";
- license = licenses.bsd2;
- maintainers = with maintainers; [ domenkozar ];
- };
-}
diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
deleted file mode 100644
index 08aa2efb8f2c..000000000000
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
-, flask, flask_wtf, flask_testing, ldap
-, mock, nose }:
-
-buildPythonPackage rec {
- pname = "flask-ldap-login";
- version = "0.3.4";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "ContinuumIO";
- repo = "flask-ldap-login";
- rev = version;
- sha256 = "1l6zahqhwn5g9fmhlvjv80288b5h2fk5mssp7amdkw5ysk570wzp";
- };
-
- patches = [
- # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41
- (fetchpatch {
- url = "https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch";
- sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48";
- })
- ];
-
- checkInputs = [ nose mock flask_testing ];
- propagatedBuildInputs = [ flask flask_wtf ldap ];
-
- checkPhase = "nosetests -d";
-
- meta = with lib; {
- homepage = "https://github.com/ContinuumIO/flask-ldap-login";
- description = "User session management for Flask";
- license = licenses.mit;
- platforms = platforms.all;
- maintainers = with maintainers; [ mic92 ];
- };
-}
diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix
deleted file mode 100644
index fa19d9bdf7a5..000000000000
--- a/pkgs/development/python-modules/flup/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "flup";
- version = "1.0.3";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159";
- };
-
- meta = with lib; {
- homepage = "https://www.saddi.com/software/flup/";
- description = "FastCGI Python module set";
- license = licenses.bsd0;
- };
-
-}
diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix
index d9516ceb88b4..c0e4bc85773d 100644
--- a/pkgs/development/python-modules/fontmath/default.nix
+++ b/pkgs/development/python-modules/fontmath/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "fontMath";
- version = "0.8.1";
+ version = "0.9.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0m2z2wwbxwljfcrg8hx4xq538adzcjpc352yqbfw0czbgs5ixmrr";
+ sha256 = "1c5e76e135409f49b15809d0ce94dfd00850f893f86d4d6a336808dbbf292700";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix
deleted file mode 100644
index ba97b2e8f47a..000000000000
--- a/pkgs/development/python-modules/fudge/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "fudge";
- version = "1.1.1";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1p7g6hv9qxscbzjv2n5pczpkkp55mp3s56adfc912w9qpf3rv4nr";
- };
-
- checkInputs = [ nose ];
-
- checkPhase = ''
- nosetests -v
- '';
-
- meta = with lib; {
- homepage = "https://github.com/fudge-py/fudge";
- description = "Replace real objects with fakes (mocks, stubs, etc) while testing";
- license = licenses.mit;
- maintainers = [ maintainers.costrouc ];
- };
-
-}
diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix
deleted file mode 100644
index 5c45e875e5da..000000000000
--- a/pkgs/development/python-modules/gateone/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, tornado
-, futures
-, html5lib
-, pkgs
-, isPy3k
-}:
-
-buildPythonPackage {
- pname = "gateone";
- version = "1.2-0d57c3";
- disabled = isPy3k;
-
- src = pkgs.fetchFromGitHub {
- rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea";
- owner= "liftoff";
- repo = "GateOne";
- sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv";
- };
-
- propagatedBuildInputs = [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh];
-
- postInstall=''
- cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone
- '';
-
- meta = with lib; {
- homepage = "http://liftoffsoftware.com/";
- description = "GateOne is a web-based terminal emulator and SSH client";
- maintainers = with maintainers; [ tomberek ];
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix
deleted file mode 100644
index f33579f66327..000000000000
--- a/pkgs/development/python-modules/gdrivefs/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, gipc
-, greenlet
-, httplib2
-, six
-, python-dateutil
-, fusepy
-, google-api-python-client
-}:
-
-buildPythonPackage rec {
- version = "0.14.12";
- pname = "gdrivefs";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "dsoprea";
- repo = "GDriveFS";
- rev = version;
- sha256 = "sha256-eDBy2rp3uitUrR9CG75x8mAio8+gaSckA/lEPAWO0Yo=";
- };
-
- buildInputs = [ gipc greenlet httplib2 six ];
- propagatedBuildInputs = [ python-dateutil fusepy google-api-python-client ];
-
- patchPhase = ''
- substituteInPlace gdrivefs/resources/requirements.txt \
- --replace "==" ">="
- '';
-
- meta = with lib; {
- description = "Mount Google Drive as a local file system";
- longDescription = ''
- GDriveFS is a FUSE wrapper for Google Drive developed. Design goals:
- - Thread for monitoring changes via "changes" functionality of API.
- - Complete stat() implementation.
- - Seamlessly work around duplicate-file allowances in Google Drive.
- - Seamlessly manage file-type versatility in Google Drive
- (Google Doc files do not have a particular format).
- - Allow for the same file at multiple paths.
- '';
- homepage = "https://github.com/dsoprea/GDriveFS";
- license = licenses.gpl2;
- platforms = platforms.unix;
- };
-
-}
diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix
deleted file mode 100644
index 48df43e22173..000000000000
--- a/pkgs/development/python-modules/geopy/2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, geographiclib
-}:
-
-buildPythonPackage rec {
- pname = "geopy";
- version = "1.22.0";
-
- disabled = !isPy27; # only Python 2.7
- doCheck = false; # Needs network access
-
- propagatedBuildInputs = [ geographiclib ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0jypkaqlbyr8icqypwm23lzsvq7flakp3a3nqr8ib5fmd0fzsq7q";
- };
-
- meta = with lib; {
- homepage = "https://github.com/geopy/geopy";
- description = "Python Geocoding Toolbox";
- license = licenses.mit;
- maintainers = with maintainers; [GuillaumeDesforges];
- };
-}
diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix
deleted file mode 100644
index 3c68a1713a0a..000000000000
--- a/pkgs/development/python-modules/gnutls/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "python-gnutls";
- version = "3.1.3";
-
- # https://github.com/AGProjects/python-gnutls/issues/2
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "79f94017e6472ac665c85bc16d68aa2e6681f53b6a9e74516557b49b6fc6a651";
- };
-
- propagatedBuildInputs = [ pkgs.gnutls ];
- patchPhase = ''
- substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib"
- '';
-
- meta = with lib; {
- description = "Python wrapper for the GnuTLS library";
- homepage = "https://github.com/AGProjects/python-gnutls";
- license = licenses.lgpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix
deleted file mode 100644
index 8d19acdc70de..000000000000
--- a/pkgs/development/python-modules/gsd/1.7.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, numpy
-}:
-
-buildPythonPackage rec {
- version = "1.7.0";
- pname = "gsd";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp";
- };
-
- propagatedBuildInputs = [ numpy ];
-
- # tests not packaged with gsd
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://bitbucket.org/glotzer/gsd";
- description = "General simulation data file format";
- license = licenses.bsd2;
- maintainers = [ maintainers.costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix
deleted file mode 100644
index a7a418afa18c..000000000000
--- a/pkgs/development/python-modules/gunicorn/19.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, coverage
-, mock
-, pytest
-, pytest-cov
-, setuptools
-}:
-
-buildPythonPackage rec {
- pname = "gunicorn";
- version = "19.10.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1080jk1ly8j0rc6lv8i33sj94rxjaskd1732cdq5chdqb3ij9ppr";
- };
-
- propagatedBuildInputs = [ setuptools ];
-
- checkInputs = [ pytest mock pytest-cov coverage ];
-
- prePatch = ''
- substituteInPlace requirements_test.txt --replace "==" ">=" \
- --replace "coverage>=4.0,<4.4" "coverage"
- '';
-
- # better than no tests
- checkPhase = ''
- $out/bin/gunicorn --help > /dev/null
- '';
-
- pythonImportsCheck = [ "gunicorn" ];
-
- meta = with lib; {
- homepage = "https://github.com/benoitc/gunicorn";
- description = "WSGI HTTP Server for UNIX";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/hg-git/0.8.nix b/pkgs/development/python-modules/hg-git/0.8.nix
deleted file mode 100644
index b3bfdf708244..000000000000
--- a/pkgs/development/python-modules/hg-git/0.8.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, dulwich
-, isPy3k
-, fetchpatch
-}:
-
-buildPythonPackage rec {
- pname = "hg-git";
- version = "0.8.12";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
- };
-
- propagatedBuildInputs = [ dulwich ];
-
- # Needs patch to work with Mercurial 4.8
- # https://foss.heptapod.net/mercurial/hg-git/-/issues/264
- patches = [
- (fetchpatch {
- url = "https://foss.heptapod.net/mercurial/hg-git/-/commit/186b37af1ff61e8141e9eea5c75a03b3c82f1ab9.diff";
- sha256 = "sha256-KS6fUJOVzCYX/r5sdRXuFDKtlgxz80bGDFb71ISnRgc=";
- })
- ];
-
- meta = with lib; {
- description = "Push and pull from a Git server using Mercurial";
- homepage = "https://hg-git.github.io/";
- maintainers = with maintainers; [ koral ];
- license = licenses.gpl2Only;
- };
-}
diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix
deleted file mode 100644
index b8b6d43b5480..000000000000
--- a/pkgs/development/python-modules/hgsvn/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, hglib
-, isPy3k
-, isPyPy
-}:
-
-buildPythonPackage rec {
- pname = "hgsvn";
- version = "0.3.15";
- disabled = isPy3k || isPyPy;
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "036270cc2803f7a7de3842e8c593849631b2293e647aa3444f68f1b1834d1fa1";
- };
-
- buildInputs = [ nose ];
- propagatedBuildInputs = [ hglib ];
-
- doCheck = false; # too many assumptions
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/hgsvn";
- description = "A set of scripts to work locally on Subversion checkouts using Mercurial";
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix
deleted file mode 100644
index d38ceec7e131..000000000000
--- a/pkgs/development/python-modules/hsaudiotag/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "hsaudiotag";
- version = "1.1.1";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "15hgm128p8nysfi0jb127awga3vlj0iw82l50swjpvdh01m7rda8";
- };
-
- # no tests
- doCheck = false;
-
- meta = with lib; {
- description = "A pure Python library that lets one to read metadata from media files";
- homepage = "http://hg.hardcoded.net/hsaudiotag/";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix
deleted file mode 100644
index 06d0c14c7e43..000000000000
--- a/pkgs/development/python-modules/html2text/2018.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "html2text";
- version = "2018.1.9";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4";
- };
-
- meta = with lib; {
- description = "Turn HTML into equivalent Markdown-structured text";
- homepage = "https://github.com/Alir3z4/html2text/";
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix
deleted file mode 100644
index 9169f1e41266..000000000000
--- a/pkgs/development/python-modules/http_signature/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pycrypto
-}:
-
-buildPythonPackage rec {
- pname = "http_signature";
- version = "0.1.4";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "14acc192ef20459d5e11b4e800dd3a4542f6bd2ab191bf5717c696bf30936c62";
- };
-
- propagatedBuildInputs = [ pycrypto ];
-
- meta = with lib; {
- homepage = "https://github.com/atl/py-http-signature";
- description = "Simple secure signing for HTTP requests using http-signature";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix
deleted file mode 100644
index 6709092ca955..000000000000
--- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, scikit-learn, pandas, nose, pytest }:
-
-buildPythonPackage rec {
- pname = "imbalanced-learn";
- version = "0.4.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083";
- };
-
- propagatedBuildInputs = [ scikit-learn ];
- checkInputs = [ nose pytest pandas ];
- checkPhase = ''
- export HOME=$PWD
- # skip some tests that fail because of minimal rounding errors
- # or large dependencies
- py.test imblearn -k 'not classification \
- and not _generator \
- and not _forest \
- and not wrong_memory'
- '';
-
- meta = with lib; {
- description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
- homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/importlib-resources/2.nix b/pkgs/development/python-modules/importlib-resources/2.nix
deleted file mode 100644
index 1034c3111306..000000000000
--- a/pkgs/development/python-modules/importlib-resources/2.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools-scm
-, importlib-metadata
-, typing
-, singledispatch
-, python
-}:
-
-buildPythonPackage rec {
- pname = "importlib-resources";
- version = "3.3.1";
-
- src = fetchPypi {
- pname = "importlib_resources";
- inherit version;
- sha256 = "0ed250dbd291947d1a298e89f39afcc477d5a6624770503034b72588601bcc05";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [
- importlib-metadata
- singledispatch
- typing
- ];
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- meta = with lib; {
- description = "Read resources from Python packages";
- homepage = "https://importlib-resources.readthedocs.io/";
- license = licenses.asl20;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix
index fda4fb00bfaf..b28932a74f05 100644
--- a/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/pkgs/development/python-modules/importlib-resources/default.nix
@@ -1,10 +1,10 @@
{ lib
+, isPy27
, buildPythonPackage
, fetchPypi
, setuptools-scm
, importlib-metadata
, typing ? null
-, singledispatch ? null
, pythonOlder
, python
}:
@@ -12,6 +12,7 @@
buildPythonPackage rec {
pname = "importlib-resources";
version = "5.4.0";
+ disabled = isPy27;
src = fetchPypi {
pname = "importlib_resources";
@@ -25,8 +26,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
importlib-metadata
- ] ++ lib.optional (pythonOlder "3.4") [
- singledispatch
] ++ lib.optional (pythonOlder "3.5") [
typing
];
diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix
deleted file mode 100644
index 7530b5552462..000000000000
--- a/pkgs/development/python-modules/ipykernel/4.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, isPy27
-, mock
-, ipython
-, jupyter-client
-, pexpect
-, traitlets
-, tornado
-}:
-
-buildPythonPackage rec {
- pname = "ipykernel";
- version = "4.10.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "eeb74b2bcfe0ced5a7900361f98fa1171288aa47ed4b522efe5acb167c6cf5fb";
- };
-
- checkInputs = [ nose ] ++ lib.optional isPy27 mock;
- propagatedBuildInputs = [
- ipython
- jupyter-client
- pexpect
- traitlets
- tornado
- ];
-
- # Tests require backends.
- # I don't want to add all supported backends as propagatedBuildInputs
- doCheck = false;
-
- meta = {
- description = "IPython Kernel for Jupyter";
- homepage = "http://ipython.org/";
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
deleted file mode 100644
index 45096bf77816..000000000000
--- a/pkgs/development/python-modules/ipython/5.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchPypi
-, fetchpatch
-# Build dependencies
-, glibcLocales
-# Test dependencies
-, nose
-, pygments
-, testpath
-, isPy27
-, mock
-# Runtime dependencies
-, backports_shutil_get_terminal_size
-, decorator
-, pathlib2
-, pickleshare
-, requests
-, simplegeneric
-, traitlets
-, prompt-toolkit
-, pexpect
-, appnope
-}:
-
-buildPythonPackage rec {
- pname = "ipython";
- version = "5.8.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906";
- };
-
- prePatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace setup.py --replace "'gnureadline'" " "
- '';
-
- patches = [
- # Use the proper pygments lexer for python2 (https://github.com/ipython/ipython/pull/12095)
- (fetchpatch {
- name = "python2-lexer.patch";
- url = "https://github.com/ipython/ipython/pull/12095/commits/8805293b5e4bce9150cc2ad9c5d6d984849ae447.patch";
- sha256 = "16p4gl7a49v76w33j39ih7yspy6x2d14p9bh4wdpg9cafhw9nbc0";
- })
- ];
-
- buildInputs = [ glibcLocales ];
-
- checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;
-
- propagatedBuildInputs = [
- backports_shutil_get_terminal_size decorator pickleshare prompt-toolkit
- simplegeneric traitlets requests pathlib2 pexpect
- ] ++ lib.optionals stdenv.isDarwin [ appnope ];
-
- LC_ALL="en_US.UTF-8";
-
- doCheck = false; # Circular dependency with ipykernel
-
- checkPhase = ''
- nosetests
- '';
-
- meta = {
- description = "IPython: Productive Interactive Computing";
- homepage = "http://ipython.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ bjornfor orivej lnl7 ];
- };
-}
diff --git a/pkgs/development/python-modules/isort/4.nix b/pkgs/development/python-modules/isort/4.nix
deleted file mode 100644
index 5da9a5c6b306..000000000000
--- a/pkgs/development/python-modules/isort/4.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools, isPy27, futures
-, backports_functools_lru_cache, mock, pytest
-}:
-
-let
- skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778";
- testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests;
-in buildPythonPackage rec {
- pname = "isort";
- version = "4.3.21"; # Note 4.x is the last version that supports Python2
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1";
- };
-
- propagatedBuildInputs = [
- setuptools
- ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ];
-
- checkInputs = [ mock pytest ];
-
- checkPhase = ''
- # isort excludes paths that contain /build/, so test fixtures don't work
- # with TMPDIR=/build/
- PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts}
-
- # Confirm that the produced executable script is wrapped correctly and runs
- # OK, by launching it in a subshell without PYTHONPATH
- (
- unset PYTHONPATH
- echo "Testing that `isort --version-number` returns OK..."
- $out/bin/isort --version-number
- )
- '';
-
- meta = with lib; {
- description = "A Python utility / library to sort Python imports";
- homepage = "https://github.com/timothycrosley/isort";
- license = licenses.mit;
- maintainers = with maintainers; [ couchemar ];
- };
-}
diff --git a/pkgs/development/python-modules/jaraco_functools/2.nix b/pkgs/development/python-modules/jaraco_functools/2.nix
deleted file mode 100644
index e10a11018a5d..000000000000
--- a/pkgs/development/python-modules/jaraco_functools/2.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, setuptools-scm
-, more-itertools, backports_functools_lru_cache }:
-
-buildPythonPackage rec {
- pname = "jaraco.functools";
- version = "2.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0ickpwvvdrlbm477gdzfjfcbgmfia9ksm9a3i3pbx9xia97r9fim";
- };
-
- propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ];
-
- doCheck = false;
-
- buildInputs = [ setuptools-scm ];
-
- meta = with lib; {
- description = "Additional functools in the spirit of stdlib's functools";
- homepage = "https://github.com/jaraco/jaraco.functools";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/jaraco_stream/2.nix b/pkgs/development/python-modules/jaraco_stream/2.nix
deleted file mode 100644
index 1f5a70477a3f..000000000000
--- a/pkgs/development/python-modules/jaraco_stream/2.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ buildPythonPackage, fetchPypi, setuptools-scm, six }:
-
-buildPythonPackage rec {
- pname = "jaraco.stream";
- version = "2.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "196synw4g76yagcflmavi7wakf5cdgsflmvbj7zs616gv03xbsf2";
- };
- doCheck = false;
- buildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ six ];
-}
diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix
deleted file mode 100644
index b1b4648e903d..000000000000
--- a/pkgs/development/python-modules/jsonrpclib/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cjson
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "jsonrpclib";
- version = "0.2.1";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "8138078fd0f2a5b1df7925e4fa0b82a7c17a4be75bf5634af20463172f44f5c0";
- };
-
- propagatedBuildInputs = [ cjson ];
-
- meta = with lib; {
- description = "JSON RPC client library";
- homepage = "https://pypi.python.org/pypi/jsonrpclib/";
- license = lib.licenses.asl20;
- maintainers = [ lib.maintainers.joachifm ];
- };
-}
diff --git a/pkgs/development/python-modules/jupyter-client/5.nix b/pkgs/development/python-modules/jupyter-client/5.nix
deleted file mode 100644
index 0894744bf0b7..000000000000
--- a/pkgs/development/python-modules/jupyter-client/5.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, traitlets
-, jupyter_core
-, pyzmq
-, python-dateutil
-, isPyPy
-, py
-, tornado
-}:
-
-buildPythonPackage rec {
- pname = "jupyter-client";
- version = "5.3.5";
-
- src = fetchPypi {
- pname = "jupyter_client";
- inherit version;
- sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25";
- };
-
- propagatedBuildInputs = [
- traitlets
- jupyter_core
- pyzmq
- python-dateutil
- tornado
- ] ++ lib.optional isPyPy py;
-
- # Circular dependency with ipykernel
- doCheck = false;
-
- meta = {
- description = "Jupyter protocol implementation and client libraries";
- homepage = "https://jupyter.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix
deleted file mode 100644
index 5e2436acc735..000000000000
--- a/pkgs/development/python-modules/jupyter_console/5.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, jupyter-client
-, ipython
-, ipykernel
-, prompt-toolkit
-, pygments
-}:
-
-buildPythonPackage rec {
- pname = "jupyter_console";
- version = "5.2.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd";
- };
-
- checkInputs = [ nose ];
- propagatedBuildInputs = [
- jupyter-client
- ipython
- ipykernel
- prompt-toolkit
- pygments
- ];
-
- # ValueError: underlying buffer has been detached
- doCheck = false;
-
- meta = {
- description = "Jupyter terminal console";
- homepage = "https://jupyter.org/";
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/kiwisolver/1_1.nix b/pkgs/development/python-modules/kiwisolver/1_1.nix
deleted file mode 100644
index 762b5bc0b7b3..000000000000
--- a/pkgs/development/python-modules/kiwisolver/1_1.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, stdenv
-, libcxx
-}:
-
-buildPythonPackage rec {
- pname = "kiwisolver";
- version = "1.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75";
- };
-
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
-
- # Does not include tests
- doCheck = false;
-
- meta = {
- description = "A fast implementation of the Cassowary constraint solver";
- homepage = "https://github.com/nucleic/kiwi";
- license = lib.licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
deleted file mode 100644
index cd3b5ff62c26..000000000000
--- a/pkgs/development/python-modules/koji/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, python-dateutil }:
-
-buildPythonPackage rec {
- pname = "koji";
- version = "1.14.3";
- format = "other";
-
- src = fetchurl {
- url = "https://releases.pagure.org/koji/${pname}-${version}.tar.bz2";
- sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40";
- };
-
- propagatedBuildInputs = [ pycurl six rpm python-dateutil ];
-
- # Judging from SyntaxError
- disabled = isPy3k;
-
- makeFlags = [ "DESTDIR=$(out)" ];
-
- postInstall = ''
- mv $out/usr/* $out/
- cp -R $out/nix/store/*/* $out/
- rm -rf $out/nix
- '';
-
- meta = with lib; {
- description = "An RPM-based build system";
- homepage = "https://pagure.io/koji";
- license = licenses.lgpl21;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/python-modules/konfig/default.nix b/pkgs/development/python-modules/konfig/default.nix
deleted file mode 100644
index e7062bad5ee7..000000000000
--- a/pkgs/development/python-modules/konfig/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, writeText, configparser, six, pytest, glibcLocales }:
-
-buildPythonPackage rec {
- pname = "konfig";
- version = "1.1";
-
- # konfig unconditionaly depend on configparser, even if it is part of
- # the standard library in python 3.2 or above.
- disabled = isPy3k;
-
- # PyPI tarball is missing utf8.ini, required for tests
- src = fetchFromGitHub {
- owner = "mozilla-services";
- repo = pname;
- rev = version;
- sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";
- };
-
- propagatedBuildInputs = [ configparser six ];
-
- patches = [ (writeText "konfig.patch" ''
- diff --git a/setup.py b/setup.py
- index 96fd858..bb4db06 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -20,7 +20,7 @@ setup(name='konfig',
- author_email="tarek@mozilla.com",
- include_package_data=True,
- install_requires = [
- - 'configparser', 'argparse', 'six'
- + 'configparser', 'six'
- ],
- zip_safe=False,
- classifiers=classifiers,
- '') ];
-
- checkInputs = [ pytest glibcLocales ];
-
- checkPhase = ''
- LC_ALL=en_US.utf8 pytest -v konfig/tests
- '';
-
- meta = with lib; {
- description = "Yet Another Config Parser";
- homepage = "https://github.com/mozilla-services/konfig";
- license = licenses.mpl20;
- };
-}
diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix
deleted file mode 100644
index 630430b8270b..000000000000
--- a/pkgs/development/python-modules/larch/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, sphinx
-, tracing
-, ttystatus
-, cliapp
-}:
-
-buildPythonPackage rec {
- pname = "larch";
- version = "1.20131130";
-
- src = fetchurl {
- url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz";
- sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7";
- };
-
- buildInputs = [ sphinx ];
- propagatedBuildInputs = [ tracing ttystatus cliapp ];
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://liw.fi/larch/";
- description = "Python B-tree library";
- license = licenses.gpl3;
- maintainers = [];
- };
-
-}
diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix
deleted file mode 100644
index 5db149708ff3..000000000000
--- a/pkgs/development/python-modules/lasagne/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, numpy
-, Theano
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "Lasagne";
- version = "0.1";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0cqj86rdm6c7y5vq3i13qy76fg5xi3yjp4r0hpqy8hvynv54wqrw";
- };
-
- propagatedBuildInputs = [ numpy Theano ];
-
- # there are no tests
- doCheck = false;
-
- meta = with lib; {
- description = "Lightweight library to build and train neural networks in Theano";
- homepage = "https://github.com/Lasagne/Lasagne";
- maintainers = with maintainers; [ NikolaMandic ];
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/ldaptor/19.nix b/pkgs/development/python-modules/ldaptor/19.nix
deleted file mode 100644
index 42141371c534..000000000000
--- a/pkgs/development/python-modules/ldaptor/19.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, twisted
-, passlib
-, pyopenssl
-, pyparsing
-, service-identity
-, zope_interface
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "ldaptor";
- version = "19.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755";
- };
-
- propagatedBuildInputs = [
- twisted passlib pyopenssl pyparsing service-identity zope_interface
- ];
-
- disabled = isPy3k;
-
- doCheck = false;
-
- meta = {
- description = "A Pure-Python Twisted library for LDAP";
- homepage = "https://github.com/twisted/ldaptor";
- license = lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix
deleted file mode 100644
index 134a143a3b0f..000000000000
--- a/pkgs/development/python-modules/le/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, simplejson
-, psutil
-}:
-
-buildPythonPackage rec {
- pname = "le";
- version = "1.4.29";
-
- src = fetchFromGitHub {
- owner = "logentries";
- repo = "le";
- rev = "v${version}";
- sha256 = "sha256-67JPnof0olReu90rM78e1px8NvbGcj8pphFhPaiSVmA=";
- };
-
- disabled = isPy3k;
-
- doCheck = false;
-
- propagatedBuildInputs = [ simplejson psutil ];
-
- meta = with lib; {
- homepage = "https://github.com/rapid7/le";
- description = "Logentries agent";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix
deleted file mode 100644
index 9cbd042c55ae..000000000000
--- a/pkgs/development/python-modules/libvirt/5.9.0.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }:
-
-buildPythonPackage rec {
- pname = "libvirt";
- version = "5.9.0";
-
- src = fetchgit {
- url = "git://libvirt.org/libvirt-python.git";
- rev = "v${version}";
- sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libvirt lxml ];
-
- checkInputs = [ nose ];
- checkPhase = ''
- nosetests
- '';
-
- passthru = {
- inherit libvirt;
- };
-
- meta = with lib; {
- homepage = "http://www.libvirt.org/";
- description = "libvirt Python bindings";
- license = licenses.lgpl2;
- maintainers = [ maintainers.fpletz ];
- };
-}
diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix
deleted file mode 100644
index feb271812443..000000000000
--- a/pkgs/development/python-modules/lightblue/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, pkgs
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "lightblue";
- version = "0.4";
- disabled = isPy3k; # build fails, 2018-04-11
-
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "016h1mlhpqxjj25lcvl4fqc19k8ifmsv6df7rhr12fyfcrp5i14d";
- };
-
- buildInputs = [ pkgs.bluez pkgs.openobex ];
-
- meta = with lib; {
- homepage = "http://lightblue.sourceforge.net";
- description = "Cross-platform Bluetooth API for Python";
- maintainers = with maintainers; [ leenaars ];
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index 3e78626238a7..8efc1e3fb12c 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "lmdb";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc";
+ sha256 = "60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e";
};
buildInputs = [ lmdb ];
diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix
deleted file mode 100644
index b570a62d9e34..000000000000
--- a/pkgs/development/python-modules/lsi/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, colored
-, boto
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "lsi";
- version = "0.4.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b2c4a9a276a32f914a6193509503c28b3cc84bf42d58e191214811cfe78f4736";
- };
-
- propagatedBuildInputs = [ colored boto pkgs.openssh pkgs.which ];
-
- meta = with lib; {
- description = "CLI for querying and SSHing onto AWS EC2 instances";
- homepage = "https://github.com/NarrativeScience/lsi";
- maintainers = [maintainers.adnelson];
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix
deleted file mode 100644
index 4534e0a01ef3..000000000000
--- a/pkgs/development/python-modules/lxc/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, pkgs
-}:
-
-buildPythonPackage {
- pname = "python-lxc-unstable";
- version = "2016-08-25";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "lxc";
- repo = "python2-lxc";
- rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef";
- sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4";
- };
-
- buildInputs = [ pkgs.lxc ];
-
- meta = with lib; {
- description = "Out of tree python 2.7 binding for liblxc";
- homepage = "https://github.com/lxc/python2-lxc";
- license = licenses.lgpl2;
- maintainers = with maintainers; [ mic92 ];
- };
-
-}
diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix
index 5ff88388818f..0b84726d5a5f 100644
--- a/pkgs/development/python-modules/manimpango/default.nix
+++ b/pkgs/development/python-modules/manimpango/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "manimpango";
- version = "0.4.0";
+ version = "0.4.0.post0";
src = fetchFromGitHub {
owner = "ManimCommunity";
repo = pname;
rev = "v${version}";
- sha256 = "1qffb04bz4s2anb6a7nm6dpqwdlvq6626z1whqwrwsvn8z9sry76";
+ sha256 = "1avlh6wk6a2mq6fl2idqk2z5bncglyla8p9m7az0430k9vdv4qks";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix
deleted file mode 100644
index 28a6e9c0c5c4..000000000000
--- a/pkgs/development/python-modules/mapsplotlib/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, matplotlib
-, scipy
-, pandas
-, requests
-, pillow
-}:
-
-buildPythonPackage rec {
- pname = "mapsplotlib";
- version = "1.2.1";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "7650754e3175f13a1cb4406a62e4cfeb424036377992b9c3c2e3f6c2404d06b3";
- };
-
- propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ];
-
- meta = with lib; {
- description = "Custom Python plots on a Google Maps background";
- homepage = "https://github.com/tcassou/mapsplotlib";
- license = licenses.mit;
- maintainers = [ maintainers.rob ];
- };
-
-}
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
deleted file mode 100644
index 187e3a646a02..000000000000
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, mozprofile
-, mozversion
-, moztest
-, manifestparser
-, marionette_driver
-, browsermob-proxy
-, wptserve
-}:
-
-buildPythonPackage rec {
- pname = "marionette-harness";
- version = "5.0.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0";
- };
-
- propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest
- wptserve manifestparser marionette_driver ];
-
- meta = {
- description = "Mozilla Marionette protocol test automation harness";
- homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
deleted file mode 100644
index 28193528ed28..000000000000
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, mozversion
-, mozrunner
-}:
-
-buildPythonPackage rec {
- pname = "marionette_driver";
- version = "3.0.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8";
- };
-
- propagatedBuildInputs = [ mozversion mozrunner ];
-
- meta = {
- description = "Mozilla Marionette driver";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
deleted file mode 100644
index 18b39307a17e..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozfile
-, mozlog
-}:
-
-buildPythonPackage rec {
- pname = "mozcrash";
- version = "1.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "8c2d2f32bd6e0ba3644f5d16e427444d8cb51ec1e9baa340a33e10687307f8c4";
- };
-
- propagatedBuildInputs = [ mozfile mozlog ];
-
- meta = {
- description = "Minidump stack trace extractor";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
deleted file mode 100644
index 56c8fc5254d2..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozlog
-, moznetwork
-, mozprocess
-}:
-
-buildPythonPackage rec {
- pname = "mozdevice";
- version = "3.0.7";
- format = "wheel";
-
- src = fetchPypi {
- inherit pname version format;
- sha256 = "1n7l3drdh3rm3320v98c9hhh37ljk9l861hyw18psca7jdd717n5";
- };
-
- propagatedBuildInputs = [ mozlog moznetwork mozprocess ];
-
- meta = {
- description = "Mozilla-authored device management";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
deleted file mode 100644
index 2cce0a221244..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, six
-}:
-
-buildPythonPackage rec {
- pname = "mozfile";
- version = "2.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "e5dc835582ea150e35ecd57e9d86cb707d3aa3b2505679db7332326dd49fd6b8";
- };
-
- propagatedBuildInputs = [ six ];
-
- # mozhttpd -> moznetwork -> mozinfo -> mozfile
- doCheck = false;
-
- meta = {
- description = "File utilities for Mozilla testing";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
deleted file mode 100644
index a7cbb7ece08c..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, moznetwork
-}:
-
-buildPythonPackage rec {
- pname = "mozhttpd";
- version = "0.7.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "3e2a9b4d6c007a1a9fb729d6e95b5404d138914727747e10155426492dced975";
- };
-
- propagatedBuildInputs = [ moznetwork ];
-
- meta = {
- description = "Webserver for Mozilla testing";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
deleted file mode 100644
index 99f3afc31f61..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, mozfile
-}:
-
-buildPythonPackage rec {
- pname = "mozinfo";
- version = "1.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4525c26350fb85c26b38c5f853a19f47b17b49a74de363d285d54258972a4cbc";
- };
-
- disabled = isPy3k;
-
- propagatedBuildInputs = [ mozfile ];
-
- meta = with lib; {
- description = "System information utilities for Mozilla testing";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = licenses.mpl20;
- maintainers = with maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
deleted file mode 100644
index ee1aed055e74..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, blessings
-, mozterm
-, six
-, mozfile
-}:
-
-buildPythonPackage rec {
- pname = "mozlog";
- version = "5.0";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0h1hgs13c1w0wvz60400i37m00077li1ky28j7kgx4bl75pkd3sw";
- };
-
- propagatedBuildInputs = [ blessings mozterm six ];
-
- checkInputs = [ mozfile ];
-
- meta = {
- description = "Mozilla logging library";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
deleted file mode 100644
index 6bdc93f680a7..000000000000
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozlog
-, mozinfo
-}:
-
-buildPythonPackage rec {
- pname = "moznetwork";
- version = "1.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd";
- };
-
- propagatedBuildInputs = [ mozlog mozinfo ];
-
- meta = {
- description = "Network utilities for Mozilla testing";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
deleted file mode 100644
index 91ed225ecb80..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozinfo
-}:
-
-buildPythonPackage rec {
- pname = "mozprocess";
- version = "1.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "a0fd8367e663d3cac74ee46bffa789667bc8d52f242d81a14522205fa6650cb2";
- };
-
- propagatedBuildInputs = [ mozinfo ];
-
- meta = {
- description = "Mozilla-authored process handling";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
deleted file mode 100644
index 7075a37263b3..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozlog
-, mozfile
-, mozhttpd
-, wptserve
-}:
-
-buildPythonPackage rec {
- pname = "mozprofile";
- version = "2.4.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "09l18x72vahq7il9nj6qj7la2d21vvbcn9szlm3vsvsbkz68w0yk";
- };
-
- propagatedBuildInputs = [ mozlog mozfile mozhttpd ];
-
- checkInputs = [ wptserve ];
-
- meta = {
- description = "Mozilla application profile handling library";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
deleted file mode 100644
index fc1d8a7bc7c8..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozdevice
-, mozfile
-, mozinfo
-, mozlog
-, mozprocess
-, mozprofile
-, mozcrash
-}:
-
-buildPythonPackage rec {
- pname = "mozrunner";
- version = "7.7.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "04s6w0sp83bn3c6ym75rnlpmcy3yr7d35jxkxhgzmy75gbcps7bi";
- };
-
- propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess
- mozprofile mozcrash ];
-
- meta = {
- description = "Mozilla application start/stop helpers";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix
deleted file mode 100644
index 1c9f9259d995..000000000000
--- a/pkgs/development/python-modules/marionette-harness/moztest.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozinfo
-}:
-
-buildPythonPackage rec {
- pname = "moztest";
- version = "0.8";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1pg9pqq4xnn14k1jqbyqg81zag2v66y725537v6hixi41yiqkdas";
- };
-
- propagatedBuildInputs = [ mozinfo ];
-
- meta = {
- description = "Mozilla test result storage and output";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
deleted file mode 100644
index 9717a847d359..000000000000
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mozlog
-, mozdevice
-}:
-
-buildPythonPackage rec {
- pname = "mozversion";
- version = "2.2.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0jczc1yr2yi3mf1qdgpvg9sidp5hf3jplzs4917j65ymvk2zw9na";
- };
-
- propagatedBuildInputs = [ mozlog mozdevice ];
-
- meta = {
- description = "Application version information library";
- homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
- license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix
deleted file mode 100644
index 96d33b681ebc..000000000000
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache
-, which, cycler, python-dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
-, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
-, fetchpatch
-, enableGhostscript ? false, ghostscript, gtk3
-, enableGtk3 ? false, cairo
-# darwin has its own "MacOSX" backend
-, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11
-, enableQt ? false, pyqt4
-, Cocoa
-, pythonOlder
-}:
-
-buildPythonPackage rec {
- version = "2.2.3";
- pname = "matplotlib";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5";
- };
-
- patches = [
- # https://github.com/matplotlib/matplotlib/pull/12478
- (fetchpatch {
- name = "numpy-1.16-compat.patch";
- url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch";
- sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2";
- })
- ];
-
- XDG_RUNTIME_DIR = "/tmp";
-
- nativeBuildInputs = [ pkg-config ];
-
- buildInputs = [ which sphinx ]
- ++ lib.optional enableGhostscript ghostscript
- ++ lib.optional stdenv.isDarwin [ Cocoa ];
-
- propagatedBuildInputs =
- [ cycler python-dateutil nose numpy pyparsing tornado freetype kiwisolver
- libpng mock pytz ]
- ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache
- ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
- ++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
- ++ lib.optionals enableQt [ pyqt4 ]
- ++ lib.optionals python.isPy2 [ functools32 subprocess32 ];
-
- passthru.config = {
- directories = { basedirlist = "."; };
- };
- setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config);
- preBuild = ''
- cp "$setup_cfg" ./setup.cfg
- '';
-
- # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
- # corresponding interpreter object for its library paths. This fails if
- # `$DISPLAY` is not set. The fallback option assumes that Tcl/Tk are both
- # installed under the same path which is not true in Nix.
- # With the following patch we just hard-code these paths into the install
- # script.
- postPatch =
- let
- tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
- in
- lib.optionalString enableTk
- "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
-
- # Matplotlib needs to be built against a specific version of freetype in
- # order for all of the tests to pass.
- doCheck = false;
-
- meta = with lib; {
- description = "Python plotting library, making publication quality plots";
- homepage = "https://matplotlib.org/";
- maintainers = with maintainers; [ lovek323 veprbl ];
- };
-
-}
diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
deleted file mode 100644
index 4c6aa746448e..000000000000
--- a/pkgs/development/python-modules/meliae/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cython
-, isPy3k
-, simplejson
-}:
-
-buildPythonPackage rec {
- pname = "meliae";
- version = "0.4.0";
-
- src = fetchPypi {
- inherit pname;
- # FIXME when updating to the next version: The tarball on pypi is called
- # "meliae-0.4.0.tar.gz" while the version within that tarball is
- # "0.4.0.final.0".
- version = "0.4.0";
- sha256 = "976519ab02aaa6a8fb5f596dc4dd9f64fc9510b00e054979566e51c9be7cec99";
- };
-
- disabled = isPy3k;
-
- doCheck = true;
-
- checkPhase = ''
- python setup.py build_ext -i
- python run_tests.py
- '';
-
- checkInputs = [ simplejson ];
-
- propagatedBuildInputs = [ cython ];
-
- meta = with lib; {
- description = "Python Memory Usage Analyzer";
- homepage = "https://launchpad.net/meliae";
- license = licenses.gpl3;
- maintainers = with maintainers; [ xvapx ];
- };
-}
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 359bed40b1ec..4ead1e43fa0c 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -12,12 +12,13 @@
, pythonOlder
, pyyaml
, tabulate
+, pytap2
, timeago
}:
buildPythonPackage rec {
pname = "meshtastic";
- version = "1.2.48";
+ version = "1.2.50";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
- sha256 = "sha256-hf+9WmYLRN53cSipNRA+mRYzSLu6NAO6HSQ3NOeCPM8=";
+ sha256 = "sha256-8Kq67FY8v4YU5hwZo+kEG2TLjI4MmvNRFTUY2C3mTEg=";
};
propagatedBuildInputs = [
@@ -43,6 +44,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ pytap2
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix
deleted file mode 100644
index d6b0c30c504c..000000000000
--- a/pkgs/development/python-modules/metaphone/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, nose }:
-
-buildPythonPackage rec {
- pname = "metaphone";
- version = "0.6";
-
- src = fetchPypi {
- pname = "Metaphone";
- inherit version;
- sha256 = "09ysaczwh2rlsqq9j5fz7m4pq2fs0axp5vvivrpfrdvclvffl2xd";
- };
-
- disabled = isPy3k;
-
- buildInputs = [ nose ];
-
- meta = with lib; {
- homepage = "https://github.com/oubiwann/metaphone";
- description = "A Python implementation of the metaphone and double metaphone algorithms";
- license = licenses.bsd3;
- maintainers = with maintainers; [ ris ];
- };
-}
diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix
deleted file mode 100644
index 0caa347edacf..000000000000
--- a/pkgs/development/python-modules/mozsvc/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pyramid
-, simplejson
-, konfig
-}:
-
-buildPythonPackage rec {
- pname = "mozsvc";
- version = "0.10";
-
- src = fetchFromGitHub {
- owner = "mozilla-services";
- repo = "mozservices";
- rev = version;
- sha256 = "0a0558g8j55pd1nnhnnf3k377jv6cah8lxb24v98rq8kxr5960cg";
- };
-
- doCheck = false; # too many dependencies and conflicting versions; I (nadrieril) gave up
- propagatedBuildInputs = [ pyramid simplejson konfig ];
-
- meta = with lib; {
- homepage = "https://github.com/mozilla-services/mozservices";
- description = "Various utilities for Mozilla apps";
- license = licenses.mpl20;
- maintainers = with maintainers; [ nadrieril ];
- };
-}
diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix
deleted file mode 100644
index c7f2b4cbc349..000000000000
--- a/pkgs/development/python-modules/mozterm/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, six }:
-
-buildPythonPackage rec {
- pname = "mozterm";
- version = "1.0.0";
-
- # name 'unicode' is not defined
- disabled = isPy3k;
-
- propagatedBuildInputs = [six];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b1e91acec188de07c704dbb7b0100a7be5c1e06567b3beb67f6ea11d00a483a4";
- };
-
- meta = with lib; {
- description = "Terminal abstractions built around the blessings module";
- license = licenses.mpl20;
- };
-}
diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix
deleted file mode 100644
index b535144fac91..000000000000
--- a/pkgs/development/python-modules/mpd/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "python-mpd";
- version = "0.3.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4";
- };
-
- meta = with lib; {
- description = "An MPD (Music Player Daemon) client library written in pure Python";
- homepage = "http://jatreuman.indefero.net/p/python-mpd/";
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix
deleted file mode 100644
index 8921719a3ae2..000000000000
--- a/pkgs/development/python-modules/mrbob/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ buildPythonPackage, lib, glibcLocales, mock, nose, isPy3k, jinja2, six
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "mr-bob";
- version = "0.1.2";
-
- src = fetchPypi {
- inherit version;
- pname = "mr.bob";
- sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121";
- };
-
- disabled = isPy3k;
-
- checkInputs = [ nose glibcLocales mock ];
- checkPhase = ''
- LC_ALL="en_US.UTF-8" nosetests
- '';
-
- propagatedBuildInputs = [ jinja2 six ];
-
- meta = with lib; {
- homepage = "https://github.com/domenkozar/mr.bob";
- description = "A tool to generate code skeletons from templates";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix
deleted file mode 100644
index e615b3e34e2c..000000000000
--- a/pkgs/development/python-modules/msrplib/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchdarcs
-, eventlib
-, application
-, gnutls
-}:
-
-buildPythonPackage rec {
- pname = "python-msrplib";
- version = "0.19.2";
-
- src = fetchdarcs {
- url = "http://devel.ag-projects.com/repositories/${pname}";
- rev = "release-${version}";
- sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz";
- };
-
- propagatedBuildInputs = [ eventlib application gnutls ];
-
- meta = with lib; {
- homepage = "https://github.com/AGProjects/python-msrplib";
- description = "Client library for MSRP protocol and its relay extension (RFC 4975 and RFC4976)";
- license = licenses.lgpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix
deleted file mode 100644
index 98f96d132123..000000000000
--- a/pkgs/development/python-modules/muttils/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, isPy3k
-}:
-
-buildPythonPackage {
- pname = "muttils";
- version = "1.3";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2";
- sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6";
- };
-
- # Tests don't work
- doCheck = false;
-
- meta = with lib; {
- description = "Utilities for use with console mail clients, like mutt";
- homepage = "https://www.blacktrash.org/hg/muttils";
- license = licenses.gpl2Plus;
- };
-
-}
diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/pkgs/development/python-modules/mwlib-ext/default.nix
deleted file mode 100644
index b9b18eaf9e5f..000000000000
--- a/pkgs/development/python-modules/mwlib-ext/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- version = "0.13.2";
- pname = "mwlib.ext";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278";
- };
-
- meta = with lib; {
- description = "Dependencies for mwlib markup";
- homepage = "http://pediapress.com/code/";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix
deleted file mode 100644
index fdb70726eb6e..000000000000
--- a/pkgs/development/python-modules/mwlib-rl/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mwlib
-, mwlib-ext
-, pygments
-}:
-
-buildPythonPackage rec {
- version = "0.14.5";
- pname = "mwlib.rl";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "dddf9603ea0ca5aa87890217709eb5a5b16baeca547db3daad43c3ace73b6bc1";
- };
-
- buildInputs = [ mwlib mwlib-ext pygments ];
-
- meta = with lib; {
- description = "Generate pdfs from mediawiki markup";
- homepage = "http://pediapress.com/code/";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix
deleted file mode 100644
index d9edb2ef3ba5..000000000000
--- a/pkgs/development/python-modules/mwlib/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, apipkg
-, bottle
-, gevent
-, lxml
-, odfpy
-, pillow
-, py
-, pyPdf
-, pyparsing
-, qserve
-, roman
-, simplejson
-, sqlite3dbm
-, timelib
-, pytest
-}:
-
-buildPythonPackage rec {
- version = "0.16.1";
- pname = "mwlib";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7";
- };
-
- propagatedBuildInputs = [ apipkg bottle gevent lxml odfpy pillow py pyPdf pyparsing qserve roman simplejson sqlite3dbm timelib ];
-
- checkInputs = [ pytest ];
-
- postPatch = ''
- sed -i "s/odfpy>=0.9, <0.10/odfpy/" setup.py
- sed -i "s/pyparsing>=1.4.11,<1.6/pyparsing/" setup.py
- '';
-
- checkPhase = ''
- py.test
- '';
-
- # Tests are in build directory but we need extension modules that are in $out
- doCheck = false;
-
- meta = with lib; {
- description = "Library for parsing MediaWiki articles and converting them to different output formats";
- homepage = "http://pediapress.com/code/";
- license = licenses.bsd3;
- # broken = true; # Requires different versions of packages
- };
-
-}
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 99580e2de37d..149aefb9a57f 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "mypy";
- version = "unstable-2021-11-14";
+ version = "0.930";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python";
repo = "mypy";
- rev = "053a1beb94ee4e5b3260725594315d1b6776e42f";
- sha256 = "sha256-q2ntj3y3GgXrw4v+yMvcqWFv4y/6YwunIj3bNzU9CH0=";
+ rev = "v${version}";
+ sha256 = "sha256-0yo6f9hRYFfwdfukOGNNTgPCIFO2MZdfMvzbci7FWRs=";
};
patches = [
@@ -33,11 +33,6 @@ buildPythonPackage rec {
})
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "tomli>=1.1.0,<1.2.0" "tomli"
- '';
-
buildInputs = [
types-typed-ast
];
diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix
deleted file mode 100644
index b7b542b8a7a9..000000000000
--- a/pkgs/development/python-modules/namebench/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, isPyPy
-, fetchurl
-, tkinter
-}:
-
-buildPythonPackage rec {
- pname = "namebench";
- version = "1.3.1";
- disabled = isPy3k || isPyPy;
-
- src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/{pname}/${pname}-${version}-source.tgz";
- sha256 = "09clbcd6wxgk4r6qw7hb78h818mvca7lijigy1mlq5y1f3lgkk1h";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- propagatedBuildInputs = [ tkinter ];
-
- # namebench expects to be run from its own source tree (it uses relative
- # paths to various resources), make it work.
- postInstall = ''
- sed -i "s|import os|import os; os.chdir(\"$out/namebench\")|" "$out/bin/namebench.py"
- '';
-
- meta = with lib; {
- homepage = "https://github.com/google/namebench"; # Formerly https://code.google.com/archive/p/namebench/
- description = "Find fastest DNS servers available";
- license = with licenses; [
- asl20
- # third-party program licenses (embedded in the sources)
- lgpl21 # Crystal_Clear
- isc # dns
- bsd3 # jinja2
- ];
- longDescription = ''
- It hunts down the fastest DNS servers available for your computer to
- use. namebench runs a fair and thorough benchmark using your web
- browser history, tcpdump output, or standardized datasets in order
- to provide an individualized recommendation. namebench is completely
- free and does not modify your system in any way.
- '';
- };
-
-}
diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix
deleted file mode 100644
index 06d02520b20d..000000000000
--- a/pkgs/development/python-modules/nbformat/2.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, glibcLocales
-, ipython_genutils
-, traitlets
-, testpath
-, jsonschema
-, jupyter_core
-}:
-
-buildPythonPackage rec {
- pname = "nbformat";
- version = "4.4.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402";
- };
-
- LC_ALL="en_US.utf8";
-
- checkInputs = [ pytest glibcLocales ];
- propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ];
-
- preCheck = ''
- mkdir tmp
- export HOME=tmp
- '';
-
- # Some of the tests use localhost networking.
- __darwinAllowLocalNetworking = true;
-
- meta = {
- description = "The Jupyter Notebook format";
- homepage = "https://jupyter.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ globin ];
- };
-}
diff --git a/pkgs/development/python-modules/networkx/2.2.nix b/pkgs/development/python-modules/networkx/2.2.nix
deleted file mode 100644
index a4c66048953b..000000000000
--- a/pkgs/development/python-modules/networkx/2.2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, decorator
-, setuptools
-}:
-
-buildPythonPackage rec {
- pname = "networkx";
- # upgrade may break sage, please test the sage build or ping @timokau on upgrade
- version = "2.2";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5";
- };
-
- checkInputs = [ nose ];
- propagatedBuildInputs = [ decorator setuptools ];
-
- meta = {
- homepage = "https://networkx.github.io/";
- description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 0821e0b763d0..6df6f15c068b 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -1,18 +1,13 @@
{ fetchFromGitHub
, lib
, buildPythonPackage
-, attrs
-, click
-, effect
, git
-, pytestCheckHook
-, pytest-cov
, pythonOlder
}:
buildPythonPackage rec {
pname = "nix-prefetch-github";
- version = "4.0.4";
+ version = "5.0.1";
disabled = pythonOlder "3.7";
@@ -20,19 +15,16 @@ buildPythonPackage rec {
owner = "seppeljordan";
repo = "nix-prefetch-github";
rev = "v${version}";
- sha256 = "g5G818Gq5EGyRIyg/ZW7guxMS0IyJ4nYaRjG/CtGhuc=";
+ sha256 = "DOmFfUCLJ+rnS4PznQaQrDrqjUU4DXmOrC9BspqKZVM=";
};
- propagatedBuildInputs = [
- attrs
- click
- effect
- ];
-
- checkInputs = [ pytestCheckHook pytest-cov git ];
+ checkInputs = [ git ];
+ checkPhase = ''
+ python -m unittest discover
+ '';
# ignore tests which are impure
- disabledTests = [ "network" "requires_nix_build" ];
+ DISABLED_TESTS = "network requires_nix_build";
meta = with lib; {
description = "Prefetch sources from github";
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 9267f70c2c01..27e17daa372a 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,4 +1,4 @@
-{ fetchPypi, buildPythonPackage, lib, singledispatch ? null, isPy3k
+{ fetchPypi, buildPythonPackage, lib, isPy3k
, click
, joblib
, regex
@@ -20,7 +20,7 @@ buildPythonPackage rec {
joblib
regex
tqdm
- ] ++ lib.optional (!isPy3k) singledispatch;
+ ];
# Tests require some data, the downloading of which is impure. It would
# probably make sense to make the data another derivation, but then feeding
diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix
deleted file mode 100644
index 2805dc4545af..000000000000
--- a/pkgs/development/python-modules/nose-focus/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti
-, nose-pattern-exclude, which }:
-
-buildPythonPackage rec {
- pname = "nose-focus";
- version = "0.1.3";
-
- propagatedBuildInputs = [ six ];
-
- checkInputs = [ nose nose-of-yeti nose-pattern-exclude which ];
-
- # PyPI doesn't contain tests so let's use GitHub. See:
- # https://github.com/delfick/nose-focus/issues/4
- #
- # However, the versions aren't tagged on GitHub so need to use a manually
- # checked revision. See: https://github.com/delfick/nose-focus/issues/5
- src = fetchFromGitHub {
- owner = "delfick";
- repo = pname;
- rev = "4dac785ba07ed6e1df61b0fe2854685eef3bd115";
- sha256 = "0gpd4j4433dc5ifh31w08c3bx862md0qm1ix6aam1rz4ayxpq51f";
- };
-
- checkPhase = ''
- patchShebangs test.sh
- ./test.sh
- '';
-
- meta = with lib; {
- description = "Decorator and plugin to make nose focus on specific tests";
- homepage = "https://nose-focus.readthedocs.io/en/latest/";
- license = licenses.wtfpl;
- maintainers = with maintainers; [ jluttine ];
- };
-}
diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix
deleted file mode 100644
index 16fb264b39ae..000000000000
--- a/pkgs/development/python-modules/nose-of-yeti/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }:
-
-buildPythonPackage rec {
- pname = "nose-of-yeti";
- version = "1.8";
-
- propagatedBuildInputs = [ six ];
-
- checkInputs = [ nose fudge should-dsl ];
-
- # PyPI doesn't contain tests so let's use GitHub.
- src = fetchFromGitHub {
- owner = "delfick";
- repo = pname;
- rev = "v${version}";
- sha256 = "1pq9bf47k0csv41vdh2g6n336p3pd11q91hj5ypk0ls3nj756gbx";
- };
-
- checkPhase = ''
- patchShebangs test.sh
- ./test.sh
- '';
-
- meta = with lib; {
- description = "Nose plugin providing BDD dsl for python";
- homepage = "https://github.com/delfick/nose-of-yeti";
- license = licenses.mit;
- maintainers = with maintainers; [ jluttine ];
- };
-}
diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix
deleted file mode 100644
index aec27eab59a9..000000000000
--- a/pkgs/development/python-modules/notebook/2.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ stdenv
-, lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, nose_warnings_filters
-, glibcLocales
-, isPy3k
-, mock
-, jinja2
-, tornado
-, ipython_genutils
-, traitlets
-, jupyter_core
-, jupyter-client
-, nbformat
-, nbconvert
-, ipykernel
-, terminado
-, requests
-, send2trash
-, pexpect
-, prometheus-client
-}:
-
-buildPythonPackage rec {
- pname = "notebook";
- version = "5.7.10";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b10107e1438e7a564292aa32510e610c88844cae03c882fe5286b891792b5c11";
- };
-
- LC_ALL = "en_US.utf8";
-
- checkInputs = [ nose glibcLocales ]
- ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
-
- propagatedBuildInputs = [
- jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
- jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
- prometheus-client
- ];
-
- # disable warning_filters
- preCheck = lib.optionalString (!isPy3k) ''
- echo "" > setup.cfg
- '';
-
- postPatch = ''
- # Remove selenium tests
- rm -rf notebook/tests/selenium
-
- '';
-
- checkPhase = ''
- runHook preCheck
- mkdir tmp
- HOME=tmp nosetests -v ${if (stdenv.isDarwin) then ''
- --exclude test_delete \
- --exclude test_checkpoints_follow_file
- ''
- else ""}
- '';
-
- # Some of the tests use localhost networking.
- __darwinAllowLocalNetworking = true;
-
- meta = {
- description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
- homepage = "https://jupyter.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
deleted file mode 100644
index 8aa70b43e665..000000000000
--- a/pkgs/development/python-modules/notify/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv
-, fetchurl
-, python
-, pygobject2
-, pygtk
-, pkgs
-}:
-
-stdenv.mkDerivation {
- pname = "python-notify";
- version = "0.1.1";
-
- src = fetchurl {
- url = "http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2";
- sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
- };
-
- patches = lib.singleton (fetchurl {
- name = "libnotify07.patch";
- url = "https://src.fedoraproject.org/cgit/notify-python.git/plain/"
- + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
- sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z";
- });
-
- postPatch = ''
- sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${pygtk}/bin/pygtk-codegen-2.0"|' \
- configure
- '';
-
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
-
- postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
-
- meta = with lib; {
- description = "Python bindings for libnotify";
- homepage = "http://www.galago-project.org/";
- license = licenses.lgpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
deleted file mode 100644
index 38920dc55429..000000000000
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchgit
-, isPy3k
-, pyusb
-, pybluez
-, pyfantom
-, git
-}:
-
-buildPythonPackage {
- version = "unstable-20160819";
- pname = "nxt-python";
- disabled = isPy3k;
-
- src = fetchgit {
- url = "https://github.com/Eelviny/nxt-python";
- rev = "479e20b7491b28567035f4cee294c4a2af629297";
- sha256 = "0mcsajhgm2wy4iy2lhmyi3xibgmbixbchanzmlhsxk6qyjccn9r9";
- branchName= "pyusb";
- };
-
- propagatedBuildInputs = [ pyusb pybluez pyfantom git ];
-
- # Tests fail on Mac dependency
- doCheck = false;
-
- meta = with lib; {
- description = "Python driver/interface for Lego Mindstorms NXT robot";
- homepage = "https://github.com/Eelviny/nxt-python";
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ leenaars ];
- };
-
-}
diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix
deleted file mode 100644
index 10757812037a..000000000000
--- a/pkgs/development/python-modules/oauthlib/3.1.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, mock
-, pytest
-, cryptography
-, blinker
-, pyjwt
-}:
-
-buildPythonPackage rec {
- pname = "oauthlib";
- version = "3.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889";
- };
-
- checkInputs = [ mock pytest ];
- propagatedBuildInputs = [ cryptography blinker pyjwt ];
-
- checkPhase = ''
- py.test tests/
- '';
-
- meta = with lib; {
- homepage = "https://github.com/idan/oauthlib";
- description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
- maintainers = with maintainers; [ prikhi ];
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/openpyxl/2.nix b/pkgs/development/python-modules/openpyxl/2.nix
deleted file mode 100644
index 73300de645ff..000000000000
--- a/pkgs/development/python-modules/openpyxl/2.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, jdcal
-, et_xmlfile
-, lxml
-}:
-
-buildPythonPackage rec {
- pname = "openpyxl";
- version = "2.6.4";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1d53801678e18d7fe38c116f1ad0c2383a654670c4c8806105b611c92d92f2e3";
- };
-
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ jdcal et_xmlfile lxml ];
-
- postPatch = ''
- # LICENSE.rst is missing, and setup.cfg currently doesn't contain anything useful anyway
- # This should likely be removed in the next update
- rm setup.cfg
- '';
-
- # Tests are not included in archive.
- # https://bitbucket.org/openpyxl/openpyxl/issues/610
- doCheck = false;
-
- meta = {
- description = "A Python library to read/write Excel 2007 xlsx/xlsm files";
- homepage = "https://openpyxl.readthedocs.org";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ lihop sjourdois ];
- };
-}
diff --git a/pkgs/development/python-modules/opt-einsum/2.nix b/pkgs/development/python-modules/opt-einsum/2.nix
deleted file mode 100644
index 41c4df89f4fc..000000000000
--- a/pkgs/development/python-modules/opt-einsum/2.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
-
-buildPythonPackage rec {
- version = "2.3.2";
- pname = "opt_einsum";
-
- src = fetchPypi {
- inherit version pname;
- sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
- };
-
- checkInputs = [
- pytest_4
- ];
-
- checkPhase = ''
- pytest
- '';
-
- propagatedBuildInputs = [
- numpy
- ];
-
- meta = {
- description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
- homepage = "https://optimized-einsum.readthedocs.io";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ teh ];
- };
-}
diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix
deleted file mode 100644
index 8390cceb2fcf..000000000000
--- a/pkgs/development/python-modules/pagerduty/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "pagerduty";
- version = "0.2.1";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "e8c237239d3ffb061069aa04fc5b3d8ae4fb0af16a9713fe0977f02261d323e9";
- };
-
- meta = with lib; {
- homepage = "https://github.com/samuel/python-pagerduty";
- description = "Library for the PagerDuty service API";
- license = licenses.bsd0;
- };
-
-}
diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix
deleted file mode 100644
index 9b29a8442696..000000000000
--- a/pkgs/development/python-modules/pandas/2.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-# Python 2 expression
-
-{ lib
-, buildPythonPackage
-, fetchPypi
-, python
-, stdenv
-, pytest
-, glibcLocales
-, cython
-, python-dateutil
-, scipy
-, moto
-, numexpr
-, pytz
-, xlrd
-, bottleneck
-, sqlalchemy
-, lxml
-, html5lib
-, beautifulsoup4
-, hypothesis
-, openpyxl
-, tables
-, xlwt
-, runtimeShell
-, libcxx ? null
-}:
-
-buildPythonPackage rec {
- pname = "pandas";
- version = "0.24.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag";
- };
-
- checkInputs = [ pytest glibcLocales moto hypothesis ];
-
- nativeBuildInputs = [ cython ];
- buildInputs = lib.optional stdenv.isDarwin libcxx;
- propagatedBuildInputs = [
- python-dateutil
- scipy
- numexpr
- pytz
- xlrd
- bottleneck
- sqlalchemy
- lxml
- html5lib
- beautifulsoup4
- openpyxl
- tables
- xlwt
- ];
-
- # For OSX, we need to add a dependency on libcxx, which provides
- # `complex.h` and other libraries that pandas depends on to build.
- postPatch = lib.optionalString stdenv.isDarwin ''
- cpp_sdk="${lib.getDev libcxx}/include/c++/v1";
- echo "Adding $cpp_sdk to the setup.py common_include variable"
- substituteInPlace setup.py \
- --replace "['pandas/src/klib', 'pandas/src']" \
- "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
- '';
-
-
- disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
- # since python-dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
- # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
- "test_fallback_plural"
- "test_ambiguous_flags"
- "test_ambiguous_compat"
- # Locale-related
- "test_names"
- "test_dt_accessor_datetime_name_accessors"
- "test_datetime_name_accessors"
- # Can't import from test folder
- "test_oo_optimizable"
- # Disable IO related tests because IO data is no longer distributed
- "io"
- # KeyError Timestamp
- "test_to_excel"
- ] ++ lib.optionals stdenv.isDarwin [
- "test_locale"
- "test_clipboard"
- ]);
-
- doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
-
- checkPhase = ''
- runHook preCheck
- ''
- # TODO: Get locale and clipboard support working on darwin.
- # Until then we disable the tests.
- + lib.optionalString stdenv.isDarwin ''
- # Fake the impure dependencies pbpaste and pbcopy
- echo "#!${runtimeShell}" > pbcopy
- echo "#!${runtimeShell}" > pbpaste
- chmod a+x pbcopy pbpaste
- export PATH=$(pwd):$PATH
- '' + ''
- LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
- runHook postCheck
- '';
-
- meta = with lib; {
- # https://github.com/pandas-dev/pandas/issues/14866
- # pandas devs are no longer testing i686 so safer to assume it's broken
- broken = stdenv.isi686;
- homepage = "https://pandas.pydata.org/";
- description = "Python Data Analysis Library";
- license = licenses.bsd3;
- maintainers = with maintainers; [ raskin knedlsepp ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix
deleted file mode 100644
index d7c635c2fe4a..000000000000
--- a/pkgs/development/python-modules/path.py/2.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools-scm
-, pytest
-, pytest-flake8
-, glibcLocales
-, packaging
-, isPy27
-, backports_os
-, importlib-metadata
-}:
-
-buildPythonPackage rec {
- pname = "path.py";
- version = "11.5.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
- };
-
- checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
- buildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [
- importlib-metadata
- ] ++ lib.optional isPy27 backports_os
- ;
-
- LC_ALL = "en_US.UTF-8";
-
- meta = {
- description = "A module wrapper for os.path";
- homepage = "https://github.com/jaraco/path.py";
- license = lib.licenses.mit;
- };
-
- checkPhase = ''
- # ignore performance test which may fail when the system is under load
- py.test -v -k 'not TestPerformance'
- '';
-}
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index d610561b3e6f..a488f15fbed8 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -6,7 +6,6 @@
# Python deps
, logutils
, Mako
-, singledispatch ? null
, six
, webtest
# Test Inputs
@@ -40,7 +39,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
logutils
Mako
- singledispatch
six
webtest
];
diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix
deleted file mode 100644
index e53817b3911b..000000000000
--- a/pkgs/development/python-modules/pg8000/1_12.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytz
-, six
-}:
-
-buildPythonPackage rec {
- pname = "pg8000";
- version = "1.12.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx";
- };
-
- propagatedBuildInputs = [ pytz six ];
-
- meta = with lib; {
- homepage = "https://github.com/tlocke/pg8000";
- description = "PostgreSQL interface library, for asyncio";
- maintainers = with maintainers; [ domenkozar ];
- platforms = platforms.unix;
- };
-
-}
-
diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix
index a79c65f4059a..3c2e2c22a88b 100644
--- a/pkgs/development/python-modules/pgpy/default.nix
+++ b/pkgs/development/python-modules/pgpy/default.nix
@@ -1,5 +1,5 @@
{ lib, pythonOlder, fetchFromGitHub, buildPythonPackage
-, six, enum34, pyasn1, cryptography, singledispatch ? null
+, six, enum34, pyasn1, cryptography
, pytestCheckHook }:
buildPythonPackage rec {
@@ -18,7 +18,6 @@ buildPythonPackage rec {
pyasn1
cryptography
] ++ lib.optionals (pythonOlder "3.4") [
- singledispatch
enum34
];
diff --git a/pkgs/development/python-modules/platformdirs/2.nix b/pkgs/development/python-modules/platformdirs/2.nix
deleted file mode 100644
index 6fe2bcbde60a..000000000000
--- a/pkgs/development/python-modules/platformdirs/2.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, appdirs
-, buildPythonPackage
-, fetchFromGitHub
-, platformdirs
-, pytest-mock
-, pytestCheckHook
-, pythonOlder
-, setuptools-scm
-}:
-
-buildPythonPackage rec {
- pname = "platformdirs";
- version = "2.0.2";
-
- src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = version;
- sha256 = "sha256-yCvfOPuX9hbQO9gbFHfeu+dGH+Vb9FM7wng1XU2D8hE=";
- };
-
- SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
- nativeBuildInputs = [
- setuptools-scm
- ];
-
- checkInputs = [
- appdirs
- pytest-mock
- pytestCheckHook
- ];
-
- pythonImportsCheck = [ "platformdirs" ];
-
- meta = with lib; {
- description = "Python module for determining appropriate platform-specific directories";
- homepage = "https://platformdirs.readthedocs.io/";
- license = licenses.mit;
- maintainers = with maintainers; [ fab ];
- };
-}
diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix
deleted file mode 100644
index 13ecab806c45..000000000000
--- a/pkgs/development/python-modules/praw/6.3.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, betamax
-, betamax-serializers
-, betamax-matchers
-, mock
-, six
-, pytest-runner
-, prawcore
-, pytest
-, requests-toolbelt
-, update_checker
-, websocket-client
-}:
-
-buildPythonPackage rec {
- pname = "praw";
- version = "6.3.1";
-
- src = fetchFromGitHub {
- owner = "praw-dev";
- repo = "praw";
- rev = "v${version}";
- sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
- };
-
- nativeBuildInputs = [
- pytest-runner
- ];
-
- propagatedBuildInputs = [
- mock
- prawcore
- update_checker
- websocket-client
- ];
-
- checkInputs = [
- betamax
- betamax-serializers
- betamax-matchers
- mock
- pytest
- requests-toolbelt
- six
- ];
-
- meta = with lib; {
- description = "Python Reddit API wrapper";
- homepage = "https://praw.readthedocs.org/";
- license = licenses.bsd2;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix
deleted file mode 100644
index d421efde8aa1..000000000000
--- a/pkgs/development/python-modules/progressbar231/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
-
-buildPythonPackage rec {
- pname = "progressbar231";
- version = "2.3.1";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0j0ifxk87xz3wkyacxaiqygghn27wwz6y5pj9k8j2yq7n33fbdam";
- };
-
- # no tests implemented
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/progressbar231";
- description = "Text progressbar library for python";
- license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ twey ];
- };
-}
diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix
deleted file mode 100644
index cebb1cc3f0ba..000000000000
--- a/pkgs/development/python-modules/pyamf/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
-
-buildPythonPackage rec {
- pname = "PyAMF";
- version = "0.8.0";
-
- # according to setup.py
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1r3lp9gkph48g9lijby5rs5daa3lhxs204r14zw4kvp3hf4xcm84";
- };
-
- propagatedBuildInputs = [ defusedxml ];
-
- meta = with lib; {
- description = "AMF (Action Message Format) support for Python";
- homepage = "https://pypi.python.org/pypi/PyAMF";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/pkgs/development/python-modules/pyblosxom/default.nix
deleted file mode 100644
index 77e47eb98364..000000000000
--- a/pkgs/development/python-modules/pyblosxom/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, pygments
-, markdown
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "pyblosxom";
- version = "1.5.3";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://github.com/pyblosxom/pyblosxom/archive/v${version}.tar.gz";
- sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885";
- };
-
- propagatedBuildInputs = [ pygments markdown ];
-
- # FAIL:test_generate_entry and test_time
- # both tests fail due to time issue that doesn't seem to matter in practice
- doCheck = false;
-
- meta = with lib; {
- homepage = "http://pyblosxom.github.io";
- description = "File-based blogging engine";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix
deleted file mode 100644
index b3479695a890..000000000000
--- a/pkgs/development/python-modules/pycarddav/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, isPyPy
-, vobject
-, lxml
-, requests
-, urwid
-, pyxdg
-}:
-
-buildPythonPackage rec {
- version = "0.7.0";
- pname = "pycarddav";
- disabled = isPy3k || isPyPy;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0avkrcpisfvhz103v7vmq2jd83hvmpqrb4mlbx6ikkk1wcvclsx8";
- };
-
- propagatedBuildInputs = [ vobject lxml requests urwid pyxdg ];
-
- meta = with lib; {
- description = "Command-line interface carddav client";
- homepage = "http://lostpackets.de/pycarddav";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
deleted file mode 100644
index 0e07d8d436f7..000000000000
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, thrift, isPy3k }:
-
-let
-
- thrift' = thrift.overridePythonAttrs (old: rec {
- version = "0.9.3";
- src= fetchPypi {
- inherit (old) pname;
- inherit version;
- sha256 = "0zl7cgckqy9j5vq8wyfzw82q1blkdpsblnmhv8c6ffcxs4xkvg6z";
- };
- });
-
-in
-
-buildPythonPackage rec {
- pname = "pycassa";
- version = "1.11.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1nsqjzgn6v0rya60dihvbnrnq1zwaxl2qwf0sr08q9qlkr334hr6";
- };
-
- disabled = isPy3k;
-
- # Tests are not executed since they require a cassandra up and
- # running
- doCheck = false;
-
- propagatedBuildInputs = [ thrift' ];
-
- meta = with lib; {
- description = "A python client library for Apache Cassandra";
- homepage = "https://github.com/pycassa/pycassa";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/pkgs/development/python-modules/pycryptopp/default.nix
deleted file mode 100644
index 7079cde0d597..000000000000
--- a/pkgs/development/python-modules/pycryptopp/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, fetchpatch
-, isPy3k
-, setuptoolsDarcs
-, darcsver
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "pycryptopp";
- version = "0.7.1.869544967005693312591928092448767568728501330214";
- disabled = isPy3k; # see https://bitbucket.org/pypy/pypy/issue/1190/
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "17v98bhh3nd6rkw0kk1xmnc9vm5ql0fji4in2wyd4zlvlfhmgb88";
- };
-
- patches = [
- (fetchpatch {
- name = "pycryptopp-cryptopp_6.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/api_change.patch?h=pycryptopp&id=55f2973d6ca5e9e70438f2eadb7fb575b1a5048d";
- sha256 = "0lvl2d32d2vkb0v6d39p9whda5bdrmlsjd41zy0x0znqm53a9i99";
- stripLen = 1;
- extraPrefix = "src/";
- })
- ];
-
- # Prefer crypto++ library from the Nix store over the one that's included
- # in the pycryptopp distribution.
- preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1";
-
- buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ];
-
- meta = with lib; {
- homepage = "https://tahoe-lafs.org/trac/pycryptopp";
- description = "Python wrappers for the Crypto++ library";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
deleted file mode 100644
index 1cdfb6c4413f..000000000000
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, isPy3k
-, simplejson
-, unittest2
-, nose
-, pkgs
-}:
-
-buildPythonPackage {
- pname = "pycurl2";
- version = "7.20.0";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "Lispython";
- repo = "pycurl";
- rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
- sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
- };
-
- # error: (6, "Couldn't resolve host 'h.wrttn.me'")
- doCheck = false;
-
- nativeBuildInputs = [ pkgs.curl.dev ];
- buildInputs = [ simplejson unittest2 nose ];
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/pycurl2";
- description = "A fork from original PycURL library that no maintained from 7.19.0";
- license = licenses.mit;
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix
deleted file mode 100644
index a6fb07c15206..000000000000
--- a/pkgs/development/python-modules/pydns/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "pydns";
- version = "2.3.6";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
- };
-
- doCheck = false;
-
- meta = with lib; {
- description = "Python DNS library";
- homepage = "http://pydns.sourceforge.net/";
- license = licenses.psfl;
- };
-
-}
diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/pkgs/development/python-modules/pyexcelerator/default.nix
deleted file mode 100644
index b3a376616d3b..000000000000
--- a/pkgs/development/python-modules/pyexcelerator/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "pyexcelerator";
- version = "0.6.4.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "18rcnc9f71lj06h8nppnv6idzb7xfmh2rp1zfqayskcg686lilrb";
- };
-
- disabled = isPy3k;
-
- # No tests are included in archive
- doCheck = false;
-
- meta = with lib; {
- description = "library for generating Excel 97/2000/XP/2003 and OpenOffice Calc compatible spreadsheets.";
- homepage = "https://sourceforge.net/projects/pyexcelerator";
- license = licenses.bsdOriginal;
- maintainers = with maintainers; [ womfoo ];
- };
-
-}
diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix
deleted file mode 100644
index bf7afdf79e2c..000000000000
--- a/pkgs/development/python-modules/pyexiv2/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, buildPythonPackage, fetchurl, python, exiv2, scons, boost }:
-
-buildPythonPackage rec {
- pname = "pyexiv2";
- version = "0.3.2";
- format = "other";
-
- src = fetchurl {
- url = "https://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${pname}-${version}.tar.bz2";
- sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a";
- };
-
- preBuild = ''
- sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" src/SConscript
- '';
-
- preInstall = ''
- sed -i -e "s@ python_lib_path = get_python_lib(plat_specific=True)@ python_lib_path = \'/lib/python2.7/site-packages\'@" src/SConscript
- '';
-
- buildInputs = [ python exiv2 scons boost ];
-
- meta = with lib; {
- platforms = platforms.linux;
- # Likely needs an older boost which does not have `boost_pythonXY` but `boost_python`.
- broken = true; # 2018-06-23
- };
-}
diff --git a/pkgs/development/python-modules/pygtksourceview/codegendir.patch b/pkgs/development/python-modules/pygtksourceview/codegendir.patch
deleted file mode 100644
index 783c5e2d4671..000000000000
--- a/pkgs/development/python-modules/pygtksourceview/codegendir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur pygtksourceview-2.10.1-orig/configure pygtksourceview-2.10.1/configure
---- pygtksourceview-2.10.1-orig/configure 2010-04-18 15:29:55.000000000 +0200
-+++ pygtksourceview-2.10.1/configure 2015-01-30 20:36:31.784541887 +0100
-@@ -12950,7 +12950,7 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5
- $as_echo_n "checking for pygtk codegen... " >&6; }
--CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
-+CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
- echo $CODEGENDIR
- if test -f $CODEGENDIR/codegen.py; then
- CODEGEN=$CODEGENDIR/codegen.py
-diff -Nur pygtksourceview-2.10.1-orig/configure.ac pygtksourceview-2.10.1/configure.ac
---- pygtksourceview-2.10.1-orig/configure.ac 2010-04-18 15:28:39.000000000 +0200
-+++ pygtksourceview-2.10.1/configure.ac 2015-01-30 20:36:42.781648830 +0100
-@@ -116,7 +116,7 @@
-
- dnl codegen
- AC_MSG_CHECKING(for pygtk codegen)
--CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
-+CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
- echo $CODEGENDIR
- if test -f $CODEGENDIR/codegen.py; then
- CODEGEN=$CODEGENDIR/codegen.py
-
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
deleted file mode 100644
index 57a21f1e1784..000000000000
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }:
-
-buildPythonPackage rec {
- pname = "pygtksourceview";
- format = "other";
- version = "2.10.1";
-
- src = fetchurl {
- url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
- sha256 = "0x2r9k547ad68sfddr5am341ap6zvy8k0rh3rd0n38k7xdd7rd5l";
- };
-
- patches = [ ./codegendir.patch ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ];
-
- meta = {
- platforms = lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix
deleted file mode 100644
index 4c2ec4df6810..000000000000
--- a/pkgs/development/python-modules/pyhamcrest/1.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, mock, pytest
-, six
-}:
-buildPythonPackage rec {
- pname = "PyHamcrest";
- version = "1.10.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0x08lfcnsak7pkym32xrdn0sn3wcf26n1jff3d11mwbizpfikbpp";
- };
-
- checkInputs = [ mock pytest ];
- propagatedBuildInputs = [ six ];
-
- doCheck = false; # pypi tarball does not include tests
-
- meta = with lib; {
- homepage = "https://github.com/hamcrest/PyHamcrest";
- description = "Hamcrest framework for matcher objects";
- license = licenses.bsd3;
- maintainers = with maintainers; [
- alunduil
- ];
- };
-}
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix
deleted file mode 100644
index 8b1eefdafedc..000000000000
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, urlgrabber
-, python
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "pykickstart";
- version = "1.99.39";
- md5_path = "d249f60aa89b1b4facd63f776925116d";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
- + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
- sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
- };
-
- postPatch = ''
- sed -i -e "s/for tst in tstList/for tst in sorted(tstList, \
- key=lambda m: m.__name__)/" tests/baseclass.py
- '';
-
- propagatedBuildInputs = [ urlgrabber ];
-
- checkPhase = ''
- ${python.interpreter} tests/baseclass.py -vv
- '';
-
- meta = with lib; {
- homepage = "http://fedoraproject.org/wiki/Pykickstart";
- description = "Read and write Fedora kickstart files";
- license = licenses.gpl2Plus;
- };
-
-}
diff --git a/pkgs/development/python-modules/pylibacl/0.5.nix b/pkgs/development/python-modules/pylibacl/0.5.nix
deleted file mode 100644
index 284a795b4c22..000000000000
--- a/pkgs/development/python-modules/pylibacl/0.5.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "pylibacl";
- version = "0.5.4";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0drvxb21y7p0aikcv3jx90vdcjk96kibf9x8qgxic2prxxd3f3q6";
- };
-
- # ERROR: testExtended (tests.test_acls.AclExtensions)
- # IOError: [Errno 0] Error
- doCheck = false;
-
- buildInputs = with pkgs; [ acl ];
-
- meta = {
- description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
- license = lib.licenses.lgpl21Plus;
- };
-}
diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix
deleted file mode 100644
index 5dbb3d6750f8..000000000000
--- a/pkgs/development/python-modules/pylint/1.9.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort,
- mccabe, configparser, backports_functools_lru_cache, singledispatch,
- pytest, pytest-runner, setuptools }:
-
-buildPythonPackage rec {
- pname = "pylint";
- version = "1.9.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p";
- };
-
- checkInputs = [ pytest pytest-runner ];
-
- propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ];
-
- postPatch = lib.optionalString stdenv.isDarwin ''
- # Remove broken darwin test
- rm -vf pylint/test/test_functional.py
- '';
-
- checkPhase = ''
- pytest pylint/test -k "not ${lib.concatStringsSep " and not " (
- [ # Broken test
- "test_good_comprehension_checks"
- # requires setuptools
- "test_pkginfo"
- # See PyCQA/pylint#2535
- "test_libmodule" ] ++
- # Disable broken darwin tests
- lib.optionals stdenv.isDarwin [
- "test_parallel_execution"
- "test_py3k_jobs_option"
- ]
- )}"
- '';
-
- postInstall = ''
- mkdir -p $out/share/emacs/site-lisp
- cp "elisp/"*.el $out/share/emacs/site-lisp/
- '';
-
- meta = with lib; {
- homepage = "https://github.com/PyCQA/pylint";
- description = "A bug and style checker for Python";
- platforms = platforms.all;
- license = licenses.gpl1Plus;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index f71f2f4d52ae..c9cc9246746f 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -11,14 +11,16 @@
buildPythonPackage rec {
pname = "pylutron-caseta";
- version = "0.11.0";
- disabled = pythonOlder "3.5";
+ version = "0.13.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "gurumitts";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2w8kRSZK9Bq3O6r6i0CJgxEXGo8KsWah9bMLlDNzMGk=";
+ sha256 = "sha256-pVBFlGguVN6b3YY2lFF8KG83tBuotLmWLq/dKjRKAUQ=";
};
propagatedBuildInputs = [
@@ -32,7 +34,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "pylutron_caseta" ];
+ pythonImportsCheck = [
+ "pylutron_caseta"
+ ];
meta = with lib; {
description = "Python module o control Lutron Caseta devices";
diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix
index 7bfa96870ead..87e769a9f922 100644
--- a/pkgs/development/python-modules/pynput/default.nix
+++ b/pkgs/development/python-modules/pynput/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynput";
- version = "1.7.5";
+ version = "1.7.6";
src = fetchPypi {
inherit pname version;
- sha256 = "e6b7926dd162a883ff16f38e01720a930bbf2509146c9f1cdcecddd25288fb6e";
+ sha256 = "3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c";
};
nativeBuildInputs = [ sphinx ];
diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix
deleted file mode 100644
index 6aa0d733049d..000000000000
--- a/pkgs/development/python-modules/pyobjc/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, fetchPypi, isPy3k, buildPythonPackage }:
-
-buildPythonPackage rec {
- pname = "pyobjc";
- version = "7.3";
-
- # Gives "No matching distribution found for
- # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "322b07420f91b2dd7f624823e53046b922cab4aad28baab01a62463728b7e0c5";
- };
-
- meta = with lib; {
- description = "A bridge between the Python and Objective-C programming languages";
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- homepage = "https://pythonhosted.org/pyobjc/";
- };
-}
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
deleted file mode 100644
index 1244f374b44c..000000000000
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "pyPdf";
- version = "1.13";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "3aede4c3c9c6ad07c98f059f90db0b09ed383f7c791c46100f649e1cabda0e3b";
- };
-
- # Not supported. Package is no longer maintained.
- disabled = isPy3k;
-
- meta = with lib; {
- description = "Pure-Python PDF toolkit";
- homepage = "http://pybrary.net/pyPdf/";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix
deleted file mode 100644
index d325c170dc64..000000000000
--- a/pkgs/development/python-modules/pypoppler/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pycairo
-, pygobject2
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "pypoppler";
- version = "0.12.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "47e6ac99e5b114b9abf2d1dd1bca06f22c028d025432512989f659142470810f";
- };
-
- NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = [ pkgs.poppler.dev ];
- propagatedBuildInputs = [ pycairo pygobject2 ];
-
- patches = [
- ./pypoppler-0.39.0.patch
- ./pypoppler-poppler.c.patch
- ];
-
- # Not supported.
- disabled = isPy3k;
-
- # No tests in archive
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://code.launchpad.net/~mriedesel/poppler-python/main";
- description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies";
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch b/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
deleted file mode 100644
index b9e02242e003..000000000000
--- a/pkgs/development/python-modules/pypoppler/pypoppler-0.39.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/poppler.defs b/poppler.defs
-index 8b12e03..2b8fc16 100644
---- a/poppler.defs
-+++ b/poppler.defs
-@@ -570,18 +570,6 @@
- )
- )
-
--(define-enum Orientation
-- (in-module "Poppler")
-- (c-name "PopplerOrientation")
-- (gtype-id "POPPLER_TYPE_ORIENTATION")
-- (values
-- '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
-- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
-- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
-- '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
-- )
--)
--
- (define-enum PageTransitionType
- (in-module "Poppler")
- (c-name "PopplerPageTransitionType")
diff --git a/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch b/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
deleted file mode 100644
index 1104097cd3e7..000000000000
--- a/pkgs/development/python-modules/pypoppler/pypoppler-poppler.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/poppler.c b/poppler.c
-index 31b4489..16d0838 100644
---- a/poppler.c
-+++ b/poppler.c
-@@ -4501,7 +4501,6 @@ py_poppler_add_constants(PyObject *module, const gchar *strip_prefix)
- pyg_enum_add(module, "FormTextType", strip_prefix, POPPLER_TYPE_FORM_TEXT_TYPE);
- pyg_enum_add(module, "FormChoiceType", strip_prefix, POPPLER_TYPE_FORM_CHOICE_TYPE);
- pyg_enum_add(module, "Error", strip_prefix, POPPLER_TYPE_ERROR);
-- pyg_enum_add(module, "Orientation", strip_prefix, POPPLER_TYPE_ORIENTATION);
- pyg_enum_add(module, "PageTransitionType", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_TYPE);
- pyg_enum_add(module, "PageTransitionAlignment", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT);
- pyg_enum_add(module, "PageTransitionDirection", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION);
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 9632fc5cb40b..815f0fb84c98 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyproj";
- version = "3.2.1";
+ version = "3.3.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pyproj4";
repo = "pyproj";
rev = version;
- sha256 = "sha256-r343TvXpSr+EMAbvzSUpsfipwP8TFmitOfT0gjgoO00=";
+ hash = "sha256-crLYNACS9I0WGOdkYCJNoyxeAYsR41ZszzKRZsYHCLY=";
};
# force pyproj to use ${proj}
diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix
deleted file mode 100644
index 6b9649699ba3..000000000000
--- a/pkgs/development/python-modules/pyreport/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "pyreport";
- version = "0.3.4c";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1584607596b7b310bf0b6ce79f424bd44238a017fd870aede11cd6732dbe0d4d";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/pyreport";
- license = licenses.bsd0;
- description = "Pyreport makes notes out of a python script";
- };
-
-}
diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
index 7b394a21b520..c3cf0a9841fa 100644
--- a/pkgs/development/python-modules/pystray/default.nix
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "pystray";
- version = "0.19.1";
+ version = "0.19.2";
src = fetchFromGitHub {
owner = "moses-palmer";
repo = "pystray";
rev = "v${version}";
- sha256 = "sha256-7w3odneRfDQ7K965ffJ+xSaGvg/KM0vTrSIj0ee13Uk=";
+ sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs=";
};
nativeBuildInputs = [ sphinx ];
diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix
new file mode 100644
index 000000000000..3823f0270381
--- /dev/null
+++ b/pkgs/development/python-modules/pytap2/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, nettools
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pytap2";
+ version = "2.2.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "johnthagen";
+ repo = "pytap2";
+ rev = "v${version}";
+ hash = "sha256-/t0Seg+8ZrOWOHBu9ftE1xkrnDeoYdHopXBvJTMGYRI=";
+ };
+
+ propagatedBuildInputs = [
+ nettools
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "pytap2"
+ ];
+
+ meta = with lib; {
+ description = "Object-oriented wrapper around the Linux Tun/Tap device";
+ homepage = "https://github.com/johnthagen/pytap2";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
index eac8cf6377d1..f7d6ce312640 100644
--- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pytest-helpers-namespace";
- version = "2021.4.29";
+ version = "2021.12.29";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "183524e3db4e2a1fea92e0ca3662a624ba44c9f3568da15679d7535ba6838a6a";
+ sha256 = "792038247e0021beb966a7ea6e3a70ff5fcfba77eb72c6ec8fd6287af871c35b";
};
nativeBuildInputs = [ setuptools setuptools-declarative-requirements setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest-mock/2.nix b/pkgs/development/python-modules/pytest-mock/2.nix
deleted file mode 100644
index 3ccaa7481d7d..000000000000
--- a/pkgs/development/python-modules/pytest-mock/2.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pytest
-, mock
-, setuptools-scm
-}:
-
-buildPythonPackage rec {
- pname = "pytest-mock";
- version = "2.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b35eb281e93aafed138db25c8772b95d3756108b601947f89af503f8c629413f";
- };
-
- propagatedBuildInputs = lib.optional (!isPy3k) mock;
-
- nativeBuildInputs = [
- setuptools-scm
- ];
-
- checkInputs = [
- pytest
- ];
-
- checkPhase = ''
- pytest
- '';
-
- meta = with lib; {
- description = "Thin-wrapper around the mock package for easier use with py.test.";
- homepage = "https://github.com/pytest-dev/pytest-mock";
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix
index 4f2a577bb4db..41890215025c 100644
--- a/pkgs/development/python-modules/pytest-services/default.nix
+++ b/pkgs/development/python-modules/pytest-services/default.nix
@@ -6,7 +6,6 @@
, psutil
, pytest
, setuptools-scm
-, subprocess32 ? null
, toml
, zc_lockfile
}:
@@ -31,7 +30,7 @@ buildPythonPackage rec {
requests
psutil
zc_lockfile
- ] ++ lib.optional (!isPy3k) subprocess32;
+ ];
# no tests in PyPI tarball
doCheck = false;
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 4aa8d853ebdb..b000379dd1bb 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -35,14 +35,15 @@
buildPythonPackage rec {
pname = "python-lsp-server";
- version = "1.3.1";
- disabled = pythonOlder "3.6";
+ version = "1.3.3";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
- sha256 = "067dlhwwv4mkrirnmqinrvkbfx59hf7fiah081d62a46vxvpnv9s";
+ sha256 = "sha256-F8f9NAjPWkm01D/KwFH0oA6nQ3EF4ZVCCckZTL4A35Y=";
};
postPatch = ''
@@ -96,7 +97,9 @@ buildPythonPackage rec {
export HOME=$(mktemp -d);
'';
- pythonImportsCheck = [ "pylsp" ];
+ pythonImportsCheck = [
+ "pylsp"
+ ];
meta = with lib; {
description = "Python implementation of the Language Server Protocol";
diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix
deleted file mode 100644
index 6b657dba78df..000000000000
--- a/pkgs/development/python-modules/python-otr/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, zope_interface
-, cryptography
-, application
-, gmpy2
-}:
-
-buildPythonPackage rec {
- pname = "python-otr";
- version = "1.2.0";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "AGProjects";
- repo = pname;
- rev = "release-${version}";
- sha256 = "0p3b1n8jlxwd65gbk2k5007fkhdyjwcvr4982s42hncivxvabzzy";
- };
-
- propagatedBuildInputs = [ zope_interface cryptography application gmpy2 ];
-
- meta = with lib; {
- description = "A pure python implementation of OTR";
- homepage = "https://github.com/AGProjects/python-otr";
- license = licenses.lgpl21Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ edwtjo ];
- # The package itself does not support python3, and its transitive
- # dependencies rely on namespace package support that does not work in
- # Nix's python2 infra. See #74619 for details.
- broken = true;
- };
-}
diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix
deleted file mode 100644
index 78378a738dba..000000000000
--- a/pkgs/development/python-modules/python2-pythondialog/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "python2-pythondialog";
- version = "3.5.1";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "ad159c7b455d9cb2a5173590656d19a26e9cc208264cfab755f5827070d18613";
- };
-
- patchPhase = ''
- substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin"
- '';
-
- meta = with lib; {
- description = "A Python interface to the UNIX dialog utility and mostly-compatible programs (Python 2 backport)";
- homepage = "http://pythondialog.sourceforge.net/";
- license = licenses.lgpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix
deleted file mode 100644
index 2aabaec2e14f..000000000000
--- a/pkgs/development/python-modules/python_statsd/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, mock
-, nose
-, coverage
-}:
-
-buildPythonPackage rec {
- pname = "python-statsd";
- version = "2.1.0";
- disabled = isPy3k; # next release will be py3k compatible
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d2c573d325d0f015b4d79f0d0f8c88dd8413d7b9ef890c09076a9b6089ab301c";
- };
-
- buildInputs = [ mock nose coverage ];
-
- meta = with lib; {
- description = "A client for Etsy's node-js statsd server";
- homepage = "https://github.com/WoLpH/python-statsd";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix
deleted file mode 100644
index 54c84fe6ef59..000000000000
--- a/pkgs/development/python-modules/pythonirclib/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, paver
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "irclib";
- version = "0.4.8";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
- sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
- };
-
- patches = [(fetchurl {
- url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
- name = "irclib.py.diff";
- sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
- })];
-
- patchFlags = [ "irclib.py" ];
-
- propagatedBuildInputs = [ paver ];
-
- meta = with lib; {
- description = "Python IRC library";
- homepage = "https://github.com/jaraco/irc";
- license = with licenses; [ lgpl21 ];
- };
-
-}
diff --git a/pkgs/development/python-modules/pythonmagick/default.nix b/pkgs/development/python-modules/pythonmagick/default.nix
deleted file mode 100644
index a647fa1005bc..000000000000
--- a/pkgs/development/python-modules/pythonmagick/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, python
-, pkg-config
-, imagemagick
-, autoreconfHook
-, boost
-, isPy3k
-, pythonImportsCheckHook
-}:
-
-buildPythonPackage rec {
- pname = "pythonmagick";
- version = "0.9.16";
- format = "other";
-
- src = fetchurl {
- url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz";
- sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn";
- };
-
- postPatch = ''
- rm configure
- '';
-
- configureFlags = [ "--with-boost=${boost}" ];
-
- nativeBuildInputs = [ pkg-config autoreconfHook pythonImportsCheckHook ];
- buildInputs = [ python boost imagemagick ];
-
- pythonImportsCheck = [
- "PythonMagick"
- ];
-
- disabled = isPy3k;
-
- meta = with lib; {
- homepage = "http://www.imagemagick.org/script/api.php";
- license = licenses.imagemagick;
- description = "PythonMagick provides object oriented bindings for the ImageMagick Library.";
- };
-}
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index f549e56c68c4..8d815ee1ce9f 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyupgrade";
- version = "2.30.1";
+ version = "2.31.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "asottile";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EDF9U4sICTN0BzZHpBCQX3lHz0QUVQrlG0mSTLhpDWY=";
+ sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
deleted file mode 100644
index 2f6bb8553a4f..000000000000
--- a/pkgs/development/python-modules/pywebdav/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k }:
-
-buildPythonPackage rec {
- pname = "PyWebDAV";
- version = "0.9.8";
- disabled = isPy3k;
- src = fetchPypi {
- inherit pname version;
- sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji";
- };
- meta = with lib; {
- homepage = "http://code.google.com/p/pywebdav/";
- description = "WebDAV library including a standalone server for python";
- maintainers = with maintainers; [ johbo ];
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
deleted file mode 100644
index 49796054b564..000000000000
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{fetchurl, python, buildPythonPackage, makeWrapper}:
-
-buildPythonPackage rec {
- pname = "PyXML";
- version = "0.8.4";
-
- format = "other";
- src = fetchurl {
- url = "mirror://sourceforge/pyxml/${pname}-${pname}.tar.gz";
- sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
- };
-
- nativeBuildInputs = [ makeWrapper ];
- buildPhase = "${python.interpreter} ./setup.py build";
- installPhase = ''
- ${python.interpreter} ./setup.py install --prefix="$out" || exit 1
-
- for i in "$out/bin/"*
- do
- wrapProgram "$i" --prefix PYTHONPATH : \
- "$out/${python.sitePackages}" || \
- exit 2
- done
- '';
-
- meta = {
- description = "A collection of libraries to process XML with Python";
- homepage = "http://pyxml.sourceforge.net/";
- };
-}
diff --git a/pkgs/development/python-modules/qserve/default.nix b/pkgs/development/python-modules/qserve/default.nix
deleted file mode 100644
index f316e3fb65c1..000000000000
--- a/pkgs/development/python-modules/qserve/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "qserve";
- version = "0.3.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "dac1ee4ec60af6beb9af8f3f02d08d6db4cc9868b0915d626cb900a50d003ed4";
- };
-
- meta = with lib; {
- description = "Job queue server";
- homepage = "https://github.com/pediapress/qserve";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix
deleted file mode 100644
index 078e431f3baa..000000000000
--- a/pkgs/development/python-modules/remotecv/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose
-, preggy, numpy, yanc, nose-focus, mock, opencv }:
-
-buildPythonPackage rec {
- pname = "remotecv";
- version = "2.2.2";
-
- propagatedBuildInputs = [ pillow pyres ];
-
- checkInputs = [ nose preggy numpy yanc nose-focus mock opencv ];
-
- # PyPI tarball doesn't contain tests so let's use GitHub
- src = fetchFromGitHub {
- owner = "thumbor";
- repo = pname;
- rev = version;
- sha256 = "0slalp1x626ajy2cbdfifhxf0ffzckqdz6siqsqr6s03hrl877hy";
- };
-
- # Remove unnecessary argparse dependency and some seemingly unnecessary
- # version upper bounds because nixpkgs contains (or could contain) newer
- # versions.
- # See: https://github.com/thumbor/remotecv/issues/15
- patches = [
- ./install_requires.patch
- ];
-
- checkPhase = ''
- nosetests --with-yanc -s tests/
- '';
-
- meta = with lib; {
- description = "OpenCV worker for facial and feature recognition";
- homepage = "https://github.com/thumbor/remotecv/wiki";
- license = licenses.mit;
- maintainers = with maintainers; [ jluttine ];
- broken = true; # no longer compatible with latest pillow
- };
-}
diff --git a/pkgs/development/python-modules/remotecv/install_requires.patch b/pkgs/development/python-modules/remotecv/install_requires.patch
deleted file mode 100644
index 37203128486e..000000000000
--- a/pkgs/development/python-modules/remotecv/install_requires.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 70f765c..8003cda 100644
---- a/setup.py
-+++ b/setup.py
-@@ -53,9 +53,8 @@ remotecv is an OpenCV worker for facial and feature recognition
- },
-
- install_requires=[
-- "argparse>=1.2.1,<1.3.0",
-- "pyres>=1.5,<1.6",
-- "Pillow>=4.3.0,<5.2.0",
-+ "pyres>=1.5",
-+ "Pillow>=4.3.0",
- ],
-
- entry_points={
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 21732ed3a956..f095cf00a28c 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "requests-cache";
- version = "0.8.1";
+ version = "0.9.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
- sha256 = "sha256-HzOcPWmvUhqPtb/7Mnw6wWY7a4CwGRwPgq+7QoHJAc8=";
+ sha256 = "0gz6fyc6lgbab9k92cihrp3711r1wcp4xhs25qp176zbzgccbj43";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index b2fc2d9beae7..b25b28eca943 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
-, fetchpatch
, docutils
, readme_renderer
, packaging
@@ -12,22 +11,29 @@
buildPythonPackage rec {
pname = "restview";
- version = "2.9.2";
+ version = "2.9.3";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "1p1jgdvc04ws8kga3r0vrq3m0b52qw3clwyydl96a13wb3mrf03r";
+ sha256 = "sha256-WVGqIYLnqao6uQbb0PDTPfj+k+ZjGKholknBIorXTNg=";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/mgedmin/restview/commit/a1ded30a87c65f3ce59a18497a7fc5099317c2be.patch";
- sha256 = "1ax7pih456a3nbj8qrrq7hqigbyag4ihzpn6bm0z4y74d0r3v8a5";
- })
+ propagatedBuildInputs = [
+ docutils
+ readme_renderer
+ packaging
+ pygments
];
- propagatedBuildInputs = [ docutils readme_renderer packaging pygments ];
- checkInputs = [ mock pytestCheckHook ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "restview"
+ ];
meta = {
description = "ReStructuredText viewer";
diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh
deleted file mode 100644
index 15e05a73f93f..000000000000
--- a/pkgs/development/python-modules/rhpl/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-rpmextract $src
-tar xfvj rhpl-*.tar.bz2
-rm rhpl-*.tar.bz2
-cd rhpl-*
-incl=$(echo $python/include/python2.*)
-sed -i -e "s@/usr/include/\$(PYTHON)@$incl@" \
- -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $(toPythonPath $out)@" Makefile.inc
-sed -i -e "s@/usr/bin/install@install@g" \
- -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile
-make PREFIX=$out
-make PREFIX=$out install
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
deleted file mode 100644
index bfc53910b29a..000000000000
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
-
-buildPythonPackage {
- pname = "rhpl";
- version = "0.218";
- format = "other";
-
- src = fetchurl {
- url = "http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm";
- sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16";
- };
-
- inherit python;
-
- builder = ./builder.sh;
-
- nativeBuildInputs = [ rpmextract gettext ];
- buildInputs = [ wirelesstools ];
-}
diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix
deleted file mode 100644
index bc9e0873fe54..000000000000
--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }:
-
-buildPythonPackage rec {
- version = "1.2.3";
- pname = "robotframework-ride";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz";
- sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
- };
-
- propagatedBuildInputs = [ pygments wxPython ];
-
- # ride_postinstall.py checks that needed deps are installed and creates a
- # desktop shortcut. We don't really need it and it clutters up bin/ so
- # remove it.
- postInstall = ''
- rm -f "$out/bin/ride_postinstall.py"
- '';
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = with lib; {
- description = "Light-weight and intuitive editor for Robot Framework test case files";
- homepage = "https://code.google.com/p/robotframework-ride/";
- license = licenses.asl20;
- platforms = platforms.linux;
- maintainers = with maintainers; [ bjornfor ];
- };
-}
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix
deleted file mode 100644
index 5f1cfc622c9f..000000000000
--- a/pkgs/development/python-modules/rpkg/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils
-, koji, rpmfluff }:
-
-buildPythonPackage rec {
- pname = "rpkg";
- version = "1.50";
-
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz";
- sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv";
- };
-
-
- propagatedBuildInputs = [ pycurl koji cccolutils six rpmfluff ];
-
- doCheck = false; # needs /var/lib/rpm database to run tests
-
- meta = with lib; {
- description = "Python library for dealing with rpm packaging";
- homepage = "https://pagure.io/fedpkg";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ];
- };
-
-}
diff --git a/pkgs/development/python-modules/rpy2/2.nix b/pkgs/development/python-modules/rpy2/2.nix
deleted file mode 100644
index 3108861e9ce2..000000000000
--- a/pkgs/development/python-modules/rpy2/2.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ lib
-, python
-, buildPythonPackage
-, fetchPypi
-, isPyPy
-, isPy27
-, readline
-, R
-, rWrapper
-, rPackages
-, pcre
-, xz
-, bzip2
-, zlib
-, icu
-, singledispatch
-, six
-, jinja2
-, pytz
-, numpy
-, pytest
-, mock
-, extraRPackages ? []
-}:
-
-buildPythonPackage rec {
- version = "2.8.6"; # python2 support dropped in 2.9.x
- pname = "rpy2";
- disabled = isPyPy;
- src = fetchPypi {
- inherit version pname;
- sha256 = "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80";
- };
- buildInputs = [
- readline
- R
- pcre
- xz
- bzip2
- zlib
- icu
- ] ++ (with rPackages; [
- # packages expected by the test framework
- ggplot2
- dplyr
- RSQLite
- broom
- DBI
- dbplyr
- hexbin
- lme4
- tidyr
-
- # is in upstream's `requires` although it shouldn't be -- this is easier than patching it away
- pytest
- ]) ++ extraRPackages ++ rWrapper.recommendedPackages;
-
- nativeBuildInputs = [
- R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
- ];
-
- patches = [
- # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
- # This patch sets R_LIBS_SITE when rpy2 is imported.
- ./r-libs-site.patch
- ];
- postPatch = ''
- substituteInPlace ${ if isPy27 then "rpy/rinterface/__init__.py" else "rpy2/rinterface_lib/embedded.py" } --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
- '';
-
- doPatchelf = false; # fails because of "missing filename"
- patchelfPhase = "";
-
- propagatedBuildInputs = [
- singledispatch
- six
- jinja2
- pytz
- numpy
- ];
-
- checkInputs = [
- pytest
- mock
- ];
- # One remaining test failure caused by different unicode encoding.
- # https://bitbucket.org/rpy2/rpy2/issues/488
- doCheck = false;
- checkPhase = ''
- ${python.interpreter} -m 'rpy2'
- '';
-
- # For some reason libreadline.so is not found. Curiously `ldd _rinterface.so | grep readline` shows two readline entries:
- # libreadline.so.6 => not found
- # libreadline.so.6 => /nix/store/z2zhmrg6jcrn5iq2779mav0nnq4vm2q6-readline-6.3p08/lib/libreadline.so.6 (0x00007f333ac43000)
- # There must be a better way to fix this, but I don't know it.
- postFixup = ''
- patchelf --add-needed ${readline}/lib/libreadline.so "$out/${python.sitePackages}/rpy2/rinterface/"_rinterface*.so
- '';
-
- meta = {
- homepage = "http://rpy.sourceforge.net/rpy2";
- description = "Python interface to R";
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ joelmo ];
- };
- }
diff --git a/pkgs/development/python-modules/rpy2/r-libs-site.patch b/pkgs/development/python-modules/rpy2/r-libs-site.patch
deleted file mode 100644
index a55b6038bb4b..000000000000
--- a/pkgs/development/python-modules/rpy2/r-libs-site.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/rpy/rinterface/__init__.py b/rpy/rinterface/__init__.py
-index 9362e57..1af258e 100644
---- a/rpy/rinterface/__init__.py
-+++ b/rpy/rinterface/__init__.py
-@@ -43,6 +43,15 @@ if not R_HOME:
- if not os.environ.get("R_HOME"):
- os.environ['R_HOME'] = R_HOME
-
-+# path to libraries
-+existing = os.environ.get('R_LIBS_SITE')
-+if existing is not None:
-+ prefix = existing + ':'
-+else:
-+ prefix = ''
-+additional = '@NIX_R_LIBS_SITE@'
-+os.environ['R_LIBS_SITE'] = prefix + additional
-+
- if sys.platform == 'win32':
- _load_r_dll(R_HOME)
-
diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix
deleted file mode 100644
index 1a9ad2171a07..000000000000
--- a/pkgs/development/python-modules/rsa/4_0.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, unittest2
-, pyasn1
-, mock
-, isPy3k
-, pythonOlder
-}:
-
-buildPythonPackage rec {
- pname = "rsa";
- version = "4.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487";
- };
-
- checkInputs = [ unittest2 mock ];
- propagatedBuildInputs = [ pyasn1 ];
-
- preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") ''
- substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
- '';
-
- meta = with lib; {
- homepage = "https://stuvel.eu/rsa";
- license = licenses.asl20;
- description = "A pure-Python RSA implementation";
- };
-
-}
diff --git a/pkgs/development/python-modules/ruamel-ordereddict/default.nix b/pkgs/development/python-modules/ruamel-ordereddict/default.nix
deleted file mode 100644
index 987680ad596f..000000000000
--- a/pkgs/development/python-modules/ruamel-ordereddict/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, isPyPy
-}:
-
-buildPythonPackage rec {
- pname = "ruamel-ordereddict";
- version = "0.4.15";
- disabled = isPy3k || isPyPy;
-
- src = fetchPypi {
- pname = "ruamel.ordereddict";
- inherit version;
- sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
- };
-
- meta = with lib; {
- description = "A version of dict that keeps keys in insertion resp. sorted order";
- homepage = "https://sourceforge.net/projects/ruamel-ordereddict/";
- license = licenses.mit;
- maintainers = with maintainers; [ SuperSandro2000 ];
- };
-}
diff --git a/pkgs/development/python-modules/ruamel-yaml/0.16.nix b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
deleted file mode 100644
index 0d9b1b4a1637..000000000000
--- a/pkgs/development/python-modules/ruamel-yaml/0.16.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, ruamel-base
-, ruamel-ordereddict
-, ruamel-yaml-clib ? null
-, isPy27
-, isPyPy
-}:
-
-buildPythonPackage rec {
- pname = "ruamel-yaml";
- version = "0.16.13";
-
- src = fetchPypi {
- pname = "ruamel.yaml";
- inherit version;
- sha256 = "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v";
- };
-
- # Tests use relative paths
- doCheck = false;
-
- propagatedBuildInputs = [ ruamel-base ]
- ++ lib.optional isPy27 ruamel-ordereddict
- ++ lib.optional (!isPyPy) ruamel-yaml-clib;
-
- # causes namespace clash on py27
- dontUsePythonImportsCheck = isPy27;
- pythonImportsCheck = [ "ruamel.yaml" ];
-
- meta = with lib; {
- description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
- homepage = "https://sourceforge.net/projects/ruamel-yaml/";
- license = licenses.mit;
- maintainers = with maintainers; [ SuperSandro2000 ];
- };
-}
diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix
deleted file mode 100644
index ace9b8269c53..000000000000
--- a/pkgs/development/python-modules/runsnakerun/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, squaremap
-, wxPython
-}:
-
-buildPythonPackage rec {
- pname = "runsnakerun";
- version = "2.0.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "a66a0cdf0333dc3c0830c18e2f3d62f741dea197cd01a7e0059da4886a3a123f";
- };
-
- propagatedBuildInputs = [ squaremap wxPython ];
-
- meta = with lib; {
- description = "GUI Viewer for Python profiling runs";
- homepage = "http://www.vrplumber.com/programming/runsnakerun/";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix
deleted file mode 100644
index 1be4c485b800..000000000000
--- a/pkgs/development/python-modules/sandboxlib/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pbr
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "sandboxlib";
- version = "0.31";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0csj8hbpylqdkxcpqkcfs73dfvdqkyj23axi8m9drqdi4dhxb41h";
- };
-
- buildInputs = [ pbr ];
-
- meta = with lib; {
- description = "Sandboxing Library for Python";
- homepage = "https://pypi.python.org/pypi/sandboxlib/0.3.1";
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/scikit-learn/0.20.nix b/pkgs/development/python-modules/scikit-learn/0.20.nix
deleted file mode 100644
index 0ed863755897..000000000000
--- a/pkgs/development/python-modules/scikit-learn/0.20.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
-, gfortran, glibcLocales
-, numpy, scipy, pytest, pillow
-}:
-
-# 0.20.x is the last version that maintains python2 compatibility
-
-buildPythonPackage rec {
- pname = "scikit-learn";
- version = "0.20.4";
- # UnboundLocalError: local variable 'message' referenced before assignment
- disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z";
- };
-
- nativeBuildInputs = [ gfortran ];
- buildInputs = [ pillow glibcLocales ];
- propagatedBuildInputs = [ numpy scipy numpy.blas ];
- checkInputs = [ pytest ];
-
- LC_ALL="en_US.UTF-8";
-
- doCheck = !stdenv.isAarch64;
- # Skip test_feature_importance_regression - does web fetch
- checkPhase = ''
- cd $TMPDIR
- HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn
- '';
-
- meta = with lib; {
- description = "A set of python modules for machine learning and data mining";
- homepage = "https://scikit-learn.org";
- license = licenses.bsd3;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/seaborn/0.9.1.nix b/pkgs/development/python-modules/seaborn/0.9.1.nix
deleted file mode 100644
index 79361a491698..000000000000
--- a/pkgs/development/python-modules/seaborn/0.9.1.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, pandas
-, matplotlib
-}:
-
-buildPythonPackage rec {
- pname = "seaborn";
- version = "0.9.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "da33aa8c20a9a342ce73831d02831a10413f54a05471c7f31edf34f225d456ae";
- };
-
- checkInputs = [ nose ];
- propagatedBuildInputs = [ pandas matplotlib ];
-
- checkPhase = ''
- nosetests -v
- '';
-
- # Computationally very demanding tests
- doCheck = false;
-
- meta = {
- description = "Statisitical data visualization";
- homepage = "https://seaborn.pydata.org/";
- license = with lib.licenses; [ bsd3 ];
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/python-modules/seahub/default.nix b/pkgs/development/python-modules/seahub/default.nix
deleted file mode 100644
index 81728dfe7864..000000000000
--- a/pkgs/development/python-modules/seahub/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, makeWrapper }:
-
-python3Packages.buildPythonPackage rec {
- pname = "seahub";
- version = "8.0.7";
-
- src = fetchFromGitHub {
- owner = "haiwen";
- repo = "seahub";
- rev = "4f7bb3f617dd847cf0a6b33c0bfb567b44c06059"; # using a fixed revision because upstream may re-tag releases :/
- sha256 = "09d05sxly1bljxxzm77limhwsbg8c4b54fzv3kmaih59pjnjyr03";
- };
-
- dontBuild = true;
- doCheck = false; # disabled because it requires a ccnet environment
-
- nativeBuildInputs = [ makeWrapper ];
-
- propagatedBuildInputs = with python3Packages; [
- django
- future
- django-statici18n
- django-webpack-loader
- django-simple-captcha
- django-picklefield
- django-formtools
- mysqlclient
- pillow
- python-dateutil
- django_compressor
- djangorestframework
- openpyxl
- requests
- requests_oauthlib
- pyjwt
- pycryptodome
- qrcode
- pysearpc
- seaserv
- ];
-
- installPhase = ''
- cp -dr --no-preserve='ownership' . $out/
- wrapProgram $out/manage.py \
- --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" \
- --prefix PATH : "${python3Packages.python}/bin"
- '';
-
- meta = with lib; {
- homepage = "https://github.com/haiwen/seahub";
- description = "The web end of seafile server";
- license = licenses.asl20;
- platforms = platforms.linux;
- maintainers = with maintainers; [ greizgh schmittlauch ];
- };
-}
diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix
deleted file mode 100644
index 518b7637ad71..000000000000
--- a/pkgs/development/python-modules/semantic/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, quantities
-, numpy
-}:
-
-buildPythonPackage rec {
- pname = "semantic";
- version = "1.0.3";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "bbc47dad03dddb1ba5895612fdfa1e43cfb3c497534976cebacd4f3684b505b4";
- };
-
- propagatedBuildInputs = [ quantities numpy ];
-
- # strange setuptools error (can not import semantic.test)
- doCheck = false;
-
- meta = with lib; {
- description = "Common Natural Language Processing Tasks for Python";
- homepage = "https://github.com/crm416/semantic";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix
deleted file mode 100644
index a409d48837e6..000000000000
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy27
-, testfixtures
-, unittest2
-, webtest
-, pyramid
-, sqlalchemy
-, simplejson
-, mozsvc
-, cornice
-, pyramid_hawkauth
-, pymysql
-, pymysqlsa
-, umemcache
-, WSGIProxy
-, requests
-, pybrowserid
-}:
-
-buildPythonPackage rec {
- pname = "serversyncstorage";
- version = "1.6.14";
- disabled = !isPy27;
-
- src = fetchFromGitHub {
- owner = "mozilla-services";
- repo = "server-syncstorage";
- rev = version;
- sha256 = "08xclxj38rav8yay9cijiavv35jbyf6a9jzr24vgcna8pjjnbbmh";
- };
-
- checkInputs = [ testfixtures unittest2 webtest ];
- propagatedBuildInputs = [
- pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql
- pymysqlsa umemcache WSGIProxy requests pybrowserid
- ];
-
- meta = with lib; {
- broken = cornice.version != "0.17";
- description = "The SyncServer server software, as used by Firefox Sync";
- homepage = "https://github.com/mozilla-services/server-syncstorage";
- license = licenses.mpl20;
- maintainers = with maintainers; [ nadrieril ];
- };
-}
diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix
deleted file mode 100644
index 41fe5043ea85..000000000000
--- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, darcsver
-}:
-
-buildPythonPackage rec {
- pname = "setuptools_darcs";
- version = "1.2.11";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1wsh0g1fn10msqk87l5jrvzs0yj5mp6q9ld3gghz6zrhl9kqzdn1";
- };
-
- # In order to break the dependency on darcs -> ghc, we don't add
- # darcs as a propagated build input.
- propagatedBuildInputs = [ darcsver ];
-
- # ugly hack to specify version that should otherwise come from darcs
- patchPhase = ''
- substituteInPlace setup.py --replace "name=PKG" "name=PKG, version='${version}'"
- '';
-
- meta = with lib; {
- description = "Setuptools plugin for the Darcs version control system";
- homepage = "http://allmydata.org/trac/setuptools_darcs";
- license = licenses.bsd0;
- };
-}
diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix
deleted file mode 100644
index 9dbf40a54706..000000000000
--- a/pkgs/development/python-modules/simpleai/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, numpy
-, isPy3k
-}:
-
-buildPythonPackage rec {
- version = "0.8.3";
- pname = "simpleai";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1d5be7a00f1f42ed86683019262acbb14e6eca1ed92ce7d7fdf932838d3742e5";
- };
-
- propagatedBuildInputs = [ numpy ];
-
- #No tests in archive
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/simpleai-team/simpleai";
- description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'";
- maintainers = with maintainers; [ NikolaMandic ];
- };
-
-}
diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix
deleted file mode 100644
index e81a7d41b7a5..000000000000
--- a/pkgs/development/python-modules/simpleparse/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, isPyPy
-}:
-
-buildPythonPackage rec {
- version = "2.2.2";
- pname = "simpleparse";
- disabled = isPy3k || isPyPy;
-
- src = fetchPypi {
- pname = "SimpleParse";
- inherit version;
- sha256 = "010szm4mbqgfdksa2n4l9avj617rb0gkwrryc70mfjmyww0bd1m6";
- };
-
- doCheck = false; # weird error
-
- meta = with lib; {
- description = "A Parser Generator for Python";
- homepage = "https://pypi.python.org/pypi/SimpleParse";
- license = licenses.bsd0;
- };
-
-}
diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix
deleted file mode 100644
index 837271b4d57c..000000000000
--- a/pkgs/development/python-modules/singledispatch/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, six
-, setuptools-scm
-, toml
-}:
-
-buildPythonPackage rec {
- pname = "singledispatch";
- version = "3.7.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092";
- };
-
- nativeBuildInputs = [
- setuptools-scm
- toml
- ];
-
- propagatedBuildInputs = [ six ];
-
- # pypi singledispatch tarbal does not contain tests
- doCheck = false;
-
- meta = {
- description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3.";
- homepage = "https://docs.python.org/3/library/functools.html";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix
deleted file mode 100644
index 34b95fe781d9..000000000000
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, pkgs
-, cython
-, dnspython
-, python-dateutil
-, xcaplib
-, msrplib
-, lxml
-, python-otr
-}:
-
-buildPythonPackage rec {
- pname = "sipsimple";
- version = "3.4.2";
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "AGProjects";
- repo = "python-sipsimple";
- rev = "release-${version}";
- sha256 = "094xf343d6zjhg9jwbm3dr74zq264cyqnn22byvm2m88lnagmhmr";
- };
-
- preConfigure = ''
- # TODO: Executable bits are set by upstream with the next release
- # see AGProjects/python-sipsimple/commit/a36d66cf758afb43c59f7ac48b193c4148eb1848
- chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure
-
- export LD=$CC
- '';
-
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ];
- propagatedBuildInputs = [ cython pkgs.openssl dnspython python-dateutil xcaplib msrplib lxml python-otr ];
-
- meta = with lib; {
- description = "SIP SIMPLE implementation for Python";
- homepage = "https://sipsimpleclient.org/";
- license = licenses.gpl3;
- maintainers = with maintainers; [ pSub ];
- };
-
-}
diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix
deleted file mode 100644
index ddca8509744d..000000000000
--- a/pkgs/development/python-modules/slowaes/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "slowaes";
- version = "0.1a1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09";
- };
-
- disabled = isPy3k;
-
- meta = with lib; {
- homepage = "http://code.google.com/p/slowaes/";
- description = "AES implemented in pure python";
- license = with licenses; [ asl20 ];
- };
-
-}
diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix
deleted file mode 100644
index ceba9eae9e4b..000000000000
--- a/pkgs/development/python-modules/smartdc/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, requests
-, http_signature
-}:
-
-buildPythonPackage rec {
- pname = "smartdc";
- version = "0.2.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "6ffd866fb98386324e189e24d4f7532f66c1b20eece35ca1a6cb4b2a2639fc85";
- };
-
- propagatedBuildInputs = [ requests http_signature ];
-
- meta = with lib; {
- description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests";
- homepage = "https://github.com/atl/py-smartdc";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix
deleted file mode 100644
index 08896467b4e5..000000000000
--- a/pkgs/development/python-modules/snug/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ buildPythonPackage, lib, fetchFromGitHub, glibcLocales
-, pytest, pytest-mock, gentools
-, typing, singledispatch, pythonOlder
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "snug";
- version = "1.3.4";
- disabled = isPy3k;
-
- # Pypi doesn't ship the tests, so we fetch directly from GitHub
- src = fetchFromGitHub {
- owner = "ariebovenberg";
- repo = "snug";
- rev = "v${version}";
- sha256 = "0jmg0sivz9ljazlnsrrqaizrb3r7asy5pa0dj3idx49gbig4589i";
- };
-
- # Prevent unicode decoding error in setup.py
- # while reading README.rst and HISTORY.rst
- buildInputs = [ glibcLocales ];
- LC_ALL = "en_US.UTF-8";
-
- propagatedBuildInputs =
- lib.optionals (pythonOlder "3.4") [ singledispatch ] ++
- lib.optionals (pythonOlder "3.5") [ typing ];
-
- checkInputs = [ pytest pytest-mock gentools ];
- checkPhase = "pytest";
-
- meta = with lib; {
- description = "Tiny toolkit for writing reusable interactions with web APIs";
- license = licenses.mit;
- homepage = "https://snug.readthedocs.io/en/latest/";
- maintainers = with maintainers; [ mredaelli ];
- };
-
-}
diff --git a/pkgs/development/python-modules/soupsieve/1.nix b/pkgs/development/python-modules/soupsieve/1.nix
deleted file mode 100644
index bb5ecbc839c2..000000000000
--- a/pkgs/development/python-modules/soupsieve/1.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, beautifulsoup4
-, isPy3k
-, backports_functools_lru_cache
-}:
-
-buildPythonPackage rec {
- pname = "soupsieve";
- version = "1.9.6";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "7985bacc98c34923a439967c1a602dc4f1e15f923b6fcf02344184f86cc7efaa";
- };
-
- checkPhase = ''
- py.test
- '';
-
- checkInputs = [ pytest beautifulsoup4 ];
-
- propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache;
-
- # Circular test dependency on beautifulsoup4
- doCheck = false;
-
- meta = {
- description = "A CSS4 selector implementation for Beautiful Soup";
- license = lib.licenses.mit;
- homepage = "https://github.com/facelessuser/soupsieve";
- };
-
-}
diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix
deleted file mode 100644
index f33748379d1e..000000000000
--- a/pkgs/development/python-modules/spambayes/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }:
-
-buildPythonPackage rec {
- pname = "spambayes";
- version = "1.1b3";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "016r3g43ja73rls1nh1dl82d75lgsjdl4cv2r5s7zcihm47nb38q";
- };
-
- propagatedBuildInputs = [ bsddb3 pydns lockfile ];
-
- meta = {
- description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
- homepage = "http://spambayes.sourceforge.net/";
- };
-}
diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix
deleted file mode 100644
index 3057f89adf4e..000000000000
--- a/pkgs/development/python-modules/sqlite3dbm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "sqlite3dbm";
- version = "0.1.4";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4721607e0b817b89efdba7e79cab881a03164b94777f4cf796ad5dd59a7612c5";
- };
-
- meta = with lib; {
- description = "sqlite-backed dictionary";
- homepage = "https://github.com/Yelp/sqlite3dbm";
- license = licenses.asl20;
- };
-
-}
diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix
deleted file mode 100644
index bab9e2f99f28..000000000000
--- a/pkgs/development/python-modules/squaremap/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, six
-, wxPython
-}:
-
-buildPythonPackage rec {
- pname = "squaremap";
- version = "1.0.5";
- disabled = isPy3k;
-
- src = fetchPypi {
- pname = "SquareMap";
- inherit version;
- sha256 = "1a79jm7mp0pvi3a19za5c3idavnj7hlral01hhr3x9mz1jayav5i";
- };
-
- propagatedBuildInputs = [ six wxPython ];
-
- meta = with lib; {
- description = "Hierarchic visualization control for wxPython";
- homepage = "https://launchpad.net/squaremap";
- license = licenses.bsd3;
- broken = true; # wxPython doesn't seem to be able to be detected by pip
- };
-
-}
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 86550f998734..18771886b0fa 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "srsly";
- version = "2.4.1";
+ version = "2.4.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-sPKuwKMp5ufnQqCmDpmnSWjKKb5x81xcTeIh4ygXaSY=";
+ hash = "sha256-KrolIpJ2eHUIat9OQ4DiewJNc2VUVveW+OB+s6TfrMA=";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix
deleted file mode 100644
index 149be55da580..000000000000
--- a/pkgs/development/python-modules/stompclient/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, mock
-, nose
-}:
-
-buildPythonPackage rec {
- pname = "stompclient";
- version = "0.3.2";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "95a4e98dd0bba348714439ea11a25ee8a74acb8953f95a683924b5bf2a527e4e";
- };
-
- buildInputs = [ mock nose ];
-
- # XXX: Ran 0 tests in 0.217s
-
- meta = with lib; {
- description = "Lightweight and extensible STOMP messaging client";
- homepage = "https://bitbucket.org/hozn/stompclient";
- license = licenses.asl20;
- };
-
-}
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
deleted file mode 100644
index 336a371c0714..000000000000
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, fetchurl, buildPythonPackage, antlr2, isPy3k }:
-
-buildPythonPackage rec {
- pname = "PyStringTemplate";
- version = "3.2b1";
-
- src = fetchurl {
- url = "https://www.stringtemplate.org/download/${pname}-${version}.tar.gz";
- sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
- };
-
- propagatedBuildInputs = [ antlr2 ];
-
- disabled = isPy3k;
-
- # No tests included in archive
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://www.stringtemplate.org/";
- description = "Text Templating Library";
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix
deleted file mode 100644
index 3fc4378fc34d..000000000000
--- a/pkgs/development/python-modules/subprocess32/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, isPyPy
-, bash
-, python
-}:
-
-buildPythonPackage rec {
- pname = "subprocess32";
- version = "3.5.4";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d";
- };
-
- buildInputs = [ bash ];
-
- preConfigure = ''
- substituteInPlace test_subprocess32.py \
- --replace '/usr/' '${bash}/'
- '';
-
- doCheck = !isPyPy;
- checkPhase = ''
- ${python.interpreter} test_subprocess32.py
- '';
-
- meta = {
- homepage = "https://pypi.python.org/pypi/subprocess32";
- description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x";
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix
deleted file mode 100644
index 1a96df26da1d..000000000000
--- a/pkgs/development/python-modules/suds/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "suds";
- version = "0.4";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1w4s9051iv90c0gs73k80c3d51y2wbx1xgfdgg2hk7mv4gjlllnm";
- };
-
- patches = [ ./suds-0.4-CVE-2013-2217.patch ];
-
- meta = with lib; {
- # Broken for security issues:
- # - https://github.com/NixOS/nixpkgs/issues/19678
- # - https://lwn.net/Vulnerabilities/559200/
- broken = true;
- description = "Lightweight SOAP client";
- homepage = "https://fedorahosted.org/suds";
- license = licenses.lgpl3Plus;
- };
-
-}
diff --git a/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch b/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch
deleted file mode 100644
index 235fc1f928c0..000000000000
--- a/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- suds.orig/suds/cache.py 2013-06-29 16:26:16.930326017 +0200
-+++ suds.orig/suds/cache.py 2013-06-29 16:02:15.000000000 +0200
-@@ -19,6 +19,7 @@
- """
-
- import os
-+import tempfile
- import suds
- from tempfile import gettempdir as tmp
- from suds.transport import *
-@@ -138,7 +139,7 @@
- @type duration: {unit:value}
- """
- if location is None:
-- location = os.path.join(tmp(), 'suds')
-+ location = tempfile.mkdtemp()
- self.location = location
- self.duration = (None, 0)
- self.setduration(**duration)
diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index b8bb9a36586a..84cc78e8a4a8 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -5,6 +5,7 @@
, six
, mock
, isPyPy
+, fetchpatch
}:
buildPythonPackage rec {
@@ -17,6 +18,14 @@ buildPythonPackage rec {
sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2";
};
+ patches = [
+ # https://github.com/gabrielfalcao/sure/issues/169
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/archlinux/svntogit-community/055baa81cd987e566de62a5657513937521a90d4/trunk/python310.diff";
+ sha256 = "sha256-BKylV8xpTOuO/X4hzZKpoIcAQcdAK0kXYENRad7AGPc=";
+ })
+ ];
+
buildInputs = [ rednose ];
propagatedBuildInputs = [ six mock ];
diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix
deleted file mode 100644
index 5a14e7e7f40e..000000000000
--- a/pkgs/development/python-modules/sybase/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, isPy3k
-, freetds
-}:
-
-buildPythonPackage rec {
- pname = "python-sybase";
- version = "0.40pre2";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j";
- };
-
- propagatedBuildInputs = [ freetds ];
-
- SYBASE = freetds;
- setupPyBuildFlags = [ "-DHAVE_FREETDS" "-UWANT_BULKCOPY" ];
-
- meta = with lib; {
- description = "The Sybase module provides a Python interface to the Sybase relational database system";
- homepage = "http://python-sybase.sourceforge.net";
- license = licenses.bsd3;
- maintainers = with maintainers; [ veprbl ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/python-modules/sympy/1_5.nix b/pkgs/development/python-modules/sympy/1_5.nix
deleted file mode 100644
index 59c9ab878550..000000000000
--- a/pkgs/development/python-modules/sympy/1_5.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, glibcLocales
-, mpmath
-}:
-
-buildPythonPackage rec {
- pname = "sympy";
- version = "1.5.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d77901d748287d15281f5ffe5b0fef62dd38f357c2b827c44ff07f35695f4e7e";
- };
-
- checkInputs = [ glibcLocales ];
-
- propagatedBuildInputs = [ mpmath ];
-
- # tests take ~1h
- doCheck = false;
- pythonImportsCheck = [ "sympy" ];
-
- preCheck = ''
- export LANG="en_US.UTF-8"
- '';
-
- meta = with lib; {
- description = "A Python library for symbolic mathematics";
- homepage = "https://www.sympy.org/";
- license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
- };
-}
diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix
deleted file mode 100644
index efc47a1ad3f4..000000000000
--- a/pkgs/development/python-modules/tables/3.5.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, fetchPypi, python, buildPythonPackage
-, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
-
-buildPythonPackage rec {
- version = "3.5.2";
- pname = "tables";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1hikrki0hx94ass31pn0jyz9iy0zhnkjacfk86m21cxsc8if685j";
- };
-
- buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
- propagatedBuildInputs = [ numpy numexpr six mock ];
-
- # The setup script complains about missing run-paths, but they are
- # actually set.
- setupPyBuildFlags = [
- "--hdf5=${lib.getDev hdf5}"
- "--lzo=${lib.getDev lzo}"
- "--bzip2=${lib.getDev bzip2}"
- "--blosc=${lib.getDev c-blosc}"
- ];
- # Run the test suite.
- # It requires the build path to be in the python search path.
- # These tests take quite some time.
- # If the hdf5 library is built with zlib then there is only one
- # test-failure. That is the same failure as described in the following
- # github issue:
- # https://github.com/PyTables/PyTables/issues/269
- checkPhase = ''
- ${python.interpreter} <
-Date: Sat, 9 Mar 2019 23:26:30 +0100
-Subject: [PATCH] Don't use `which` implementation to find required executables
-
-Nix specific patch.
-
-Rather than relying on a global state, we set an absolute store path for
-all external dependencies to ensure their functionality.
----
- integration_tests/__init__.py | 4 ++--
- tests/engines/test_gif.py | 2 +-
- tests/handlers/test_base_handler.py | 30 ++++++++++++++---------------
- tests/optimizers/test_gifv.py | 2 +-
- tests/test_server.py | 4 ++++
- tests/test_utils.py | 3 +++
- thumbor/server.py | 7 +------
- 7 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/integration_tests/__init__.py b/integration_tests/__init__.py
-index 9bdd0a3..7d9de8f 100644
---- a/integration_tests/__init__.py
-+++ b/integration_tests/__init__.py
-@@ -15,7 +15,7 @@ class EngineCase(AsyncHTTPTestCase):
- def get_app(self):
- cfg = Config(SECURITY_KEY='ACME-SEC')
- server_params = ServerParameters(None, None, None, None, None, None)
-- server_params.gifsicle_path = which('gifsicle')
-+ server_params.gifsicle_path = '@gifsicle@'
-
- cfg.DETECTORS = [
- 'thumbor.detectors.face_detector',
-@@ -28,7 +28,7 @@ class EngineCase(AsyncHTTPTestCase):
- cfg.FILE_LOADER_ROOT_PATH = os.path.join(os.path.dirname(__file__), 'imgs')
- cfg.ENGINE = getattr(self, 'engine', None)
- cfg.USE_GIFSICLE_ENGINE = True
-- cfg.FFMPEG_PATH = which('ffmpeg')
-+ cfg.FFMPEG_PATH = '@ffmpeg@'
- cfg.ENGINE_THREADPOOL_SIZE = 10
- cfg.OPTIMIZERS = [
- 'thumbor.optimizers.gifv',
-diff --git a/tests/engines/test_gif.py b/tests/engines/test_gif.py
-index c0c8430..ce0cc51 100644
---- a/tests/engines/test_gif.py
-+++ b/tests/engines/test_gif.py
-@@ -44,7 +44,7 @@ class GitEngineTestCase(TestCase):
- def get_server(self):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
-- server.gifsicle_path = which('gifsicle')
-+ server.gifsicle_path = '@gifsicle@'
- return server
-
- def get_context(self, *args, **kwargs):
-diff --git a/tests/handlers/test_base_handler.py b/tests/handlers/test_base_handler.py
-index 69dc110..4493abe 100644
---- a/tests/handlers/test_base_handler.py
-+++ b/tests/handlers/test_base_handler.py
-@@ -557,7 +557,7 @@ class ImageOperationsWithAutoWebPTestCase(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
- return ctx
-
- def get_as_webp(self, url):
-@@ -657,7 +657,7 @@ class ImageOperationsWithAutoWebPWithResultStorageTestCase(BaseImagingTestCase):
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
- ctx.request = self.get_request()
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
- return ctx
-
- @property
-@@ -783,7 +783,7 @@ class ImageOperationsWithGifVTestCase(BaseImagingTestCase):
- cfg = Config(SECURITY_KEY='ACME-SEC')
- cfg.LOADER = "thumbor.loaders.file_loader"
- cfg.FILE_LOADER_ROOT_PATH = self.loader_path
-- cfg.FFMPEG_PATH = which('ffmpeg')
-+ cfg.FFMPEG_PATH = '@ffmpeg@'
- cfg.OPTIMIZERS = [
- 'thumbor.optimizers.gifv',
- ]
-@@ -793,7 +793,7 @@ class ImageOperationsWithGifVTestCase(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
- return ctx
-
- def test_should_convert_animated_gif_to_mp4_when_filter_without_params(self):
-@@ -828,7 +828,7 @@ class ImageOperationsImageCoverTestCase(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
- return ctx
-
- def test_can_get_image_cover(self):
-@@ -849,7 +849,7 @@ class ImageOperationsWithResultStorageTestCase(BaseImagingTestCase):
- cfg.RESULT_STORAGE_FILE_STORAGE_ROOT_PATH = self.root_path
-
- cfg.USE_GIFSICLE_ENGINE = True
-- cfg.FFMPEG_PATH = which('ffmpeg')
-+ cfg.FFMPEG_PATH = '@ffmpeg@'
- cfg.AUTO_WEBP = True
- cfg.OPTIMIZERS = [
- 'thumbor.optimizers.gifv',
-@@ -860,7 +860,7 @@ class ImageOperationsWithResultStorageTestCase(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
-
- return ctx
-
-@@ -891,7 +891,7 @@ class ImageOperationsResultStorageOnlyTestCase(BaseImagingTestCase):
- cfg.RESULT_STORAGE = 'thumbor.result_storages.file_storage'
- cfg.RESULT_STORAGE_EXPIRATION_SECONDS = 60
- cfg.RESULT_STORAGE_FILE_STORAGE_ROOT_PATH = self.root_path
-- cfg.FFMPEG_PATH = which('ffmpeg')
-+ cfg.FFMPEG_PATH = '@ffmpeg@'
-
- cfg.USE_GIFSICLE_ENGINE = True
- cfg.AUTO_WEBP = True
-@@ -904,7 +904,7 @@ class ImageOperationsResultStorageOnlyTestCase(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
-
- return ctx
-
-@@ -1040,7 +1040,7 @@ class ImageOperationsWithMaxPixels(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
- return ctx
-
- def test_should_error(self):
-@@ -1061,7 +1061,7 @@ class ImageOperationsWithRespectOrientation(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- self.context = Context(server, cfg, importer)
-- self.context.server.gifsicle_path = which('gifsicle')
-+ self.context.server.gifsicle_path = '@gifsicle@'
- return self.context
-
- def test_should_be_ok_when_orientation_exif(self):
-@@ -1153,7 +1153,7 @@ class ImageOperationsWithJpegtranTestCase(BaseImagingTestCase):
- cfg = Config(SECURITY_KEY='ACME-SEC')
- cfg.LOADER = "thumbor.loaders.file_loader"
- cfg.FILE_LOADER_ROOT_PATH = self.loader_path
-- cfg.JPEGTRAN_PATH = which('jpegtran')
-+ cfg.JPEGTRAN_PATH = '@jpegtran@'
- cfg.PROGRESSIVE_JPEG = True,
- cfg.RESULT_STORAGE_STORES_UNSAFE = True,
- cfg.OPTIMIZERS = [
-@@ -1175,9 +1175,7 @@ class ImageOperationsWithJpegtranTestCase(BaseImagingTestCase):
- f.write(response.body)
- f.close()
-
-- exiftool = which('exiftool')
-- if not exiftool:
-- raise AssertionError('exiftool was not found. Please install it to run thumbor\'s tests.')
-+ exiftool = '@exiftool@'
-
- command = [
- exiftool,
-@@ -1221,7 +1219,7 @@ class ImageOperationsWithoutStorage(BaseImagingTestCase):
- server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None)
- server.security_key = 'ACME-SEC'
- ctx = Context(server, cfg, importer)
-- ctx.server.gifsicle_path = which('gifsicle')
-+ ctx.server.gifsicle_path = '@gifsicle@'
- return ctx
-
- def test_meta(self):
-diff --git a/tests/optimizers/test_gifv.py b/tests/optimizers/test_gifv.py
-index 229e9cd..066f2d5 100644
---- a/tests/optimizers/test_gifv.py
-+++ b/tests/optimizers/test_gifv.py
-@@ -31,7 +31,7 @@ class GifvOptimizerTest(TestCase):
- def get_context(self):
- conf = Config()
- conf.STATSD_HOST = ''
-- conf.FFMPEG_PATH = which('ffmpeg')
-+ conf.FFMPEG_PATH = '@ffmpeg@'
- ctx = Context(config=conf)
- ctx.request = RequestParameters()
- ctx.request.filters.append('gifv')
-diff --git a/tests/test_server.py b/tests/test_server.py
-index 5b31750..c2a65dc 100644
---- a/tests/test_server.py
-+++ b/tests/test_server.py
-@@ -11,6 +11,8 @@
- from unittest import TestCase
- import mock
-
-+from nose.tools import nottest
-+
- from preggy import expect
-
- from thumbor.app import ThumborServiceApp
-@@ -118,6 +120,7 @@ class ServerTestCase(TestCase):
- expect(server_parameters.security_key).to_equal('something')
-
- @mock.patch.object(thumbor.server, 'which')
-+ @nottest
- def test_validate_gifsicle_path(self, which_mock):
- server_parameters = mock.Mock(security_key=None)
- conf = Config(SECURITY_KEY='test', USE_GIFSICLE_ENGINE=True)
-@@ -128,6 +131,7 @@ class ServerTestCase(TestCase):
- expect(server_parameters.gifsicle_path).to_equal('/usr/bin/gifsicle')
-
- @mock.patch.object(thumbor.server, 'which')
-+ @nottest
- def test_validate_null_gifsicle_path(self, which_mock):
- server_parameters = mock.Mock(security_key=None)
- conf = Config(SECURITY_KEY='test', USE_GIFSICLE_ENGINE=True)
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 38cd51b..7dd0b3e 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -10,6 +10,7 @@
-
- from mock import Mock, patch
- from unittest import TestCase
-+from nose.tools import nottest
- import logging
-
- from preggy import expect
-@@ -112,6 +113,7 @@ class UtilsTestCase(TestCase):
- test_func()
- mock_warn.assert_called_once_with('Deprecated function test_func: func2')
-
-+ @nottest
- def test_can_which_by_path(self):
- result = which('/bin/ls')
- expect(result).to_equal('/bin/ls')
-@@ -119,6 +121,7 @@ class UtilsTestCase(TestCase):
- result = which('/tmp')
- expect(result).to_be_null()
-
-+ @nottest
- def test_can_which_by_env(self):
- result = which('ls')
- expect(result).to_equal('/bin/ls')
-diff --git a/thumbor/server.py b/thumbor/server.py
-index c75a769..821163b 100644
---- a/thumbor/server.py
-+++ b/thumbor/server.py
-@@ -89,12 +89,7 @@ def validate_config(config, server_parameters):
- warnings.simplefilter('error', Image.DecompressionBombWarning)
-
- if config.USE_GIFSICLE_ENGINE:
-- server_parameters.gifsicle_path = which('gifsicle')
-- if server_parameters.gifsicle_path is None:
-- raise RuntimeError(
-- 'If using USE_GIFSICLE_ENGINE configuration to True, the `gifsicle` binary must be in the PATH '
-- 'and must be an executable.'
-- )
-+ server_parameters.gifsicle_path = '@gifsicle@'
-
-
- def get_context(server_parameters, config, importer):
---
-2.18.1
-
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
deleted file mode 100644
index 86a2dd200110..000000000000
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{ buildPythonPackage, python, tornado, pycrypto, pycurl, pytz
-, pillow, derpconf, python_magic, libthumbor, webcolors
-, piexif, futures, statsd, thumborPexif, fetchFromGitHub, isPy3k, lib
-, mock, raven, nose, yanc, remotecv, pyssim, cairosvg, preggy, opencv3
-, pkgs, coreutils, substituteAll
-}:
-
-buildPythonPackage rec {
- pname = "thumbor";
- version = "6.7.0";
-
- disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
-
- # Tests aren't included in PyPI tarball so use GitHub instead
- src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = version;
- sha256 = "1qv02jz7ivn38dsywp7nxrlflly86x9pm2pk3yqi8m8myhc7lipg";
- };
-
- patches = [
- (substituteAll {
- src = ./0001-Don-t-use-which-implementation-to-find-required-exec.patch;
- gifsicle = "${pkgs.gifsicle}/bin/gifsicle";
- exiftool = "${pkgs.exiftool}/bin/exiftool";
- jpegtran = "${pkgs.libjpeg}/bin/jpegtran";
- ffmpeg = "${pkgs.ffmpeg_3}/bin/ffmpeg";
- })
- ];
-
- postPatch = ''
- substituteInPlace "setup.py" \
- --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
- sed -i setup.py \
- -e 's/piexif[^"]*/piexif/;s/Pillow[^"]*/Pillow/'
- substituteInPlace "tests/test_utils.py" \
- --replace "/bin/ls" "${coreutils}/bin/ls"
- substituteInPlace "tests/detectors/test_face_detector.py" \
- --replace "./thumbor" "$out/lib/${python.libPrefix}/site-packages/thumbor"
- substituteInPlace "tests/detectors/test_glasses_detector.py" \
- --replace "./thumbor" "$out/lib/${python.libPrefix}/site-packages/thumbor"
- '';
-
- checkInputs = [
- nose
- pyssim
- preggy
- mock
- yanc
- remotecv
- raven
- pkgs.redis
- pkgs.glibcLocales
- pkgs.gifsicle
- ];
-
- propagatedBuildInputs = [
- tornado
- pycrypto
- pycurl
- pytz
- pillow
- derpconf
- python_magic
- libthumbor
- opencv3
- webcolors
- piexif
- statsd
- cairosvg
- ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ];
-
- # Remove the source tree before running nosetests because otherwise nosetests
- # uses that instead of the installed package. Is there some other way to
- # achieve this?
- checkPhase = ''
- redis-server --port 6668 --requirepass hey_you &
- rm -r thumbor
- export LC_ALL="en_US.UTF-8"
- nosetests -v --with-yanc -s tests/ -e test_redeye_applied
- '';
-
- meta = with lib; {
- description = "A smart imaging service";
- homepage = "https://github.com/thumbor/thumbor/wiki";
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix
deleted file mode 100644
index 36a88ea22e49..000000000000
--- a/pkgs/development/python-modules/tmdb3/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
-
-buildPythonPackage rec {
- pname = "tmdb3";
- version = "0.7.2";
- disabled = isPy3k; # Upstream has not received any updates since 2015, and importing from python3 does not work.
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983";
- };
-
- # no tests implemented
- doCheck = false;
-
- pythonImportsCheck = [ "tmdb3" ];
-
- meta = with lib; {
- description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
- homepage = "https://pypi.python.org/pypi/tmdb3";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix
deleted file mode 100644
index 6d3c7e2be054..000000000000
--- a/pkgs/development/python-modules/tokenserver/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, alembic, boto, cornice, hawkauthlib, mozsvc, paste, pybrowserid, pyfxa
-, pymysql, pymysqlsa, sqlalchemy, testfixtures, tokenlib, umemcache
-, mock, nose, unittest2, webtest
-}:
-
-buildPythonPackage rec {
- pname = "tokenserver";
- version = "1.3.1";
-
- src = fetchFromGitHub {
- owner = "mozilla-services";
- repo = pname;
- rev = version;
- sha256 = "04z0r8xzrmhvh04y8ggdz9gs8qa8lv3qr7kasf6lm63fixsfgrlp";
- };
-
- propagatedBuildInputs = [
- alembic boto cornice hawkauthlib mozsvc paste pybrowserid pyfxa
- pymysql pymysqlsa sqlalchemy testfixtures tokenlib umemcache
- ];
-
- checkInputs = [
- mock nose unittest2 webtest
- ];
-
- # Requires virtualenv, MySQL, ...
- doCheck = false;
-
- meta = with lib; {
- description = "The Mozilla Token Server";
- homepage = "https://github.com/mozilla-services/tokenserver";
- license = licenses.mpl20;
- maintainers = with maintainers; [ nadrieril ];
- };
-}
diff --git a/pkgs/development/python-modules/toolz/2.nix b/pkgs/development/python-modules/toolz/2.nix
deleted file mode 100644
index 8c8a64db3a5e..000000000000
--- a/pkgs/development/python-modules/toolz/2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-}:
-
-buildPythonPackage rec {
- pname = "toolz";
- version = "0.10.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
- };
-
- checkInputs = [ nose ];
-
- checkPhase = ''
- nosetests toolz/tests
- '';
-
- meta = with lib; {
- homepage = "https://github.com/pytoolz/toolz";
- description = "List processing tools and functional utilities";
- license = licenses.bsd3;
- maintainers = with maintainers; [ fridh ];
- };
-}
diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix
index da86c7037b92..b4343b5d5ff6 100644
--- a/pkgs/development/python-modules/tornado/4.nix
+++ b/pkgs/development/python-modules/tornado/4.nix
@@ -2,19 +2,13 @@
, python
, buildPythonPackage
, fetchPypi
-, backports_abc ? null
-, backports_ssl_match_hostname ? null
-, certifi ? null
-, singledispatch ? null
-, futures ? null
, isPy27
}:
buildPythonPackage rec {
pname = "tornado";
version = "4.5.3";
-
- propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ];
+ disabled = isPy27;
# We specify the name of the test files to prevent
# https://github.com/NixOS/nixpkgs/issues/14634
diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix
index 2905f89dc0cc..2f3ba5c1c2aa 100644
--- a/pkgs/development/python-modules/tornado/5.nix
+++ b/pkgs/development/python-modules/tornado/5.nix
@@ -2,19 +2,13 @@
, python
, buildPythonPackage
, fetchPypi
-, backports_abc ? null
-, backports_ssl_match_hostname ? null
-, certifi ? null
-, singledispatch ? null
-, futures ? null
, isPy27
}:
buildPythonPackage rec {
pname = "tornado";
version = "5.1.1";
-
- propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ];
+ disabled = isPy27;
# We specify the name of the test files to prevent
# https://github.com/NixOS/nixpkgs/issues/14634
diff --git a/pkgs/development/python-modules/traitlets/4.nix b/pkgs/development/python-modules/traitlets/4.nix
deleted file mode 100644
index bffd7c790bea..000000000000
--- a/pkgs/development/python-modules/traitlets/4.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, glibcLocales
-, pytest
-, mock
-, ipython_genutils
-, decorator
-, enum34
-, pythonOlder
-, six
-}:
-
-buildPythonPackage rec {
- pname = "traitlets";
- version = "4.3.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7";
- };
-
- checkInputs = [ glibcLocales pytest mock ];
- propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
-
- checkPhase = ''
- LC_ALL="en_US.UTF-8" py.test
- '';
-
- meta = {
- description = "Traitlets Python config system";
- homepage = "http://ipython.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
new file mode 100644
index 000000000000..3629b47e8a29
--- /dev/null
+++ b/pkgs/development/python-modules/treeo/default.nix
@@ -0,0 +1,41 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, jax
+, jaxlib
+, lib
+, poetry-core
+}:
+
+buildPythonPackage rec {
+ pname = "treeo";
+ version = "0.0.9";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "cgarciae";
+ repo = pname;
+ rev = version;
+ sha256 = "0jfqj5150braj4ybnifc6b8mp0w2j93li6bm20lcd7a19qs0lkk2";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ # These deps are not needed for the wheel, but required during the import.
+ propagatedBuildInputs = [
+ jax
+ jaxlib
+ ];
+
+ pythonImportsCheck = [
+ "treeo"
+ ];
+
+ meta = with lib; {
+ description = "A small library for creating and manipulating custom JAX Pytree classes.";
+ homepage = "https://github.com/cgarciae/treeo";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix
deleted file mode 100644
index f32045ce9cde..000000000000
--- a/pkgs/development/python-modules/ttystatus/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, sphinx
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "ttystatus";
- version = "0.23";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz";
- sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y";
- };
-
- buildInputs = [ sphinx ];
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://liw.fi/ttystatus/";
- description = "Progress and status updates on terminals for Python";
- license = licenses.gpl3;
- maintainers = [];
- };
-
-}
diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix
index 7c2c7f66a246..4962f2d02e3a 100644
--- a/pkgs/development/python-modules/types-typed-ast/default.nix
+++ b/pkgs/development/python-modules/types-typed-ast/default.nix
@@ -5,17 +5,20 @@
buildPythonPackage rec {
pname = "types-typed-ast";
- version = "1.5.0";
+ version = "1.5.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-2Op5y/vFIL6Nm8jeSHL0SzQtvbwJFmfi8hsDu9eWkVA=";
+ hash = "sha256-UQ876qlUkrNUTWfoFYGvopA8dktwiJ/82yhubGJn0pc=";
};
# Module doesn't have tests
doCheck = false;
- pythonImportsCheck = [ "typed_ast-stubs" ];
+ pythonImportsCheck = [
+ "typed_ast-stubs"
+ ];
meta = with lib; {
description = "Typing stubs for typed-ast";
diff --git a/pkgs/development/python-modules/tzlocal/2.nix b/pkgs/development/python-modules/tzlocal/2.nix
deleted file mode 100644
index ba96c63af850..000000000000
--- a/pkgs/development/python-modules/tzlocal/2.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, pytz
-, mock
-}:
-
-buildPythonPackage rec {
- pname = "tzlocal";
- version = "2.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44";
- };
-
- propagatedBuildInputs = [
- pytz
- ];
-
- checkInputs = [
- mock
- ];
-
- doCheck = false;
-
- pythonImportsCheck = [ "tzlocal" ];
-
- meta = with lib; {
- description = "Tzinfo object for the local timezone";
- homepage = "https://github.com/regebro/tzlocal";
- license = licenses.cddl;
- maintainers = with maintainers; [ dotlambda ];
- };
-}
diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix
deleted file mode 100644
index d9ec65c2392e..000000000000
--- a/pkgs/development/python-modules/ujson/2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools-scm
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
- pname = "ujson";
- version = "2.0.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
-
- checkInputs = [
- pytestCheckHook
- ];
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/ujson";
- description = "Ultra fast JSON encoder and decoder for Python";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix
deleted file mode 100644
index 26f8ba02756c..000000000000
--- a/pkgs/development/python-modules/umemcache/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, buildPythonPackage, isPy3k, fetchurl }:
-
-buildPythonPackage rec {
- pname = "umemcache";
- version = "1.6.3";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "mirror://pypi/u/umemcache/${pname}-${version}.zip";
- sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
- };
-
- hardeningDisable = [ "format" ];
-
- meta = with lib; {
- description = "Ultra fast memcache client written in highly optimized C++ with Python bindings";
- homepage = "https://github.com/esnme/ultramemcache";
- license = licenses.bsdOriginal;
- };
-}
diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix
index 2055a4813447..e23407ab06b3 100644
--- a/pkgs/development/python-modules/variants/default.nix
+++ b/pkgs/development/python-modules/variants/default.nix
@@ -3,8 +3,7 @@
, fetchPypi
, pytest-runner
, setuptools-scm
-, singledispatch ? null
-, pytest
+, pytestCheckHook
, lib
}:
@@ -23,8 +22,8 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
- ] ++ lib.optionals isPy27 [ singledispatch ];
+ pytestCheckHook
+ ];
meta = with lib; {
description = "Library providing syntactic sugar for creating variant forms of a canonical function";
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
deleted file mode 100644
index 7caf36fa6b2b..000000000000
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, six, h2
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "wptserve";
- version = "3.0";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "11990a92b07e4535c2723c34a88bd905c66acec9cda6efa7a7b61371bfe8d87a";
- };
-
- postPatch = ''
- substituteInPlace setup.py --replace "h2==" "h2>="
- '';
-
- propagatedBuildInputs = [ six h2 ];
-
- meta = {
- description = "A webserver intended for web browser testing";
- homepage = "https://wptserve.readthedocs.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ raskin ];
- };
-}
diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix
deleted file mode 100644
index e2cc26ff143e..000000000000
--- a/pkgs/development/python-modules/wsgiproxy/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, paste
-, six
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "WSGIProxy";
- version = "0.2.2";
- disabled = isPy3k; # Judging from SyntaxError
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0wqz1q8cvb81a37gb4kkxxpv4w7k8192a08qzyz67rn68ln2wcig";
- };
-
- propagatedBuildInputs = [ paste six ];
-
- meta = with lib; {
- description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other";
- homepage = "http://pythonpaste.org/wsgiproxy/";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
deleted file mode 100644
index 086eaf1e3488..000000000000
--- a/pkgs/development/python-modules/xcaplib/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchdarcs
-, isPy3k
-, eventlib
-, application
-}:
-
-buildPythonPackage rec {
- pname = "python-xcaplib";
- version = "1.2.1";
- disabled = isPy3k;
-
- src = fetchdarcs {
- url = "http://devel.ag-projects.com/repositories/${pname}";
- rev = "release-${version}";
- sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v";
- };
-
- propagatedBuildInputs = [ eventlib application ];
-
- meta = with lib; {
- homepage = "https://github.com/AGProjects/python-xcaplib";
- description = "XCAP (RFC4825) client library";
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix
deleted file mode 100644
index 453f3113853b..000000000000
--- a/pkgs/development/python-modules/yenc/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ fetchurl
-, lib
-, buildPythonPackage
-, python
-, isPyPy
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "yenc";
- version = "0.4.0";
- src = fetchurl {
- url = "https://bitbucket.org/dual75/yenc/get/${version}.tar.gz";
- sha256 = "0zkyzxgq30mbrzpnqam4md0cb09d5falh06m0npc81nnlhcghkp7";
- };
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover -s test
- '';
-
- disabled = isPy3k || isPyPy;
-
- meta = {
- description = "Encoding and decoding yEnc";
- license = lib.licenses.lgpl21;
- homepage = "https://bitbucket.org/dual75/yenc";
- maintainers = with lib.maintainers; [ fridh ];
- };
-}
diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix
deleted file mode 100644
index 9611b2722295..000000000000
--- a/pkgs/development/python-modules/yt/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, matplotlib
-, setuptools
-, sympy
-, numpy
-, ipython
-, hdf5
-, nose
-, cython
-, python
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "yt";
- version = "4.0.1";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "6219cbf971871320a13679a57722c0363e50db5e6d4d64ea9d197461b2a7f70f";
- };
-
- buildInputs = [
- cython
- ];
-
- propagatedBuildInputs = [
- matplotlib
- setuptools
- sympy
- numpy
- ipython
- hdf5
- ];
-
- checkInputs = [
- nose
- ];
-
- checkPhase = ''
- cd $out/${python.sitePackages}
- HOME=$(mktemp -d) nosetests yt
- '';
-
- meta = with lib; {
- description = "An analysis and visualization toolkit for volumetric data";
- homepage = "https://github.com/yt-project/yt";
- license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix
deleted file mode 100644
index 715da719bbbc..000000000000
--- a/pkgs/development/python-modules/zbase32/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptoolsDarcs
-, pyutil
-}:
-
-buildPythonPackage rec {
- pname = "zbase32";
- version = "1.1.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "9b25c34ba586cbbad4517af516e723599a6f38fc560f4797855a5f3051e6422f";
- };
-
- # Tests require `pyutil' so disable them to avoid circular references.
- doCheck = false;
-
- propagatedBuildInputs = [ setuptoolsDarcs pyutil ];
-
- meta = with lib; {
- description = "zbase32, a base32 encoder/decoder";
- homepage = "https://pypi.python.org/pypi/zbase32";
- license = licenses.bsd0;
- };
-
-}
diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix
index 3082d9d4f829..698f9e8231d0 100644
--- a/pkgs/development/tools/analysis/rizin/cutter.nix
+++ b/pkgs/development/tools/analysis/rizin/cutter.nix
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "cutter";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "cutter";
rev = "v${version}";
- sha256 = "sha256-OC04d3j8Dfsob1dUjNBc1pSQFxJlexzWJ4v0V3QNkno=";
+ sha256 = "sha256-Z5mqLkeA7AZnvKdpdRzaYfNMsGUI7i7wPTXVyIRYwxI=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix
index d76c63044ccd..e632c3c3cc01 100644
--- a/pkgs/development/tools/analysis/rizin/default.nix
+++ b/pkgs/development/tools/analysis/rizin/default.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "rizin";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchurl {
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
- sha256 = "sha256-+XW12VIaRfRkLc3Li6ItF4VQfWLNRvxZW2VGtxVYJxY=";
+ sha256 = "sha256-muS3+cR75jZl/Q5ZN1srEPg8NxVquwRMpNYcHw/Ij34=";
};
mesonFlags = [
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
deleted file mode 100644
index 53333c217ba5..000000000000
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, pythonPackages }:
-
-with lib;
-with pythonPackages;
-
-buildPythonApplication rec {
- pname = "pantsbuild.pants";
- version = "1.7.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37";
- };
-
- # No tests
- doCheck = false;
-
- prePatch = ''
- sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
- substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0"
- '';
-
- # Unnecessary, and causes some really weird behavior around .class files, which
- # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
- dontStrip = true;
-
- propagatedBuildInputs = [
- twitter-common-collections setproctitle ansicolors packaging pathspec
- scandir twitter-common-dirutil psutil requests pystache pex docutils
- markdown pygments twitter-common-confluence fasteners pywatchman
- futures cffi subprocess32 contextlib2 faulthandler pyopenssl wheel
- ];
-
- meta = {
- description = "A build system for software projects in a variety of languages";
- homepage = "https://www.pantsbuild.org/";
- license = licenses.asl20;
- maintainers = with maintainers; [ copumpkin ];
- broken = true;
- };
-}
diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix
index 729e523dc89d..505a0681085a 100644
--- a/pkgs/development/tools/dprint/default.nix
+++ b/pkgs/development/tools/dprint/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchCrate, rustPlatform }:
+{ lib, stdenv, fetchCrate, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "dprint";
@@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ezfVDgZs0QemYHm/o3aX2QGO2WuMweE8LuNZaX4whhw=";
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
# Tests fail because they expect a test WASM plugin. Tests already run for
# every commit upstream on GitHub Actions
doCheck = false;
diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
deleted file mode 100644
index 2ba0f494c216..000000000000
--- a/pkgs/development/tools/fedpkg/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, python2Packages, fetchurl }:
-
-with python2Packages;
-
-let
- fedora_cert = buildPythonPackage rec {
- name = "fedora-cert";
- version = "0.6.0.2";
- format = "other";
-
- src = fetchurl {
- url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2";
- sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z";
- };
- propagatedBuildInputs = [ python_fedora pyopenssl ];
- doCheck = false;
- };
-in buildPythonApplication rec {
- pname = "fedpkg";
- version = "1.29";
-
- disabled = isPy3k;
-
- src = fetchurl {
- url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
- sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
- };
- patches = [ ./fix-paths.patch ];
- propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
-
- meta = with lib; {
- description = "Subclass of the rpkg project for dealing with rpm packaging";
- homepage = "https://pagure.io/fedpkg";
- license = licenses.gpl2;
- maintainers = with maintainers; [ ];
- broken = true;
- };
-}
diff --git a/pkgs/development/tools/fedpkg/fix-paths.patch b/pkgs/development/tools/fedpkg/fix-paths.patch
deleted file mode 100644
index 1831337a5851..000000000000
--- a/pkgs/development/tools/fedpkg/fix-paths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- orig/setup.py
-+++ new/setup.py
-@@ -27,10 +27,10 @@
- 'bin/fedpkg',
- 'bin/fedpkg-stage',
- ],
-- data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
-- ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
-+ data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
-+ ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
- 'conf/etc/rpkg/fedpkg-stage.conf']),
-- ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
-+ ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
- ],
-
- tests_require=['nose', 'mock'],
diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 424942663393..051e9207aa5a 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gofumpt";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MHNxJ9DPBWrLkaEEfXOmRqo2h2ugwgZT/SIe7bi3J2E=";
+ sha256 = "sha256-Kgj3f90bAtaVl4mby6FQr4t4BT4I3QLtHhvO10f1BOk=";
};
- vendorSha256 = "sha256-LR4W7NKrDP7Ke5NYDZPYorZI77upP5IksBFRFsPnDRc=";
+ vendorSha256 = "sha256-gxxK2eUmYUqHjt8HP6OANaHsO43wCaodUDR4BlMY8Zw=";
doCheck = false;
diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index 3613b18e7286..c275777c12b4 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mold";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-89Dh4qly70Jzyo/KPlRte58hbN5HNnzZpi32tFd8fXU=";
+ sha256 = "sha256-G+mVZS3ZRuBd00xfBqrTvmHOykFk63nJlucxv01nr3k=";
};
buildInputs = [ zlib openssl ];
diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix
index 9be99de8b339..e86380c53e76 100644
--- a/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/pkgs/development/tools/rust/sqlx-cli/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
- version = "0.5.9";
+ version = "0.5.10";
src = fetchFromGitHub {
owner = "launchbadge";
repo = "sqlx";
rev = "v${version}";
- sha256 = "sha256-z8gIuMknqiXpmXANS+V1GYioevCysDDzb+UYc9NeU04=";
+ sha256 = "sha256-OBIuURj0C/ws71KTGN9EbMwN4QsGMEdgoWyctmHaHjQ=";
};
- cargoSha256 = "sha256-b+X4u83Jae2xjKFT4lYqSk125wPQjMiM8wZ36tA/rjo=";
+ cargoSha256 = "sha256-9+I4mi7w1WK2NkmN65EtC52KtSZR9GjrHCPE9w82IXw=";
doCheck = false;
cargoBuildFlags = [ "-p sqlx-cli" ];
diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix
new file mode 100644
index 000000000000..f04de27f1c24
--- /dev/null
+++ b/pkgs/development/tools/tokio-console/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, protobuf
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "tokio-console";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "tokio-rs";
+ repo = "console";
+ rev = "tokio-console-v${version}";
+ sha256 = "sha256-1wxRTdDmgTlGJ3W1txDA/3Rnccs3KBw55vprrGaVnkg=";
+ };
+
+ cargoSha256 = "sha256-RScu5V55OowwWHi3MLjW8DPlTMA/IEBYFt4VUDUHPKo=";
+
+ nativeBuildInputs = [ protobuf ];
+
+ meta = with lib; {
+ description = "A debugger for asynchronous Rust code";
+ homepage = "https://github.com/tokio-rs/console";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ max-niederman ];
+ };
+}
+
diff --git a/pkgs/games/colobot/data.nix b/pkgs/games/colobot/data.nix
index 7ae9dbb2b5ed..761c68c15e81 100644
--- a/pkgs/games/colobot/data.nix
+++ b/pkgs/games/colobot/data.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "colobot-data";
- version = "0.1.12-alpha";
+ version = "0.2.0-alpha";
src = fetchFromGitHub {
owner = "colobot";
repo = "colobot-data";
rev = "colobot-gold-${version}";
- sha256 = "1vm33s52ymwd03x24i9bqiglw5v3wgd7rlzyx9r5ww0nnqzwbwi6";
+ sha256 = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms=";
};
nativeBuildInputs = [ cmake vorbis-tools xmlstarlet doxygen python3 ];
diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix
index b26244ccc5fd..e1070843811c 100644
--- a/pkgs/games/colobot/default.nix
+++ b/pkgs/games/colobot/default.nix
@@ -9,24 +9,15 @@ stdenv.mkDerivation rec {
pname = "colobot";
# Maybe require an update to package colobot-data as well
# in file data.nix next to this one
- version = "0.1.12-alpha";
+ version = "0.2.0-alpha";
src = fetchFromGitHub {
owner = "colobot";
- repo = "colobot";
+ repo = pname;
rev = "colobot-gold-${version}";
- sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2";
+ sha256 = "sha256-Nu7NyicNIk5yza9sXfd4KbGdB65guVuGREd6rwRU3lU=";
};
- patches = [
- # Fix issue with newer compilers, like used in nixpkgs
- # https://github.com/colobot/colobot/pull/1291
- (fetchpatch {
- url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch";
- sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo=";
- })
- ];
-
nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ];
buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ];
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index eca0d10d7f98..7f0f50881768 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
- version = "15.8";
+ version = "15.8.1";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
- sha256 = "sha256-segJVGH5ngSEhk0EpLHPORTNck4tIDCxJh9Ri6sa2dE=";
+ sha256 = "sha256-ZxLaGAKBACR65CRCjt3NPSjMNm7GQkESxF6sLv3q4lQ=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index 83e40a4c3407..4476c0a7a532 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -1,22 +1,25 @@
-{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config, freetype ? null, glib, harfbuzz ? null
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config
+, freetype ? null, fmt, glib, harfbuzz ? null
, liblcf, libpng, libsndfile ? null, libvorbis ? null, libxmp ? null
, libXcursor, libXext, libXi, libXinerama, libXrandr, libXScrnSaver, libXxf86vm
-, mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }:
+, mpg123 ? null, opusfile ? null, pcre, pixman, SDL2, speexdsp ? null, wildmidi ? null, zlib
+}:
stdenv.mkDerivation rec {
pname = "easyrpg-player";
- version = "0.6.2.3";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "EasyRPG";
repo = "Player";
rev = version;
- sha256 = "103ywad12dcfjpf97kyx22smilqrw1f20xcfvjjr4mm3walc2mdp";
+ sha256 = "049bj3jg3ldi3n11nx8xvh6pll68g7dcxz51q6z1gyyfxxws1qpj";
};
nativeBuildInputs = [ cmake doxygen pkg-config ];
buildInputs = [
+ fmt
freetype
glib
harfbuzz
@@ -34,9 +37,9 @@ stdenv.mkDerivation rec {
libXxf86vm
mpg123
opusfile
- SDL2_mixer
pcre
pixman
+ SDL2
speexdsp
wildmidi
zlib
diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index 82db9a118e4a..e0915703003a 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
- version = "0.238";
+ version = "0.239";
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
- sha256 = "sha256-kh0kvtl+zPJjBWUXyzb/LSbPoJRxh55vUwF2G06tzoo=";
+ sha256 = "sha256-svclBaFkp4d6db+zWZNvZP8vWIFz/7M5N1M6WseOFEk=";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix
index cc483cd66ad6..aa58483ecb28 100644
--- a/pkgs/misc/wiki-tui/default.nix
+++ b/pkgs/misc/wiki-tui/default.nix
@@ -1,25 +1,29 @@
-{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, nix-update-script, Security }:
+{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security, fetchpatch }:
rustPlatform.buildRustPackage rec {
pname = "wiki-tui";
- version = "0.4.2";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "Builditluc";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TWpCmHG07dv0/hXGpo71Ie0uDRqs6yywHzcv0Hpi8Sc=";
+ sha256 = "sha256-maN/0lJx6/lj3Zn+IZcPJFPPFVLbnpwxeMSTyzKYX6s=";
};
+ # latest update forgot to include cargo.lock update
+ cargoPatches = [
+ (fetchpatch {
+ url = "https://github.com/Builditluc/wiki-tui/commit/87993eaca35a14afc1fb557482b099a6dd2da911.patch";
+ sha256 = "sha256-n04FCZwQ9pPanz9QQY/7Apyoy6lG0t/23S40p4c/TXw=";
+ })
+ ];
+
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "sha256-tJhbIsmh4zw1Dhvc2jE0N1cTE4//DOe3rDzDVNiTigA=";
-
- passthru.updateScript = nix-update-script {
- attrPath = pname;
- };
+ cargoSha256 = "sha256-x4oS9IBF2GMcilv9Oi/IeFaCM3sxWn7PpkKcaeSqIog=";
meta = with lib; {
description = "A simple and easy to use Wikipedia Text User Interface";
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index dcd74748b865..92e7572a446d 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
- version = "2021-12-10T23-03-39Z";
+ version = "2021-12-27T07-23-18Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-vu3p6LnmC2o7pX7T/x8SJ+Nr0G2GPIZqqOdPZ836puc=";
+ sha256 = "sha256-Gkn3sl6oPozOy0FMIJ1w3EeiJocI5cGBiXRlG94K4Wg=";
};
- vendorSha256 = "sha256-QxQPjjfCx0SVYquYVX5DOe8uzM16I2AYve0O2bj4y1k=";
+ vendorSha256 = "sha256-EHAcrFoOQ+Ta3rPY+FlXKf0fOWc5dtgzbMCsyGADgSs=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
index 84cb7a62f243..c04a3df2e909 100644
--- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "openldap_exporter";
- version = "2.1.4";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "tomcz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4=";
+ sha256 = "sha256-+lrLA9CbGNzvvbwn79ili/kFRCr6vMKDtkvyfnL9n9k=";
};
ldflags = [
diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix
index 9d460e3140be..5804d709b838 100644
--- a/pkgs/servers/nitter/default.nix
+++ b/pkgs/servers/nitter/default.nix
@@ -2,14 +2,14 @@
nimPackages.buildNimPackage rec {
pname = "nitter";
- version = "unstable-2021-07-18";
+ version = "unstable-2021-12-31";
nimBinOnly = true;
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
- rev = "6c5cb01b294d4f6e3b438fc47683359eb0fe5057";
- sha256 = "1dl8ndyv8m1hnydrp5xilcpp2cfbp02d5jap3y42i4nazc9ar6p4";
+ rev = "9d117aa15b3c3238cee79acd45d655eeb0e46293";
+ sha256 = "06hd3r1kgxx83sl5ss90r39v815xp2ki72fc8p64kid34mcn57cz";
};
buildInputs = with nimPackages; [
@@ -25,7 +25,8 @@ nimPackages.buildNimPackage rec {
packedjson
supersnappy
redpool
- frosty
+ flatty
+ zippy
redis
];
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
deleted file mode 100644
index fafeda88975c..000000000000
--- a/pkgs/servers/radicale/1.x.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchurl, pythonPackages }:
-
-pythonPackages.buildPythonApplication rec {
- pname = "radicale";
- version = "1.1.6";
-
- src = fetchurl {
- url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
- sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0";
- };
-
- propagatedBuildInputs = lib.optionals (!pythonPackages.isPy3k) [
- pythonPackages.flup
- pythonPackages.ldap
- pythonPackages.sqlalchemy
- ];
-
- doCheck = !pythonPackages.isPy3k;
-
- meta = with lib; {
- homepage = "http://www.radicale.org/";
- description = "CalDAV CardDAV server";
- longDescription = ''
- The Radicale Project is a complete CalDAV (calendar) and CardDAV
- (contact) server solution. Calendars and address books are available for
- both local and remote access, possibly limited through authentication
- policies. They can be viewed and edited by calendar and contact clients
- on mobile phones or computers.
- '';
- license = licenses.gpl3Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo pSub ];
- };
-}
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 5fcd2f2d3bc0..285db86a133c 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
- sha256 = "sha256-YRsNgCJ9C3AonHFXh7LYX9Fe2RXrVtWFwQTCQ3YDboM=";
+ sha256 = "sha256-8DloOBFW/nkNhYr34GnFVQqFd/uWT5ZiRDSJUnIFODg=";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix
new file mode 100644
index 000000000000..64b2a1bcb923
--- /dev/null
+++ b/pkgs/servers/rtrtr/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, stdenv
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rtrtr";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "NLnetLabs";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-8wcmciQ2OcvMNl6gADte40jrP+VfhoKn95ofjyjtRIo=";
+ };
+
+ cargoSha256 = "sha256-Jdu5U56Duqzakvj3rldzch17y1nhJmuxwJtq4Ydx3IY=";
+
+ buildInputs = lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ pkg-config ];
+
+ buildNoDefaultFeatures = true;
+
+ meta = with lib; {
+ description = "RPKI data proxy";
+ longDescription = ''
+ TRTR is an RPKI data proxy, designed to collect Validated ROA Payloads
+ from one or more sources in multiple formats and dispatch it onwards. It
+ provides the means to implement multiple distribution architectures for RPKI
+ such as centralised RPKI validators that dispatch data to local caching RTR
+ servers. RTRTR can read RPKI data from multiple RPKI Relying Party packages via
+ RTR and JSON and, in turn, provide an RTR service for routers to connect to.
+ '';
+ homepage = "https://github.com/NLnetLabs/rtrtr";
+ changelog = "https://github.com/NLnetLabs/rtrtr/blob/v${version}/Changelog.md";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ steamwalker ];
+ };
+}
diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/servers/seafile-server/default.nix
index d60dd7809913..464c808bac06 100644
--- a/pkgs/servers/seafile-server/default.nix
+++ b/pkgs/servers/seafile-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, python3Packages, autoreconfHook
+{ stdenv, lib, fetchFromGitHub, pkg-config, python3, autoreconfHook
, libuuid, sqlite, glib, libevent, libsearpc, openssl, fuse, libarchive, which
, vala, cmake, oniguruma }:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
glib
libsearpc
libevent
- python3Packages.python
+ python3
fuse
libarchive
which
diff --git a/pkgs/servers/syncserver/default.nix b/pkgs/servers/syncserver/default.nix
deleted file mode 100644
index 24c093fde505..000000000000
--- a/pkgs/servers/syncserver/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, python2
-, fetchFromGitHub
-}:
-
-let
- python = python2.override {
- packageOverrides = self: super: {
- # Older version, used by syncserver, tokenserver and serversyncstorage
- cornice = super.cornice.overridePythonAttrs (oldAttrs: rec {
- version = "0.17";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "1vvymhf6ydc885ygqiqpa39xr9v302i1l6nzirjnczqy9llyqvpj";
- };
- });
- };
- };
-
-# buildPythonPackage is necessary for syncserver to work with gunicorn or paster scripts
-in python.pkgs.buildPythonPackage rec {
- pname = "syncserver";
- version = "1.8.0";
-
- src = fetchFromGitHub {
- owner = "mozilla-services";
- repo = "syncserver";
- rev = version;
- sha256 = "0hxjns9hz7a8r87iqr1yfvny4vwj1rlhwcf8bh7j6lsf92mkmgy8";
- };
-
- # There are no tests
- doCheck = false;
-
- propagatedBuildInputs = with python.pkgs; [
- cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver
- serversyncstorage configparser
- ];
-
- meta = with lib; {
- description = "Run-Your-Own Firefox Sync Server";
- homepage = "https://github.com/mozilla-services/syncserver";
- platforms = platforms.unix;
- license = licenses.mpl20;
- maintainers = with maintainers; [ nadrieril ];
- };
-}
diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index 0b6b88f31ba8..bfbe46388d2d 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
- version = "2.5.260";
+ version = "2.5.268";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
- sha256 = "sha256-X9GmW2m94e7ft+ujJeR3ig5d8rsbEYzmlG52YJt2294=";
+ sha256 = "sha256-Ec4trrVETbgKs41aIc4Ne02c969Qc44QtoBf8tyk4+I=";
};
sourceRoot = ".";
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 4a95f1627f43..e94354d68045 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -4,7 +4,7 @@ buildGoModule rec {
pname = "elvish";
version = "0.17.0";
- excludedPackages = [ "website" ];
+ subPackages = [ "cmd/elvish" ];
ldflags = [ "-s" "-w" "-X github.com/elves/elvish/pkg/buildinfo.Version==${version}" "-X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ];
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 5ee4f1fc0667..a6ca5242e498 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.41.0";
+ version = "0.42.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-IMQFOWcHv3gLD+jUJl48IVNv8gu1jMQ0/m4gzSKbHNk=";
+ sha256 = "sha256-2EBy61K/HCdCFZkVT5XrflQGuQrRWfdrevV3OPjpUcQ=";
};
- cargoSha256 = "sha256-usxmfnKIrxX8md7EcmnhP5eFXpik6LZPURX9Ayxs/yo=";
+ cargoSha256 = "sha256-iU19rHb1td4NIF+P3wctIcZKL09H+51XwD3NaSBKK18=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix
index 01c84c869aa5..e2cb8cd8f43a 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/pkgs/tools/X11/wmutils-core/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wmutils-core";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "wmutils";
repo = "core";
rev = "v${version}";
- sha256 = "XPVH7vXlpmUsvNyGKMxLSZnWLnH/J5nGkXizcVqDwzM=";
+ sha256 = "sha256-Nv8ZTi3qVQyOkwyErjtE6/lLCubcLM2BRTY48r1HhHo=";
};
buildInputs = [ libxcb xcbutil xcb-util-cursor ];
diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/tools/admin/acme-sh/default.nix
new file mode 100644
index 000000000000..f9fda024cf16
--- /dev/null
+++ b/pkgs/tools/admin/acme-sh/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, coreutils
+, curl
+, dnsutils
+, gnugrep
+, gnused
+, iproute2
+, makeWrapper
+, openssl
+, socat
+, unixtools
+}:
+
+stdenv.mkDerivation rec {
+ pname = "acme.sh";
+ version = "3.0.1";
+
+ src = fetchFromGitHub {
+ owner = "acmesh-official";
+ repo = "acme.sh";
+ rev = version;
+ sha256 = "sha256-CqgaE8SfMPEyr97t/yfh9FqvdRPWIQiu/jkWAvurUyQ=";
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ installPhase = let
+ binPath = lib.makeBinPath [
+ coreutils
+ curl
+ dnsutils
+ gnugrep
+ gnused
+ openssl
+ socat
+ (if stdenv.isLinux then iproute2 else unixtools.netstat)
+ ];
+ in
+ ''
+ runHook preInstall
+
+ mkdir -p $out $out/bin $out/libexec
+ cp -R $src/* $_
+ makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \
+ --prefix PATH : "${binPath}"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "https://acme.sh/";
+ description = "A pure Unix shell script implementing ACME client protocol";
+ longDescription = ''
+ An ACME Shell script: acme.sh
+
+ - An ACME protocol client written purely in Shell (Unix shell) language.
+ - Full ACME protocol implementation.
+ - Support ECDSA certs
+ - Support SAN and wildcard certs
+ - Simple, powerful and very easy to use. You only need 3 minutes to learn it.
+ - Bash, dash and sh compatible.
+ - Purely written in Shell with no dependencies on python.
+ - Just one script to issue, renew and install your certificates automatically.
+ - DOES NOT require root/sudoer access.
+ - Docker ready
+ - IPv6 ready
+ - Cron job notifications for renewal or error etc.
+ '';
+ license = licenses.gpl3Only;
+ maintainers = teams.serokell.members;
+ inherit (coreutils.meta) platforms;
+ };
+}
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
deleted file mode 100644
index efa565bc3e70..000000000000
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2,
- unixtools, dnsutils, coreutils, gnugrep, gnused }:
-stdenv.mkDerivation rec {
- pname = "acme.sh";
- version = "3.0.0";
-
- src = fetchFromGitHub {
- owner = "Neilpang";
- repo = "acme.sh";
- rev = version;
- sha256 = "sha256-KWSDAHzvNl8Iao13OV/ExRoKqkc9nouWim+bAN1V+Jo=";
- };
-
- nativeBuildInputs = [ makeWrapper ];
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out $out/bin $out/libexec
- cp -R $src/* $_
- makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \
- --prefix PATH : "${
- lib.makeBinPath [
- coreutils
- gnugrep
- gnused
- socat
- openssl
- curl
- dnsutils
- (if stdenv.isLinux then iproute2 else unixtools.netstat)
- ]
- }"
-
- runHook postInstall
- '';
-
- meta = with lib; {
- description = "A pure Unix shell script implementing ACME client protocol";
- homepage = "https://acme.sh/";
- license = licenses.gpl3;
- maintainers = teams.serokell.members;
- };
-}
diff --git a/pkgs/tools/archivers/unzoo/default.nix b/pkgs/tools/archivers/unzoo/default.nix
new file mode 100644
index 000000000000..a24b490279b7
--- /dev/null
+++ b/pkgs/tools/archivers/unzoo/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "unzoo";
+ version = "4.4";
+
+ src = fetchFromGitHub {
+ owner = "museoa";
+ repo = pname;
+ rev = version;
+ hash = "sha256-oPq1I7EsvHaJ7anHbm/KWrYrxJkM79rLhgRfSAdoLtk=";
+ };
+
+ outputs = [ "out" "doc" ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ ${stdenv.cc.targetPrefix}cc -o unzoo -DSYS_IS_UNIX src/unzoo.c
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $doc/share/doc/${pname}
+ cp unzoo $out/bin
+ cp README.TXT $doc/share/doc/${pname}
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "http://github.com/museoa/unzoo/";
+ description = "Manipulate archives of files in Zoo compressed form";
+ license = licenses.publicDomain;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
deleted file mode 100644
index 94ed258d3322..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# FIXME: Unify with pkgs/development/python-modules/blivet/default.nix.
-
-{ lib, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
-, libselinux, cryptsetup, multipath_tools, lsof, util-linux
-, useNixUdev ? true, systemd ? null
-# useNixUdev is here for bw compatibility
-}:
-
-assert useNixUdev -> systemd != null;
-
-buildPythonApplication rec {
- pname = "blivet";
- version = "0.17-1";
-
- src = fetchurl {
- url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
- + "${pname}-${version}.tar.bz2";
- sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
- };
-
- patches = [ ./blivet.patch ];
-
- postPatch = ''
- sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
- blivet/devicelibs/mpath.py blivet/devices.py
- sed -i -e '/"wipefs"/ {
- s|wipefs|${util-linux.bin}/sbin/wipefs|
- s/-f/--force/
- }' blivet/formats/__init__.py
- sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
- sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py
- sed -i -e '/find_library/,/find_library/ {
- c libudev = "${lib.getLib systemd}/lib/libudev.so.1"
- }' blivet/pyudev.py
- '';
-
- propagatedBuildInputs = [
- pykickstart pyparted pyblock libselinux cryptsetup
- ] ++ lib.optional useNixUdev systemd;
-
- # tests are currently _heavily_ broken upstream
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://fedoraproject.org/wiki/Blivet";
- description = "Module for management of a system's storage configuration";
- license = with licenses; [ gpl2Plus lgpl21Plus ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
deleted file mode 100644
index d53231a84fd6..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/blivet/pyudev.py b/blivet/pyudev.py
-index 705b93d..7268d71 100644
---- a/blivet/pyudev.py
-+++ b/blivet/pyudev.py
-@@ -7,9 +7,9 @@ from ctypes import *
-
-
- # XXX this one may need some tweaking...
--def find_library(name, somajor=0):
-+def find_library(name):
- env = os.environ.get("LD_LIBRARY_PATH")
-- common = ["/lib64", "/lib"]
-+ common = ["/lib64", "/lib", "/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]
-
- if env:
- libdirs = env.split(":") + common
-@@ -19,7 +19,7 @@ def find_library(name, somajor=0):
- libdirs = filter(os.path.isdir, libdirs)
-
- for dir in libdirs:
-- files = fnmatch.filter(os.listdir(dir), "lib%s.so.%d" % (name, somajor))
-+ files = fnmatch.filter(os.listdir(dir), "lib%s.so.*" % name)
- files = [os.path.join(dir, file) for file in files]
-
- if files:
-@@ -32,11 +32,10 @@ def find_library(name, somajor=0):
-
- # find the udev library
- name = "udev"
--somajor = 1
--libudev = find_library(name=name, somajor=somajor)
-+libudev = find_library(name)
-
- if not libudev or not os.path.exists(libudev):
-- raise ImportError, "No library named %s.%d" % (name, somajor)
-+ raise ImportError, "No library named lib%s.so" % name
-
- # load the udev library
- libudev = CDLL(libudev)
-diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
-index 705b93d..60f8f32 100644
---- a/blivet/deviceaction.py
-+++ b/blivet/deviceaction.py
-@@ -467,6 +467,7 @@ def execute(self):
-
- self.device.disk.format.commitToDisk()
-
-+ self.device.setup()
- self.device.format.create(device=self.device.path,
- options=self.device.formatArgs)
-
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
deleted file mode 100644
index 7b2e65d474f7..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, lvm2
-, libgcrypt
-, libuuid
-, pkg-config
-, popt
-, enablePython ? true
-, python ? null
-}:
-
-assert enablePython -> python != null;
-
-stdenv.mkDerivation rec {
- pname = "cryptsetup";
- version = "1.6.3";
-
- src = fetchurl {
- url = "http://cryptsetup.googlecode.com/files/cryptsetup-${version}.tar.bz2";
- sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";
- };
-
- patches = [
- # Fix build with glibc >= 2.28
- # https://github.com/NixOS/nixpkgs/issues/86403
- (fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryptsetup/files/cryptsetup-1.7.1-sysmacros.patch?id=d72316f97ebcc7fe622b21574442a9ac59b9115f";
- sha256 = "0xbhazgl44bimqhcrhajk016w9wi7bkrgwyfq13xmrvyrllqvgdx";
- })
- ];
-
- configureFlags = [ "--enable-cryptsetup-reencrypt" ]
- ++ lib.optional enablePython "--enable-python";
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ lvm2 libgcrypt libuuid popt ]
- ++ lib.optional enablePython python;
-
- meta = with lib; {
- homepage = "http://code.google.com/p/cryptsetup/";
- description = "LUKS for dm-crypt";
- license = licenses.gpl2;
- maintainers = with maintainers; [ ];
- platforms = with platforms; linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
deleted file mode 100644
index 2c024a24ba39..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, python, buildPythonApplication
-, libselinux
-# Propagated to blivet
-, useNixUdev ? true
-# Needed by NixOps
-, udevSoMajor ? null
-# Propagated dependencies
-, pkgs, urlgrabber
-}:
-
-let
- blivet = import ./blivet.nix {
- inherit lib fetchurl buildPythonApplication;
- inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
- inherit useNixUdev;
- inherit (pkgs) lsof util-linux systemd;
- };
-
- cryptsetup = import ./cryptsetup.nix {
- inherit lib stdenv fetchurl python;
- inherit (pkgs) fetchpatch pkg-config libgcrypt libuuid popt lvm2;
- };
-
- dmraid = import ./dmraid.nix {
- inherit lib stdenv fetchurl lvm2;
- };
-
- lvm2 = import ./lvm2.nix {
- inherit lib stdenv fetchurl;
- inherit (pkgs) fetchpatch pkg-config util-linux systemd coreutils;
- };
-
- multipath_tools = import ./multipath-tools.nix {
- inherit lib stdenv fetchurl lvm2;
- inherit (pkgs) fetchpatch readline systemd libaio gzip;
- };
-
- parted = import ./parted.nix {
- inherit lib stdenv fetchurl;
- inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2;
- };
-
- pyblock = import ./pyblock.nix {
- inherit lib stdenv fetchurl python lvm2 dmraid;
- };
-
- pykickstart = import ./pykickstart.nix {
- inherit lib fetchurl python buildPythonApplication urlgrabber;
- };
-
- pyparted = import ./pyparted.nix {
- inherit lib stdenv fetchurl python buildPythonApplication parted;
- inherit (pkgs) pkg-config e2fsprogs;
- };
-
-in buildPythonApplication rec {
- pname = "nixpart";
- version = "0.4.1";
- disabled = python.isPy3k;
-
- src = fetchFromGitHub {
- owner = "NixOS";
- repo = "nixpart";
- rev = "v${version}";
- sha256 = "sha256-edl3mRg9Bn9Bd6FJl4zf1WS7XRcHTL5ey9LuKhaZG7I=";
- };
-
- propagatedBuildInputs = [ blivet ];
-
- doCheck = false;
-
- meta = with lib; {
- description = "NixOS storage manager/partitioner";
- homepage = "https://github.com/NixOS/nixpart";
- license = licenses.gpl2Plus;
- maintainers = [ maintainers.aszlig ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
deleted file mode 100644
index 899af827508a..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl, lvm2 }:
-
-stdenv.mkDerivation rec {
- pname = "dmraid";
- version = "1.0.0.rc15";
-
- src = fetchurl {
- url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2";
- sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
- };
-
- preConfigure = "cd */";
-
- buildInputs = [ lvm2 ];
-
- meta = with lib; {
- description = "Old-style RAID configuration utility";
- longDescription = ''
- Old RAID configuration utility (still under development, though).
- It is fully compatible with modern kernels and mdadm recognizes
- its volumes. May be needed for rescuing an older system or nuking
- the metadata when reformatting.
- '';
- maintainers = [ maintainers.raskin ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
deleted file mode 100644
index 95cec1803807..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, systemd, util-linux, coreutils }:
-
-stdenv.mkDerivation {
- pname = "lvm2";
- version = "2.02.106";
-
- src = fetchurl {
- url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
- sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
- };
-
- patches = [
- # Fix build with glibc >= 2.28
- # https://github.com/NixOS/nixpkgs/issues/86403
- (fetchpatch {
- url = "https://github.com/lvmteam/lvm2/commit/92d5a8441007f578e000b492cecf67d6b8a87405.patch";
- sha256 = "1yqd6jng0b370k53vks1shg57yhfyribhpmv19km5zsjqf0qqx2d";
- excludes = [
- "libdm/libdm-stats.c"
- ];
- })
- ];
-
- configureFlags = [
- "--disable-readline"
- "--enable-udev_rules"
- "--enable-udev_sync"
- "--enable-pkg-config"
- "--enable-applib"
- ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ systemd ];
-
- preConfigure =
- ''
- substituteInPlace scripts/lvmdump.sh \
- --replace /usr/bin/tr ${coreutils}/bin/tr
- substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
- --replace /usr/sbin/lvm $out/sbin/lvm \
- --replace /usr/bin/udevadm ${systemd}/bin/udevadm
-
- sed -i /DEFAULT_SYS_DIR/d Makefile.in
- sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
- '';
-
- enableParallelBuilding = true;
-
- #patches = [ ./purity.patch ];
-
- # To prevent make install from failing.
- installFlags = [ "OWNER=" "GROUP=" "confdir=${placeholder "out"}/etc" ];
-
- # Install systemd stuff.
- #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration";
-
- postInstall =
- ''
- substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
- --replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid
-
- # Systemd stuff
- mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
- cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system
- cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators
- '';
-
- meta = with lib; {
- homepage = "http://sourceware.org/lvm2/";
- description = "Tools to support Logical Volume Management (LVM) on Linux";
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
deleted file mode 100644
index e6d304c2cd37..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-# FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix.
-
-{ lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:
-
-stdenv.mkDerivation rec {
- pname = "multipath-tools";
- version = "0.4.9";
-
- src = fetchurl {
- url = "http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-${version}.tar.bz2";
- sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";
- };
-
- patches = [
- # Fix build with glibc >= 2.28
- # https://github.com/NixOS/nixpkgs/issues/86403
- (fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch?id=eb22b954c177b5c1e2b6ed5c7cdd02f40f40d757";
- sha256 = "1an0cgmz7g03c4qjimhpm9fcf2iswws18lwqxi688k87qm3xb5qd";
- excludes = [
- "libmultipath/util.c"
- ];
- })
- ];
-
- sourceRoot = ".";
-
- buildInputs = [ lvm2 libaio readline gzip ];
-
- preBuild =
- ''
- makeFlagsArray=(GZIP="-9" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib)
-
- substituteInPlace multipath/Makefile --replace /etc $out/etc
- substituteInPlace kpartx/Makefile --replace /etc $out/etc
-
- substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
- substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
-
- substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id
- substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id
-
- sed -i -re '
- s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
- ' libmultipath/defaults.h
-
- '';
-
- meta = with lib; {
- description = "Tools for the Linux multipathing driver";
- homepage = "http://christophe.varoqui.free.fr/";
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
deleted file mode 100644
index e3dd662c18a9..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, lvm2
-, libuuid
-, gettext
-, readline
-, util-linux
-, check
-, enableStatic ? stdenv.hostPlatform.isStatic
-}:
-
-stdenv.mkDerivation rec {
- pname = "parted";
- version = "3.1";
-
- src = fetchurl {
- url = "mirror://gnu/parted/parted-${version}.tar.xz";
- sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
- };
-
- patches = [
- # Fix build with glibc >= 2.28
- # https://github.com/NixOS/nixpkgs/issues/86403
- (fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-block/parted/files/parted-3.2-sysmacros.patch?id=8e2414f551c14166f259f9a25a594aec7a5b9ea0";
- sha256 = "0fdgifjbri7n28hv74zksac05gw72p2czzvyar0jp62b9dnql3mp";
- })
- ];
-
- buildInputs = [ libuuid ]
- ++ lib.optional (readline != null) readline
- ++ lib.optional (gettext != null) gettext
- ++ lib.optional (lvm2 != null) lvm2;
-
- configureFlags =
- (if (readline != null)
- then [ "--with-readline" ]
- else [ "--without-readline" ])
- ++ lib.optional (lvm2 == null) "--disable-device-mapper"
- ++ lib.optional enableStatic "--enable-static";
-
- doCheck = true;
- checkInputs = [ check util-linux ];
-
- meta = with lib; {
- description = "Create, destroy, resize, check, and copy partitions";
-
- longDescription = ''
- GNU Parted is an industrial-strength package for creating, destroying,
- resizing, checking and copying partitions, and the file systems on
- them. This is useful for creating space for new operating systems,
- reorganising disk usage, copying data on hard disks and disk imaging.
-
- It contains a library, libparted, and a command-line frontend, parted,
- which also serves as a sample implementation and script backend.
- '';
-
- homepage = "https://www.gnu.org/software/parted/";
- license = licenses.gpl3Plus;
-
- maintainers = [
- # Add your name here!
- ];
-
- # GNU Parted requires libuuid, which is part of util-linux-ng.
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch b/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch
deleted file mode 100644
index b8ab7bd53b2b..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/dm.c b/dm.c
-index 5daa0e5..d5b84c8 100644
---- a/dm.c
-+++ b/dm.c
-@@ -19,6 +19,7 @@
- #define _GNU_SOURCE
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
deleted file mode 100644
index ddf260300fbc..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchurl, python, lvm2, dmraid }:
-
-stdenv.mkDerivation rec {
- pname = "pyblock";
- version = "0.53";
- md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
-
- src = fetchurl {
- url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
- + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
- sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
- };
-
- patches = [
- # Fix build with glibc >= 2.28
- # https://github.com/NixOS/nixpkgs/issues/86403
- ./pyblock-sysmacros.h.patch
- ];
-
- postPatch = ''
- sed -i -e 's|/usr/include/python|${python}/include/python|' \
- -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile
- '';
-
- buildInputs = [ python lvm2 dmraid ];
-
- makeFlags = [
- "USESELINUX=0"
- "SITELIB=$(out)/lib/${python.libPrefix}/site-packages"
- ];
-
- meta = with lib; {
- description = "Interface for working with block devices";
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
deleted file mode 100644
index 092db8ee7c4c..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, python, buildPythonApplication, fetchurl, urlgrabber }:
-
-buildPythonApplication rec {
- pname = "pykickstart";
- version = "1.99.39";
- md5_path = "d249f60aa89b1b4facd63f776925116d";
-
- src = fetchurl {
- url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
- + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
- sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
- };
-
- postPatch = ''
- sed -i -e "s/for tst in tstList/for tst in sorted(tstList, \
- key=lambda m: m.__name__)/" tests/baseclass.py
- '';
-
- propagatedBuildInputs = [ urlgrabber ];
-
- checkPhase = ''
- ${python}/bin/${python.executable} tests/baseclass.py -vv
- '';
-
- meta = with lib; {
- homepage = "http://fedoraproject.org/wiki/Pykickstart";
- description = "Read and write Fedora kickstart files";
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
deleted file mode 100644
index 9d1eff2bab77..000000000000
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, python, buildPythonApplication, parted, e2fsprogs }:
-
-buildPythonApplication rec {
- pname = "pyparted";
- version = "3.10";
-
- src = fetchurl {
- url = "https://fedorahosted.org/releases/p/y/pyparted/${pname}-${version}.tar.gz";
- sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv";
- };
-
- postPatch = ''
- sed -i -e 's|/sbin/mke2fs|${e2fsprogs}&|' tests/baseclass.py
- sed -i -e '
- s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
- ' tests/test__ped_ped.py
- '' + lib.optionalString stdenv.isi686 ''
- # remove some integers in this test case which overflow on 32bit systems
- sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
- tests/test__ped_ped.py
- '';
-
- preConfigure = ''
- PATH="${parted}/sbin:$PATH"
- '';
-
- nativeBuildInputs = [ pkg-config ];
-
- propagatedBuildInputs = [ parted ];
-
- checkPhase = ''
- patchShebangs Makefile
- make test PYTHON=${python.executable}
- '';
-
- meta = with lib; {
- homepage = "https://fedorahosted.org/pyparted/";
- description = "Python interface for libparted";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
deleted file mode 100644
index 80ae8ca2b3cd..000000000000
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, fetchurl, buildPythonApplication, blivet }:
-
-buildPythonApplication rec {
- pname = "nixpart";
- version = "1.0.0";
-
- src = fetchurl {
- url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
- sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
- };
-
- propagatedBuildInputs = [ blivet ];
-
- meta = {
- description = "NixOS storage manager/partitioner";
- license = lib.licenses.gpl2Plus;
- maintainers = [ lib.maintainers.aszlig ];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix
new file mode 100644
index 000000000000..f5eb7c7f02ef
--- /dev/null
+++ b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+, installShellFiles
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "zpool-iostat-viz";
+ version = "unstable-2021-11-13";
+
+ src = fetchFromGitHub {
+ owner = "chadmiller";
+ repo = pname;
+ rev = "cdd8f3d882ab7a9990fb2d26af3e5b2bcc4bb312";
+ sha256 = "sha256-vNXD5SauBpCtP7VPTumQ0/wXfW0PjtooS21cjpAole8=";
+ };
+
+ nativeBuildInputs = [
+ installShellFiles
+ python3Packages.wrapPython
+ ];
+
+ # There is no setup.py
+ dontConfigure = true;
+ dontBuild = true;
+ doCheck = false;
+
+ installPhase = ''
+ wrapPythonPrograms
+ install -D zpool-iostat-viz $out/bin/zpool-iostat-viz
+ installManPage zpool-iostat-viz.1
+ '';
+
+ meta = with lib; {
+ description = "\"zpool iostats\" for humans; find the slow parts of your ZFS pool";
+ homepage = "https://github.com/chadmiller/zpool-iostat-viz";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ julm ];
+ };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index d04de7bafebc..deef4a8f8736 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "ibus-anthy";
- version = "1.5.12";
+ version = "1.5.14";
src = fetchurl {
url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-6edY3dRq4pI3bqsXEYf6jyBjDwpXzRKKQSCP3N/fV7s=";
+ sha256 = "sha256-yGlNoY0LiRpI9NdaDezjfsvKbRsay2QQGnqEytEEbZs=";
};
buildInputs = [
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 5eef6a517f3a..af728e9749af 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -6,11 +6,11 @@ let
in
stdenv.mkDerivation rec {
pname = "bandwidth";
- version = "1.10.4";
+ version = "1.11.2";
src = fetchurl {
url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
- sha256 = "sha256-e/eP2rA7ElFrh2Z4qTzRGR/cxY1UI6s+LQ9Og1x46/I=";
+ sha256 = "sha256-mjtvQAOH9rv12XszGdD5hIX197er7Uc74WfVaP32TpM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/tools/misc/bitbucket-cli/default.nix
similarity index 71%
rename from pkgs/development/python-modules/bitbucket-cli/default.nix
rename to pkgs/tools/misc/bitbucket-cli/default.nix
index bb1fa1d6c17c..4a770b187fe7 100644
--- a/pkgs/development/python-modules/bitbucket-cli/default.nix
+++ b/pkgs/tools/misc/bitbucket-cli/default.nix
@@ -1,16 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }:
+{ lib
+, python2
+}:
-buildPythonPackage rec {
+python2.pkgs.buildPythonApplication rec {
pname = "bitbucket-cli";
version = "0.5.1";
- disabled = isPy3k;
- src = fetchPypi {
+ src = python2.pkgs.fetchPypi {
inherit pname version;
sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = with python2.pkgs; [
+ requests
+ ];
# No tests
doCheck = false;
diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix
index d3abb37b9f47..c184dc0b3dd3 100644
--- a/pkgs/tools/misc/edid-generator/default.nix
+++ b/pkgs/tools/misc/edid-generator/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.flokli ];
platforms = lib.platforms.all;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin
};
}
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 3f4dbb01e5a9..542af55ad95d 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -43,5 +43,7 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ mit ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
+ # https://hydra.nixos.org/build/162650896/nixlog/1
+ broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix
index 0de14426f213..fcb44333941e 100644
--- a/pkgs/tools/misc/nix-direnv/default.nix
+++ b/pkgs/tools/misc/nix-direnv/default.nix
@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "nix-direnv";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-direnv";
rev = version;
- sha256 = "sha256-PEteip6FcaJ2wqdhSM9SqL7bJ4nimcOrC3s2pWunEIE=";
+ sha256 = "sha256-/V2v4dF3DEvsrJRbHD3wF5ZByek26NjphmaPG8FU9lI=";
};
# Substitute instead of wrapping because the resulting file is
diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix
deleted file mode 100644
index 1d0f9a5d8288..000000000000
--- a/pkgs/tools/misc/trac/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib
-, buildPythonApplication
-, fetchPypi
-, Babel
-, docutils
-, pygments
-, pytz
-, jinja2
-, pysqlite
-, psycopg2
-, pymysql
-, git
-, setuptools
-}:
-
-
-buildPythonApplication rec {
- pname = "trac";
- version = "1.4.1";
-
- src = fetchPypi {
- inherit version;
- pname = "Trac";
- sha256 = "0d61ypn0j9wb8119bj3pj7s8swfjykdl0sz398p92k9bvxh4dayz";
- };
-
- prePatch = ''
- # Removing the date format tests as they are outdated
- substituteInPlace trac/util/tests/__init__.py \
- --replace "suite.addTest(datefmt.test_suite())" ""
- # Removing Pygments tests as per https://trac.edgewall.org/ticket/13229
- substituteInPlace trac/mimeview/tests/__init__.py \
- --replace "suite.addTest(pygments.test_suite())" ""
- '';
-
- propagatedBuildInputs = [
- Babel
- docutils
- pygments
- pytz
- jinja2
- pysqlite
- psycopg2
- pymysql
- git
- setuptools
- ];
-
- meta = with lib; {
- description = "Integrated SCM, wiki, issue tracker and project environment";
- homepage = "https://trac.edgewall.org/";
- license = licenses.bsd3;
- maintainers = with maintainers; [ mmahut ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix
index 2f504a0cef8c..00c6441cffe9 100644
--- a/pkgs/tools/misc/upterm/default.nix
+++ b/pkgs/tools/misc/upterm/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "upterm";
- version = "0.6.5";
+ version = "0.6.7";
src = fetchFromGitHub {
owner = "owenthereal";
repo = "upterm";
rev = "v${version}";
- sha256 = "sha256-wzDK7iQN/z/M1mTKPCH3c+OjFsavplV/0oMiOe5thuI=";
+ sha256 = "sha256-JxyrH48CXaaa+LkTpUPsT9aq95IuuvDoyfZndrSF1IA=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 1fc5e84fddef..cff2d4df8e86 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
pname = "chrony";
- version = "4.1";
+ version = "4.2";
src = fetchurl {
url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
- sha256 = "sha256-7Xby0/k0esYiGpGtS9VT3QVlrBiM10kNCAHQj3FxFkw=";
+ sha256 = "sha256-Jz+f0Vwyjtbzpfa6a67DWkIaNKc7tyVgUymxcSBI25o=";
};
postPatch = ''
diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix
index 2c560cffb07b..750461b708e8 100644
--- a/pkgs/tools/networking/mubeng/default.nix
+++ b/pkgs/tools/networking/mubeng/default.nix
@@ -5,16 +5,18 @@
buildGoModule rec {
pname = "mubeng";
- version = "0.5.2";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "kitabisa";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-jwBDa/TfXrD+f0q4nyQkpi52Jwl1XWZrMd3fPowNzgA=";
+ sha256 = "sha256-ckTIHtS7lUUP1Ozt+6O0CAyl3JrcXFqiBC6c+Uc7lwA=";
};
- vendorSha256 = "sha256-/K1kBuxGEDUCBC7PiSpQRv1NEvTKwN+vNg2rz7pg838=";
+ vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o=";
+
+ ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ];
meta = with lib; {
description = "Proxy checker and IP rotator";
diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix
index 1c56d520b907..7f15ef91e1be 100644
--- a/pkgs/tools/networking/radsecproxy/default.nix
+++ b/pkgs/tools/networking/radsecproxy/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "radsecproxy";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0ppgnvmzk5j42zvz74mwaz6767lzf9vpl8y57w612fvqpg65g4bv";
+ sha256 = "sha256-gSXjwQ9zJPVNzGqLsZzTEQ0OxbQUiUJYGxrEm56DZDE=";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
- homepage = "https://software.nordu.net/radsecproxy/";
+ homepage = "https://radsecproxy.github.io/";
description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports";
license = licenses.bsd3;
maintainers = with maintainers; [ sargon ];
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 8b9d4c9e7b89..233da21ec93e 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "spiped";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchurl {
url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz";
- sha256 = "8d7089979db79a531a0ecc507b113ac6f2cf5f19305571eff1d3413e0ab33713";
+ sha256 = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix
index 9f5fbac787df..016f07a7d335 100644
--- a/pkgs/tools/package-management/micromamba/default.nix
+++ b/pkgs/tools/package-management/micromamba/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
-, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc
+, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc, spdlog, termcolor, ghc_filesystem
}:
let
@@ -11,51 +11,26 @@ let
patches = [
# Patch added by the mamba team
(fetchpatch {
- url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/add_strict_repo_prio_rule.patch";
+ url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/add_strict_repo_prio_rule.patch";
sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r";
})
# Patch added by the mamba team
(fetchpatch {
- url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/conda_variant_priorization.patch";
+ url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch";
sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd";
})
- # Patch added by the mamba team
- (fetchpatch {
- url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/memcpy_to_memmove.patch";
- sha256 = "1c9ir40l6crcxllj5zwhzbrbgibwqaizyykd0vip61gywlfzss64";
- })
- ];
- });
-
- # fails linking with yaml-cpp 0.7.x
- libyamlcpp' = libyamlcpp.overrideAttrs (oldAttrs: rec {
-
- version = "0.6.3";
-
- src = fetchFromGitHub {
- owner = "jbeder";
- repo = "yaml-cpp";
- rev = "yaml-cpp-${version}";
- sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
- };
-
- patches = [
- (fetchpatch {
- url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
- sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
- })
];
});
in
stdenv.mkDerivation rec {
pname = "micromamba";
- version = "0.15.0";
+ version = "0.18.1";
src = fetchFromGitHub {
owner = "mamba-org";
repo = "mamba";
rev = version;
- sha256 = "1zksp4zqj4wn9p9jb1qx1acajaz20k9xnm80yi7bab2d37y18hcw";
+ sha256 = "1gr9r257l300hafp8zm61bn58rysdk9i4wv1879q96b6n6v8hwa6";
};
nativeBuildInputs = [ cmake ];
@@ -65,23 +40,32 @@ stdenv.mkDerivation rec {
nlohmann_json
curl
libarchive
- libyamlcpp'
+ libyamlcpp
libsolv'
reproc
- # python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess.
+ spdlog
+ termcolor
+ ghc_filesystem
];
+ postPatch = ''
+ # See https://github.com/gabime/spdlog/issues/1897
+ sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt
+ echo 'target_link_libraries(micromamba PRIVATE -lspdlog -lfmt)' >> micromamba/CMakeLists.txt
+ '';
+
cmakeFlags = [
- "-DBUILD_BINDINGS=OFF" # Fails to build, I don't think it's necessary for now.
- "-DBUILD_EXE=ON"
+ "-DBUILD_LIBMAMBA=ON"
+ "-DBUILD_SHARED=ON"
+ "-DBUILD_MICROMAMBA=ON"
+ # "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
];
- CXXFLAGS = "-DMAMBA_USE_STD_FS";
-
meta = with lib; {
description = "Reimplementation of the conda package manager";
homepage = "https://github.com/mamba-org/mamba";
license = licenses.bsd3;
+ platforms = platforms.linux;
maintainers = with maintainers; [ mausch ];
};
}
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 70b1a78586cf..9ffdd46c6b48 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, runCommand
, darwin
+, removeReferencesTo
}:
stdenv.mkDerivation rec {
@@ -38,6 +39,10 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" ];
+ postInstall = ''
+ ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop)
+ '';
+
meta = with lib; {
description = "A monitor of resources";
homepage = "https://github.com/aristocratos/btop";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index b811ea5f39f7..7a16c5ab592c 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "consul-template";
- version = "0.27.1";
+ version = "0.27.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "consul-template";
rev = "v${version}";
- sha256 = "sha256-t6oqey2GlGOOxGuhlYnQeYzw1vR7qeiM+tSqzp3L3g0=";
+ sha256 = "sha256-Uqb0HXaYHGcW7lkUNLa2oXM0gu+SWwpv+NdPnOO87cs=";
};
vendorSha256 = "sha256-my4ECzmvrPhbKlcEptQ0xi4lYxHm42IrEsOvcetuMeQ=";
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index 8d867c76e1ae..5aca34e344ba 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sg3_utils";
- version = "1.46r862";
+ version = "1.47";
src = fetchurl {
url = "https://sg.danny.cz/sg/p/sg3_utils-${version}.tgz";
- sha256 = "s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8=";
+ sha256 = "sha256-hnPH+sqEm2s0dkMy0qqR9y2wW/9zgruDbQaIeVGZw+E=";
};
meta = with lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e7c2deca6a11..91820f6f9614 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -941,7 +941,6 @@ mapAliases ({
terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28
terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16
- terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28
tesseract_4 = tesseract4; # added 2018-12-19
tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f2ad49d6ace..86a1b3aeedc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -858,7 +858,7 @@ with pkgs;
accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };
- acme-sh = callPackage ../tools/admin/acme.sh { };
+ acme-sh = callPackage ../tools/admin/acme-sh { };
acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
@@ -2192,7 +2192,7 @@ with pkgs;
birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
- bitbucket-cli = python2Packages.bitbucket-cli;
+ bitbucket-cli = callPackage ../tools/misc/bitbucket-cli { };
bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { };
@@ -3082,8 +3082,6 @@ with pkgs;
gbsplay = callPackage ../applications/audio/gbsplay { };
- gdrivefs = python27Packages.gdrivefs;
-
gdrive = callPackage ../applications/networking/gdrive { };
gdu = callPackage ../tools/system/gdu { };
@@ -3771,6 +3769,10 @@ with pkgs;
libmaxminddb = null;
};
+ rtrtr = callPackage ../servers/rtrtr {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
xmlbeans = callPackage ../tools/misc/xmlbeans { };
xmlsort = perlPackages.XMLFilterSort;
@@ -4954,8 +4956,6 @@ with pkgs;
tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };
tsm-client-withGui = callPackage ../tools/backup/tsm-client { };
- trac = pythonPackages.callPackage ../tools/misc/trac { };
-
tracker = callPackage ../development/libraries/tracker { };
tracker-miners = callPackage ../development/libraries/tracker-miners { };
@@ -8996,8 +8996,6 @@ with pkgs;
pwndbg = callPackage ../development/tools/misc/pwndbg { };
- pycangjie = pythonPackages.pycangjie;
-
pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
pydb = callPackage ../development/tools/pydb { };
@@ -9010,8 +9008,6 @@ with pkgs;
teapot = callPackage ../applications/office/teapot { };
- pythonIRClib = pythonPackages.pythonIRClib;
-
pyditz = callPackage ../applications/misc/pyditz {
pythonPackages = python27Packages;
};
@@ -9147,7 +9143,7 @@ with pkgs;
radvd = callPackage ../tools/networking/radvd { };
- rainbowstream = pythonPackages.rainbowstream;
+ rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;
rambox = callPackage ../applications/networking/instant-messengers/rambox { };
@@ -9387,6 +9383,8 @@ with pkgs;
runzip = callPackage ../tools/archivers/runzip { };
+ unzoo = callPackage ../tools/archivers/unzoo { };
+
ruplacer = callPackage ../tools/text/ruplacer {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -10150,6 +10148,8 @@ with pkgs;
termplay = callPackage ../tools/misc/termplay { };
+ tetrd = callPackage ../applications/networking/tetrd { };
+
tewisay = callPackage ../tools/misc/tewisay { };
texmacs = if stdenv.isDarwin
@@ -10286,6 +10286,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
+ tokio-console = callPackage ../development/tools/tokio-console { };
+
toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { };
topgrade = callPackage ../tools/misc/topgrade {
@@ -11370,6 +11372,8 @@ with pkgs;
zmap = callPackage ../tools/security/zmap { };
+ zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { };
+
### SHELLS
@@ -14519,7 +14523,9 @@ with pkgs;
cwltool = callPackage ../applications/science/misc/cwltool { };
- dprint = callPackage ../development/tools/dprint { };
+ dprint = callPackage ../development/tools/dprint {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
libcxx = llvmPackages.libcxx;
libcxxabi = llvmPackages.libcxxabi;
@@ -14744,8 +14750,6 @@ with pkgs;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- fedpkg = callPackage ../development/tools/fedpkg { };
-
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
flex = callPackage ../development/tools/parsing/flex { };
@@ -15172,8 +15176,6 @@ with pkgs;
panopticon = callPackage ../development/tools/analysis/panopticon {};
- pants = callPackage ../development/tools/build-managers/pants {};
-
parinfer-rust = callPackage ../development/tools/parinfer-rust {};
parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
@@ -18607,7 +18609,6 @@ with pkgs;
libvirt = callPackage ../development/libraries/libvirt {
inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
};
- libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { };
libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
@@ -20417,6 +20418,8 @@ with pkgs;
xed = callPackage ../development/libraries/xed { };
+ xedit = callPackage ../applications/editors/xedit { };
+
xine-lib = callPackage ../development/libraries/xine-lib { };
xautolock = callPackage ../misc/screensavers/xautolock { };
@@ -21688,9 +21691,9 @@ with pkgs;
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
+ elixir = elixir_1_12;
};
- radicale1 = callPackage ../servers/radicale/1.x.nix { };
radicale2 = callPackage ../servers/radicale/2.x.nix { };
radicale3 = callPackage ../servers/radicale/3.x.nix { };
@@ -21828,8 +21831,6 @@ with pkgs;
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
- syncserver = callPackage ../servers/syncserver { };
-
tailscale = callPackage ../servers/tailscale {
buildGoModule = buildGo117Module;
};
@@ -31664,6 +31665,8 @@ with pkgs;
whisper = callPackage ../applications/science/biology/whisper { };
+ xenomapper = callPackage ../applications/science/biology/xenomapper { };
+
hmmer = callPackage ../applications/science/biology/hmmer { };
bwa = callPackage ../applications/science/biology/bwa { };
@@ -31964,6 +31967,8 @@ with pkgs;
eprover = callPackage ../applications/science/logic/eprover { };
+ eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; };
+
gappa = callPackage ../applications/science/logic/gappa { };
gfan = callPackage ../applications/science/math/gfan {};
@@ -31997,7 +32002,7 @@ with pkgs;
configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ];
});
- java = openjdk11;
+ java = openjdk17;
z3 = z3_4_4_0;
};
@@ -32714,6 +32719,8 @@ with pkgs;
velero = callPackage ../applications/networking/cluster/velero { };
+ HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { };
+
hplip = callPackage ../misc/drivers/hplip { };
hplipWithPlugin = hplip.override { withPlugin = true; };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3438d68a2b1f..f131cfcb06ee 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -106,6 +106,7 @@ mapAliases ({
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
websocket_client = websocket-client; # added 2021-06-15
+ xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
zc-buildout221 = zc-buildout; # added 2021-07-21
zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";
})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fafac2e8f246..f82a0e0851c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7355,7 +7355,9 @@ in {
pysdl2 = callPackage ../development/python-modules/pysdl2 { };
- pysearpc = toPythonModule pkgs.libsearpc;
+ pysearpc = toPythonModule (pkgs.libsearpc.override {
+ python3 = self.python;
+ });
pysecuritas = callPackage ../development/python-modules/pysecuritas { };
@@ -7505,6 +7507,8 @@ in {
pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { };
+ pytap2 = callPackage ../development/python-modules/pytap2 { };
+
pytautulli = callPackage ../development/python-modules/pytautulli { };
pyte = callPackage ../development/python-modules/pyte { };
@@ -8772,9 +8776,9 @@ in {
seabreeze = callPackage ../development/python-modules/seabreeze { };
- seahub = callPackage ../development/python-modules/seahub { };
-
- seaserv = toPythonModule pkgs.seafile-server;
+ seaserv = toPythonModule (pkgs.seafile-server.override {
+ python3 = self.python;
+ });
seatconnect = callPackage ../development/python-modules/seatconnect { };
@@ -9782,6 +9786,8 @@ in {
transmissionrpc = callPackage ../development/python-modules/transmissionrpc { };
+ treeo = callPackage ../development/python-modules/treeo { };
+
treq = callPackage ../development/python-modules/treq { };
trezor_agent = callPackage ../development/python-modules/trezor_agent { };
@@ -10409,8 +10415,6 @@ in {
inherit (pkgs) graphviz;
};
- xenomapper = callPackage ../applications/science/biology/xenomapper { };
-
xgboost = callPackage ../development/python-modules/xgboost {
inherit (pkgs) xgboost;
};
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 1f894f3a14b6..01f77c482d1b 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -6,386 +6,78 @@ self: super:
with self; with super; {
- affinity = callPackage ../development/python-modules/affinity { };
-
- antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime {
- inherit (pkgs) antlr4;
- };
-
- appleseed = disabled super.appleseed;
-
- application = callPackage ../development/python-modules/application { };
-
- arrow = callPackage ../development/python-modules/arrow/2.nix { };
-
- ase = callPackage ../development/python-modules/ase/3.17.nix { };
-
- astroid = callPackage ../development/python-modules/astroid/1.6.nix { };
-
- backports_lzma = callPackage ../development/python-modules/backports_lzma { };
-
- backports_os = callPackage ../development/python-modules/backports_os { };
-
- bcrypt = callPackage ../development/python-modules/bcrypt/3_1.nix { };
-
- bitbucket_api = callPackage ../development/python-modules/bitbucket-api { };
-
- bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { };
-
- blivet = callPackage ../development/python-modules/blivet { };
-
- box2d = callPackage ../development/python-modules/box2d { };
-
boto3 = callPackage ../development/python-modules/boto3/1_17.nix {};
botocore = callPackage ../development/python-modules/botocore/1_20.nix {};
- browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { };
-
- cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { };
-
- cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { };
-
- CDDB = callPackage ../development/python-modules/cddb { };
-
- cdecimal = callPackage ../development/python-modules/cdecimal { };
-
certifi = callPackage ../development/python-modules/certifi/python2.nix { };
chardet = callPackage ../development/python-modules/chardet/2.nix { };
cheetah = callPackage ../development/python-modules/cheetah { };
- cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { };
-
- cjson = callPackage ../development/python-modules/cjson { };
-
- cliapp = callPackage ../development/python-modules/cliapp { };
-
click = callPackage ../development/python-modules/click/7.nix { };
- closure-linter = callPackage ../development/python-modules/closure-linter { };
-
- cmdtest = callPackage ../development/python-modules/cmdtest { };
-
- coilmq = callPackage ../development/python-modules/coilmq { };
-
configparser = callPackage ../development/python-modules/configparser/4.nix { };
construct = callPackage ../development/python-modules/construct/2.10.54.nix { };
contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { };
- convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { };
-
cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { };
cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors-3.3.nix { };
- darcsver = callPackage ../development/python-modules/darcsver { };
-
- dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { };
-
decorator = callPackage ../development/python-modules/decorator/4.nix { };
- deskcon = callPackage ../development/python-modules/deskcon { };
-
- django_evolution = callPackage ../development/python-modules/django_evolution { };
-
- dnspython = callPackage ../development/python-modules/dnspython/1.nix { };
-
- docker-py = disabled super.docker-py;
-
- dtopt = callPackage ../development/python-modules/dtopt { };
-
- dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { };
-
enum = callPackage ../development/python-modules/enum { };
- eventlib = callPackage ../development/python-modules/eventlib { };
-
- faulthandler = callPackage ../development/python-modules/faulthandler { };
-
- fdint = callPackage ../development/python-modules/fdint { };
-
- feedparser = callPackage ../development/python-modules/feedparser/5.nix { };
-
filelock = callPackage ../development/python-modules/filelock/3.2.nix { };
flask = callPackage ../development/python-modules/flask/1.nix { };
- flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { };
-
- flit = disabled super.flit;
-
- flit-core = disabled super.flit-core;
-
- flup = callPackage ../development/python-modules/flup { };
-
- fontforge = disabled super.fontforge;
-
freezegun = callPackage ../development/python-modules/freezegun/0.3.nix { };
- fudge = callPackage ../development/python-modules/fudge { };
-
futures = callPackage ../development/python-modules/futures { };
- gdcm = disabled super.gdcm;
-
- geant4 = disabled super.geant4;
-
- geopy = callPackage ../development/python-modules/geopy/2.nix { };
-
- # Python 2.7 support was deprecated but is still needed by weboob and duplicity
- google-api-python-client = super.google-api-python-client.overridePythonAttrs (old: rec {
- version = "1.7.6";
- src = old.src.override {
- inherit version;
- sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z";
- };
- });
-
- gateone = callPackage ../development/python-modules/gateone { };
-
- gdrivefs = callPackage ../development/python-modules/gdrivefs { };
-
- gsd = callPackage ../development/python-modules/gsd/1.7.nix { };
-
- gnutls = callPackage ../development/python-modules/gnutls { };
-
google-apputils = callPackage ../development/python-modules/google-apputils { };
- grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override {
- enablePython = true;
- pythonPackages = self;
- }));
-
- gunicorn = callPackage ../development/python-modules/gunicorn/19.nix { };
-
- gwyddion = toPythonModule (pkgs.gwyddion.override {
- pythonSupport = true;
- pythonPackages = self;
- });
-
- hg-git = callPackage ../development/python-modules/hg-git/0.8.nix { };
-
- hgsvn = callPackage ../development/python-modules/hgsvn { };
-
- hsaudiotag = callPackage ../development/python-modules/hsaudiotag { };
-
- html2text = callPackage ../development/python-modules/html2text/2018.nix { };
-
httpretty = callPackage ../development/python-modules/httpretty/0.nix { };
- http_signature = callPackage ../development/python-modules/http_signature { };
-
hypothesis = callPackage ../development/python-modules/hypothesis/2.nix { };
idna = callPackage ../development/python-modules/idna/2.nix { };
- imagecodecs-lite = disabled super.imagecodecs-lite;
-
- imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn/0.4.nix { };
-
importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { };
- importlib-resources = callPackage ../development/python-modules/importlib-resources/2.nix { };
-
ipaddr = callPackage ../development/python-modules/ipaddr { };
- ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { };
-
- ipython = callPackage ../development/python-modules/ipython/5.nix { };
-
- isort = callPackage ../development/python-modules/isort/4.nix { };
-
itsdangerous = callPackage ../development/python-modules/itsdangerous/1.nix { };
- jaraco_functools = callPackage ../development/python-modules/jaraco_functools/2.nix { };
-
- jaraco_stream = callPackage ../development/python-modules/jaraco_stream/2.nix { };
-
jinja2 = callPackage ../development/python-modules/jinja2/2.nix { };
- jsonrpclib = callPackage ../development/python-modules/jsonrpclib { };
-
- jupyter-client = callPackage ../development/python-modules/jupyter-client/5.nix { };
-
- jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { };
-
- koji = callPackage ../development/python-modules/koji { };
-
- konfig = callPackage ../development/python-modules/konfig { };
-
- kicad = disabled super.kicad;
-
- kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { };
-
- larch = callPackage ../development/python-modules/larch { };
-
- Lasagne = callPackage ../development/python-modules/lasagne { };
-
- le = callPackage ../development/python-modules/le { };
-
libcloud = callPackage ../development/python-modules/libcloud/2.nix { };
- libgpiod = disabled super.libgpiod;
-
- libnl-python = toPythonModule (pkgs.libnl.override {
- pythonSupport = true;
- inherit python;
- }).py;
-
- libplist = toPythonModule (pkgs.libplist.override {
- enablePython = true;
- inherit python;
- }).py;
-
- libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python;
-
- libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix {
- libvirt = pkgs.libvirt_5_9_0;
- };
-
- lightblue = callPackage ../development/python-modules/lightblue { };
-
- lirc = disabled super.lirc;
-
lpod = callPackage ../development/python-modules/lpod { };
- lsi = callPackage ../development/python-modules/lsi { };
-
- lxc = callPackage ../development/python-modules/lxc { };
-
- mapsplotlib = callPackage ../development/python-modules/mapsplotlib { };
-
- marionette-harness = callPackage ../development/python-modules/marionette-harness { };
-
marisa = callPackage ../development/python-modules/marisa {
inherit (pkgs) marisa;
};
- marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { };
-
markdown = callPackage ../development/python-modules/markdown/3_1.nix { };
markupsafe = callPackage ../development/python-modules/markupsafe/1.nix { };
- matplotlib = callPackage ../development/python-modules/matplotlib/2.nix {
- stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
- inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
- };
-
- meliae = callPackage ../development/python-modules/meliae { };
-
- mercurial = disabled super.mercurial;
-
- meson = disabled super.meson;
-
- metaphone = callPackage ../development/python-modules/metaphone { };
-
- mlt = disabled super.mlt;
-
mock = callPackage ../development/python-modules/mock/2.nix { };
- monosat = disabled super.monosat;
-
more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { };
- mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { };
-
- mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { };
-
- mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { };
-
- mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { };
-
- mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { };
-
- mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { };
-
- moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { };
-
- mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { };
-
- mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { };
-
- mozterm = callPackage ../development/python-modules/mozterm { };
-
- mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { };
-
- mozsvc = callPackage ../development/python-modules/mozsvc { };
-
- moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { };
-
- mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { };
-
- mpd = callPackage ../development/python-modules/mpd { };
-
- mrbob = callPackage ../development/python-modules/mrbob { };
-
- msrplib = callPackage ../development/python-modules/msrplib { };
-
- mwlib = callPackage ../development/python-modules/mwlib { };
-
- mwlib-ext = callPackage ../development/python-modules/mwlib-ext { };
-
- mwlib-rl = callPackage ../development/python-modules/mwlib-rl { };
-
mutagen = callPackage ../development/python-modules/mutagen/1.43.nix { };
- muttils = callPackage ../development/python-modules/muttils { };
-
- namebench = callPackage ../development/python-modules/namebench { };
-
- nbformat = callPackage ../development/python-modules/nbformat/2.nix { };
-
- networkx = callPackage ../development/python-modules/networkx/2.2.nix { };
-
- nevow = callPackage ../development/python-modules/nevow { };
-
- # This is used for NixOps to make sure we won't break it with the next major version of nixpart.
- nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { };
-
- nixpart = callPackage ../tools/filesystems/nixpart { };
-
- nose-focus = callPackage ../development/python-modules/nose-focus { };
-
- nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };
-
- notebook = callPackage ../development/python-modules/notebook/2.nix { };
-
- notify = callPackage ../development/python-modules/notify { };
-
numpy = callPackage ../development/python-modules/numpy/1.16.nix { };
- nxt-python = callPackage ../development/python-modules/nxt-python { };
-
- oauthlib = callPackage ../development/python-modules/oauthlib/3.1.nix { };
-
- opencv = toPythonModule (pkgs.opencv.override {
- enablePython = true;
- pythonPackages = self;
- });
-
- 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 { };
-
packaging = callPackage ../development/python-modules/packaging/2.nix { };
- pagerduty = callPackage ../development/python-modules/pagerduty { };
-
- pandas = callPackage ../development/python-modules/pandas/2.nix { };
-
- pathpy = callPackage ../development/python-modules/path.py/2.nix { };
-
- pg8000 = callPackage ../development/python-modules/pg8000/1_12.nix { };
-
pillow = callPackage ../development/python-modules/pillow/6.nix {
inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk;
inherit (pkgs.xorg) libX11;
@@ -393,53 +85,19 @@ with self; with super; {
pip = callPackage ../development/python-modules/pip/20.nix { };
- platformdirs = callPackage ../development/python-modules/platformdirs/2.nix { };
-
pluggy = callPackage ../development/python-modules/pluggy/0.nix { };
- postorius = disabled super.postorius;
-
- praw = callPackage ../development/python-modules/praw/6.3.nix { };
-
prettytable = callPackage ../development/python-modules/prettytable/1.nix { };
- ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { };
-
- progressbar231 = callPackage ../development/python-modules/progressbar231 { };
-
- prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit/1.nix { };
-
protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
protobuf = pkgs.protobuf3_17; # last version compatible with Python 2
};
- pyamf = callPackage ../development/python-modules/pyamf { };
-
- pyblosxom = callPackage ../development/python-modules/pyblosxom { };
-
pycairo = callPackage ../development/python-modules/pycairo/1.18.nix {
inherit (pkgs.buildPackages) meson;
};
- pycangjie = disabled pycangjie;
-
- pycarddav = callPackage ../development/python-modules/pycarddav { };
-
- pycassa = callPackage ../development/python-modules/pycassa { };
-
- pycryptopp = callPackage ../development/python-modules/pycryptopp { };
-
- pycurl2 = callPackage ../development/python-modules/pycurl2 { };
-
- pydns = callPackage ../development/python-modules/pydns { };
-
- pyechonest = callPackage ../development/python-modules/pyechonest { };
-
- pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
-
- pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { });
-
pygments = callPackage ../development/python-modules/Pygments/2_5.nix { };
pygobject3 = callPackage ../development/python-modules/pygobject/3.36.nix {
@@ -448,215 +106,52 @@ with self; with super; {
pygtk = callPackage ../development/python-modules/pygtk { };
- pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
-
pyGtkGlade = self.pygtk.override {
inherit (pkgs.gnome2) libglade;
};
- 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 { };
-
- pylint = callPackage ../development/python-modules/pylint/1.9.nix { };
-
- pyobjc = if stdenv.isDarwin then
- callPackage ../development/python-modules/pyobjc { }
- else
- throw "pyobjc can only be built on Mac OS";
-
- pyPdf = callPackage ../development/python-modules/pypdf { };
-
- pypoppler = callPackage ../development/python-modules/pypoppler { };
-
- pyreport = callPackage ../development/python-modules/pyreport { };
-
pyroma = callPackage ../development/python-modules/pyroma/2.nix { };
pysqlite = callPackage ../development/python-modules/pysqlite { };
- pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
-
pytest = pytest_4;
- pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { };
-
pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { };
pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { };
- python-otr = callPackage ../development/python-modules/python-otr { };
-
- python_statsd = callPackage ../development/python-modules/python_statsd { };
-
- python-sybase = callPackage ../development/python-modules/sybase { };
-
- python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { };
-
- pythonIRClib = callPackage ../development/python-modules/pythonirclib { };
-
- pythonmagick = callPackage ../development/python-modules/pythonmagick { };
-
- pyutil = callPackage ../development/python-modules/pyutil { };
-
- pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec {
- version = "0.6.1";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3";
- };
- });
-
- PyWebDAV = callPackage ../development/python-modules/pywebdav { };
-
- pyxml = callPackage ../development/python-modules/pyxml { };
-
qpid-python = callPackage ../development/python-modules/qpid-python { };
- qserve = callPackage ../development/python-modules/qserve { };
-
- remotecv = callPackage ../development/python-modules/remotecv { };
-
recoll = disabled super.recoll;
- rhpl = callPackage ../development/python-modules/rhpl { };
-
rivet = disabled super.rivet;
- robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
-
- ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { };
-
- ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml/0.16.nix { };
-
- runsnakerun = callPackage ../development/python-modules/runsnakerun { };
-
rpm = disabled super.rpm;
- rpkg = callPackage ../development/python-modules/rpkg { };
-
- rpy2 = callPackage ../development/python-modules/rpy2/2.nix { };
-
- rsa = callPackage ../development/python-modules/rsa/4_0.nix { };
-
s3transfer = callPackage ../development/python-modules/s3transfer/0_4.nix { };
- sandboxlib = callPackage ../development/python-modules/sandboxlib { };
-
scandir = callPackage ../development/python-modules/scandir { };
- scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix {
- inherit (pkgs) gfortran glibcLocales;
- };
-
- scipy = super.scipy.overridePythonAttrs (oldAttrs: rec {
- version = "1.2.2";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1";
- };
- });
-
- seaborn = callPackage ../development/python-modules/seaborn/0.9.1.nix { };
-
- secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { };
-
- semantic = callPackage ../development/python-modules/semantic { };
-
- serversyncstorage = callPackage ../development/python-modules/serversyncstorage { };
-
sequoia = disabled super.sequoia;
setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { };
setuptools-scm = callPackage ../development/python-modules/setuptools-scm/2.nix { };
- setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { };
-
- simpleai = callPackage ../development/python-modules/simpleai { };
-
- simpleparse = callPackage ../development/python-modules/simpleparse { };
-
- singledispatch = callPackage ../development/python-modules/singledispatch { };
-
- sipsimple = callPackage ../development/python-modules/sipsimple { };
-
- slowaes = callPackage ../development/python-modules/slowaes { };
-
- smartdc = callPackage ../development/python-modules/smartdc { };
-
- snug = callPackage ../development/python-modules/snug { };
-
- soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { };
-
- spambayes = callPackage ../development/python-modules/spambayes { };
-
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { };
sphinx = callPackage ../development/python-modules/sphinx/2.nix { };
- sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { };
-
- squaremap = callPackage ../development/python-modules/squaremap { };
-
- stompclient = callPackage ../development/python-modules/stompclient { };
-
- subliminal = callPackage ../development/python-modules/subliminal { };
-
- subprocess32 = callPackage ../development/python-modules/subprocess32 { };
-
- suds = callPackage ../development/python-modules/suds { };
-
- sympy = callPackage ../development/python-modules/sympy/1_5.nix { };
-
- tables = callPackage ../development/python-modules/tables/3.5.nix {
- hdf5 = pkgs.hdf5_1_10;
- };
-
- tarman = callPackage ../development/python-modules/tarman { };
-
- tensorflow-bin = disabled super.tensorflow-bin;
-
- thumbor = callPackage ../development/python-modules/thumbor { };
-
- tmdb3 = callPackage ../development/python-modules/tmdb3 { };
-
- tokenizers = disabled super.tokenizers;
-
- tokenize-rt = disabled super.tokenize-rt;
-
- tokenserver = callPackage ../development/python-modules/tokenserver { };
-
- toolz = callPackage ../development/python-modules/toolz/2.nix { };
-
- tornado = callPackage ../development/python-modules/tornado/5.nix { };
-
- traitlets = callPackage ../development/python-modules/traitlets/4.nix { };
-
- ttystatus = callPackage ../development/python-modules/ttystatus { };
-
TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };
typing = callPackage ../development/python-modules/typing { };
- tzlocal = callPackage ../development/python-modules/tzlocal/2.nix { };
-
- ujson = callPackage ../development/python-modules/ujson/2.nix { };
-
- umemcache = callPackage ../development/python-modules/umemcache { };
-
urllib3 = callPackage ../development/python-modules/urllib3/2.nix { };
- wptserve = callPackage ../development/python-modules/wptserve { };
-
werkzeug = callPackage ../development/python-modules/werkzeug/1.nix { };
- WSGIProxy = callPackage ../development/python-modules/wsgiproxy { };
-
wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
wxGTK = pkgs.wxGTK30;
};
@@ -665,20 +160,12 @@ with self; with super; {
vcrpy = callPackage ../development/python-modules/vcrpy/3.nix { };
- xcaplib = callPackage ../development/python-modules/xcaplib { };
-
- xenomapper = disabled super.xenomapper;
-
yenc = callPackage ../development/python-modules/yenc { };
yt = callPackage ../development/python-modules/yt { };
zeek = disabled super.zeek;
- zbase32 = callPackage ../development/python-modules/zbase32 { };
-
- zfec = callPackage ../development/python-modules/zfec { };
-
zipp = callPackage ../development/python-modules/zipp/1.nix { };
}