diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c88bce2901be..43df157cd9b3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10051,6 +10051,13 @@
githubId = 16779;
name = "Rickard Nilsson";
};
+ ricochet = {
+ email = "behayes2@gmail.com";
+ github = "ricochet";
+ githubId = 974323;
+ matrix = "@ricochetcode:matrix.org";
+ name = "Bailey Hayes";
+ };
riey = {
email = "creeper844@gmail.com";
github = "Riey";
@@ -10812,6 +10819,16 @@
githubId = 6720672;
name = "Shane Pearlman";
};
+ shanesveller = {
+ email = "shane@sveller.dev";
+ github = "shanesveller";
+ githubId = 831;
+ keys = [{
+ longkeyid = "rsa4096/0x9210C218023C15CD";
+ fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD";
+ }];
+ name = "Shane Sveller";
+ };
shawndellysse = {
email = "sdellysse@gmail.com";
github = "shawndellysse";
@@ -13601,6 +13618,12 @@
github = "jpagex";
githubId = 635768;
};
+ portothree = {
+ name = "Gustavo Porto";
+ email = "gustavoporto@ya.ru";
+ github = "portothree";
+ githubId = 3718120;
+ };
pwoelfel = {
name = "Philipp Woelfel";
email = "philipp.woelfel@gmail.com";
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 4a6ecac6bd0e..e77ca0a85218 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
@@ -75,6 +75,14 @@
services.filebeat.
+
+
+ FRRouting, a
+ popular suite of Internet routing protocol daemons (BGP, BFD,
+ OSPF, IS-IS, VVRP and others). Available as
+ services.frr
+
+
heisenbridge,
@@ -135,6 +143,13 @@
services.baget.
+
+
+ prosody-filer,
+ a server for handling XMPP HTTP Upload requests. Available at
+ services.prosody-filer.
+
+
@@ -290,6 +305,12 @@
follow with upstream changes.
+
+
+ pkgs.docbookrx was removed since it’s
+ unmaintained
+
+
@@ -411,6 +432,15 @@
renamed to linux-firmware.
+
+
+ A new module was added for the
+ Starship shell
+ prompt, providing the options
+ programs.starship.enable and
+ programs.starship.settings.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 9540681fa4fe..5957f82bce92 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -19,12 +19,15 @@ In addition to numerous new and upgraded packages, this release has the followin
## New Services {#sec-release-22.05-new-services}
- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).
+
- [rootless Docker](https://docs.docker.com/engine/security/rootless/), a `systemd --user` Docker service which runs without root permissions. Available as [virtualisation.docker.rootless.enable](options.html#opt-virtualisation.docker.rootless.enable).
- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable).
- [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).
+- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable)
+
- [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).
- [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable).
@@ -41,6 +44,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable).
+- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).
+
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.
@@ -93,6 +98,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.thelounge.private` was removed in favor of `services.thelounge.public`, to follow with upstream changes.
+- `pkgs.docbookrx` was removed since it's unmaintained
+
## Other Notable Changes {#sec-release-22.05-notable-changes}
- The option [services.redis.servers](#opt-services.redis.servers) was added
@@ -144,3 +151,6 @@ In addition to numerous new and upgraded packages, this release has the followin
- The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`.
- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.
+
+- A new module was added for the [Starship](https://starship.rs/) shell prompt,
+ providing the options `programs.starship.enable` and `programs.starship.settings`.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b56b9ae8d8b4..e710d4282dd6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -198,6 +198,7 @@
./programs/ssmtp.nix
./programs/sysdig.nix
./programs/systemtap.nix
+ ./programs/starship.nix
./programs/steam.nix
./programs/sway.nix
./programs/system-config-printer.nix
@@ -746,6 +747,7 @@
./services/networking/flannel.nix
./services/networking/freenet.nix
./services/networking/freeradius.nix
+ ./services/networking/frr.nix
./services/networking/gateone.nix
./services/networking/gdomap.nix
./services/networking/ghostunnel.nix
@@ -1032,6 +1034,7 @@
./services/web-apps/plausible.nix
./services/web-apps/pgpkeyserver-lite.nix
./services/web-apps/powerdns-admin.nix
+ ./services/web-apps/prosody-filer.nix
./services/web-apps/matomo.nix
./services/web-apps/openwebrx.nix
./services/web-apps/restya-board.nix
diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix
new file mode 100644
index 000000000000..83d2272003c6
--- /dev/null
+++ b/nixos/modules/programs/starship.nix
@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.starship;
+
+ settingsFormat = pkgs.formats.toml { };
+
+ settingsFile = settingsFormat.generate "starship.toml" cfg.settings;
+
+in {
+ options.programs.starship = {
+ enable = mkEnableOption "the Starship shell prompt";
+
+ settings = mkOption {
+ inherit (settingsFormat) type;
+ default = { };
+ description = ''
+ Configuration included in starship.toml.
+
+ See https://starship.rs/config/#prompt for documentation.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ programs.bash.promptInit = ''
+ if [[ $TERM != "dumb" && (-z $INSIDE_EMACS || $INSIDE_EMACS == "vterm") ]]; then
+ export STARSHIP_CONFIG=${settingsFile}
+ eval "$(${pkgs.starship}/bin/starship init bash)"
+ fi
+ '';
+
+ programs.fish.promptInit = ''
+ if test "$TERM" != "dumb" -a \( -z "$INSIDE_EMACS" -o "$INSIDE_EMACS" = "vterm" \)
+ set -x STARSHIP_CONFIG ${settingsFile}
+ eval (${pkgs.starship}/bin/starship init fish)
+ end
+ '';
+
+ programs.zsh.promptInit = ''
+ if [[ $TERM != "dumb" && (-z $INSIDE_EMACS || $INSIDE_EMACS == "vterm") ]]; then
+ export STARSHIP_CONFIG=${settingsFile}
+ eval "$(${pkgs.starship}/bin/starship init zsh)"
+ fi
+ '';
+ };
+
+ meta.maintainers = pkgs.starship.meta.maintainers;
+}
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 0944b36c6d19..21202c55fe28 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1072,8 +1072,8 @@ in
security.apparmor.includes."abstractions/pam" = let
isEnabled = test: fold or false (map test (attrValues config.security.pam.services));
in
- lib.concatMapStringsSep "\n"
- (name: "r ${config.environment.etc."pam.d/${name}".source},")
+ lib.concatMapStrings
+ (name: "r ${config.environment.etc."pam.d/${name}".source},\n")
(attrNames config.security.pam.services) +
''
mr ${getLib pkgs.pam}/lib/security/pam_filter/*,
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 00bdd9fcda0d..f528d1830424 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -19,8 +19,17 @@ let
"${wrappedPlugins}/libexec/netdata/plugins.d"
] ++ cfg.extraPluginPaths;
+ configDirectory = pkgs.runCommand "netdata-config-d" { } ''
+ mkdir $out
+ ${concatStringsSep "\n" (mapAttrsToList (path: file: ''
+ mkdir -p "$out/$(dirname ${path})"
+ ln -s "${file}" "$out/${path}"
+ '') cfg.configDir)}
+ '';
+
localConfig = {
global = {
+ "config directory" = "/etc/netdata/conf.d";
"plugins directory" = concatStringsSep " " plugins;
};
web = {
@@ -130,6 +139,26 @@ in {
'';
};
+ configDir = mkOption {
+ type = types.attrsOf types.path;
+ default = {};
+ description = ''
+ Complete netdata config directory except netdata.conf.
+ The default configuration is merged with changes
+ defined in this option.
+ Each top-level attribute denotes a path in the configuration
+ directory as in environment.etc.
+ Its value is the absolute path and must be readable by netdata.
+ Cannot be combined with configText.
+ '';
+ example = literalExpression ''
+ "health_alarm_notify.conf" = pkgs.writeText "health_alarm_notify.conf" '''
+ sendmail="/path/to/sendmail"
+ ''';
+ "health.d" = "/run/secrets/netdata/health.d";
+ '';
+ };
+
enableAnalyticsReporting = mkOption {
type = types.bool;
default = false;
@@ -150,11 +179,14 @@ in {
}
];
+ environment.etc."netdata/netdata.conf".source = configFile;
+ environment.etc."netdata/conf.d".source = configDirectory;
+
systemd.services.netdata = {
description = "Real time performance monitoring";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- path = (with pkgs; [ curl gawk iproute2 which ])
+ path = (with pkgs; [ curl gawk iproute2 which procps ])
++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages)
++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package);
environment = {
@@ -162,8 +194,12 @@ in {
} // lib.optionalAttrs (!cfg.enableAnalyticsReporting) {
DO_NOT_TRACK = "1";
};
+ restartTriggers = [
+ config.environment.etc."netdata/netdata.conf".source
+ config.environment.etc."netdata/conf.d".source
+ ];
serviceConfig = {
- ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
+ ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
TimeoutStopSec = 60;
Restart = "on-failure";
diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix
new file mode 100644
index 000000000000..45a82b9450a4
--- /dev/null
+++ b/nixos/modules/services/networking/frr.nix
@@ -0,0 +1,211 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.frr;
+
+ services = [
+ "static"
+ "bgp"
+ "ospf"
+ "ospf6"
+ "rip"
+ "ripng"
+ "isis"
+ "pim"
+ "ldp"
+ "nhrp"
+ "eigrp"
+ "babel"
+ "sharp"
+ "pbr"
+ "bfd"
+ "fabric"
+ ];
+
+ allServices = services ++ [ "zebra" ];
+
+ isEnabled = service: cfg.${service}.enable;
+
+ daemonName = service: if service == "zebra" then service else "${service}d";
+
+ configFile = service:
+ let
+ scfg = cfg.${service};
+ in
+ if scfg.configFile != null then scfg.configFile
+ else pkgs.writeText "${daemonName service}.conf"
+ ''
+ ! FRR ${daemonName service} configuration
+ !
+ hostname ${config.networking.hostName}
+ log syslog
+ service password-encryption
+ !
+ ${scfg.config}
+ !
+ end
+ '';
+
+ serviceOptions = service:
+ {
+ enable = mkEnableOption "the FRR ${toUpper service} routing protocol";
+
+ configFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/etc/frr/${daemonName service}.conf";
+ description = ''
+ Configuration file to use for FRR ${daemonName service}.
+ By default the NixOS generated files are used.
+ '';
+ };
+
+ config = mkOption {
+ type = types.lines;
+ default = "";
+ example =
+ let
+ examples = {
+ rip = ''
+ router rip
+ network 10.0.0.0/8
+ '';
+
+ ospf = ''
+ router ospf
+ network 10.0.0.0/8 area 0
+ '';
+
+ bgp = ''
+ router bgp 65001
+ neighbor 10.0.0.1 remote-as 65001
+ '';
+ };
+ in
+ examples.${service} or "";
+ description = ''
+ ${daemonName service} configuration statements.
+ '';
+ };
+
+ vtyListenAddress = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = ''
+ Address to bind to for the VTY interface.
+ '';
+ };
+
+ vtyListenPort = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = ''
+ TCP Port to bind to for the VTY interface.
+ '';
+ };
+ };
+
+in
+
+{
+
+ ###### interface
+ imports = [
+ {
+ options.services.frr = {
+ zebra = (serviceOptions "zebra") // {
+ enable = mkOption {
+ type = types.bool;
+ default = any isEnabled services;
+ description = ''
+ Whether to enable the Zebra routing manager.
+
+ The Zebra routing manager is automatically enabled
+ if any routing protocols are configured.
+ '';
+ };
+ };
+ };
+ }
+ { options.services.frr = (genAttrs services serviceOptions); }
+ ];
+
+ ###### implementation
+
+ config = mkIf (any isEnabled allServices) {
+
+ environment.systemPackages = [
+ pkgs.frr # for the vtysh tool
+ ];
+
+ users.users.frr = {
+ description = "FRR daemon user";
+ isSystemUser = true;
+ group = "frr";
+ };
+
+ users.groups = {
+ frr = {};
+ # Members of the frrvty group can use vtysh to inspect the FRR daemons
+ frrvty = { members = [ "frr" ]; };
+ };
+
+ environment.etc = let
+ mkEtcLink = service: {
+ name = "frr/${service}.conf";
+ value.source = configFile service;
+ };
+ in
+ (builtins.listToAttrs
+ (map mkEtcLink (filter isEnabled allServices))) // {
+ "frr/vtysh.conf".text = "";
+ };
+
+ systemd.tmpfiles.rules = [
+ "d /run/frr 0750 frr frr -"
+ ];
+
+ systemd.services =
+ let
+ frrService = service:
+ let
+ scfg = cfg.${service};
+ daemon = daemonName service;
+ in
+ nameValuePair daemon ({
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-pre.target" "systemd-sysctl.service" ] ++ lib.optionals (service != "zebra") [ "zebra.service" ];
+ bindsTo = lib.optionals (service != "zebra") [ "zebra.service" ];
+ wants = [ "network.target" ];
+
+ description = if service == "zebra" then "FRR Zebra routing manager"
+ else "FRR ${toUpper service} routing daemon";
+
+ unitConfig.Documentation = if service == "zebra" then "man:zebra(8)"
+ else "man:${daemon}(8) man:zebra(8)";
+
+ restartTriggers = [
+ (configFile service)
+ ];
+ reloadIfChanged = true;
+
+ serviceConfig = {
+ PIDFile = "frr/${daemon}.pid";
+ ExecStart = "${pkgs.frr}/libexec/frr/${daemon} -f /etc/frr/${service}.conf"
+ + optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}"
+ + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}";
+ ExecReload = "${pkgs.python3.interpreter} ${pkgs.frr}/libexec/frr/frr-reload.py --reload --daemon ${daemonName service} --bindir ${pkgs.frr}/bin --rundir /run/frr /etc/frr/${service}.conf";
+ Restart = "on-abnormal";
+ };
+ });
+ in
+ listToAttrs (map frrService (filter isEnabled allServices));
+
+ };
+
+ meta.maintainers = with lib.maintainers; [ woffs ];
+
+}
diff --git a/nixos/modules/services/web-apps/prosody-filer.nix b/nixos/modules/services/web-apps/prosody-filer.nix
new file mode 100644
index 000000000000..6a52c36ab2cf
--- /dev/null
+++ b/nixos/modules/services/web-apps/prosody-filer.nix
@@ -0,0 +1,88 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+
+ cfg = config.services.prosody-filer;
+
+ settingsFormat = pkgs.formats.toml { };
+ configFile = settingsFormat.generate "prosody-filer.toml" cfg.settings;
+in {
+
+ options = {
+ services.prosody-filer = {
+ enable = mkEnableOption "Prosody Filer XMPP upload file server";
+
+ settings = mkOption {
+ description = ''
+ Configuration for Prosody Filer.
+ Refer to for details on supported values.
+ '';
+
+ type = settingsFormat.type;
+
+ example = literalExample ''
+ {
+ secret = "mysecret";
+ storeDir = "/srv/http/nginx/prosody-upload";
+ }
+ '';
+
+ defaultText = literalExpression ''
+ {
+ listenport = mkDefault "127.0.0.1:5050";
+ uploadSubDir = mkDefault "upload/";
+ }
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.prosody-filer.settings = {
+ listenport = mkDefault "127.0.0.1:5050";
+ uploadSubDir = mkDefault "upload/";
+ };
+
+ users.users.prosody-filer = {
+ group = "prosody-filer";
+ isSystemUser = true;
+ };
+
+ users.groups.prosody-filer = { };
+
+ systemd.services.prosody-filer = {
+ description = "Prosody file upload server";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ User = "prosody-filer";
+ Group = "prosody-filer";
+ ExecStart = "${pkgs.prosody-filer}/bin/prosody-filer -config ${configFile}";
+ Restart = "on-failure";
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ PrivateDevices = true;
+ PrivateTmp = true;
+ PrivateMounts = true;
+ ProtectHome = true;
+ ProtectClock = true;
+ ProtectProc = "noaccess";
+ ProcSubset = "pid";
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ ProtectHostname = true;
+ RestrictSUIDSGID = true;
+ RestrictRealtime = true;
+ RestrictNamespaces = true;
+ LockPersonality = true;
+ RemoveIPC = true;
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+ SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index 629fd04dc033..3753d01bf8d6 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -301,11 +301,16 @@ in
# implementation
config = mkIf (eachSite != {}) (mkMerge [{
- assertions = mapAttrsToList (hostName: cfg:
- { assertion = cfg.database.createLocally -> cfg.database.user == user;
- message = ''services.wordpress.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
- }
- ) eachSite;
+ assertions =
+ (mapAttrsToList (hostName: cfg:
+ { assertion = cfg.database.createLocally -> cfg.database.user == user;
+ message = ''services.wordpress.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
+ }) eachSite) ++
+ (mapAttrsToList (hostName: cfg:
+ { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
+ message = ''services.wordpress.sites."${hostName}".database.passwordFile cannot be specified if services.wordpress.sites."${hostName}".database.createLocally is set to true.'';
+ }) eachSite);
+
warnings = mapAttrsToList (hostName: _: ''services.wordpress."${hostName}" is deprecated use services.wordpress.sites."${hostName}"'') (oldSites cfg);
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 409424a5b0f6..6dfe6b939abe 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -633,7 +633,7 @@ in
boot.consoleLogLevel = 0;
- boot.kernelParams = [ "quiet" "udev.log_priority=3" ];
+ boot.kernelParams = [ "quiet" "udev.log_level=3" ];
'';
};
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5ebe07ad3cb7..95ce2cc5ccf2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -143,6 +143,7 @@ in
fluidd = handleTest ./fluidd.nix {};
fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
freeswitch = handleTest ./freeswitch.nix {};
+ frr = handleTest ./frr.nix {};
fsck = handleTest ./fsck.nix {};
ft2-clone = handleTest ./ft2-clone.nix {};
gerrit = handleTest ./gerrit.nix {};
@@ -445,6 +446,7 @@ in
sslh = handleTest ./sslh.nix {};
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
+ starship = handleTest ./starship.nix {};
step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {};
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
sudo = handleTest ./sudo.nix {};
diff --git a/nixos/tests/frr.nix b/nixos/tests/frr.nix
new file mode 100644
index 000000000000..598d7a7d2867
--- /dev/null
+++ b/nixos/tests/frr.nix
@@ -0,0 +1,104 @@
+# This test runs FRR and checks if OSPF routing works.
+#
+# Network topology:
+# [ client ]--net1--[ router1 ]--net2--[ router2 ]--net3--[ server ]
+#
+# All interfaces are in OSPF Area 0.
+
+import ./make-test-python.nix ({ pkgs, ... }:
+ let
+
+ ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address;
+
+ ospfConf1 = ''
+ router ospf
+ network 192.168.0.0/16 area 0
+ '';
+
+ ospfConf2 = ''
+ interface eth2
+ ip ospf hello-interval 1
+ ip ospf dead-interval 5
+ !
+ router ospf
+ network 192.168.0.0/16 area 0
+ '';
+
+ in
+ {
+ name = "frr";
+
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ hexa ];
+ };
+
+ nodes = {
+
+ client =
+ { nodes, ... }:
+ {
+ virtualisation.vlans = [ 1 ];
+ networking.defaultGateway = ifAddr nodes.router1 "eth1";
+ };
+
+ router1 =
+ { ... }:
+ {
+ virtualisation.vlans = [ 1 2 ];
+ boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+ networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT";
+ services.frr.ospf = {
+ enable = true;
+ config = ospfConf1;
+ };
+
+ specialisation.ospf.configuration = {
+ services.frr.ospf.config = ospfConf2;
+ };
+ };
+
+ router2 =
+ { ... }:
+ {
+ virtualisation.vlans = [ 3 2 ];
+ boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+ networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospfigp -j ACCEPT";
+ services.frr.ospf = {
+ enable = true;
+ config = ospfConf2;
+ };
+ };
+
+ server =
+ { nodes, ... }:
+ {
+ virtualisation.vlans = [ 3 ];
+ networking.defaultGateway = ifAddr nodes.router2 "eth1";
+ };
+ };
+
+ testScript =
+ { nodes, ... }:
+ ''
+ start_all()
+
+ # Wait for the networking to start on all machines
+ for machine in client, router1, router2, server:
+ machine.wait_for_unit("network.target")
+
+ with subtest("Wait for Zebra and OSPFD"):
+ for gw in router1, router2:
+ gw.wait_for_unit("zebra")
+ gw.wait_for_unit("ospfd")
+
+ router1.succeed("${nodes.router1.config.system.build.toplevel}/specialisation/ospf/bin/switch-to-configuration test >&2")
+
+ with subtest("Wait for OSPF to form adjacencies"):
+ for gw in router1, router2:
+ gw.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full")
+ gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'")
+
+ with subtest("Test ICMP"):
+ client.wait_until_succeeds("ping -c 3 server >&2")
+ '';
+ })
diff --git a/nixos/tests/starship.nix b/nixos/tests/starship.nix
new file mode 100644
index 000000000000..f21da1e6e255
--- /dev/null
+++ b/nixos/tests/starship.nix
@@ -0,0 +1,31 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "starship";
+ meta.maintainers = pkgs.starship.meta.maintainers;
+
+ machine = {
+ programs = {
+ fish.enable = true;
+ zsh.enable = true;
+
+ starship = {
+ enable = true;
+ settings.format = "";
+ };
+ };
+
+ services.getty.autologinUser = "root";
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("default.target")
+
+ for shell in ["bash", "fish", "zsh"]:
+ machine.send_chars(f"script -c {shell} /tmp/{shell}.txt\n")
+ machine.wait_until_tty_matches(1, f"Script started.*{shell}.txt")
+ machine.send_chars("exit\n")
+ machine.wait_until_tty_matches(1, "Script done")
+ machine.sleep(1)
+ machine.succeed(f"grep -q '' /tmp/{shell}.txt")
+ '';
+})
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix
index b21b859596e1..86c7e64a6e64 100644
--- a/pkgs/applications/audio/meters_lv2/default.nix
+++ b/pkgs/applications/audio/meters_lv2/default.nix
@@ -1,46 +1,53 @@
-{ lib, stdenv, fetchurl, pkg-config
-, lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, lv2
+, libGLU
+, libGL
+, gtk2
+, cairo
+, pango
+, fftwFloat
+, libjack2
+}:
-let
+stdenv.mkDerivation rec {
+ pname = "meters.lv2";
version = "0.9.10";
- name = "meters.lv2-${version}";
-
- # robtk submodule is pegged to this version
robtkVersion = "0.6.2";
- robtkName = "robtk-${robtkVersion}";
-
- src = fetchurl {
- name = "${name}.tar.gz";
- url = "https://github.com/x42/meters.lv2/archive/v${version}.tar.gz";
- sha256 = "0yfyn7j8g50w671b1z7ph4ppjx8ddj5c6nx53syp5y5mfr1b94nx";
- };
-
- robtkSrc = fetchurl {
- name = "${robtkName}.tar.gz";
- url = "https://github.com/x42/robtk/archive/v${robtkVersion}.tar.gz";
- sha256 = "1v79xys1k2923wpivdjd44vand6c4agwvnrqi4c8kdv9r07b559v";
- };
-
-in
-stdenv.mkDerivation {
- inherit name;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ];
- srcs = [ src robtkSrc ];
- sourceRoot = name;
+ src = fetchFromGitHub {
+ owner = "x42";
+ repo = "meters.lv2";
+ rev = "v${version}";
+ sha256 = "sha256-u2KIsaia0rAteQoEh6BLNCiRHFufHYF95z6J/EMgeSE=";
+ };
- postUnpack = "mv ${robtkName}/* ${name}/robtk"; # */
+ robtkSrc = fetchFromGitHub {
+ owner = "x42";
+ repo = "robtk";
+ rev = "v${robtkVersion}";
+ sha256 = "sha256-zeRMobfKW0+wJwYVem74tglitkI6DSoK75Auywcu4Tw=";
+ };
+
+ postUnpack = ''
+ rm -rf $sourceRoot/robtk/
+ ln -s ${robtkSrc} $sourceRoot/robtk
+ '';
- preConfigure = "makeFlagsArray=( PREFIX=$out )";
meter_VERSION = version;
+ enableParallelBuilding = true;
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
- meta = with lib;
- { description = "Collection of audio level meters with GUI in LV2 plugin format";
- homepage = "http://x42.github.io/meters.lv2/";
- maintainers = with maintainers; [ ehmry ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
+ meta = with lib; {
+ description = "Collection of audio level meters with GUI in LV2 plugin format";
+ homepage = "https://x42.github.io/meters.lv2/";
+ maintainers = with maintainers; [ ehmry ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix
index b0ed8a1a2e87..6c8d895e03a4 100644
--- a/pkgs/applications/blockchains/elements/default.nix
+++ b/pkgs/applications/blockchains/elements/default.nix
@@ -1,6 +1,6 @@
{ lib
, stdenv
-, fetchurl
+, fetchFromGitHub
, autoreconfHook
, pkg-config
, util-linux
@@ -26,9 +26,11 @@ stdenv.mkDerivation rec {
pname = if withGui then "elements" else "elementsd";
version = "0.21.0.1";
- src = fetchurl {
- url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz";
- sha256 = "00a2lrn77mfmr5dvrqwplk20gaxxq4cd9gcx667hgmfmmz1v6r6b";
+ src = fetchFromGitHub {
+ owner = "ElementsProject";
+ repo = "elements";
+ rev = "elements-${version}";
+ sha256 = "sha256-nZa5doiFQJhtK8cUUISTZhS61HzW7CMB9pPsWKc8Gac=";
};
nativeBuildInputs =
diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix
index bc020de8be49..9efdd6c56dfd 100644
--- a/pkgs/applications/blockchains/wownero/default.nix
+++ b/pkgs/applications/blockchains/wownero/default.nix
@@ -1,28 +1,30 @@
-{ lib, stdenv, fetchgit, cmake, boost, miniupnpc_2, openssl, unbound
-, readline, libsodium, rapidjson, fetchurl
+{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc_2, openssl, unbound
+, readline, libsodium, rapidjson
}:
with lib;
-
-let
- randomwowVersion = "1.1.7";
- randomwow = fetchurl {
- url = "https://github.com/wownero/RandomWOW/archive/${randomwowVersion}.tar.gz";
- sha256 = "1xp76zf01hnhnk6rjvqjav9n9pnvxzxlzqa5rc574d1c2qczfy3q";
- };
-in
-
stdenv.mkDerivation rec {
pname = "wownero";
version = "0.8.0.1";
+ randomwowVersion = "1.1.7";
- src = fetchgit {
- url = "https://git.wownero.com/wownero/wownero.git";
+ src = fetchFromGitea {
+ domain = "git.wownero.com";
+ owner = "wownero";
+ repo = "wownero";
rev = "v${version}";
- sha256 = "15443xv6q1nw4627ajk6k4ghhahvh82lb4gyb8nvq753p2v838g3";
+ sha256 = "sha256-+cUdousEiZMNwqhTvjoqw/k21x3dg7Lhb/5KyNUGrjQ=";
fetchSubmodules = false;
};
+ randomwow = fetchFromGitea {
+ domain = "git.wownero.com";
+ owner = "wownero";
+ repo = "RandomWOW";
+ rev = randomwowVersion;
+ sha256 = "sha256-JzyRlHwM8rmJ5OaKHz+6vHGfpSz+X4zkFAKn4Jmo+EE=";
+ };
+
nativeBuildInputs = [ cmake ];
buildInputs = [
@@ -31,8 +33,7 @@ stdenv.mkDerivation rec {
postUnpack = ''
rm -r $sourceRoot/external/RandomWOW
- unpackFile ${randomwow}
- mv RandomWOW-${randomwowVersion} $sourceRoot/external/RandomWOW
+ ln -s ${randomwow} $sourceRoot/external/RandomWOW
'';
cmakeFlags = [
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index 80328fb06f82..f722f8c3db82 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "featherpad";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
- sha256 = "sha256-Sff1oyRYCsiJ7Kl3HxI/bln0M80KlbcNSw6jrEOeWiI=";
+ sha256 = "sha256-qDhubKk6FLZmVxp4SkGm1B7zIg6rPtPRoFGCcBYUDFA=";
};
nativeBuildInputs = [ cmake pkg-config qttools ];
diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix
index 7f395fe30600..2bba3c80cd9b 100644
--- a/pkgs/applications/graphics/image-roll/default.nix
+++ b/pkgs/applications/graphics/image-roll/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "image-roll";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "weclaw1";
repo = pname;
rev = version;
- sha256 = "sha256-NhZ0W9WBOIRe2nE4jQJ9WgfduKhHd+222feUCay4atw=";
+ sha256 = "sha256-SyG/syIDnyQaXUgGkXZkY98dmFs7O+OFnGL50250nJI=";
};
- cargoSha256 = "sha256-7sV8v/npmdOgTMtnww/VoK1Kp4Na9Go95XLcfdgkTik=";
+ cargoSha256 = "sha256-pyeJ7WmtkbQjbek/rRh2UKFQ5o006Rf7phZ1yl2s4wA=";
nativeBuildInputs = [ glib pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix
index b29c83914c6e..ad58bde5838b 100644
--- a/pkgs/applications/kde/kbreakout.nix
+++ b/pkgs/applications/kde/kbreakout.nix
@@ -12,7 +12,7 @@
mkDerivation {
pname = "kbreakout";
meta = {
- homepage = "KBreakOut";
+ homepage = "https://apps.kde.org/kbreakout/";
description = "Breakout-like game";
license = with lib.licenses; [ lgpl21 gpl3 ];
};
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 8d612ceb413d..b65904006751 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gphoto2";
- version = "2.5.27";
+ version = "2.5.28";
src = fetchFromGitHub {
owner = "gphoto";
repo = "gphoto2";
rev = "v${version}";
- sha256 = "sha256-zzlyA2IedyBZ4/TdSmrqbe2le8rFMQ6tY6jF5skJ7l4=";
+ sha256 = "sha256-t5EnM4WaDbOTPM+rJW+hQxBgNErnnZEN9lZvxTKoDhA=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 2d8bb1689cc9..264b4ba53dd8 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
- version = "0.91.2";
+ version = "0.92.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8=";
+ sha256 = "sha256-rzAt6jGj1MJ5AvkEKjAH91mKnUcLOPgHgiDkzkdibks=";
};
- vendorSha256 = "sha256-M4pKAxNd8rqluVm+c+X+nxC/vcaVclebo9HP17yEpfo=";
+ vendorSha256 = "sha256-ftA7ktZ6dEownEwJC4tK5/V3fl8toACiFiq9xTa7NE4=";
doCheck = false;
diff --git a/pkgs/applications/misc/kup/default.nix b/pkgs/applications/misc/kup/default.nix
new file mode 100644
index 000000000000..3ac622b11ff5
--- /dev/null
+++ b/pkgs/applications/misc/kup/default.nix
@@ -0,0 +1,60 @@
+{ lib,
+ stdenv,
+ fetchFromGitLab,
+ extra-cmake-modules,
+ shared-mime-info,
+ wrapQtAppsHook,
+ kcoreaddons,
+ kdbusaddons,
+ ki18n,
+ kio,
+ solid,
+ kidletime,
+ knotifications,
+ kconfig,
+ kinit,
+ kjobwidgets,
+ plasma-framework,
+ libgit2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "kup";
+ version = "0.9.1";
+
+ src = fetchFromGitLab {
+ domain = "invent.kde.org";
+ repo = pname;
+ owner = "system";
+ rev = "${pname}-${version}";
+ sha256 = "1s180y6vzkxxcjpfdvrm90251rkaf3swzkjwdlpm6m4vnggq0hvs";
+ };
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ shared-mime-info
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ kcoreaddons
+ kdbusaddons
+ ki18n
+ kio
+ solid
+ kidletime
+ knotifications
+ kconfig
+ kinit
+ kjobwidgets
+ plasma-framework
+ libgit2
+ ];
+
+ meta = with lib; {
+ description = "Backup tool for KDE";
+ homepage = "https://apps.kde.org/kup";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.pwoelfel ];
+ };
+}
diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/misc/llama/default.nix
new file mode 100644
index 000000000000..60598afcc4e1
--- /dev/null
+++ b/pkgs/applications/misc/llama/default.nix
@@ -0,0 +1,22 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "llama";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "antonmedv";
+ repo = "llama";
+ rev = "v${version}";
+ sha256 = "sha256-6Xuwl4IpzbVfJ2MhHeImPFWxL/Y6rhnBExlh64PeGdk=";
+ };
+
+ vendorSha256 = "sha256-J/2R3XhGNmejc3jstJ0NWmJm/a1Re6UK6AuQb5gzh4E=";
+
+ meta = with lib; {
+ description = "Terminal file manager";
+ homepage = "https://github.com/antonmedv/llama";
+ license = licenses.mit;
+ maintainers = with maintainers; [ portothree ];
+ };
+}
diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix
index dfd68fd5ac19..6623a8775a93 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/pkgs/applications/misc/toggldesktop/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config
+{ mkDerivation, lib, fetchFromGitHub, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config
, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco
, qtbase, qtwebengine, qtx11extras, sqlite }:
@@ -6,18 +6,22 @@ let
name = "toggldesktop-${version}";
version = "7.4.231";
- src = fetchzip {
- url = "https://github.com/toggl/toggldesktop/archive/v${version}.tar.gz";
- sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1";
+ src = fetchFromGitHub {
+ owner = "toggl";
+ repo = "toggldesktop";
+ rev = "v${version}";
+ sha256 = "sha256-YaeeUlwz42i1ik5nUKSIy0IBrvu1moi95dBK2lKfGAY=";
};
bugsnag-qt = mkDerivation rec {
pname = "bugsnag-qt";
version = "20180522.005732";
- src = fetchzip {
- url = "https://github.com/alpakido/bugsnag-qt/archive/${version}.tar.gz";
- sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq";
+ src = fetchFromGitHub {
+ owner = "alpakido";
+ repo = "bugsnag-qt";
+ rev = version;
+ sha256 = "sha256-2L7pxdQOniwrp1Kgq3Q8BFbjb2yGtGoKUiQC+B6tRgs=";
};
nativeBuildInputs = [ qmake ];
@@ -28,9 +32,11 @@ let
pname = "qxtglobalshortcut";
version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
- src = fetchzip {
- url = "https://github.com/hluk/qxtglobalshortcut/archive/${version}.tar.gz";
- sha256 = "1iy17gypav10z8aa62s5jb6mq9y4kb9ms4l61ydmk3xwlap7igw1";
+ src = fetchFromGitHub {
+ owner = "hluk";
+ repo = "qxtglobalshortcut";
+ rev = version;
+ sha256 = "sha256-gb94rqK8j1mbD4YSXdOaxCdczZJFC6MU+iBsdf07wcc=";
};
nativeBuildInputs = [ cmake ];
@@ -41,9 +47,11 @@ let
pname = "qt-oauth-lib";
version = "20190125.190943";
- src = fetchzip {
- url = "https://github.com/alpakido/qt-oauth-lib/archive/${version}.tar.gz";
- sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj";
+ src = fetchFromGitHub {
+ owner = "alpakido";
+ repo = "qt-oauth-lib";
+ rev = version;
+ sha256 = "sha256-MjtNAN4F9JJFxM8MYpCv8tPe26RHtbXdq+lY49p+rn4=";
};
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 7c490e860d41..7358c1e3ab31 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,22 +19,9 @@
}
},
"beta": {
- "version": "97.0.4692.71",
- "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
- "sha256bin64": "18wr4pgzfcvvdpvvxhpd4as2qnyggq9f8z90ikdz8yj8i71l5wnc",
- "deps": {
- "gn": {
- "version": "2021-11-03",
- "url": "https://gn.googlesource.com/gn",
- "rev": "90294ccdcf9334ed25a76ac9b67689468e506342",
- "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa"
- }
- }
- },
- "dev": {
- "version": "98.0.4758.9",
- "sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj",
- "sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04",
+ "version": "98.0.4758.48",
+ "sha256": "0c6lxmr8xxjhifm28v9ri05v5al9ph6infksx9qgd045svmfynxs",
+ "sha256bin64": "0m7vbd7fy4wrbk28hw3hy6x8yb8vyyyisnicdhkp6j0xq9ni5jhj",
"deps": {
"gn": {
"version": "2021-12-07",
@@ -44,6 +31,19 @@
}
}
},
+ "dev": {
+ "version": "99.0.4818.0",
+ "sha256": "1k8xzmybrmwgcyg4n7x3gj486rpwic17m6i5ij9nmfzcxx7fbwlm",
+ "sha256bin64": "1jfqmv94ami3n6hzp9ycczqv3lh3wijsf555mg62rv4rdvw5adm6",
+ "deps": {
+ "gn": {
+ "version": "2022-01-07",
+ "url": "https://gn.googlesource.com/gn",
+ "rev": "f1b1412521b41e47118b29863224171e434a27a2",
+ "sha256": "1cxq991by7sa5k1hvb5xx98bfqgq7rdbw3cawhyyqq91a521wsb7"
+ }
+ }
+ },
"ungoogled-chromium": {
"version": "97.0.4692.71",
"sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index e1c93fe97726..f35ae98f71c4 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "11.0.3";
+ version = "11.0.4";
lang = "en-US";
@@ -97,7 +97,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "1a2nxxmjg1gk8p0bxxjqx2g9bwv4ivz8hndabg31nglzv83r7p35";
+ sha256 = "0pz1v5ig031wgnq3191ja08a4brdrbzziqnkpcrlra1wcdnzv985";
};
i686-linux = fetchurl {
@@ -105,7 +105,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "0fjq6bj2b6rd66ky9i4p7asda0ghdcm6q0fnr92yan5x77pji73m";
+ sha256 = "0ykdgbm8f5lcv7p54f3ffxsaw2cdzbhk6sv7d2hm7d81fcnhmjq4";
};
};
in
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index 68ab73da01e3..2eb0f63bc345 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -26,18 +26,20 @@
, docbook-xsl-nons
, docbook_xml_dtd_43
, gobject-introspection
+, gst_all_1
+, sofia_sip
}:
stdenv.mkDerivation rec {
pname = "calls";
- version = "0.3.1";
+ version = "41.1";
src = fetchFromGitLab {
- domain = "source.puri.sm";
- owner = "Librem5";
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
repo = pname;
- rev = "v${version}";
- sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
+ rev = version;
+ sha256 = "1vbw9x5s3ww11f3lnqivc74rjlmi9fk1hzaq1idrdcck3gvif0h8";
};
outputs = [ "out" "devdoc" ];
@@ -62,11 +64,17 @@ stdenv.mkDerivation rec {
folks
gom
gsound
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-ugly
feedbackd
callaudiod
gtk3
libpeas
libgdata # required by some dependency transitively
+ sofia_sip
];
checkInputs = [
@@ -80,7 +88,8 @@ stdenv.mkDerivation rec {
"-Dgtk_doc=true"
];
- doCheck = true;
+ # Disable until tests are fixed upstream https://gitlab.gnome.org/GNOME/calls/-/issues/258
+ doCheck = false;
checkPhase = ''
runHook preCheck
diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
index c4365975713a..2f6dcbe01446 100644
--- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
+++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
@@ -1,17 +1,17 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "chart-testing";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "helm";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-c7Rjk2YZaQXyFwrDVwYgOCnq/F2ooIUVETXVn5FVlZE=";
+ sha256 = "sha256-lXi778MTeVUBtepGjIkKAX1kDEaaVzQI1gTKfcpANC0=";
};
- vendorSha256 = "sha256-1Py66ljDjJC38biJ25D8KnWEi3nXAVt9QSgyH1KkwHM=";
+ vendorSha256 = "sha256-pNevyTibnhUK8LSM1lVnmumFazXK86q4AZ2WKFt5jok=";
postPatch = ''
substituteInPlace pkg/config/config.go \
@@ -26,9 +26,16 @@ buildGoModule rec {
"-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00"
];
+ nativeBuildInputs = [ installShellFiles ];
+
postInstall = ''
install -Dm644 -t $out/etc/ct etc/chart_schema.yaml
install -Dm644 -t $out/etc/ct etc/lintconf.yaml
+
+ installShellCompletion --cmd ct \
+ --bash <($out/bin/ct completion bash) \
+ --zsh <($out/bin/ct completion zsh) \
+ --fish <($out/bin/ct completion fish) \
'';
meta = with lib; {
@@ -36,5 +43,6 @@ buildGoModule rec {
homepage = "https://github.com/helm/chart-testing";
license = licenses.asl20;
maintainers = with maintainers; [ atkinschang ];
+ mainProgram = "ct";
};
}
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 861fa2eb97ef..fa2f218ffa0b 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -49,7 +49,7 @@ buildGoModule rec {
multi-node k3s cluster on a single machine using docker.
'';
license = licenses.mit;
- maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 4ecc449fe85a..de8c4dc1026e 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python2
+{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python3
, enableLibPurple ? false, pidgin ? null
, enablePam ? false, pam ? null
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ] ++ optional doCheck check;
- buildInputs = [ gnutls libotr python2 ]
+ buildInputs = [ gnutls libotr python3 ]
++ optional enableLibPurple pidgin
++ optional enablePam pam;
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.bitlbee.org/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ pSub ];
+ maintainers = with maintainers; [ lassulus pSub ];
platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index b499f01d88fd..6154ce668cdb 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -26,10 +26,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.131";
+ version = "0.0.132";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "087rzyivk0grhc73v7ldxxghks0n16ifrvpmk95vzaw99l9xv0v5";
+ sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv";
};
};
}.${branch}
diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index 2389aee53a99..9723f7111e7e 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.5";
+ version = "5.6.10";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
- sha256 = "sha256-JeFPvU4xXHcv6/ApCDkejYWfA8lqsxwoFXnqIiOQ0+Y=";
+ sha256 = "sha256-tm9tuIP4pVociJAiXVsZkDU+zCM5tVAlt+FNpOaiths=";
};
extraBuildInputs = [ xorg.libxshmfence ];
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 59ff3554ebf5..93d0f7a4694e 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }:
+{ stdenv, lib, fetchurl, makeWrapper, openjdk17_headless, libmatthew_java, dbus, dbus_java }:
stdenv.mkDerivation rec {
pname = "signal-cli";
- version = "0.9.2";
+ version = "0.10.0";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
- sha256 = "sha256-CumrIlOPmvQ3x7Ua5I2G7ZlTSAbhLgAQMPUg4I5WCeQ=";
+ sha256 = "sha256-2JofDCq9HsF+2DO5wzObzAALbJmJ9HJgmuuSJQDu1vY=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
@@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli
'' + (if stdenv.isLinux then ''
- makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \
- --set JAVA_HOME "${openjdk11_headless}" \
+ makeWrapper ${openjdk17_headless}/bin/java $out/bin/signal-cli \
+ --set JAVA_HOME "${openjdk17_headless}" \
--add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
--add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
--add-flags "org.asamk.signal.Main"
'' else ''
wrapProgram $out/bin/signal-cli \
- --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \
- --set JAVA_HOME ${openjdk11_headless}
+ --prefix PATH : ${lib.makeBinPath [ openjdk17_headless ]} \
+ --set JAVA_HOME ${openjdk17_headless}
'');
# Execution in the macOS (10.13) sandbox fails with
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index dbbfddcb2c01..2a95453f7ae3 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "notmuch";
- version = "0.34.2";
+ version = "0.34.3";
src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
- sha256 = "wfLO7kf2iXESItcgWvKj/npKnYwy5OCyStZviN9qR9M=";
+ sha256 = "sha256-P+kQSDv9gVpcO5UOImp7yoFWBT/TLXrR6xoKijrK6Ig=";
};
patches = [
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index ed8a86bc9d3f..2254b4f34156 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "2.71";
+ version = "2.85";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
- sha256 = "sha256-d4Vl+HixZy7fJ8YU1fy3b2B+F/76mm0NQmFC/PDl4SY=";
+ sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk=";
};
- vendorSha256 = "sha256-oxrOjiRxgcJ5yzQYQvLXFPHlOHMB88FThw4OCVxFOwQ=";
+ vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ=";
subPackages = [ "weed" ];
diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index 1b5b2fc35d84..dbb187dc35ee 100644
--- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "finalfusion-utils";
- version = "0.13.2";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "finalfusion";
repo = pname;
rev = version;
- sha256 = "sha256-Wv3K2G542e1bKuJB+dZi0SW4dbopvs7SBohv+zgi5MI=";
+ sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
};
- cargoSha256 = "sha256-oI7bq/yEXP7aMLWGKAecyq1lqq7ZbHtwxX2ldZMFY8I=";
+ cargoSha256 = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index 7cbd9354a372..cd5e5409a483 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -7,21 +7,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
- version = "3.1.20211104071347";
+ version = "3.1.20211107152837";
format = "setuptools";
- disabled = python3.pythonOlder "3.6";
-
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
- sha256 = "sha256-tp4SdilW2PKav7b3/BchXYl33W9U0aQH6FPdOhHSvIQ=";
+ sha256 = "sha256-hIkRzFLG9MujSaQrhWFPXegLLKTV96lVYP79+xpPfUQ=";
};
postPatch = ''
substituteInPlace setup.py \
- --replace 'prov == 1.5.1' 'prov' \
+ --replace "ruamel.yaml >= 0.15, < 0.17.18" "ruamel.yaml" \
+ --replace "prov == 1.5.1" "prov" \
--replace "setup_requires=PYTEST_RUNNER," ""
'';
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index af2b5cdc9a3d..f8d84f4e93c0 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -1,9 +1,9 @@
{ lib, fetchurl, makeWrapper
-, python2Packages
+, pypy2Packages
, cvs, subversion, git, breezy
}:
-python2Packages.buildPythonApplication rec {
+pypy2Packages.buildPythonApplication rec {
pname = "cvs2svn";
version = "2.5.0";
@@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec {
checkInputs = [ subversion git breezy ];
- checkPhase = "python run-tests.py";
+ checkPhase = "${pypy2Packages.python.interpreter} run-tests.py";
doCheck = false; # Couldn't find node 'transaction...' in expected output tree
diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix
new file mode 100644
index 000000000000..ee280c6620c0
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "gfold";
+ version = "3.0.0";
+
+ src = fetchFromGitHub {
+ owner = "nickgerace";
+ repo = pname;
+ rev = version;
+ sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63";
+ };
+
+ cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin"
+ '';
+
+ meta = with lib; {
+ inherit (src.meta) homepage;
+ description =
+ "A tool to help keep track of your Git repositories, written in Rust";
+ license = licenses.asl20;
+ maintainers = [ maintainers.shanesveller ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/pkgs/applications/version-management/git-and-tools/gitty/default.nix
index bc27c4eb9094..759694b0eb3e 100644
--- a/pkgs/applications/version-management/git-and-tools/gitty/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitty/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitty";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "muesli";
repo = "gitty";
rev = "v${version}";
- sha256 = "sha256-BlYZe8bLyr6QQmBwQQ0VySHohKLRVImECxfzAOPm8Xg=";
+ sha256 = "sha256-gjiFaBM6PP937l5EQIeB27kGuZCT7cmVHm0UwuytqfE=";
};
- vendorSha256 = "sha256-LINOjjKicnr0T9RiOcSWWDl0bdY3c6EHHMTBA9LTOG4=";
+ vendorSha256 = "sha256-CytlkfOzrmCRjj4tGoDUbqdim5DWElMYo1Tosw7Dhmg=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index c769ec0a66d6..e3b5891720fb 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, python2Packages }:
+{ fetchurl, pypy2Packages }:
-python2Packages.buildPythonApplication rec {
+pypy2Packages.buildPythonApplication rec {
pname = "tailor";
version = "0.9.35";
diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
new file mode 100644
index 000000000000..51fda8098fd0
--- /dev/null
+++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, xbmcswift2 }:
+
+buildKodiAddon rec {
+ pname = "arteplussept";
+ namespace = "plugin.video.arteplussept";
+ version = "1.1.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ xbmcswift2
+ ];
+
+ passthru = {
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.arteplussept";
+ };
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept";
+ description = "Watch videos available on Arte+7";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix
index 56f25ddc9d12..c1abb00d0a30 100644
--- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix
+++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix
@@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "orftvthek";
namespace = "plugin.video.orftvthek";
- version = "0.12.3-1";
+ version = "0.12.3+matrix.1";
src = fetchFromGitHub {
owner = "s0faking";
repo = namespace;
rev = version;
- sha256 = "sha256-+J1NtmjbDWtS8d4nO9P/lR5GNmvtc1YjTW+bulGaU2Q=";
+ sha256 = "sha256-GB9VkC9Vbi7TJXl/vF3ViF/tAcHGH0KxYQ0zkfMLZCY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
new file mode 100644
index 000000000000..7d435521f06c
--- /dev/null
+++ b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+
+buildKodiAddon rec {
+ pname = "xbmcswift2";
+ namespace = "script.module.xbmcswift2";
+ version = "19.0.7";
+
+ src = fetchFromGitHub {
+ owner = "XBMC-Addons";
+ repo = namespace;
+ rev = version;
+ sha256 = "sha256-Z+rHz3wncoNvV1pwhRzJFB/X0H6wdfwg88otVh27wg8=";
+ };
+
+ passthru = {
+ pythonPath = "lib";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/XBMC-Addons/script.module.xbmcswift2";
+ description = "Framework to ease development of Kodi addons";
+ license = licenses.gpl3Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index c8f78117f500..11df90ce6e63 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
- version = "2.0.31";
+ version = "2.0.32";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/IQS5L9Gqhft1eefkcNAPcQn7nSqOxAp9ySKBSOjs7M=";
+ sha256 = "sha256-aj0RQVVJp2S8cIYT7fsbK1TLaK0auvdgEIgkZJktsdo=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix
index 9ecc7f76c073..8df63a75ad8d 100644
--- a/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/pkgs/data/icons/kora-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
- version = "1.4.9";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
- sha256 = "sha256-bhzkR8V/kdETC12mqMtTw+80o8AAD8sYeMhpktd0WMo=";
+ sha256 = "sha256-kUgNj7KuxsQ/BvQ0ORl3xzEm9gv69+2PS0Bgv8i/S9U=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 91711ecb28f6..29b08aa3c1ed 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -55,11 +55,11 @@
stdenv.mkDerivation rec {
pname = "gnome-boxes";
- version = "41.2";
+ version = "41.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "u3G2zflFOBjyblV0Tl5ZUN2TJ5PQ6Ot+n/h78Mvvwz0=";
+ sha256 = "m4QGgNHnOG/d/WoVrU3Q8s2ljv6BjPVHg3tGrovw4Yk=";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix
index c3cfeec8ff80..8eb3c9951f3c 100644
--- a/pkgs/desktops/gnome/core/rygel/default.nix
+++ b/pkgs/desktops/gnome/core/rygel/default.nix
@@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "rygel";
- version = "0.40.2";
+ version = "0.40.3";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc=";
+ sha256 = "zwvjUQnLVw5c8K/lltha7Lmw6TWYYVNTArt7YE2vUdc=";
};
patches = [
diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
index 526e6776f7f2..3a158e7ddf81 100644
--- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "gnome-autoar";
- version = "0.4.1";
+ version = "0.4.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "ZGvVDrrZLZHBvokJehU2QVYVdELKwUcd7X7LJ9mpFQ4=";
+ sha256 = "HSBpQHkwDhL+q9t3MEqWnRzBkNHRKpSb6EXK0Bx4pdM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix
index 422053ea9d81..dfbec7442ed4 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -1,18 +1,19 @@
-{ lib, eggDerivation, fetchurl, chickenEggs }:
+{ lib, eggDerivation, fetchFromGitHub, chickenEggs }:
# Note: This mostly reimplements the default.nix already contained in
# the tarball. Is there a nicer way than duplicating code?
-let
+eggDerivation rec {
+ name = "egg2nix-${version}";
version = "0.5";
-in
-eggDerivation {
- src = fetchurl {
- url = "https://github.com/the-kenny/egg2nix/archive/${version}.tar.gz";
- sha256 = "0adal428v4i7h9lzs7sfq75q2mxhsbf1qqwzrsjv8j41paars20y";
+
+ src = fetchFromGitHub {
+ owner = "the-kenny";
+ repo = "egg2nix";
+ rev = version;
+ sha256 = "sha256-5ov2SWVyTUQ6NHnZNPRywd9e7oIxHlVWv4uWbsNaj/s=";
};
- name = "egg2nix-${version}";
buildInputs = with chickenEggs; [
matchable http-client
];
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 19b79989dc23..20a33307bf3c 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -1,14 +1,16 @@
# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
-{ lib, stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
+{ lib, stdenv, fetchFromGitHub, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
stdenv.mkDerivation rec {
pname = "fsharp";
version = "4.0.1.1";
- src = fetchurl {
- url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
- sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk";
+ src = fetchFromGitHub {
+ owner = "fsharp";
+ repo = "fsharp";
+ rev = version;
+ sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index ebdc55ee3f8f..9d21ed667f6c 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -82,6 +82,7 @@ let majorVersion = "9";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
++ optional noSysDirs ../no-sys-dirs.patch
+ ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv-gcc9.patch
/* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
sha256 = ""; # TODO: uncomment and check hash when available.
diff --git a/pkgs/development/compilers/gcc/no-sys-dirs-riscv-gcc9.patch b/pkgs/development/compilers/gcc/no-sys-dirs-riscv-gcc9.patch
new file mode 100644
index 000000000000..afe3f26360e4
--- /dev/null
+++ b/pkgs/development/compilers/gcc/no-sys-dirs-riscv-gcc9.patch
@@ -0,0 +1,17 @@
+diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
+index 701f5ea1544..8de333caf54 100644
+--- a/gcc/config/riscv/riscv.h
++++ b/gcc/config/riscv/riscv.h
+@@ -886,11 +886,7 @@ extern unsigned riscv_stack_boundary;
+ "%{mabi=lp64f:lp64f}" \
+ "%{mabi=lp64d:lp64d}" \
+
+-#define STARTFILE_PREFIX_SPEC \
+- "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \
+- "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \
+- "/lib/ " \
+- "/usr/lib/ "
++#define STARTFILE_PREFIX_SPEC ""
+
+ /* ISA constants needed for code generation. */
+ #define OPCODE_LW 0x2003
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix
index e7dc9ceae6d9..44ed1185fafc 100644
--- a/pkgs/development/compilers/mosml/default.nix
+++ b/pkgs/development/compilers/mosml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gmp, perl }:
+{ lib, stdenv, fetchFromGitHub, gmp, perl }:
stdenv.mkDerivation rec {
pname = "mosml";
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
- src = fetchurl {
- url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";
- sha256 = "13x7wj94p0inn84pzpj52dch5s9lznqrj287bd3nk3dqd0v3kmgy";
+ src = fetchFromGitHub {
+ owner = "kfl";
+ repo = "mosml";
+ rev = "ver-${version}";
+ sha256 = "sha256-GK39WvM7NNhoC5f0Wjy4/5VWT+Rbh2qo+W71hWrbPso=";
};
setSourceRoot = ''export sourceRoot="$(echo */src)"'';
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 74ba1866b555..ac1a2f8abd53 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -1,16 +1,14 @@
-{ lib, stdenv, fetchurl, omake, ocaml, flex, bison }:
+{ lib, stdenv, fetchFromGitHub, omake, ocaml, flex, bison }:
-let
- version = "2.1";
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "teyjus";
- inherit version;
+ version = "2.1";
- src = fetchurl {
- url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz";
- sha256 = "0393wpg8v1vvarqy2xh4fdmrwlrl6jaj960kql7cq79mb9p3m269";
+ src = fetchFromGitHub {
+ owner = "teyjus";
+ repo = "teyjus";
+ rev = "v${version}";
+ sha256 = "sha256-nz7jZ+GdF6mZQPzBrVD9K/RtoeuVRuhfs7vej4zDkhg=";
};
patches = [ ./fix-lex-to-flex.patch ];
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 1412985a247e..f8fe2a46cc70 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }:
+{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }:
stdenv.mkDerivation rec {
pname = "bats";
version = "1.5.0";
- src = fetchzip {
- url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
- hash = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk=";
+ src = fetchFromGitHub {
+ owner = "bats-core";
+ repo = "bats-core";
+ rev = "v${version}";
+ sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix
index 65653701b806..0bb95ed6ea52 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/pkgs/development/interpreters/lolcode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, doxygen, cmake, readline }:
with lib;
stdenv.mkDerivation rec {
@@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
pname = "lolcode";
version = "0.11.2";
- src = fetchurl {
- url = "https://github.com/justinmeza/lci/archive/v${version}.tar.gz";
- sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
+ src = fetchFromGitHub {
+ owner = "justinmeza";
+ repo = "lci";
+ rev = "v${version}";
+ sha256 = "sha256-VMBW3/sw+1kI6iuOckSPU1TIeY6QORcSfFLFkRYw3Gs=";
};
nativeBuildInputs = [ pkg-config cmake doxygen ];
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 45c34b53cd77..cba1d0ba4c59 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "p8-platform";
version = "2.1.0.1";
- src = fetchurl {
- url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
- sha256 = "18381y54f7d18ckpzf9cfxbz1ws6imprbbm9pvhcg5c86ln8skq6";
+ src = fetchFromGitHub {
+ owner = "Pulse-Eight";
+ repo = "platform";
+ rev = "p8-platform-${version}";
+ sha256 = "sha256-zAI/AOLJAunv+cCQ6bOXrgkW+wl5frj3ktzx2cDeCCk=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 3c1d1e890207..067eba793f7f 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libite";
- version = "2.4.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "troglobit";
repo = "libite";
rev = "v${version}";
- sha256 = "sha256-EV1YVOxd92z2hBZIqe6jzYV06YfNTAbZntZQdH05lBI=";
+ sha256 = "sha256-G9X0ZMyasS9praogWnLDU1LeTvK4fYPgJ89o2y3AIJI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index eb23e16d653a..3993b3f73e1f 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
, pkg-config
-, libxml2, findXMLCatalogs, gettext, python3, libgcrypt
+, libxml2, findXMLCatalogs, gettext, python, libgcrypt
, cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2.dev ]
++ lib.optional stdenv.isDarwin gettext
- ++ lib.optionals pythonSupport [ libxml2.py python3 ]
+ ++ lib.optionals pythonSupport [ libxml2.py python ]
++ lib.optionals cryptoSupport [ libgcrypt ];
propagatedBuildInputs = [ findXMLCatalogs ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"--without-debug"
"--without-mem-debug"
"--without-debugger"
- ] ++ lib.optional pythonSupport "--with-python=${python3}"
+ ] ++ lib.optional pythonSupport "--with-python=${python}"
++ lib.optional (!cryptoSupport) "--without-crypto";
postFixup = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'' + lib.optionalString pythonSupport ''
mkdir -p $py/nix-support
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
- moveToOutput ${python3.libPrefix} "$py"
+ moveToOutput ${python.libPrefix} "$py"
'';
passthru = {
diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix
new file mode 100644
index 000000000000..6a07371261ae
--- /dev/null
+++ b/pkgs/development/libraries/libyang/default.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+
+# build time
+, cmake
+, pkg-config
+
+# run time
+, pcre2
+
+# update script
+, genericUpdater
+, common-updater-scripts
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libyang";
+ version = "2.0.112";
+
+ src = fetchFromGitHub {
+ owner = "CESNET";
+ repo = "libyang";
+ rev = "v${version}";
+ sha256 = "sha256-f8x0tC3XcQ9fnUE987GYw8qEo/B+J759vpCImqG3QWs=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ pcre2
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ "-DCMAKE_BUILD_TYPE:String=Release"
+ ];
+
+ passthru.updateScript = genericUpdater {
+ inherit pname version;
+ versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
+ rev-prefix = "v";
+ };
+
+ meta = with lib; {
+ description = "YANG data modelling language parser and toolkit";
+ longDescription = ''
+ libyang is a YANG data modelling language parser and toolkit written (and
+ providing API) in C. The library is used e.g. in libnetconf2, Netopeer2,
+ sysrepo or FRRouting projects.
+ '';
+ homepage = "https://github.com/CESNET/libyang";
+ license = with licenses; [ bsd3 ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ woffs ];
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mustache.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mustache.nix
new file mode 100644
index 000000000000..1e22ad9dad08
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mustache.nix
@@ -0,0 +1,26 @@
+/* Generated file. */
+args @ { fetchurl, ... }:
+rec {
+ baseName = "cl-mustache";
+ version = "20200325-git";
+
+ description = "Mustache Template Renderer";
+
+ deps = [ args."uiop" ];
+
+ src = fetchurl {
+ url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz";
+ sha256 = "1x1rsmgqc39imx4ay3b35dzvzccaqjayz90qv2cylqbbq9sg9arr";
+ };
+
+ packageName = "cl-mustache";
+
+ asdFilesToKeep = ["cl-mustache.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-mustache DESCRIPTION Mustache Template Renderer SHA256
+ 1x1rsmgqc39imx4ay3b35dzvzccaqjayz90qv2cylqbbq9sg9arr URL
+ http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz
+ MD5 52381d17458d88d6a8b760f351bf517d NAME cl-mustache FILENAME cl-mustache
+ DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION 20200325-git
+ SIBLINGS (cl-mustache-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3d67721f7f35..51e4627cb8e6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -60,6 +60,7 @@ cl-l10n
cl-libuv
cl-locale
cl-markup
+cl-mustache
cl-mysql
cl-paths-ttf
cl-pattern
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 1040c2e51e27..018cba19c031 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -4312,6 +4312,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-mustache" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-mustache" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-mustache.nix {
+ inherit fetchurl;
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
"cl-markup" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-markup" or (x: {}))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 3824a04826f1..4a82b6cafa6f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -44,7 +44,7 @@
(wrap :ql-dist short-description)
(defun escape-filename (s)
- (format
+ (format
nil "~a~{~a~}"
(if (scan "^[a-zA-Z_]" s) "" "_")
(loop
@@ -260,9 +260,10 @@ This function stores results for memoization purposes in files within
(defun print-usage-and-quit ()
"Does what it says on the tin."
(format *error-output* "Usage:
- ~A [--help] [--cacheSystemInfoDir ]
+ ~A [--help] [--cacheSystemInfoDir ] [--cacheFaslDir ]
Arguments:
--cacheSystemInfoDir Store computed system info in the given directory
+ --cacheFaslDir Store intermediate fast load files in the given directory
--help Print usage and exit
Path to directory with quicklisp-to-nix-systems.txt
" (uiop:argv0))
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 2e7c6fc38cc3..7f40453a6f74 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -314,7 +314,7 @@ let
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
- sha512 = "sha512-pzgc95msPLcCHqOli7Hnabu/GRfSGSUWl5s2P6N13T/rgMB+NNeKbxCmzQiZT2yLOeLEPivV6YrW1oeQIwJxcg==";
+ sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g==";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \
diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix
index 2df17844d1a0..1ba21af864bb 100644
--- a/pkgs/development/ocaml-modules/lwt/ppx.nix
+++ b/pkgs/development/ocaml-modules/lwt/ppx.nix
@@ -1,4 +1,4 @@
-{ fetchzip, buildDunePackage, lwt, ppxlib }:
+{ fetchFromGitHub, buildDunePackage, lwt, ppxlib }:
buildDunePackage {
pname = "lwt_ppx";
@@ -8,16 +8,18 @@ buildDunePackage {
minimumOCamlVersion = "4.04";
- src = fetchzip {
- # `lwt_ppx` has a different release cycle than Lwt, but it's included in
- # one of its release bundles.
- # Because there could exist an Lwt release _without_ a `lwt_ppx` release,
- # this `src` field doesn't inherit from the Lwt derivation.
- #
- # This is particularly useful for overriding Lwt without breaking `lwt_ppx`,
- # as new Lwt releases may contain broken `lwt_ppx` code.
- url = "https://github.com/ocsigen/lwt/archive/5.4.0.tar.gz";
- sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d";
+ # `lwt_ppx` has a different release cycle than Lwt, but it's included in
+ # one of its release bundles.
+ # Because there could exist an Lwt release _without_ a `lwt_ppx` release,
+ # this `src` field doesn't inherit from the Lwt derivation.
+ #
+ # This is particularly useful for overriding Lwt without breaking `lwt_ppx`,
+ # as new Lwt releases may contain broken `lwt_ppx` code.
+ src = fetchFromGitHub {
+ owner = "ocsigen";
+ repo = "lwt";
+ rev = "5.4.0";
+ sha256 = "sha256-rRivROVbQbXkHWen1n8+9AwrRJaOK0Fhyilw29T7was=";
};
propagatedBuildInputs = [ lwt ppxlib ];
diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index cc77a731f020..4ec160a92230 100644
--- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, camlp4 }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4 }:
if !lib.versionAtLeast ocaml.version "4.00"
|| lib.versionAtLeast ocaml.version "4.03"
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
pname = "ocaml-type_conv";
version = "109.60.01";
- src = fetchurl {
- url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz";
- sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx";
+ src = fetchFromGitHub {
+ owner = "janestreet";
+ repo = "type_conv";
+ rev = version;
+ sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs=";
};
buildInputs = [ ocaml findlib camlp4 ];
diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index c71bfa00e7ef..e90ca2d16a64 100644
--- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildOcaml}:
+{ lib, fetchFromGitHub, buildOcaml}:
buildOcaml rec {
minimumSupportedOcamlVersion = "4.02";
@@ -6,9 +6,11 @@ buildOcaml rec {
pname = "type_conv";
version = "113.00.02";
- src = fetchurl {
- url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz";
- sha256 = "1718yl2q8zandrs4xqffkfmssfld1iz62dzcqdm925735c1x01fk";
+ src = fetchFromGitHub {
+ owner = "janestreet";
+ repo = "type_conv";
+ rev = version;
+ sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU=";
};
meta = {
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index e0ebf564163f..52d4ecdc3b71 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -2,55 +2,51 @@
, stdenv
, buildPythonPackage
, fetchPypi
-, setuptools-scm
-, pytestCheckHook
+, gevent
, pytest-asyncio
, pytest-tornado
-, sqlalchemy
+, pytestCheckHook
+, pythonOlder
+, pytz
+, setuptools
+, setuptools-scm
+, six
, tornado
, twisted
-, mock
-, gevent
-, six
-, pytz
, tzlocal
-, funcsigs
-, setuptools
-, pythonOlder
}:
buildPythonPackage rec {
- pname = "APScheduler";
+ pname = "apscheduler";
version = "3.8.1";
+ format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
- inherit pname version;
- sha256 = "5cf344ebcfbdaa48ae178c029c055cec7bc7a4a47c21e315e4d1f08bd35f2355";
+ pname = "APScheduler";
+ inherit version;
+ hash = "sha256-XPNE68+9qkiuF4wCnAVc7HvHpKR8IeMV5NHwi9NfI1U=";
};
buildInputs = [
setuptools-scm
];
+ propagatedBuildInputs = [
+ pytz
+ setuptools
+ six
+ tzlocal
+ ];
+
checkInputs = [
+ gevent
pytest-asyncio
pytest-tornado
pytestCheckHook
- sqlalchemy
tornado
twisted
- mock
- gevent
- ];
-
- propagatedBuildInputs = [
- six
- pytz
- tzlocal
- funcsigs
- setuptools
];
postPatch = ''
@@ -60,15 +56,21 @@ buildPythonPackage rec {
disabledTests = [
"test_broken_pool"
+ # gevent tests have issue on newer Python releases
+ "test_add_live_job"
+ "test_add_pending_job"
+ "test_shutdown"
] ++ lib.optionals stdenv.isDarwin [
"test_submit_job"
"test_max_instances"
];
- pythonImportsCheck = [ "apscheduler" ];
+ pythonImportsCheck = [
+ "apscheduler"
+ ];
meta = with lib; {
- description = "A Python library that lets you schedule your Python code to be executed";
+ description = "Library that lets you schedule your Python code to be executed";
homepage = "https://github.com/agronholm/apscheduler";
license = licenses.mit;
maintainers = with maintainers; [ ];
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index bc71e3721288..907cf155ea10 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -7,6 +7,7 @@
, libusb1
, mock
, pyasn1
+, pythonAtLeast
, pycryptodome
, pytestCheckHook
, rsa
@@ -15,15 +16,15 @@
buildPythonPackage rec {
pname = "adb-shell";
version = "0.4.2";
+ format = "setuptools";
disabled = !isPy3k;
- # pypi does not contain tests, using github sources instead
src = fetchFromGitHub {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
- sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
+ hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
};
propagatedBuildInputs = [
@@ -40,7 +41,16 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "adb_shell" ];
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # Tests are failing with Python 3.10
+ # https://github.com/JeffLIrion/adb_shell/issues/198
+ "TestAdbDeviceAsync"
+ "TestTcpTransportAsync"
+ ];
+
+ pythonImportsCheck = [
+ "adb_shell"
+ ];
meta = with lib; {
description = "Python implementation of ADB with shell and FileSync functionality";
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index ddcd11d4eebd..bc6954900ae2 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -4,21 +4,21 @@
, pythonOlder
, pygments
, pytestCheckHook
-, pytest-cov
, uvloop
}:
buildPythonPackage rec {
pname = "aiorun";
- version = "2021.8.1";
+ version = "2021.10.1";
format = "flit";
+
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "cjrh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-aehYPZ1+GEO+bNSsE5vVgjtVo4MRMH+vNurk+bJ1/Io=";
+ hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8=";
};
propagatedBuildInputs = [
@@ -27,7 +27,6 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytest-cov
uvloop
];
@@ -36,7 +35,9 @@ buildPythonPackage rec {
export HOME=$TMPDIR
'';
- pythonImportsCheck = [ "aiorun" ];
+ pythonImportsCheck = [
+ "aiorun"
+ ];
meta = with lib; {
description = "Boilerplate for asyncio applications";
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index c666d89b2bfa..2fe6fe08ef18 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -13,12 +13,13 @@
, colorlog
, croniter
, cryptography
+, dataclasses
, dill
, flask
-, flask-appbuilder
-, flask-caching
, flask_login
, flask_wtf
+, flask-appbuilder
+, flask-caching
, GitPython
, graphviz
, gunicorn
@@ -47,6 +48,7 @@
, python-nvd3
, python-slugify
, python3-openid
+, pythonOlder
, pyyaml
, rich
, setproctitle
@@ -63,7 +65,6 @@
, mkYarnPackage
}:
let
-
version = "2.1.4";
airflow-src = fetchFromGitHub rec {
@@ -107,6 +108,8 @@ buildPythonPackage rec {
inherit version;
src = airflow-src;
+ disabled = pythonOlder "3.6";
+
propagatedBuildInputs = [
alembic
argcomplete
@@ -130,7 +133,6 @@ buildPythonPackage rec {
httpx
iso8601
importlib-resources
- importlib-metadata
inflection
itsdangerous
jinja2
@@ -163,6 +165,10 @@ buildPythonPackage rec {
termcolor
unicodecsv
werkzeug
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ dataclasses
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ importlib-metadata
];
buildInputs = [
@@ -178,24 +184,22 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.cfg \
- --replace "importlib_resources~=1.4" "importlib_resources" \
- --replace "importlib_metadata~=1.7" "importlib_metadata" \
- --replace "tenacity~=6.2.0" "tenacity" \
- --replace "pyjwt<2" "pyjwt" \
- --replace "flask>=1.1.0, <2.0" "flask" \
- --replace "flask-login>=0.3, <0.5" "flask-login" \
- --replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
- --replace "jinja2>=2.10.1, <2.12.0" "jinja2" \
--replace "attrs>=20.0, <21.0" "attrs" \
--replace "cattrs~=1.1, <1.7.0" "cattrs" \
- --replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
+ --replace "colorlog>=4.0.2, <6.0" "colorlog" \
+ --replace "croniter>=0.3.17, <1.1" "croniter" \
--replace "docutils<0.17" "docutils" \
- --replace "sqlalchemy>=1.3.18, <1.4" "sqlalchemy" \
- --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
- --replace "werkzeug~=1.0, >=1.0.1" "werkzeug" \
+ --replace "flask-login>=0.3, <0.5" "flask-login" \
+ --replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
+ --replace "flask>=1.1.0, <2.0" "flask" \
+ --replace "importlib_resources~=1.4" "importlib_resources" \
--replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" \
+ --replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
+ --replace "pyjwt<2" "pyjwt" \
--replace "python-slugify>=3.0.0,<5.0" "python-slugify" \
- --replace "colorlog>=4.0.2, <6.0" "colorlog"
+ --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
+ --replace "tenacity~=6.2.0" "tenacity" \
+ --replace "werkzeug~=1.0, >=1.0.1" "werkzeug"
substituteInPlace tests/core/test_core.py \
--replace "/bin/bash" "${stdenv.shell}"
@@ -205,19 +209,21 @@ buildPythonPackage rec {
--replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"
'';
- # allow for gunicorn processes to have access to python packages
- makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ];
+ # allow for gunicorn processes to have access to Python packages
+ makeWrapperArgs = [
+ "--prefix PYTHONPATH : $PYTHONPATH"
+ ];
preCheck = ''
- export HOME=$(mktemp -d)
- export AIRFLOW_HOME=$HOME
- export AIRFLOW__CORE__UNIT_TEST_MODE=True
- export AIRFLOW_DB="$HOME/airflow.db"
- export PATH=$PATH:$out/bin
+ export HOME=$(mktemp -d)
+ export AIRFLOW_HOME=$HOME
+ export AIRFLOW__CORE__UNIT_TEST_MODE=True
+ export AIRFLOW_DB="$HOME/airflow.db"
+ export PATH=$PATH:$out/bin
- airflow version
- airflow db init
- airflow db reset -y
+ airflow version
+ airflow db init
+ airflow db reset -y
'';
pytestFlagsArray = [
@@ -225,7 +231,7 @@ buildPythonPackage rec {
];
disabledTests = lib.optionals stdenv.isDarwin [
- "bash_operator_kill" # psutil.AccessDenied
+ "bash_operator_kill" # psutil.AccessDenied
];
postInstall = ''
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 79aca1e4a99f..f02bef97ba34 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,16 +1,18 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPyPy
, pytestCheckHook
, case
, psutil
+, pythonOlder
}:
buildPythonPackage rec {
pname = "billiard";
version = "3.6.4.0";
- disabled = isPyPy;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -23,9 +25,14 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportsCheck = [
+ "billiard"
+ ];
+
meta = with lib; {
- homepage = "https://github.com/celery/billiard";
description = "Python multiprocessing fork with improvements and bugfixes";
+ homepage = "https://github.com/celery/billiard";
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix
index 3f95d9e22afc..36efc1aab3bc 100644
--- a/pkgs/development/python-modules/case/default.nix
+++ b/pkgs/development/python-modules/case/default.nix
@@ -1,20 +1,40 @@
-{ lib, buildPythonPackage, fetchPypi
-, six, nose, unittest2, mock }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pythonOlder
+, pytestCheckHook
+, six
+}:
buildPythonPackage rec {
pname = "case";
version = "1.5.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1";
};
- propagatedBuildInputs = [ six nose unittest2 mock ];
+ propagatedBuildInputs = [
+ nose
+ six
+ ];
+
+ # No real unittests, only coverage
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "case"
+ ];
meta = with lib; {
homepage = "https://github.com/celery/case";
- description = "unittests utilities";
+ description = "Utilities for unittests handling";
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index fb5698062f77..d77554c79ab8 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -1,4 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, python, packaging, unittest2 }:
+{ lib, buildPythonPackage, fetchPypi
+, fetchpatch
+, packaging
+, python
+, pythonAtLeast
+, pythonOlder
+, unittest2
+}:
buildPythonPackage rec {
pname = "deprecation";
@@ -9,9 +16,22 @@ buildPythonPackage rec {
sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj";
};
+ patches = lib.optionals (pythonAtLeast "3.10") [
+ # fixes for python 3.10 test suite
+ (fetchpatch {
+ url = "https://github.com/briancurtin/deprecation/pull/57/commits/e13e23068cb8d653a02a434a159e8b0b7226ffd6.patch";
+ sha256 = "sha256-/5zr2V1s5ULUZnbLXsgyHxZH4m7/a27QYuqQt2Savc8=";
+ includes = [ "tests/test_deprecation.py" ];
+ })
+ ];
+
propagatedBuildInputs = [ packaging ];
- checkInputs = [ unittest2 ];
+ # avoiding mass rebuilds for python3.9, but no longer
+ # needed with patch
+ checkInputs = lib.optional (pythonOlder "3.10") [
+ unittest2
+ ];
checkPhase = ''
${python.interpreter} -m unittest discover
diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix
index d688e1e22e66..62dcc44ca593 100644
--- a/pkgs/development/python-modules/emv/default.nix
+++ b/pkgs/development/python-modules/emv/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
--replace '"enum-compat==0.0.3",' "" \
--replace '"argparse==1.4.0",' "" \
--replace "click==7.1.2" "click" \
- --replace "pyscard==2.0.0" "pyscard"
+ --replace "pyscard==2.0.0" "pyscard" \
+ --replace "terminaltables==3.1.0" "terminaltables"
'';
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix
index 2b81577af22d..fbd22a42b555 100644
--- a/pkgs/development/python-modules/enrich/default.nix
+++ b/pkgs/development/python-modules/enrich/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "enrich";
- version = "1.2.6";
+ version = "1.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Dpn/V9h/e13vDKeZF+iPuTUaoNUuIo7ji/982FgxX+Q=";
+ sha256 = "0a2ab0d2931dff8947012602d1234d2a3ee002d9a355b5d70be6bf5466008893";
};
buildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index 9d54849e92d9..3c7058c1212d 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -1,27 +1,51 @@
-{ lib, buildPythonPackage, fetchPypi, pythonAtLeast
-, flask, blinker, nose, mock, semantic-version }:
+{ lib
+, blinker
+, buildPythonPackage
+, fetchPypi
+, flask
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, semantic-version
+, werkzeug
+}:
buildPythonPackage rec {
- pname = "Flask-Login";
+ pname = "flask-login";
version = "0.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
- inherit pname version;
+ pname = "Flask-Login";
+ inherit version;
sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b";
};
- checkInputs = [ nose mock semantic-version ];
- propagatedBuildInputs = [ flask blinker ];
+ propagatedBuildInputs = [
+ flask
+ werkzeug
+ ];
- checkPhase = "nosetests -d";
+ checkInputs = [
+ blinker
+ pytestCheckHook
+ semantic-version
+ ];
- doCheck = pythonAtLeast "3.3";
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ "test_hashable"
+ ];
+
+ pythonImportsCheck = [
+ "flask_login"
+ ];
meta = with lib; {
- homepage = "https://github.com/maxcountryman/flask-login";
description = "User session management for Flask";
+ homepage = "https://github.com/maxcountryman/flask-login";
license = licenses.mit;
- platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index fc2fb2bcd5cc..058a8f4d9875 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "0.18.0";
+ version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
- sha256 = "sha256-SkEI5uWKtszSBZblDBvbEmJh0OdvqDcwY6PG3JK4djY=";
+ sha256 = "sha256-i3pNbIYISvZ681KLnxP9ZpITnkX7p0rBWjs1KidlFrM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 4497683932ce..a5da612467c1 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
- version = "2.4.2";
+ version = "2.4.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6YduKmXqgqXAqlK2cd1CkdI7nzK0Dg65E+nl6vhMAow=";
+ sha256 = "sha256-r7Ta/OumYdm+brM6UgAPTWvxODpex1Mg0Arq94tPdnM=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index 35e406b6f5cb..4603b8708c4e 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "jedi-language-server";
- version = "0.34.12";
+ version = "0.35.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "pappasam";
repo = pname;
rev = "v${version}";
- sha256 = "0v2292sn0c9bl4gsw698hpzcgm115gk4929nx726vh2139qnazqp";
+ sha256 = "sha256-+bhvWWiG0cA36oc2PFvgRTIvqnjIt5BUN82DY0tvuPo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 5613b904f63d..89b9ba1f6df0 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -17,6 +17,9 @@ buildPythonPackage rec {
};
postPatch = ''
+ # relax version constraint, https://storyboard.openstack.org/#!/story/2009723
+ substituteInPlace requirements.txt --replace 'PyYAML>=3.10.0,<6' 'PyYAML>=3.10.0'
+
export HOME=$TMPDIR
'';
diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index f9452a25b7ab..aa70a35bd079 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "coveooss";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gaholnLO5oIQaXgliuvlU2MfpjiCMgAPplOPgvMYim8=";
+ hash = "sha256-gaholnLO5oIQaXgliuvlU2MfpjiCMgAPplOPgvMYim8=";
};
nativeBuildInputs = [
@@ -54,6 +54,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ # https://github.com/coveooss/json-schema-for-humans/issues/127
+ substituteInPlace pyproject.toml \
+ --replace 'PyYAML = "^5.4.1"' 'PyYAML = "*"'
+ '';
+
disabledTests = [
# Tests require network access
"test_references_url"
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 68043f268ba5..71e9be548e5b 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "keyring";
- version = "23.4.0";
- disabled = pythonOlder "3.6";
+ version = "23.5.0";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-iPIGAkKV48b7FrsKYPtLt+wRhWKdxacp8SqnwjbQE4c=";
+ hash = "sha256-kBJQjhQagL0cC2d41cYQ3Z+MRk11rGd0JIUAUD+XL7k=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix
index 2ded1dfc1961..6e4eabeb68ab 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/pkgs/development/python-modules/opt-einsum/default.nix
@@ -1,24 +1,38 @@
-{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
version = "3.3.0";
- pname = "opt_einsum";
+ pname = "opt-einsum";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
- inherit version pname;
- sha256 = "0jb5lia0q742d1713jk33vlj41y61sf52j6pgk7pvhxvfxglgxjr";
+ pname = "opt_einsum";
+ inherit version;
+ hash = "sha256-WfZHX3e7w33PfNdIUZwOxgci6R5jyhFOaIIcDFSkZUk=";
};
- propagatedBuildInputs = [ numpy ];
+ propagatedBuildInputs = [
+ numpy
+ ];
- checkInputs = [ pytest_4 ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = ''
- pytest
- '';
+ pythonImportsCheck = [
+ "opt_einsum"
+ ];
meta = with lib; {
- description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
+ description = "Optimizing NumPy's einsum function with order optimization and GPU support";
homepage = "https://github.com/dgasmith/opt_einsum";
license = licenses.mit;
maintainers = with maintainers; [ teh ];
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index a488f15fbed8..0931cc2b28d8 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -1,46 +1,36 @@
{ lib
, fetchPypi
-, fetchpatch
, buildPythonPackage
-, isPy27
-# Python deps
, logutils
, Mako
-, six
, webtest
-# Test Inputs
+, pythonOlder
, pytestCheckHook
, genshi
, gunicorn
, jinja2
-, Kajiki
-, mock
+, six
, sqlalchemy
, virtualenv
}:
buildPythonPackage rec {
pname = "pecan";
- version = "1.4.0";
+ version = "1.4.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a";
+ sha256 = "sha256-LL0O7btXR8BM3xjEquTxxunZUPOvcK8lRLB09+16BIA=";
};
- patches = [
- (fetchpatch {
- name = "Support-SQLAlchemy-1.4x.patch";
- url = "https://github.com/pecan/pecan/commit/a520bd544c0b02a02dbf692b8d6e2f7a503ee6d4.patch";
- sha256 = "sha256-QCHRjwnpy8ndCvcuyE5Y65BybKYthJXDySUtmpJD8gY=";
- })
- ];
-
propagatedBuildInputs = [
logutils
Mako
- six
webtest
+ six
];
checkInputs = [
@@ -48,19 +38,23 @@ buildPythonPackage rec {
genshi
gunicorn
jinja2
- mock
sqlalchemy
virtualenv
- ] ++ lib.optionals isPy27 [ Kajiki ];
+ ];
pytestFlagsArray = [
- "--pyargs pecan "
+ "--pyargs pecan"
+ ];
+
+ pythonImportsCheck = [
+ "pecan"
];
meta = with lib; {
- description = "WSGI object-dispatching web framework, designed to be lean and fast";
- homepage = "https://www.pecanpy.org/";
changelog = "https://pecan.readthedocs.io/en/latest/changes.html";
+ description = "WSGI object-dispatching web framework";
+ homepage = "https://www.pecanpy.org/";
+ license = licenses.bsd3;
maintainers = with maintainers; [ applePrincess ];
};
}
diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix
index a2198c258e60..145ea83abeb8 100644
--- a/pkgs/development/python-modules/pykeyatome/default.nix
+++ b/pkgs/development/python-modules/pykeyatome/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to get data from Atome Key";
- homepage = "hhttps://github.com/jugla/pyKeyAtome";
+ homepage = "https://github.com/jugla/pyKeyAtome";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix
index d6ad5480ddd3..552d30c70f35 100644
--- a/pkgs/development/python-modules/pylaunches/default.nix
+++ b/pkgs/development/python-modules/pylaunches/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pylaunches";
- version = "1.2.0";
+ version = "1.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
- sha256 = "0mczxkwczyh9kva4xzpmnawy0hjha1fdrwj6igip9w5z1q48zs49";
+ sha256 = "sha256-WwtNgKP5YM9i7au02taOfJuKQy6DDmmBrE34EPvJYmA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index 867e42485975..96b0e08a56d9 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -10,14 +10,16 @@
}:
buildPythonPackage rec {
- pname = "Pyro4";
- version = "4.81";
+ pname = "pyro4";
+ version = "4.82";
+ format = "setuptools";
disabled = isPy27;
src = fetchPypi {
- inherit pname version;
- sha256 = "e130da06478b813173b959f7013d134865e07fbf58cc5f1a2598f99479cdac5f";
+ pname = "Pyro4";
+ inherit version;
+ hash = "sha256-UR9bCATpLdd9wzrfnJR3h+P56cWpaxIWLwVXp8TOIfs=";
};
propagatedBuildInputs = [
@@ -30,13 +32,18 @@ buildPythonPackage rec {
msgpack
];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
# add testsupport.py to PATH
preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH";
- # ignore network related tests, which fail in sandbox
- pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ];
+
+ pytestFlagsArray = [
+ # ignore network related tests, which fail in sandbox
+ "--ignore=tests/PyroTests/test_naming.py"
+ ];
disabledTests = [
"StartNSfunc"
@@ -47,6 +54,10 @@ buildPythonPackage rec {
# otherwise the tests hang the build
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [
+ "Pyro4"
+ ];
+
meta = with lib; {
description = "Distributed object middleware for Python (RPC)";
homepage = "https://github.com/irmen/Pyro4";
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index c1b3d8c4b648..da15590e5da4 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, pythonOlder
-, fetchFromGitHub
+, fetchPypi
, pyaes
, pysocks
, async-lru
@@ -11,15 +11,14 @@
buildPythonPackage rec {
pname = "pyrogram";
- version = "1.3.0";
+ version = "1.3.1";
disabled = pythonOlder "3.6";
- src = fetchFromGitHub {
- owner = "pyrogram";
- repo = "pyrogram";
- rev = "v${version}";
- sha256 = "09rxdd5bl1yby76xd3wcyrmlb4glixs637nj1w05gh2rp3gppkf8";
+ src = fetchPypi {
+ pname = "Pyrogram";
+ inherit version;
+ sha256 = "e883c001ebf2d0f5ce6805063470c92436c493eb15547923e5d437e2c13f66cd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index cf2325633fba..81fc1d5709e9 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pysma";
- version = "0.6.9";
+ version = "0.6.10";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-2ZU3UjDNo+fpnYK4WlYSu7XqkbpcK7Xz5cUKDABhwdk=";
+ sha256 = "990abf6dba3f52b98970fc95aaf484e521faa9ff28c9c19f5a6dca3fddf5840c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index 8ba191317ea0..561ec037c0a2 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python SPNEGO authentication library";
- homepage = "Python SPNEGO authentication library";
+ homepage = "https://github.com/jborean93/pyspnego";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix
index a49c958c3fcc..e40e0671bc03 100644
--- a/pkgs/development/python-modules/pytest-order/default.nix
+++ b/pkgs/development/python-modules/pytest-order/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pytest-order";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-WZeiYrMSNO67Rh+anvJGh79zICm0mYRaQ5i2nttawyE=";
+ sha256 = "sha256-Xda5KfvX6qbQ7gdYb2XGI7q7Cv5ytIQ8XxUFXWs7Gx8=";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 9df9bf8a593b..074e5699e3d5 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -3,16 +3,21 @@
, fetchPypi
, docutils
, lockfile
-, mock
-, pytest_4
+, pytestCheckHook
, testscenarios
, testtools
, twine
+, python
+, pythonOlder
+, fetchpatch
}:
buildPythonPackage rec {
pname = "python-daemon";
version = "2.3.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -29,22 +34,39 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest_4
- mock
+ pytestCheckHook
testscenarios
testtools
];
- # tests disabled due to incompatibilities with testtools>=2.5.0
- checkPhase = ''
- runHook preCheck
- pytest -k ' \
- not detaches_process_context and \
- not standard_stream_file_descriptors and \
- not test_module_has_attribute and \
- not test_module_attribute_has_duck_type'
- runHook postCheck
- '';
+ patches = [
+ # Should be fixed in the next release
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/python-daemon-safe_hasattr.patch";
+ sha256 = "sha256-p5epAlM/sdel01oZkSI1vahUZYX8r90WCJuvBnfMaus=";
+ })
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/tests-remove-duplicate-mocking.patch";
+ sha256 = "sha256-5b/dFR3Z8xaPw8AZU95apDZd4ZfmMQhAmavWkVaJog8=";
+ })
+ ];
+
+ disabledTests = [
+ "begin_with_TestCase"
+ "changelog_TestCase"
+ "ChangeLogEntry"
+ "DaemonContext"
+ "file_descriptor"
+ "get_distribution_version_info_TestCase"
+ "InvalidFormatError_TestCase"
+ "make_year_range_TestCase"
+ "ModuleExceptions_TestCase"
+ "test_metaclass_not_called"
+ "test_passes_specified_object"
+ "test_returns_expected"
+ "value_TestCase"
+ "YearRange_TestCase"
+ ];
pythonImportsCheck = [
"daemon"
@@ -56,10 +78,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to implement a well-behaved Unix daemon process";
homepage = "https://pagure.io/python-daemon/";
- license = with licenses; [
- gpl3Plus
- asl20
- ];
+ # See "Copying" section in https://pagure.io/python-daemon/blob/main/f/README
+ license = with licenses; [ gpl3Plus asl20 ];
maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index db79870ad591..02faf4db4d63 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, mock
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
@@ -10,6 +11,8 @@ buildPythonPackage rec {
version = "3.3.4";
format = "setuptools";
+ disabled = pythonOlder "3.8";
+
src = fetchFromGitHub {
owner = "sendgrid";
repo = "python-http-client";
@@ -22,6 +25,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ # Test is failing as the test is dynamic
+ # https://github.com/sendgrid/python-http-client/issues/153
+ "test__daterange"
+ ];
+
pythonImportsCheck = [
"python_http_client"
];
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index 7941bb537183..e819cd24e99d 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -1,16 +1,30 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder
-# runtime dependencies
-, pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata
-# test suite dependencies
-, nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy
-# additional runtime dependencies are required on Python 2.x
-, pyopenssl, ndg-httpsclient, pyasn1
+{ lib
+, buildPythonPackage
+, factory_boy
+, faker
+, fetchPypi
+, httpretty
+, importlib-metadata
+, inflection
+, jsondate
+, mock
+, more-itertools
+, numpy
+, pandas
+, parameterized
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, requests
+, six
}:
buildPythonPackage rec {
pname = "quandl";
version = "3.7.0";
- disabled = !isPy3k;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
@@ -18,18 +32,6 @@ buildPythonPackage rec {
sha256 = "6e0b82fbc7861610b3577c5397277c4220e065eee0fed4e46cd6b6021655b64c";
};
- checkInputs = [
- nose
- unittest2
- flake8
- httpretty
- mock
- jsondate
- parameterized
- faker
- factory_boy
- ];
-
propagatedBuildInputs = [
pandas
numpy
@@ -38,15 +40,23 @@ buildPythonPackage rec {
python-dateutil
six
more-itertools
- ] ++ lib.optionals (!isPy3k) [
- pyopenssl
- ndg-httpsclient
- pyasn1
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
- pythonImportsCheck = [ "quandl" ];
+ checkInputs = [
+ factory_boy
+ faker
+ httpretty
+ jsondate
+ mock
+ parameterized
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "quandl"
+ ];
meta = with lib; {
description = "Quandl Python client library";
diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index e56aed2aeb7c..61a2f1e75605 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -3,11 +3,15 @@
, fetchFromGitHub
, plumbum
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "rpyc";
version = "5.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tomerfiliba";
@@ -16,17 +20,27 @@ buildPythonPackage rec {
sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1";
};
- propagatedBuildInputs = [ plumbum ];
+ propagatedBuildInputs = [
+ plumbum
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- # Disable tests that requires network access
disabledTests = [
+ # Disable tests that requires network access
"test_api"
"test_pruning"
"test_rpyc"
+ # Test is outdated
+ # ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997)
+ "test_ssl_conenction"
+ ];
+
+ pythonImportsCheck = [
+ "rpyc"
];
- pythonImportsCheck = [ "rpyc" ];
meta = with lib; {
description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index cb4578671b98..a86b51c005ba 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,30 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytest-cov
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "semver";
version = "2.13.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-semver";
repo = "python-semver";
rev = version;
- sha256 = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
+ hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
};
checkInputs = [
- pytest-cov
pytestCheckHook
];
- # Confuses source vs dist imports in pytest
- preCheck = "rm -r dist";
+ postPatch = ''
+ sed -i "/--cov/d" setup.cfg
+ sed -i "/--no-cov-on-fail/d" setup.cfg
+ '';
- pythonImportsCheck = [ "semver" ];
+ preCheck = ''
+ # Confuses source vs dist imports in pytest
+ rm -r dist
+ '';
+
+ disabledTestPaths = [
+ # Don't test the documentation
+ "docs/*.rst"
+ ];
+
+ pythonImportsCheck = [
+ "semver"
+ ];
meta = with lib; {
description = "Python package to work with Semantic Versioning (http://semver.org/)";
diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index d46fc14cdf67..7114f0aeba48 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -1,28 +1,40 @@
{ lib
, buildPythonApplication
, fetchPypi
-, pytest
-, nose
+, pytestCheckHook
+, pythonOlder
}:
buildPythonApplication rec {
pname = "sybil";
version = "2.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524";
};
- checkInputs = [ pytest nose ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = ''
- py.test tests
- '';
+ disabledTests = [
+ # Will be fixed with 3.0.0, https://github.com/simplistix/sybil/pull/27
+ "test_future_imports"
+ "test_pytest"
+ ];
+
+ pythonImportsCheck = [
+ "sybil"
+ ];
meta = with lib; {
description = "Automated testing for the examples in your documentation";
homepage = "https://github.com/cjw296/sybil";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 6a0e68855673..21498135916d 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.27.5";
+ version = "2.27.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-pn3BqFEjErjLifO6lfmg5p7zQ2rnfJvU8yjNiPF63aI=";
+ sha256 = "sha256-Xg3Ggem/rbXB0X9j0p9tE9Ke8ol9MMuceShbNKFlX9c=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 56929f16c477..8b9d0c23e1e8 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.168.0";
+ version = "0.169.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
- sha256 = "sha256:0bd5xja547gwjh7zn26l52mssp6l9djd0lfc581zj30yx07aimi5";
+ sha256 = "sha256-QyY0Tb6FalPkWvVGegY6VBqX0pBP15GQgIKLNLPUMYk=";
};
installPhase = ''
diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index a0d0ced824d8..9b79def7d7af 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloud-nuke";
- version = "0.7.1";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gW7uunW7gE/5umBQNjx+k2FIAryKka7yLMqnd6ewv6I=";
+ sha256 = "sha256-rAyS9S7kZzc9BBciI3aK3PyMmjP2LRQz9H6mMLQt34I=";
};
- vendorSha256 = "sha256-GDXkrrE0KgFJHXCDZH83/nQAexKhmGed/QGZ1aSXnpg=";
+ vendorSha256 = "sha256-ZKv68j/4X48c6ipf4Ei4UnVPn7435wI2igQ9UjM2yOM=";
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index ae5e97cd574b..a1d1453cb104 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "conftest";
- version = "0.28.3";
+ version = "0.30.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
- sha256 = "sha256-qUbrd80As5BrP67bk8aXWAq85UKL1de5sJlPQtBuxn4=";
+ sha256 = "sha256-8/eZz5ejw5bahCYwz825HI+oZ6D1odeTpMIJh0TcGMY=";
};
- vendorSha256 = "sha256-cEa2IB65CWsWXZnVRZmOOvUyOhybHBssQGt/pP7YPcg=";
+ vendorSha256 = "sha256-rYWo0t6iUI6DVsjHJg2fUv2tv3jovndi12prKzLaMlI=";
ldflags = [
"-s"
diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index 77d5eb006b10..eee49d1c6fcc 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -10,19 +10,19 @@
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
- version = "3.7.0";
+ version = "3.8.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
- sha256 = "sha256-00WAN4GFchZVsL1Vf1bPXF3/pmqygs3T8XrCMtGimfg=";
+ sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
- cargoSha256 = "sha256-w4n61gNEWdfiIMDQ82lFxnE4o4liS5z3tx3OZCcT1kI=";
+ cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix
index 3531926e4bc4..487edcde9980 100644
--- a/pkgs/development/tools/github/bump/default.nix
+++ b/pkgs/development/tools/github/bump/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bump";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "mroth";
repo = pname;
rev = "v${version}";
- sha256 = "0092jn7nxnr64fyb2yy9amrd8gl7q9p70a2yq9jrgr1pyrlrazbq";
+ sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8=";
};
- vendorSha256 = "0w5sqg1ii4vp7iijs6ffbskkj2xqggbr40j6wxrjrbjr1qisl8r1";
+ vendorSha256 = "sha256-2x5rQGEp6ARP2nggE+tvXDRY7AkKCEUXTLEPWDJMCnI=";
doCheck = false;
diff --git a/pkgs/development/tools/literate-programming/md-tangle/default.nix b/pkgs/development/tools/literate-programming/md-tangle/default.nix
new file mode 100644
index 000000000000..fd895c96c047
--- /dev/null
+++ b/pkgs/development/tools/literate-programming/md-tangle/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonPackage rec {
+ pname = "md-tangle";
+ version = "1.3.1";
+
+ # By some strange reason, fetchPypi fails miserably
+ src = fetchFromGitHub {
+ owner = "joakimmj";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-cUME2AHK/Fva+1TSTE6hNu0SE/V1FOwcSxWF0+iZhS4=";
+ };
+
+ # Pure Python application, uses only standard modules and comes without
+ # testing suite
+ doCheck = false;
+
+ meta = with lib;{
+ homepage = "https://github.com/joakimmj/md-tangle/";
+ description = "Generates (\"tangles\") source code from Markdown documents";
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix
index 8cfebb34861e..1615c798286c 100644
--- a/pkgs/development/tools/mani/default.nix
+++ b/pkgs/development/tools/mani/default.nix
@@ -2,19 +2,21 @@
buildGoModule rec {
pname = "mani";
- version = "0.10.0";
+ version = "0.11.1";
src = fetchFromGitHub {
owner = "alajmo";
repo = "mani";
rev = "v${version}";
- sha256 = "sha256-9rcgPeYFHdIN73K0zGPEHqFFLFkVYkNYRXJ+0/Zo4zI=";
+ sha256 = "sha256-9SvjgXQADDNyv8O9KKE3gKXu67Nz5LepayUXSbWwEoY=";
};
- vendorSha256 = "sha256-ZivzDfjx2djzS0Xm3GISK3zpB5fUUMgy2o4Ti1Z9wMM=";
+ vendorSha256 = "sha256-cuAZN08A2nND9d4c9w+kTqiMB9yaJ49Q0aT/V0J9FRw=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
+ ldflags = [ "-s" "-w" "-X github.com/alajmo/mani/cmd.version=${version}" ];
+
postInstall = ''
installShellCompletion --cmd mani \
--bash <($out/bin/mani completion bash) \
diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix
index fd626acd16b4..de928d35fa0e 100644
--- a/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
- version = "0.25.0";
+ version = "0.25.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iOSH7eFLsp31mW5ZsTUcJVPE1OBEXPLsoVYroYjwXtk=";
+ sha256 = "sha256-dFmXROqh1HYPthzmOE07oyZglaQyx7JqxqYDlLpysrM=";
};
- vendorSha256 = "sha256-s6urF9uZ9o8kkKfbRk22JuIv+f3ZlVAFR9c1vylhhoY=";
+ vendorSha256 = "sha256-5g/s8WDzxobORFY12YdDQ6rDmr9gQzViv1FFrVwrVIE=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index b56cd98da637..9495e331bd13 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -27,7 +27,8 @@ let
# to update:
# 1) change all these hashes
# 2) nix-build -A tree-sitter.updater.update-all-grammars
- # 3) run the ./result script that is output by that (it updates ./grammars)
+ # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit
+ # 4) run the ./result script that is output by that (it updates ./grammars)
version = "0.20.1";
sha256 = "sha256-JKbL05hFWI0jhAnRT9D0SWCoRPFqoMD4+LQQ1zyWc7g=";
cargoSha256 = "sha256-64O+3GrDqhRGth20B2/+jNDYSnwvT3SqYVqYNthiCB0=";
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 58d420fe4028..19d29f4eaa10 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -360,9 +360,15 @@ let
# generic bash script to find the latest github release for a repo
latestGithubRelease = { orga, repo }: writeShellScript "latest-github-release" ''
set -euo pipefail
- res=$(${curl}/bin/curl \
- --silent \
- "https://api.github.com/repos/${urlEscape orga}/${urlEscape repo}/releases/latest")
+
+ args=( '--silent' )
+ if [ -n "$GITHUB_TOKEN" ]; then
+ args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" )
+ fi
+ args+=( "https://api.github.com/repos/${urlEscape orga}/${urlEscape repo}/releases/latest" )
+
+ res=$(${curl}/bin/curl "''${args[@]}")
+
if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then
echo "rate limited" >&2
fi
@@ -378,9 +384,14 @@ let
# find the latest repos of a github organization
latestGithubRepos = { orga }: writeShellScript "latest-github-repos" ''
set -euo pipefail
- res=$(${curl}/bin/curl \
- --silent \
- 'https://api.github.com/orgs/${urlEscape orga}/repos?per_page=100')
+
+ args=( '--silent' )
+ if [ -n "$GITHUB_TOKEN" ]; then
+ args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" )
+ fi
+ args+=( 'https://api.github.com/orgs/${urlEscape orga}/repos?per_page=100' )
+
+ res=$(${curl}/bin/curl "''${args[@]}")
if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then
echo "rate limited" >&2 #
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 07e0063d6c5b..c9b70c83bfee 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
- version = "1.24.1";
+ version = "1.26.0";
inherit (poetryLib) isCompatible readTOML moduleName;
@@ -122,10 +122,10 @@ lib.makeScope pkgs.newScope (self: {
# Example: { my-app = ./src; }
, editablePackageSources ? { }
, __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping
+ , pyProject ? readTOML pyproject
}@attrs:
let
poetryPkg = poetry.override { inherit python; };
- pyProject = readTOML pyproject;
scripts = pyProject.tool.poetry.scripts or { };
hasScripts = scripts != { };
@@ -133,9 +133,11 @@ lib.makeScope pkgs.newScope (self: {
inherit python scripts;
};
- hasEditable = editablePackageSources != { };
+ editablePackageSources' = lib.filterAttrs (name: path: path != null) editablePackageSources;
+ hasEditable = editablePackageSources' != { };
editablePackage = self.mkPoetryEditablePackage {
- inherit pyProject python editablePackageSources;
+ inherit pyProject python;
+ editablePackageSources = editablePackageSources';
};
poetryLock = readTOML poetrylock;
@@ -190,7 +192,10 @@ lib.makeScope pkgs.newScope (self: {
(lib.reverseList compatible)
);
in
- lockPkgs;
+ lockPkgs // {
+ # Create a dummy null package for the current project in case any dependencies depend on the root project (issue #307)
+ ${pyProject.tool.poetry.name} = null;
+ };
overlays = builtins.map
getFunctorFn
(
@@ -264,14 +269,34 @@ lib.makeScope pkgs.newScope (self: {
, extraPackages ? ps: [ ]
}:
let
+ inherit (lib) elem hasAttr;
+
+ pyProject = readTOML pyproject;
+
+ # Automatically add dependencies with develop = true as editable packages, but only if path dependencies
+ getEditableDeps = set: lib.mapAttrs
+ (name: value: projectDir + "/${value.path}")
+ (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set);
+
+ editablePackageSources' = (
+ (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))
+ // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))
+ // editablePackageSources
+ );
+
poetryPython = self.mkPoetryPackages {
- inherit pyproject poetrylock overrides python pwd preferWheels editablePackageSources;
+ inherit pyproject poetrylock overrides python pwd preferWheels pyProject;
+ editablePackageSources = editablePackageSources';
};
inherit (poetryPython) poetryPackages;
+ # Don't add editable sources to the environment since they will sometimes fail to build and are not useful in the development env
+ editableAttrs = lib.attrNames editablePackageSources';
+ envPkgs = builtins.filter (drv: ! lib.elem (drv.pname or drv.name or "") editableAttrs) poetryPackages;
+
in
- poetryPython.python.withPackages (ps: poetryPackages ++ (extraPackages ps));
+ poetryPython.python.withPackages (ps: envPkgs ++ (extraPackages ps));
/* Creates a Python application from pyproject.toml and poetry.lock
@@ -282,7 +307,10 @@ lib.makeScope pkgs.newScope (self: {
*/
mkPoetryApplication =
{ projectDir ? null
- , src ? self.cleanPythonSources { src = projectDir; }
+ , src ? (
+ # Assume that a project which is the result of a derivation is already adequately filtered
+ if lib.isDerivation projectDir then projectDir else self.cleanPythonSources { src = projectDir; }
+ )
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? self.defaultPoetryOverrides
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py
index d59c3a7763ac..8858b64ec3ee 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py
@@ -63,30 +63,36 @@ context.verify_mode = ssl.CERT_NONE
req = urllib.request.Request(index_url)
if username and password:
import base64
- password_b64 = base64.b64encode(bytes(f"{username}:{password}", "utf-8")).decode("utf-8")
- req.add_header("Authorization", f"Basic {password_b64}")
-response = urllib.request.urlopen(
- req,
- context=context)
+
+ password_b64 = base64.b64encode(":".join((username, password)).encode()).decode(
+ "utf-8"
+ )
+ req.add_header("Authorization", "Basic {}".format(password_b64))
+response = urllib.request.urlopen(req, context=context)
index = response.read()
parser = Pep503()
parser.feed(str(index))
if package_filename not in parser.sources:
- print("The file %s has not be found in the index %s" % (
- package_filename, index_url))
+ print(
+ "The file %s has not be found in the index %s" % (package_filename, index_url)
+ )
exit(1)
package_file = open(package_filename, "wb")
# Sometimes the href is a relative path
-if urlparse(parser.sources[package_filename]).netloc == '':
+if urlparse(parser.sources[package_filename]).netloc == "":
parsed_url = urlparse(index_url)
- package_url = urlunparse((
- parsed_url.scheme,
- parsed_url.netloc,
- parser.sources[package_filename],
- None, None, None,
- ))
+ package_url = urlunparse(
+ (
+ parsed_url.scheme,
+ parsed_url.netloc,
+ parsed_url.path + "/" + parser.sources[package_filename],
+ None,
+ None,
+ None,
+ )
+ )
else:
package_url = parser.sources[package_filename]
@@ -106,10 +112,8 @@ print("Downloading %s" % real_package_url)
req = urllib.request.Request(real_package_url)
if username and password:
- req.add_unredirected_header("Authorization", f"Basic {password_b64}")
-response = urllib.request.urlopen(
- req,
- context=context)
+ req.add_unredirected_header("Authorization", "Basic {}".format(password_b64))
+response = urllib.request.urlopen(req, context=context)
with response as r:
shutil.copyfileobj(r, package_file)
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
index af9816cf831e..9f79f9afab56 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
@@ -22,7 +22,12 @@ def main(input, output, fields_to_remove):
if any_removed:
dep["version"] = "*"
- json.dump(data, output, separators=(",", ":"))
+ # Set ensure_ascii to False because TOML is valid UTF-8 so text that can't
+ # be represented in ASCII is perfectly legitimate
+ # HACK: Setting ensure_asscii to False breaks Python2 for some dependencies (like cachy==0.3.0)
+ json.dump(
+ data, output, separators=(",", ":"), ensure_ascii=sys.version_info.major < 3
+ )
if __name__ == "__main__":
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 6039e50d04eb..6e35069a817c 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -98,12 +98,26 @@ self: super:
'';
});
+ backports-functools-lru-cache = super.backports-functools-lru-cache.overridePythonAttrs (old: {
+ postPatch = ''
+ substituteInPlace setup.py --replace \
+ 'setuptools.setup()' \
+ 'setuptools.setup(version="${old.version}")'
+ '';
+ });
+
bcrypt = super.bcrypt.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ];
}
);
+ bjoern = super.bjoern.overridePythonAttrs (
+ old: {
+ buildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libev ];
+ }
+ );
+
black = super.black.overridePythonAttrs (
old: {
dontPreferSetupPy = true;
@@ -247,6 +261,36 @@ self: super:
buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ];
});
+ dbus-python = super.dbus-python.overridePythonAttrs (old: {
+ outputs = [ "out" "dev" ];
+
+ postPatch = old.postPatch or "" + ''
+ substituteInPlace ./configure --replace /usr/bin/file ${pkgs.file}/bin/file
+ substituteInPlace ./dbus-python.pc.in --replace 'Cflags: -I''${includedir}' 'Cflags: -I''${includedir}/dbus-1.0'
+ '';
+
+ configureFlags = (old.configureFlags or [ ]) ++ [
+ "PYTHON_VERSION=${lib.versions.major self.python.version}"
+ ];
+
+ preConfigure = lib.concatStringsSep "\n" [
+ (old.preConfigure or "")
+ (if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
+ MACOSX_DEPLOYMENT_TARGET=10.16
+ '' else "")
+ ];
+
+ preBuild = old.preBuild or "" + ''
+ make distclean
+ '';
+
+ nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ];
+ buildInputs = old.buildInputs or [ ] ++ [ pkgs.dbus pkgs.dbus-glib ]
+ # My guess why it's sometimes trying to -lncurses.
+ # It seems not to retain the dependency anyway.
+ ++ lib.optional (! self.python ? modules) pkgs.ncurses;
+ });
+
dcli = super.dcli.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
});
@@ -373,6 +417,13 @@ self: super:
}
);
+ fastapi = super.fastapi.overridePythonAttrs (
+ old: {
+ # Note: requires full flit, not just flit-core
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.flit ];
+ }
+ );
+
fastecdsa = super.fastecdsa.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++ [ pkgs.gmp.dev ];
});
@@ -504,6 +555,13 @@ self: super:
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pyparsing ];
});
+ icecream = super.icecream.overridePythonAttrs (old: {
+ # # ERROR: Could not find a version that satisfies the requirement executing>=0.3.1 (from icecream) (from versions: none)
+ postPatch = ''
+ substituteInPlace setup.py --replace 'executing>=0.3.1' 'executing'
+ '';
+ });
+
imagecodecs = super.imagecodecs.overridePythonAttrs (
old: {
patchPhase = ''
@@ -569,9 +627,9 @@ self: super:
# disable the removal of pyproject.toml, required because of setuptools_scm
dontPreferSetupPy = true;
- postPatch = old.postPatch or "" + ''
+ postPatch = old.postPatch or "" + (lib.optionalString ((old.format or "") != "wheel") ''
substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")'
- '';
+ '');
}
);
@@ -867,13 +925,6 @@ self: super:
buildInputs = oa.buildInputs ++ [ self.pbr ];
});
- moto = super.moto.overridePythonAttrs (
- old: {
- buildInputs = (old.buildInputs or [ ]) ++
- [ self.sshpubkeys ];
- }
- );
-
mpi4py = super.mpi4py.overridePythonAttrs (
old:
let
@@ -988,8 +1039,18 @@ self: super:
);
opencv-python = super.opencv-python.overridePythonAttrs (
- old: rec {
- buildInputs = (old.buildInputs or [ ]) ++ [ self.scikit-build ];
+ old: {
+ nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
+ buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
+ dontUseCmakeConfigure = true;
+ }
+ );
+
+ opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs (
+ old: {
+ nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
+ buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
+ dontUseCmakeConfigure = true;
}
);
@@ -1007,6 +1068,13 @@ self: super:
}
);
+ pantalaimon = super.pantalaimon.overridePythonAttrs (old: {
+ nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];
+ postInstall = old.postInstall or "" + ''
+ installManPage docs/man/*.[1-9]
+ '';
+ });
+
paramiko = super.paramiko.overridePythonAttrs (old: {
doCheck = false; # requires networking
});
@@ -1077,6 +1145,10 @@ self: super:
}
);
+ prettytable = super.prettytable.overridePythonAttrs (old: {
+ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
+ });
+
psycopg2 = super.psycopg2.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ])
@@ -1277,7 +1349,11 @@ self: super:
}
);
- pytezos = super.pytezos.override (old: {
+ pytaglib = super.pytaglib.overridePythonAttrs (old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.taglib ];
+ });
+
+ pytezos = super.pytezos.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libsodium ];
});
@@ -1323,6 +1399,7 @@ self: super:
pkgs.qt5.qtsvg
pkgs.qt5.qtdeclarative
pkgs.qt5.qtwebchannel
+ pkgs.qt5.qt3d
# self.pyqt5-sip
self.sip
]
@@ -1472,6 +1549,12 @@ self: super:
}
);
+ python-olm = super.python-olm.overridePythonAttrs (
+ old: {
+ buildInputs = old.buildInputs or [ ] ++ [ pkgs.olm ];
+ }
+ );
+
python-snappy = super.python-snappy.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.snappy ];
@@ -1496,6 +1579,13 @@ self: super:
}
);
+ pyudev = super.pyudev.overridePythonAttrs (old: {
+ postPatch = ''
+ substituteInPlace src/pyudev/_ctypeslib/utils.py \
+ --replace "find_library(name)" "'${pkgs.lib.getLib pkgs.systemd}/lib/libudev.so'"
+ '';
+ });
+
pyusb = super.pyusb.overridePythonAttrs (
old: {
postPatch = ''
@@ -1559,6 +1649,12 @@ self: super:
}
);
+ requests-mock = super.requests-mock.overridePythonAttrs (
+ old: {
+ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ super.pbr ];
+ }
+ );
+
requests-unixsocket = super.requests-unixsocket.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pbr ];
@@ -1616,6 +1712,18 @@ self: super:
} else old
);
+ scikit-image = super.scikit-image.overridePythonAttrs (
+ old: {
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+ self.cython
+ self.pythran
+ self.packaging
+ self.wheel
+ self.numpy
+ ];
+ }
+ );
+
scikit-learn = super.scikit-learn.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [
@@ -1673,7 +1781,7 @@ self: super:
tables = super.tables.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pywavelets ];
- HDF5_DIR = "${pkgs.hdf5}";
+ HDF5_DIR = lib.getDev pkgs.hdf5;
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ];
}
@@ -2126,6 +2234,10 @@ self: super:
buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ];
});
+ pysqlite = super.pysqlite.overridePythonAttrs (old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ];
+ });
+
selinux = super.selinux.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ];
});
@@ -2147,6 +2259,12 @@ self: super:
sourceRoot = ".";
});
+ wcwidth = super.wcwidth.overridePythonAttrs (old: {
+ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++
+ lib.optional self.isPy27 (self.backports-functools-lru-cache or self.backports_functools_lru_cache)
+ ;
+ });
+
wtforms = super.wtforms.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ];
});
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index 1f6978b98a2e..56f894c2e752 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -84,7 +84,13 @@ let
)
else
(x: x.platform == "any")
- else (x: hasInfix "macosx" x.platform || x.platform == "any");
+ else
+ if stdenv.isDarwin
+ then
+ if stdenv.targetPlatform.isAarch64
+ then (x: x.platform == "any" || (hasInfix "macosx" x.platform && lib.lists.any (e: hasSuffix e x.platform) [ "arm64" "aarch64" ]))
+ else (x: x.platform == "any" || (hasInfix "macosx" x.platform && hasSuffix "x86_64" x.platform))
+ else (x: x.platform == "any");
filterWheel = x:
let
f = toWheelAttrs x.file;
@@ -93,7 +99,7 @@ let
filtered = builtins.filter filterWheel filesWithoutSources;
choose = files:
let
- osxMatches = [ "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ];
+ osxMatches = [ "12_0" "11_0" "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ];
linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ];
chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x);
chooseOSX = x: lib.take 1 (findBestMatches osxMatches x);
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index f69915ddfa69..4eaf37d2bf40 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "12.22.8";
- sha256 = "0g0ihjzbd02izhmb4jzkdsr5788982wy8q2b4a1h04q8l4fwp197";
+ version = "12.22.9";
+ sha256 = "0jp2fdl73zj5lqjvw98i8pcf7m05cvjcab231zjvdhl4wl1jr66s";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 31912481b499..d6d94297f373 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -7,7 +7,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "14.18.2";
- sha256 = "02v8rjwm8492w91rfvxy369bm11wy3vlkl3dxcl3dkcb1zhrr2iy";
+ version = "14.18.3";
+ sha256 = "026nd6vihjdqz4jn0slg89m8m5vvkvjzgg1aip3dcg9lrm1w8fkq";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index a0c978169ae1..dd1410625db1 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -8,8 +8,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "16.13.1";
- sha256 = "1bb3rjb2xxwn6f4grjsa7m1pycp0ad7y6vz7v2d7kbsysx7h08sc";
+ version = "16.13.2";
+ sha256 = "185lm13q0kwz0qimc38c7mxn8ml6m713pjdjsa9jna9az4gxxccq";
patches = [
./disable-darwin-v8-system-instrumentation.patch
# Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL.
diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix
index 62db8e9f87d2..2242a923f0b7 100644
--- a/pkgs/development/web/nodejs/v17.nix
+++ b/pkgs/development/web/nodejs/v17.nix
@@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "17.3.0";
- sha256 = "00sx046xmh75va7jh810npphnz3yrixifjhlj0jqysal93kc9r74";
+ version = "17.3.1";
+ sha256 = "070xy8rk5z6jmxiay95sjw0jld6pp2ymig7ryypday5aaiw8y26g";
patches = [
./disable-darwin-v8-system-instrumentation.patch
# Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL.
diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index e6413a87f2ca..a877eed6213f 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -1,16 +1,17 @@
-{ lib, fetchurl, appimageTools, python }:
+{ lib, fetchurl, appimageTools, python, gsettings-desktop-schemas, gtk3 }:
let
pname = "heroic";
- version = "1.10.3";
+ version = "2.0.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${version}/Heroic-${version}.AppImage";
- sha256 = "sha256-0VQ5rSGGsEAsOLB4H/Hn2w7wCOrCSoVFzCBqNV5NyVE=";
+ sha256 = "sha256-4gq0ZCcPIx/CkFNZTM5Atkd/GP6v1t3MO2tibrKkcZQ=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
-in appimageTools.wrapType2 {
+in
+appimageTools.wrapType2 {
inherit name src;
extraInstallCommands = ''
@@ -28,6 +29,10 @@ in appimageTools.wrapType2 {
--replace 'Exec=AppRun' 'Exec=heroic'
'';
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
+
meta = with lib; {
description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac";
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 558cb53c3d5d..c5f38a040c1f 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -17,10 +17,7 @@
, udev
# Darwin dependencies
, libicns
-, Carbon
-, Cocoa
-, OpenAL
-, OpenGL
+, darwin
}:
stdenv.mkDerivation rec {
@@ -54,12 +51,13 @@ stdenv.mkDerivation rec {
libpulseaudio
openal
udev
- ] ++ lib.optionals stdenv.isDarwin [
+ ]
+ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
Carbon
Cocoa
OpenAL
OpenGL
- ];
+ ]);
patches = [
# Includes cmath header
@@ -151,6 +149,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
# TODO: select between Qt, GTK2 and GTK3
diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix
index 6a8786be6eaa..fd93260a4bca 100644
--- a/pkgs/misc/flashfocus/default.nix
+++ b/pkgs/misc/flashfocus/default.nix
@@ -9,6 +9,11 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1"
+ '';
+
nativeBuildInputs = with python3.pkgs; [
pytest-runner
];
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 123f17509857..5807f7756cef 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3442,6 +3442,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/mayansmoke/";
};
+ mini-nvim = buildVimPluginFrom2Nix {
+ pname = "mini.nvim";
+ version = "2022-01-06";
+ src = fetchFromGitHub {
+ owner = "echasnovski";
+ repo = "mini.nvim";
+ rev = "a1aa674e94c81feb1fc210527324bfb1e4a08b6f";
+ sha256 = "1blpk5p1lpd87ramnp5nqv188p8wdxsg8d1w811pmxqwas2ji7f5";
+ };
+ meta.homepage = "https://github.com/echasnovski/mini.nvim/";
+ };
+
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap.vim";
version = "2022-01-04";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 92a530d55fb7..fb55aff7812a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -129,6 +129,7 @@ dylanaraps/wal.vim
eagletmt/ghcmod-vim
eagletmt/neco-ghc
easymotion/vim-easymotion
+echasnovski/mini.nvim
eddiebergman/nvim-treesitter-pyfold
eddyekofo94/gruvbox-flat.nvim
EdenEast/nightfox.nvim
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 740b96c110a8..0f0327db7c1d 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -433,6 +433,20 @@ let
};
};
+ cweijan.vscode-database-client2 = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-database-client2";
+ publisher = "cweijan";
+ version = "4.3.3";
+ sha256 = "06bj23y5rbpz0lw45p1sxssalgn19iqfqbijw2ym22grm0i9hcby";
+ };
+ meta = {
+ description = "Database Client For Visual Studio Code";
+ homepage = "https://marketplace.visualstudio.com/items?itemName=cweijan.vscode-mysql-client2";
+ license = lib.licenses.mit;
+ };
+ };
+
dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-eslint";
@@ -1216,8 +1230,8 @@ let
mktplcRef = {
name = "rainbow-csv";
publisher = "mechatroner";
- version = "1.7.1";
- sha256 = "0w5mijs4ll5qjkpyw7qpn1k40pq8spm0b3q72x150ydbcini5hxw";
+ version = "2.0.0";
+ sha256 = "0wjlp6lah9jb0646sbi6x305idfgydb6a51pgw4wdnni02gipbrs";
};
meta = {
license = lib.licenses.mit;
@@ -1470,8 +1484,8 @@ let
mktplcRef = {
name = "crates";
publisher = "serayuzgur";
- version = "0.5.9";
- sha256 = "0l26pyvw7n3bszf97yx6qps72acq112akg3q4jq5mvlibng1nwk0";
+ version = "0.5.10";
+ sha256 = "1dbhd6xbawbnf9p090lpmn8i5gg1f7y8xk2whc9zhg4432kdv3vd";
};
meta = {
license = lib.licenses.mit;
@@ -1709,6 +1723,21 @@ let
};
};
+ tuttieee.emacs-mcx = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "emacs-mcx";
+ publisher = "tuttieee";
+ version = "0.37.1";
+ sha256 = "19969qb6ink70km4wawh4w238igdm6npwskyr3hx38qgf69nd748";
+ };
+ meta = {
+ changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
+ description = "Awesome Emacs Keymap - VSCode emacs keybinding with multi cursor support";
+ homepage = "https://github.com/whitphx/vscode-emacs-mcx";
+ license = lib.licenses.mit;
+ };
+ };
+
tyriar.sort-lines = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "sort-lines";
@@ -1725,8 +1754,8 @@ let
mktplcRef = {
name = "errorlens";
publisher = "usernamehw";
- version = "3.4.0";
- sha256 = "1x9rkyhbp15dwp6dikzpk9lzjnh9cnxac89gzx533681zld906m8";
+ version = "3.4.1";
+ sha256 = "1mr8si7jglpjw8qzl4af1k7r68vz03fpal1dr8i0iy4ly26pz7bh";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index 9a197b4c78c8..abf8fb63bc35 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "iovisor";
repo = "bpftrace";
rev = "v${version}";
- sha256 = "sha256-rlaajNfpoiMtU/4aNAnbQ0VixPz9/302TZMarGzsb58=";
+ sha256 = "sha256-QDqHAEVM/XHCFMS0jMLdKJfDUOpkUqONOf8+Fbd5dCY=";
};
# libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index e664024aff8a..bf36ad52169e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.261";
+ version = "4.14.262";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "08s7idxpsjb29ccj0gkrj87xhbdqj9nc417qc7gd2kmbjd6amymz";
+ sha256 = "05yl51r5n3q9l8pq6azx3bbl69l79lk8vkdivy3cvgzdh59pizac";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index dab9b5e2ab9e..5953b9ff22ce 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.224";
+ version = "4.19.225";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0c8h457n52qzpw4kgr16ndhsl35si99amc6fadb31fy32csgrk01";
+ sha256 = "15k7b04zx5ggfjagp8sfrylr9xgwgz3hb2bygdml7ka1jnbv76jb";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 7690c1f6a953..1addff89c2a2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.4.298";
+ version = "4.4.299";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1q56ch8p53in5rl5i7mvsyf0jimchrh48w3l416x3yi0n5cyvjc6";
+ sha256 = "019hmplv1zhghl840qky9awziba3gx7jm80khny44gjfbyzf7d4v";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 313568e799af..81f576616f7f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.296";
+ version = "4.9.297";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1a5ws21dk5wp397zmd7msl4zbhzm2xxgbxd09wrdcwilpv4dnjzx";
+ sha256 = "17yqnr6p0prgcw8nikjmi49ll4s77ylaixcja5m15cq9x36shfz4";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 0d31047cc951..d29c5b408de3 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.90";
+ version = "5.10.91";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0997ijkmvf9iz4hn8m8naiagphhyvl4r6qx4q3gxk8qlq1j44pll";
+ sha256 = "1lcmhp6njj4ypwkq471mdjapbqvcn6jfqx7z422h8fn6q62gpkk2";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index a8d4c43a107e..1de3117f94e3 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.13";
+ version = "5.15.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0shmrx33crnhi0wr5v6ly85pza1mmdcm8arkrdzf6plz5xm1n4qa";
+ sha256 = "0kbayz4k72hx9b0l9yz2mbgb2xpnpm13snms06r2absv3gkv9wid";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index c24b9778c594..8147f55409df 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.170";
+ version = "5.4.171";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0b1qdmp2q0lpngfvvnwb248cnqn9akk2z4xawrfwziszrzh797xh";
+ sha256 = "0n29bd1kv4rk3ji05vkvxkrzyzq50dxk0zsnk7r5lj45gpnwig5g";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix
index 5911305c0d8b..ede1dc38053f 100644
--- a/pkgs/os-specific/linux/tuigreet/default.nix
+++ b/pkgs/os-specific/linux/tuigreet/default.nix
@@ -5,22 +5,22 @@
rustPlatform.buildRustPackage rec {
pname = "tuigreet";
- version = "0.6.1";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "apognu";
repo = pname;
rev = version;
- sha256 = "sha256-Exw3HPNFh1yiUfDfaIDiz2PemnVLRmefD4ydgMiHQAc=";
+ sha256 = "sha256-Ecp79q/xN6KDAD346ANzunTM3xW+z5UaRy/lblOCLaE=";
};
- cargoSha256 = "sha256-/JNGyAEZlb4YilsoXtaXekXNVev6sdVxS4pEcPFh7Bg=";
+ cargoSha256 = "sha256-eam+85c2y+eNSOlfhO7oIhGqy0HPyi3FuqxHBDkZRVE=";
meta = with lib; {
description = "Graphical console greter for greetd";
homepage = "https://github.com/apognu/tuigreet";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ luc65r ];
+ maintainers = with maintainers; [ luc65r ivar ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
index 563e1333b87f..f122aaf641db 100644
--- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tuxedo-keyboard-${kernel.version}";
- version = "3.0.8";
+ version = "3.0.9";
src = fetchFromGitHub {
owner = "tuxedocomputers";
repo = "tuxedo-keyboard";
rev = "v${version}";
- sha256 = "1rv3ns4n61v18cpnp36zi47jpnqhj410yzi8b307ghiyriapbijv";
+ sha256 = "HGN2CKJ76FzgKkOsU5pLMsRl7hEGMcZ8Loa2YP0P558=";
};
buildInputs = [ linuxHeaders ];
@@ -24,7 +24,13 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "Full color keyboard driver for tuxedo computers laptops";
+ description = "Keyboard and hardware I/O driver for TUXEDO Computers laptops";
+ longDescription = ''
+ This driver provides support for Fn keys, brightness/color/mode for most TUXEDO
+ keyboards (except white backlight-only models).
+
+ Can be used with the "hardware.tuxedo-keyboard" NixOS module.
+ '';
homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix
index 4f1a128dd388..34b6f6fb5b7b 100644
--- a/pkgs/servers/althttpd/default.nix
+++ b/pkgs/servers/althttpd/default.nix
@@ -1,15 +1,17 @@
-{ lib, stdenv, fetchfossil }:
+{ lib, stdenv, fetchfossil, openssl }:
stdenv.mkDerivation rec {
pname = "althttpd";
- version = "unstable-2021-06-09";
+ version = "unstable-2022-01-10";
src = fetchfossil {
url = "https://sqlite.org/althttpd/";
- rev = "0d3b5e232c57e188";
- sha256 = "sha256-vZwpjYYMdP/FgPTAQ9Kdh2RRMovpONqu2v73cCoYyxE=";
+ rev = "83196564d05f33c3";
+ sha256 = "sha256-z/XMVnDihcO56kJaXIJGUUdnz8mR5jlySrLZX1tkV5c=";
};
+ buildInputs = [ openssl ];
+
installPhase = ''
install -Dm755 -t $out/bin althttpd
'';
diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix
index 8b8e93bc27a0..87c06646b4f2 100644
--- a/pkgs/servers/calibre-web/default.nix
+++ b/pkgs/servers/calibre-web/default.nix
@@ -16,6 +16,22 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-rR5pUB3A0WNQxq7ZJ6ykua7hMlzs49aMmVbBUOkOVfA=";
};
+ propagatedBuildInputs = with python3Packages; [
+ backports_abc
+ flask-babel
+ flask_login
+ flask_principal
+ flask_wtf
+ iso-639
+ lxml
+ pypdf3
+ requests
+ sqlalchemy
+ tornado
+ unidecode
+ Wand
+ ];
+
patches = [
# default-logger.patch switches default logger to /dev/stdout. Otherwise calibre-web tries to open a file relative
# to its location, which can't be done as the store is read-only. Log file location can later be configured using UI
@@ -36,39 +52,24 @@ python3.pkgs.buildPythonApplication rec {
mv cps src/calibreweb
substituteInPlace setup.cfg \
- --replace "requests>=2.11.1,<2.25.0" "requests" \
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
+ --replace "flask-wtf>=0.14.2,<0.16.0" "flask-wtf>=0.14.2" \
+ --replace "lxml>=3.8.0,<4.7.0" "lxml>=3.8.0" \
--replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" \
- --replace "unidecode>=0.04.19,<1.3.0" "unidecode>=0.04.19" \
- --replace "flask-wtf>=0.14.2,<0.16.0" "flask-wtf>=0.14.2"
+ --replace "requests>=2.11.1,<2.25.0" "requests" \
+ --replace "unidecode>=0.04.19,<1.3.0" "unidecode>=0.04.19"
'';
# Upstream repo doesn't provide any tests.
doCheck = false;
- propagatedBuildInputs = with python3Packages; [
- backports_abc
- flask-babel
- flask_login
- flask_principal
- flask_wtf
- iso-639
- lxml
- pypdf3
- requests
- sqlalchemy
- tornado
- unidecode
- Wand
- ];
-
passthru.tests.calibre-web = nixosTests.calibre-web;
meta = with lib; {
description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database";
- maintainers = with maintainers; [ pborzenkov ];
homepage = "https://github.com/janeczku/calibre-web";
license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ pborzenkov ];
platforms = platforms.all;
};
}
diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix
new file mode 100644
index 000000000000..833710f1feca
--- /dev/null
+++ b/pkgs/servers/frr/default.nix
@@ -0,0 +1,137 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, python3Packages
+
+# build time
+, autoreconfHook
+, flex
+, bison
+, perl
+, pkg-config
+, texinfo
+
+# runtime
+, c-ares
+, json_c
+, libcap
+, libelf
+, libunwind
+, libyang
+, net-snmp
+, openssl
+, pam
+, pcre2
+, python3
+, readline
+
+# tests
+, nettools
+, nixosTests
+}:
+
+stdenv.mkDerivation rec {
+ pname = "frr";
+ version = "8.1";
+
+ src = fetchFromGitHub {
+ owner = "FRRouting";
+ repo = pname;
+ rev = "${pname}-${version}";
+ sha256 = "sha256-hJcgLiPBxOE5QEh0RhtZhM3dOxFqW5H0TUjN+aP4qRk=";
+ };
+
+ patches = [
+ (fetchpatch {
+ # Fix clippy build on aarch64-linux
+ # https://github.com/FRRouting/frr/issues/10267
+ url = "https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f.patch";
+ sha256 = "1i0acfy5k9fbm9cxchrcvkhyw9704srq4wm2hyjqgdimm2dq7ryf";
+ })
+ ];
+
+ nativeBuildInputs = [
+ autoreconfHook
+ bison
+ flex
+ perl
+ pkg-config
+ python3Packages.sphinx
+ texinfo
+ ];
+
+ buildInputs = [
+ c-ares
+ json_c
+ libelf
+ libunwind
+ libyang
+ net-snmp
+ openssl
+ pam
+ pcre2
+ python3
+ readline
+ ] ++ lib.optionals stdenv.isLinux [
+ libcap
+ ];
+
+ configureFlags = [
+ "--sysconfdir=/etc/frr"
+ "--localstatedir=/run/frr"
+ "--sbindir=$(out)/libexec/frr"
+ "--disable-exampledir"
+ "--enable-user=frr"
+ "--enable-group=frr"
+ "--enable-configfile-mask=0640"
+ "--enable-logfile-mask=0640"
+ "--enable-vty-group=frrvty"
+ "--enable-snmp"
+ "--enable-multipath=64"
+ ];
+
+ postPatch = ''
+ substituteInPlace tools/frr-reload --replace /usr/lib/frr/ $out/libexec/frr/
+ '';
+
+ doCheck = true;
+ checkInputs = [
+ nettools
+ python3Packages.pytest
+ ];
+
+ enableParallelBuilding = true;
+
+ passthru.tests = { inherit (nixosTests) frr; };
+
+ meta = with lib; {
+ description = "FRR BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite";
+ longDescription = ''
+ FRRouting (FRR) is a free and open source Internet routing protocol suite
+ for Linux and Unix platforms. It implements BGP, OSPF, RIP, IS-IS, PIM,
+ LDP, BFD, Babel, PBR, OpenFabric and VRRP, with alpha support for EIGRP
+ and NHRP.
+
+ FRR’s seamless integration with native Linux/Unix IP networking stacks
+ makes it a general purpose routing stack applicable to a wide variety of
+ use cases including connecting hosts/VMs/containers to the network,
+ advertising network services, LAN switching and routing, Internet access
+ routers, and Internet peering.
+
+ FRR has its roots in the Quagga project. In fact, it was started by many
+ long-time Quagga developers who combined their efforts to improve on
+ Quagga’s well-established foundation in order to create the best routing
+ protocol stack available. We invite you to participate in the FRRouting
+ community and help shape the future of networking.
+
+ Join the ranks of network architects using FRR for ISPs, SaaS
+ infrastructure, web 2.0 businesses, hyperscale services, and Fortune 500
+ private clouds.
+ '';
+ homepage = "https://frrouting.org/";
+ license = with licenses; [ gpl2Plus lgpl21Plus ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ woffs ];
+ };
+}
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 076bd4dbdf43..a6648bbc0f8d 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
- version = "0.20.184";
+ version = "0.20.285";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "Qp1yh1bPiJyZb5myPJJqOZAbrEHl/sD+PSLxjvrj0ho=";
+ sha256 = "3TwDzbuXaychz/BQ/AoXjhjXz1TedC2tmh5jNwe3gOM=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 1061ba925fb9..ce441e661b34 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-27T07-23-18Z";
+ version = "2022-01-08T03-11-54Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-Gkn3sl6oPozOy0FMIJ1w3EeiJocI5cGBiXRlG94K4Wg=";
+ sha256 = "sha256-aOFG3/BnDJOjPiVZL1jKwYUzPX6mI9FkRDZIzTAnT+8=";
};
- vendorSha256 = "sha256-gwxmn/339n/avhclRj2BNLl8NTmAYBK+6R7tl4oxLcI=";
+ vendorSha256 = "sha256-sQoD+Kdw3epjzDmqCfw6rXC0dQCeaEpvfLqZpxKcViw=";
doCheck = false;
diff --git a/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch b/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch
deleted file mode 100644
index 07b224b1f0da..000000000000
--- a/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8af53101fbeb0d4855ffa2b33069e833abf2e825 Mon Sep 17 00:00:00 2001
-From: Finn Behrens
-Date: Tue, 7 Dec 2021 09:18:53 +0100
-Subject: [PATCH] move result into with guard
-
----
- lib/pleroma/web/activity_pub/publisher.ex | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex
-index 4f29a44..849b359 100644
---- a/lib/pleroma/web/activity_pub/publisher.ex
-+++ b/lib/pleroma/web/activity_pub/publisher.ex
-@@ -63,8 +63,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa
- date: date
- })
-
-- with {:ok, %{status: code}} when code in 200..299 <-
-- result =
-+ with {:ok, %{status: code}} = result when code in 200..299 <-
- HTTP.post(
- inbox,
- json,
---
-2.34.0
-
diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix
index 5419ad97633b..ec7de2ac57cd 100644
--- a/pkgs/servers/pleroma/default.nix
+++ b/pkgs/servers/pleroma/default.nix
@@ -7,18 +7,16 @@
beamPackages.mixRelease rec {
pname = "pleroma";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "v${version}";
- sha256 = "sha256-XYZIf8/Vznl4FvVAOy5GVfTBTCwhfUol/3vWWIDwIxQ=";
+ sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g=";
};
- patches = [ ./0001-move-result-into-with-guard.patch ];
-
mixNixDeps = import ./mix.nix {
inherit beamPackages lib;
overrides = (final: prev: {
@@ -120,13 +118,11 @@ beamPackages.mixRelease rec {
name = "crypt";
version = "0.4.3";
- src = fetchFromGitLab {
- domain = "git.pleroma.social";
- group = "pleroma";
- owner = "elixir-libraries";
+ src = fetchFromGitHub {
+ owner = "msantos";
repo = "crypt";
- rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3";
- sha256 = "0fnzljxy9pwabh1nzx0vawn131d5pdfb0p98kvpkqs441jr0ii73";
+ rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";
+ sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";
};
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
@@ -208,7 +204,7 @@ beamPackages.mixRelease rec {
description = "ActivityPub microblogging server";
homepage = "https://git.pleroma.social/pleroma/pleroma";
license = licenses.agpl3;
- maintainers = with maintainers; [ petabyteboy ninjatrappeur yuka ];
+ maintainers = with maintainers; [ petabyteboy ninjatrappeur yuka kloenk ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix
index ccced19bf9fb..31ab20c29409 100644
--- a/pkgs/servers/pleroma/mix.nix
+++ b/pkgs/servers/pleroma/mix.nix
@@ -140,12 +140,12 @@ let
certifi = buildRebar3 rec {
name = "certifi";
- version = "2.6.1";
+ version = "2.8.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
- sha256 = "0zmvagzisnk7lj5pfipl19mjq9wn70i339hpbkfljf0vk6s9fk2j";
+ sha256 = "1slp20z2fgcq9p2bbdp1gj218kjqpx5jsa95sq40nq7qqv0yziva";
};
beamDeps = [];
@@ -686,12 +686,12 @@ let
hackney = buildRebar3 rec {
name = "hackney";
- version = "1.17.4";
+ version = "1.18.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
- sha256 = "05kbk3rpw2j3cb9pybikydxmi2nm5pidpx0jsm48av2mjr4zy5ny";
+ sha256 = "0pjwbf87nqj2ki3i076whrswh2cdhklj6cbaikdj1mq40xidmz4s";
};
beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ];
diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
new file mode 100644
index 000000000000..ab059b518e74
--- /dev/null
+++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchurl }:
+import ./versions.nix ({version, sha256}:
+ buildGoModule {
+ pname = "honeymarker";
+ inherit version;
+ vendorSha256 = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU=";
+
+ src = fetchurl {
+ url = "https://github.com/honeycombio/honeymarker/archive/refs/tags/v${version}.tar.gz";
+ inherit sha256;
+ };
+ inherit (buildGoModule.go) GOOS GOARCH;
+
+ meta = with lib; {
+ description = "provides a simple CRUD interface for dealing with per-dataset markers on honeycomb.io";
+ homepage = "https://honeycomb.io/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.iand675 ];
+ };
+})
+
diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix
new file mode 100644
index 000000000000..c7fde50e15d0
--- /dev/null
+++ b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix
@@ -0,0 +1,6 @@
+generic: {
+ v0_2_1 = generic {
+ version = "0.2.1";
+ sha256 = "0gp427bsc1y7k6j1sqgl8r3kng5b0qhmqd4bpfb9139ivmp2sykk";
+ };
+}
diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix
new file mode 100644
index 000000000000..cbe901f2859a
--- /dev/null
+++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchurl }:
+import ./versions.nix ({version, sha256}:
+ buildGoModule {
+ pname = "honeytail";
+ inherit version;
+ vendorSha256 = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY=";
+
+ src = fetchurl {
+ url = "https://github.com/honeycombio/honeytail/archive/refs/tags/v${version}.tar.gz";
+ inherit sha256;
+ };
+ inherit (buildGoModule.go) GOOS GOARCH;
+
+ meta = with lib; {
+ description = "agent for ingesting log file data into honeycomb.io and making it available for exploration";
+ homepage = "https://honeycomb.io/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.iand675 ];
+ };
+})
+
diff --git a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix
new file mode 100644
index 000000000000..370d645ab626
--- /dev/null
+++ b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix
@@ -0,0 +1,6 @@
+generic: {
+ v1_6_0 = generic {
+ version = "1.6.0";
+ sha256 = "039svpvqjck7s3rq86s29xgcyxl1wr0zj90s3jsyp058zk1dgwdy";
+ };
+}
diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
new file mode 100644
index 000000000000..839b8ec053f7
--- /dev/null
+++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchurl }:
+import ./versions.nix ({version, sha256}:
+ buildGoModule {
+ pname = "honeyvent";
+ inherit version;
+ vendorSha256 = null;
+
+ src = fetchurl {
+ url = "https://github.com/honeycombio/honeyvent/archive/refs/tags/v${version}.tar.gz";
+ inherit sha256;
+ };
+ inherit (buildGoModule.go) GOOS GOARCH;
+
+ meta = with lib; {
+ description = "CLI for sending individual events to honeycomb.io";
+ homepage = "https://honeycomb.io/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.iand675 ];
+ };
+})
+
diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix
new file mode 100644
index 000000000000..831de6c93372
--- /dev/null
+++ b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix
@@ -0,0 +1,6 @@
+generic: {
+ v1_1_0 = generic {
+ version = "1.1.0";
+ sha256 = "0ar2m25ngdd1wk7d70j2781wbrvhjhf9cj9qvp24jjrhqng6hvn7";
+ };
+}
diff --git a/pkgs/servers/xmpp/prosody-filer/default.nix b/pkgs/servers/xmpp/prosody-filer/default.nix
new file mode 100644
index 000000000000..a6de3a104740
--- /dev/null
+++ b/pkgs/servers/xmpp/prosody-filer/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "prosody-filer";
+ version = "unstable-2021-05-24";
+
+ vendorSha256 = "05spkks77x88kc31c1zdg1cbf9ijymjs7qzmhg4c6lql5p2h5fbd";
+
+ src = fetchFromGitHub {
+ owner = "ThomasLeister";
+ repo = "prosody-filer";
+ rev = "c65edd199b47dc505366c85b3702230fda797cd6";
+ sha256 = "0h6vp5flgy4wwmzhs6pf6qkk2j4ah8w919dwhfsq4wdpqs78kc0y";
+ };
+
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = "https://github.com/ThomasLeister/prosody-filer";
+ maintainers = with maintainers; [ abbradar ];
+ license = licenses.mit;
+ platforms = platforms.linux;
+ description = "A simple file server for handling XMPP http_upload requests";
+ };
+}
diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix
index 38dfd55783de..fb7fc1179571 100644
--- a/pkgs/tools/backup/discordchatexporter-cli/default.nix
+++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix
@@ -8,17 +8,19 @@
buildDotnetModule rec {
pname = "discordchatexporter-cli";
- version = "2.30.1";
+ version = "2.31.1";
src = fetchFromGitHub {
owner = "tyrrrz";
repo = "discordchatexporter";
rev = version;
- sha256 = "JSYIhd+DNVOKseHtWNNChECR5hKr+ntu1Yyqtnlg8rM=";
+ sha256 = "QK63H+Qyd8zEue84vECcyAP6FH8az++1PZmbrPvBgrU=";
};
+ dotnet-sdk = dotnetCorePackages.sdk_6_0;
+ dotnet-runtime = dotnetCorePackages.runtime_6_0;
+
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
- dotnet-runtime = dotnetCorePackages.runtime_3_1;
nugetDeps = ./deps.nix;
nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix
index 172fe928dd77..edc2eccd92a9 100644
--- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix
+++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix
@@ -1,16 +1,10 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "CliFx"; version = "2.0.6"; sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; })
(fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; })
- (fetchNuGet { pname = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; })
- (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; })
- (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; })
- (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; })
+ (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
+ (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; })
+ (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; })
(fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; })
- (fetchNuGet { pname = "Spectre.Console"; version = "0.41.0"; sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; })
- (fetchNuGet { pname = "Superpower"; version = "2.3.0"; sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; })
- (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; })
- (fetchNuGet { pname = "Tyrrrz.Extensions"; version = "1.6.5"; sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3"; })
- (fetchNuGet { pname = "Wcwidth"; version = "0.2.0"; sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s"; })
+ (fetchNuGet { pname = "Spectre.Console"; version = "0.43.0"; sha256 = "17yh20s17fkcs3iyb5yylqh90jvb36gdn0aaglq3d67rpmcrl5gc"; })
+ (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
]
diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh
index 1fc261c29803..c33b318d25b1 100755
--- a/pkgs/tools/backup/discordchatexporter-cli/updater.sh
+++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5
+#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_6
set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index fb8253919181..14fea30a45d2 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.2.2";
+ version = "1.2.5";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-p+QLZ0G75Mk0Z9G+u+qcxTTWzPZnuM+inLO0Lkojs84=";
+ sha256 = "sha256-FIUp3l3CwtQeFvdXqY3HoaARBmlXqNfl7zUz3ND8ixI=";
};
- vendorSha256 = "sha256-mAJrUGgO0iprQnYOa3TMENNJbJcgM1eiV/AG+TYP0Mg=";
+ vendorSha256 = "sha256-f7EKdffnDUzzyueMM8pHfU3XdQNcIrFf9miVsVTIdM8=";
ldflags = [
"-s"
diff --git a/pkgs/tools/misc/pinsel/default.nix b/pkgs/tools/misc/pinsel/default.nix
new file mode 100644
index 000000000000..de6cc3700838
--- /dev/null
+++ b/pkgs/tools/misc/pinsel/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, lua, glib }:
+
+stdenv.mkDerivation rec {
+ pname = "pinsel";
+ version = "unstable-2021-09-13";
+
+ src = fetchFromGitHub {
+ owner = "Nooo37";
+ repo = pname;
+ rev = "24b0205ca041511b3efb2a75ef296539442f9f54";
+ sha256 = "sha256-w+jiKypZODsmZq3uWGNd8PZhe1SowHj0thcQTX8WHfQ=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [ pkg-config glib ];
+
+ buildInputs = [ lua gtk3 ];
+
+ makeFlags = [ "INSTALLDIR=${placeholder "out"}/bin" ];
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ meta = with lib; {
+ description = "Minimal screenshot annotation tool with lua config";
+ homepage = "https://github.com/Nooo37/pinsel";
+ # no license
+ license = licenses.unfree;
+ maintainers = with maintainers; [ lom ];
+ mainProgram = "pinsel";
+ };
+}
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 89d4bb662da7..165ed45d7b7a 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -6,6 +6,7 @@
, openssl
, installShellFiles
, libiconv
+, nixosTests
, Security
}:
@@ -40,10 +41,14 @@ rustPlatform.buildRustPackage rec {
HOME=$TMPDIR
'';
+ passthru.tests = {
+ inherit (nixosTests) starship;
+ };
+
meta = with lib; {
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
homepage = "https://starship.rs";
license = licenses.isc;
- maintainers = with maintainers; [ bbigras davidtwco Br1ght0ne Frostman marsam ];
+ maintainers = with maintainers; [ bbigras danth davidtwco Br1ght0ne Frostman marsam ];
};
}
diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix
index f3cd9b785f2f..8245f0561325 100644
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "steampipe";
- version = "0.11.0";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
- sha256 = "sha256-P/Fys9/V71+VL5Az3EGGaW+tdeQbr2wO+jvVSVZmJT0=";
+ sha256 = "sha256-omg/MgCTKkj0p1vDvJs22/0Jhzim0CeISV0Kn9p5lh4=";
};
vendorSha256 = "sha256-PYaq74NNEOJ1jZ6PoS6zcTiUN4JA9JDjO7GB9tqgT6c=";
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index c8237dd78df2..c9849a60fa11 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
- version = "2021-12-20T23-43-34Z";
+ version = "2022-01-07T06-01-38Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "sha256-9/8h7KlvGRyxFiGLd5YAOjvzGsrkDUJDei6WQtrgY2s=";
+ sha256 = "sha256-jBCYEAwiPWu6n4LtzQ05MumgsQkflbOjJbtGKfAWS04=";
};
- vendorSha256 = "sha256-vNTCw2VsXTQto8T4eSPYwoSUbwD3FQ1oj51iLHnSCC0=";
+ vendorSha256 = "sha256-EAAVfelrZqxVYMyEp2wvVYhBYwiGGl9j/PYJJTVFk20=";
subPackages = [ "." ];
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix
deleted file mode 100644
index 462c9e615a13..000000000000
--- a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs
-, buildPythonPackage
-, fetchPypi
-, python
-, azure-mgmt-common
-}:
-
-buildPythonPackage rec {
- version = "0.20.1";
- pname = "azure-mgmt-compute";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a";
- };
-
- preConfigure = ''
- # Patch to make this package work on requests >= 2.11.x
- # CAN BE REMOVED ON NEXT PACKAGE UPDATE
- sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py
- '';
-
- postInstall = ''
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
- '';
-
- propagatedBuildInputs = [ azure-mgmt-common ];
-
- meta = with pkgs.lib; {
- description = "Microsoft Azure SDK for Python";
- homepage = "https://azure.microsoft.com/en-us/develop/python/";
- license = licenses.asl20;
- maintainers = with maintainers; [ olcai ];
- };
-}
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix
deleted file mode 100644
index fd47f8895fd4..000000000000
--- a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs
-, buildPythonPackage
-, fetchPypi
-, azure-mgmt-common
-, python
-}:
-
-buildPythonPackage rec {
- version = "0.20.1";
- pname = "azure-mgmt-network";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
- };
-
- preConfigure = ''
- # Patch to make this package work on requests >= 2.11.x
- # CAN BE REMOVED ON NEXT PACKAGE UPDATE
- sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py
- '';
-
- postInstall = ''
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
- '';
-
- propagatedBuildInputs = [ azure-mgmt-common ];
-
- meta = with pkgs.lib; {
- description = "Microsoft Azure SDK for Python";
- homepage = "https://azure.microsoft.com/en-us/develop/python/";
- license = licenses.asl20;
- maintainers = with maintainers; [ olcai ];
- };
-}
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix
deleted file mode 100644
index aa037b48b4f5..000000000000
--- a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs
-, buildPythonPackage
-, fetchPypi
-, azure-nspkg
-}:
-
-buildPythonPackage rec {
- version = "1.0.0";
- pname = "azure-mgmt-nspkg";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
- };
-
- propagatedBuildInputs = [ azure-nspkg ];
-
- meta = with pkgs.lib; {
- description = "Microsoft Azure SDK for Python";
- homepage = "https://azure.microsoft.com/en-us/develop/python/";
- license = licenses.asl20;
- maintainers = with maintainers; [ olcai ];
- };
-}
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix
deleted file mode 100644
index b60e3aee3402..000000000000
--- a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs
-, buildPythonPackage
-, fetchPypi
-, python
-, azure-mgmt-common
-}:
-
-
-buildPythonPackage rec {
- version = "0.20.1";
- pname = "azure-mgmt-resource";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
- };
-
- preConfigure = ''
- # Patch to make this package work on requests >= 2.11.x
- # CAN BE REMOVED ON NEXT PACKAGE UPDATE
- sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py
- '';
-
- postInstall = ''
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
- '';
-
- propagatedBuildInputs = [ azure-mgmt-common ];
-
- meta = with pkgs.lib; {
- description = "Microsoft Azure SDK for Python";
- homepage = "https://azure.microsoft.com/en-us/develop/python/";
- license = licenses.asl20;
- maintainers = with maintainers; [ olcai ];
- };
-}
diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix
deleted file mode 100644
index 2e0523bb25cc..000000000000
--- a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs
-, buildPythonPackage
-, fetchPypi
-, python
-, azure-mgmt-common
-}:
-
-buildPythonPackage rec {
- version = "0.20.0";
- pname = "azure-mgmt-storage";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
- };
-
- preConfigure = ''
- # Patch to make this package work on requests >= 2.11.x
- # CAN BE REMOVED ON NEXT PACKAGE UPDATE
- sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
- '';
-
- postInstall = ''
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
- '';
-
- propagatedBuildInputs = [ azure-mgmt-common ];
-
- meta = with pkgs.lib; {
- description = "Microsoft Azure SDK for Python";
- homepage = "https://azure.microsoft.com/en-us/develop/python/";
- license = licenses.asl20;
- maintainers = with maintainers; [ olcai ];
- };
-}
diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix
deleted file mode 100644
index c6f3d71e98ea..000000000000
--- a/pkgs/tools/package-management/nixops/azure-storage/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ pkgs
-, buildPythonPackage
-, fetchPypi
-, python
-, azure-common
-, futures
-, python-dateutil
-, requests
-, isPy3k
-}:
-
-buildPythonPackage rec {
- version = "0.20.3";
- pname = "azure-storage";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
- };
-
- propagatedBuildInputs = [ azure-common python-dateutil requests ]
- ++ pkgs.lib.optionals (!isPy3k) [ futures ];
-
- postInstall = ''
- echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
- '';
-
- meta = with pkgs.lib; {
- description = "Microsoft Azure SDK for Python";
- homepage = "https://azure.microsoft.com/en-us/develop/python/";
- license = licenses.asl20;
- maintainers = with maintainers; [ olcai ];
- };
-}
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 5b4729e2abd7..2ec98b82c690 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,8 +1,15 @@
-{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? []
+{ lib, python2, poetry2nix, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? []
, fetchurl, fetchpatch
}:
-python2Packages.buildPythonApplication rec {
+let
+ inherit (poetry2nix.mkPoetryPackages {
+ projectDir = ./python-env;
+ python = python2;
+ }) python;
+ pythonPackages = python.pkgs;
+
+in pythonPackages.buildPythonApplication rec {
pname = "nixops";
version = "1.7";
@@ -19,23 +26,22 @@ python2Packages.buildPythonApplication rec {
./optional-virtd.patch
];
- buildInputs = [ libxslt ];
+ buildInputs = [ pythonPackages.libxslt ];
- pythonPath = with python2Packages;
+ pythonPath = (with pythonPackages;
[ prettytable
boto
boto3
hetzner
- libcloud
+ apache-libcloud
adal
# Go back to sqlite once Python 2.7.13 is released
pysqlite
datadog
- digital-ocean
- typing
+ python-digitalocean
]
++ lib.optional (!libvirt.passthru.libvirt.meta.insecure or true) libvirt
- ++ nixopsAzurePackages;
+ ++ nixopsAzurePackages);
checkPhase =
# Ensure, that there are no (python) import errors
diff --git a/pkgs/tools/package-management/nixops/python-env/poetry.lock b/pkgs/tools/package-management/nixops/python-env/poetry.lock
new file mode 100644
index 000000000000..7cc195c95f57
--- /dev/null
+++ b/pkgs/tools/package-management/nixops/python-env/poetry.lock
@@ -0,0 +1,644 @@
+[[package]]
+name = "adal"
+version = "1.2.7"
+description = "Note: This library is already replaced by MSAL Python, available here: https://pypi.org/project/msal/ .ADAL Python remains available here as a legacy. The ADAL for Python library makes it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+cryptography = ">=1.1.0"
+PyJWT = ">=1.0.0,<3"
+python-dateutil = ">=2.1.0,<3"
+requests = ">=2.0.0,<3"
+
+[[package]]
+name = "apache-libcloud"
+version = "2.8.3"
+description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see http://libcloud.apache.org"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
+
+[package.dependencies]
+"backports.ssl-match-hostname" = {version = "*", markers = "python_version < \"2.7.9\""}
+enum34 = {version = "*", markers = "python_version < \"3.4.0\""}
+requests = ">=2.5.0"
+typing = {version = "*", markers = "python_version < \"3.4.0\""}
+
+[[package]]
+name = "backports.functools-lru-cache"
+version = "1.6.4"
+description = "Backport of functools.lru_cache"
+category = "main"
+optional = false
+python-versions = ">=2.6"
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-checkdocs (>=2.4)"]
+
+[[package]]
+name = "backports.ssl-match-hostname"
+version = "3.7.0.1"
+description = "The ssl.match_hostname() function from Python 3.5"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "boto"
+version = "2.49.0"
+description = "Amazon Web Services Library"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "boto3"
+version = "1.17.112"
+description = "The AWS SDK for Python"
+category = "main"
+optional = false
+python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
+[package.dependencies]
+botocore = ">=1.20.112,<1.21.0"
+jmespath = ">=0.7.1,<1.0.0"
+s3transfer = ">=0.4.0,<0.5.0"
+
+[[package]]
+name = "botocore"
+version = "1.20.112"
+description = "Low-level, data-driven core of boto 3."
+category = "main"
+optional = false
+python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
+[package.dependencies]
+jmespath = ">=0.7.1,<1.0.0"
+python-dateutil = ">=2.1,<3.0.0"
+urllib3 = ">=1.25.4,<1.27"
+
+[package.extras]
+crt = ["awscrt (==0.11.24)"]
+
+[[package]]
+name = "certifi"
+version = "2021.10.8"
+description = "Python package for providing Mozilla's CA Bundle."
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "cffi"
+version = "1.15.0"
+description = "Foreign Function Interface for Python calling C code."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+pycparser = "*"
+
+[[package]]
+name = "chardet"
+version = "4.0.0"
+description = "Universal encoding detector for Python 2 and 3"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "configparser"
+version = "4.0.2"
+description = "Updated configparser from Python 3.7 for Python 2.6+."
+category = "main"
+optional = false
+python-versions = ">=2.6"
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"]
+
+[[package]]
+name = "contextlib2"
+version = "0.6.0.post1"
+description = "Backports and enhancements for the contextlib module"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "cryptography"
+version = "3.3.2"
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+category = "main"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
+
+[package.dependencies]
+cffi = ">=1.12"
+enum34 = {version = "*", markers = "python_version < \"3\""}
+ipaddress = {version = "*", markers = "python_version < \"3\""}
+six = ">=1.4.1"
+
+[package.extras]
+docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
+docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
+pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
+ssh = ["bcrypt (>=3.1.5)"]
+test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+
+[[package]]
+name = "datadog"
+version = "0.42.0"
+description = "The Datadog Python library"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+configparser = {version = "<5", markers = "python_version < \"3.0\""}
+requests = ">=2.6.0"
+typing = {version = "*", markers = "python_version < \"3.5\""}
+
+[[package]]
+name = "enum34"
+version = "1.1.10"
+description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "futures"
+version = "3.3.0"
+description = "Backport of the concurrent.futures package from Python 3"
+category = "main"
+optional = false
+python-versions = ">=2.6, <3"
+
+[[package]]
+name = "hetzner"
+version = "0.8.3"
+description = "High level access to the Hetzner robot"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "idna"
+version = "2.10"
+description = "Internationalized Domain Names in Applications (IDNA)"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "importlib-metadata"
+version = "2.1.2"
+description = "Read metadata from Python packages"
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[package.dependencies]
+configparser = {version = ">=3.5", markers = "python_version < \"3\""}
+contextlib2 = {version = "*", markers = "python_version < \"3\""}
+pathlib2 = {version = "*", markers = "python_version < \"3\""}
+zipp = ">=0.5"
+
+[package.extras]
+docs = ["sphinx", "rst.linker"]
+testing = ["packaging", "pep517", "unittest2", "importlib-resources (>=1.3)"]
+
+[[package]]
+name = "ipaddress"
+version = "1.0.23"
+description = "IPv4/IPv6 manipulation library"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "jmespath"
+version = "0.10.0"
+description = "JSON Matching Expressions"
+category = "main"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "jsonpickle"
+version = "2.0.0"
+description = "Python library for serializing any arbitrary object graph into JSON"
+category = "main"
+optional = false
+python-versions = ">=2.7"
+
+[package.dependencies]
+importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
+testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "sklearn", "sqlalchemy", "enum34", "jsonlib"]
+"testing.libs" = ["demjson", "simplejson", "ujson", "yajl"]
+
+[[package]]
+name = "pathlib2"
+version = "2.3.6"
+description = "Object-oriented filesystem paths"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+scandir = {version = "*", markers = "python_version < \"3.5\""}
+six = "*"
+
+[[package]]
+name = "prettytable"
+version = "1.0.1"
+description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+wcwidth = "*"
+
+[package.extras]
+tests = ["pytest", "pytest-cov"]
+
+[[package]]
+name = "pycparser"
+version = "2.21"
+description = "C parser in Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "pyjwt"
+version = "1.7.1"
+description = "JSON Web Token implementation in Python"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.extras]
+crypto = ["cryptography (>=1.4)"]
+flake8 = ["flake8", "flake8-import-order", "pep8-naming"]
+test = ["pytest (>=4.0.1,<5.0.0)", "pytest-cov (>=2.6.0,<3.0.0)", "pytest-runner (>=4.2,<5.0.0)"]
+
+[[package]]
+name = "pysqlite"
+version = "2.8.3"
+description = "DB-API 2.0 interface for SQLite 3.x"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "python-dateutil"
+version = "2.8.2"
+description = "Extensions to the standard Python datetime module"
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+
+[package.dependencies]
+six = ">=1.5"
+
+[[package]]
+name = "python-digitalocean"
+version = "1.17.0"
+description = "digitalocean.com API to manage Droplets and Images"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+jsonpickle = "*"
+requests = "*"
+
+[[package]]
+name = "requests"
+version = "2.27.1"
+description = "Python HTTP for Humans."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
+[package.dependencies]
+certifi = ">=2017.4.17"
+chardet = {version = ">=3.0.2,<5", markers = "python_version < \"3\""}
+idna = {version = ">=2.5,<3", markers = "python_version < \"3\""}
+urllib3 = ">=1.21.1,<1.27"
+
+[package.extras]
+socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
+use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"]
+
+[[package]]
+name = "s3transfer"
+version = "0.4.2"
+description = "An Amazon S3 Transfer Manager"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+botocore = ">=1.12.36,<2.0a.0"
+futures = {version = ">=2.2.0,<4.0.0", markers = "python_version == \"2.7\""}
+
+[package.extras]
+crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"]
+
+[[package]]
+name = "scandir"
+version = "1.10.0"
+description = "scandir, a better directory iterator and faster os.walk()"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "six"
+version = "1.16.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "typing"
+version = "3.10.0.0"
+description = "Type Hints for Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <3.5"
+
+[[package]]
+name = "urllib3"
+version = "1.26.8"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+
+[package.extras]
+brotli = ["brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
+socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
+
+[[package]]
+name = "wcwidth"
+version = "0.2.5"
+description = "Measures the displayed width of unicode strings in a terminal"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+"backports.functools-lru-cache" = {version = ">=1.2.1", markers = "python_version < \"3.2\""}
+
+[[package]]
+name = "zipp"
+version = "1.2.0"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+category = "main"
+optional = false
+python-versions = ">=2.7"
+
+[package.dependencies]
+contextlib2 = {version = "*", markers = "python_version < \"3.4\""}
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
+testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"]
+
+[metadata]
+lock-version = "1.1"
+python-versions = "^2.7"
+content-hash = "4d572971089aafa023518c48b1048ea91ffb2d35c9737d0f43bf1b0395ae2769"
+
+[metadata.files]
+adal = [
+ {file = "adal-1.2.7-py2.py3-none-any.whl", hash = "sha256:2a7451ed7441ddbc57703042204a3e30ef747478eea022c70f789fc7f084bc3d"},
+ {file = "adal-1.2.7.tar.gz", hash = "sha256:d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"},
+]
+apache-libcloud = [
+ {file = "apache-libcloud-2.8.3.tar.gz", hash = "sha256:70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"},
+ {file = "apache_libcloud-2.8.3-py2.py3-none-any.whl", hash = "sha256:a3414c1ecc9bb9643fd11af18018b23922f4a2585babf9a4450c3531994935f2"},
+]
+"backports.functools-lru-cache" = [
+ {file = "backports.functools_lru_cache-1.6.4-py2.py3-none-any.whl", hash = "sha256:dbead04b9daa817909ec64e8d2855fb78feafe0b901d4568758e3a60559d8978"},
+ {file = "backports.functools_lru_cache-1.6.4.tar.gz", hash = "sha256:d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"},
+]
+"backports.ssl-match-hostname" = [
+ {file = "backports.ssl_match_hostname-3.7.0.1.tar.gz", hash = "sha256:bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"},
+]
+boto = [
+ {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"},
+ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
+]
+boto3 = [
+ {file = "boto3-1.17.112-py2.py3-none-any.whl", hash = "sha256:8716465313c50ad9e5c2ac1767642ca0ddf7d1729c3d5c884d82880c1a15a310"},
+ {file = "boto3-1.17.112.tar.gz", hash = "sha256:08b6dacbe7ebe57ae8acfb7106b2728d946ae1e0c3da270caee1deb79ccbd8af"},
+]
+botocore = [
+ {file = "botocore-1.20.112-py2.py3-none-any.whl", hash = "sha256:6d51de0981a3ef19da9e6a3c73b5ab427e3c0c8b92200ebd38d087299683dd2b"},
+ {file = "botocore-1.20.112.tar.gz", hash = "sha256:d0b9b70b6eb5b65bb7162da2aaf04b6b086b15cc7ea322ddc3ef2f5e07944dcf"},
+]
+certifi = [
+ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
+ {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
+]
+cffi = [
+ {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
+ {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"},
+ {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"},
+ {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"},
+ {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"},
+ {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"},
+ {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"},
+ {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"},
+ {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"},
+ {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"},
+ {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"},
+ {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"},
+ {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"},
+ {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"},
+ {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"},
+ {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"},
+ {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"},
+ {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"},
+ {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"},
+ {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"},
+ {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"},
+ {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"},
+ {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"},
+ {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"},
+ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
+]
+chardet = [
+ {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
+ {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
+]
+configparser = [
+ {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"},
+ {file = "configparser-4.0.2.tar.gz", hash = "sha256:c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"},
+]
+contextlib2 = [
+ {file = "contextlib2-0.6.0.post1-py2.py3-none-any.whl", hash = "sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b"},
+ {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"},
+]
+cryptography = [
+ {file = "cryptography-3.3.2-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed"},
+ {file = "cryptography-3.3.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3"},
+ {file = "cryptography-3.3.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042"},
+ {file = "cryptography-3.3.2-cp27-cp27m-win32.whl", hash = "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b"},
+ {file = "cryptography-3.3.2-cp27-cp27m-win_amd64.whl", hash = "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff"},
+ {file = "cryptography-3.3.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da"},
+ {file = "cryptography-3.3.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f"},
+ {file = "cryptography-3.3.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72"},
+ {file = "cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e"},
+ {file = "cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44"},
+ {file = "cryptography-3.3.2-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed"},
+ {file = "cryptography-3.3.2-cp36-abi3-win32.whl", hash = "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c"},
+ {file = "cryptography-3.3.2-cp36-abi3-win_amd64.whl", hash = "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433"},
+ {file = "cryptography-3.3.2.tar.gz", hash = "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed"},
+]
+datadog = [
+ {file = "datadog-0.42.0-py2.py3-none-any.whl", hash = "sha256:140b51f5db3f46d6f3ec022c05830c6b3e13e4f62c19c823e1227ac322b26667"},
+ {file = "datadog-0.42.0.tar.gz", hash = "sha256:7a6fac17a7d09f1883ab9a45ce4ff7a16aa1a5eb3cc4c6cddac7f8c53e7d1e9b"},
+]
+enum34 = [
+ {file = "enum34-1.1.10-py2-none-any.whl", hash = "sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53"},
+ {file = "enum34-1.1.10-py3-none-any.whl", hash = "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328"},
+ {file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"},
+]
+futures = [
+ {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"},
+ {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"},
+]
+hetzner = [
+ {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"},
+]
+idna = [
+ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
+ {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
+]
+importlib-metadata = [
+ {file = "importlib_metadata-2.1.2-py2.py3-none-any.whl", hash = "sha256:cd6a92d78385dd145f5f233b3a6919acf5e8e43922aa9b9dbe78573e3540eb56"},
+ {file = "importlib_metadata-2.1.2.tar.gz", hash = "sha256:09db40742204610ef6826af16e49f0479d11d0d54687d0169ff7fddf8b3f557f"},
+]
+ipaddress = [
+ {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"},
+ {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"},
+]
+jmespath = [
+ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"},
+ {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"},
+]
+jsonpickle = [
+ {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"},
+ {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"},
+]
+pathlib2 = [
+ {file = "pathlib2-2.3.6-py2.py3-none-any.whl", hash = "sha256:3a130b266b3a36134dcc79c17b3c7ac9634f083825ca6ea9d8f557ee6195c9c8"},
+ {file = "pathlib2-2.3.6.tar.gz", hash = "sha256:7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"},
+]
+prettytable = [
+ {file = "prettytable-1.0.1-py2.py3-none-any.whl", hash = "sha256:e7e464e8f7ecfd9a74c67f8da35f2a7da3d827235ba0a4737bb6d4b19f4a04bb"},
+ {file = "prettytable-1.0.1.tar.gz", hash = "sha256:6bb7f539903cb031fecb855b615cbcac8cd245ebc6fa51c6e23ab3386db89771"},
+]
+pycparser = [
+ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
+ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
+]
+pyjwt = [
+ {file = "PyJWT-1.7.1-py2.py3-none-any.whl", hash = "sha256:5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e"},
+ {file = "PyJWT-1.7.1.tar.gz", hash = "sha256:8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"},
+]
+pysqlite = [
+ {file = "pysqlite-2.8.3.tar.gz", hash = "sha256:17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"},
+]
+python-dateutil = [
+ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+ {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+python-digitalocean = [
+ {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"},
+ {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"},
+]
+requests = [
+ {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
+ {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
+]
+s3transfer = [
+ {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"},
+ {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"},
+]
+scandir = [
+ {file = "scandir-1.10.0-cp27-cp27m-win32.whl", hash = "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188"},
+ {file = "scandir-1.10.0-cp27-cp27m-win_amd64.whl", hash = "sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"},
+ {file = "scandir-1.10.0-cp34-cp34m-win32.whl", hash = "sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f"},
+ {file = "scandir-1.10.0-cp34-cp34m-win_amd64.whl", hash = "sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e"},
+ {file = "scandir-1.10.0-cp35-cp35m-win32.whl", hash = "sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f"},
+ {file = "scandir-1.10.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32"},
+ {file = "scandir-1.10.0-cp36-cp36m-win32.whl", hash = "sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022"},
+ {file = "scandir-1.10.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4"},
+ {file = "scandir-1.10.0-cp37-cp37m-win32.whl", hash = "sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173"},
+ {file = "scandir-1.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d"},
+ {file = "scandir-1.10.0.tar.gz", hash = "sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae"},
+]
+six = [
+ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+typing = [
+ {file = "typing-3.10.0.0-py2-none-any.whl", hash = "sha256:c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"},
+ {file = "typing-3.10.0.0-py3-none-any.whl", hash = "sha256:12fbdfbe7d6cca1a42e485229afcb0b0c8259258cfb919b8a5e2a5c953742f89"},
+ {file = "typing-3.10.0.0.tar.gz", hash = "sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"},
+]
+urllib3 = [
+ {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"},
+ {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"},
+]
+wcwidth = [
+ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
+ {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
+]
+zipp = [
+ {file = "zipp-1.2.0-py2.py3-none-any.whl", hash = "sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921"},
+ {file = "zipp-1.2.0.tar.gz", hash = "sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1"},
+]
diff --git a/pkgs/tools/package-management/nixops/python-env/pyproject.toml b/pkgs/tools/package-management/nixops/python-env/pyproject.toml
new file mode 100644
index 000000000000..2c216e402259
--- /dev/null
+++ b/pkgs/tools/package-management/nixops/python-env/pyproject.toml
@@ -0,0 +1,24 @@
+[tool.poetry]
+name = "nixops-python-env"
+version = "0.1.0"
+description = ""
+authors = ["Your Name "]
+license = "MIT"
+
+[tool.poetry.dependencies]
+python = "^2.7"
+prettytable = "^1.0.1"
+boto = "^2.49.0"
+boto3 = "^1.17.97"
+hetzner = "^0.8.3"
+apache-libcloud = "^2.8.3"
+adal = "^1.2.7"
+pysqlite = "^2.8.3"
+datadog = "^0.42.0"
+python-digitalocean = "^1.17.0"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
diff --git a/pkgs/tools/package-management/nixops/python-env/shell.nix b/pkgs/tools/package-management/nixops/python-env/shell.nix
new file mode 100644
index 000000000000..13fcab0e0faa
--- /dev/null
+++ b/pkgs/tools/package-management/nixops/python-env/shell.nix
@@ -0,0 +1,8 @@
+let
+ pkgs = import ../../../../../. { };
+in pkgs.mkShell {
+ packages = [
+ pkgs.python2
+ pkgs.poetry
+ ];
+}
diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix
new file mode 100644
index 000000000000..aecdbf8dd250
--- /dev/null
+++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "faraday-agent-dispatcher";
+ version = "2.1.3";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "infobyte";
+ repo = "faraday_agent_dispatcher";
+ rev = version;
+ hash = "sha256-lqCW1/wRXfN7C9c6TPvninueOgrhzNdjRJ9fuueMyH0=";
+ };
+
+ nativeBuildInputs = with python3.pkgs; [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ aiohttp
+ click
+ faraday-agent-parameters-types
+ faraday-plugins
+ itsdangerous
+ python-gvm
+ python-owasp-zap-v2-4
+ pyyaml
+ requests
+ syslog-rfc5424-formatter
+ websockets
+ ];
+
+ checkInputs = with python3.pkgs; [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace '"pytest-runner",' ""
+ '';
+
+ preCheck = ''
+ export HOME=$(mktemp -d);
+ '';
+
+ disabledTests = [
+ "test_execute_agent"
+ ];
+
+ disabledTestPaths = [
+ # Tests require a running Docker instance
+ "tests/plugins-docker/test_executors.py"
+ ];
+
+ pythonImportsCheck = [
+ "faraday_agent_dispatcher"
+ ];
+
+ meta = with lib; {
+ description = "Tool to send result from tools to the Faraday Platform";
+ homepage = "https://github.com/infobyte/faraday_agent_dispatcher";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix
new file mode 100644
index 000000000000..c5d33645f114
--- /dev/null
+++ b/pkgs/tools/security/spire/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "spire";
+ version = "1.1.2";
+
+ outputs = [ "out" "agent" "server" ];
+
+ src = fetchFromGitHub {
+ owner = "spiffe";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-MX2kbdLj72S2WBceUW/3ps34Bcsf/VArK8RN4r13wQY=";
+ };
+
+ vendorSha256 = "sha256-ZRcXMNKhNY3W5fV9q/V7xsnODoG6KWHrzpWte9hx/Ms=";
+
+ subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
+
+ # Usually either the agent or server is needed for a given use case, but not both
+ postInstall = ''
+ mkdir -vp $agent/bin $server/bin
+ mv -v $out/bin/spire-agent $agent/bin/
+ mv -v $out/bin/spire-server $server/bin/
+
+ ln -vs $agent/bin/spire-agent $out/bin/spire-agent
+ ln -vs $server/bin/spire-server $out/bin/spire-server
+ '';
+
+ meta = with lib; {
+ description = "The SPIFFE Runtime Environment";
+ homepage = "github.com/spiffe/spire";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile b/pkgs/tools/typesetting/docbookrx/Gemfile
deleted file mode 100644
index d5290dcb0093..000000000000
--- a/pkgs/tools/typesetting/docbookrx/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'nokogiri', '~> 1.11.7'
diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/pkgs/tools/typesetting/docbookrx/Gemfile.lock
deleted file mode 100644
index 07b58b649f4c..000000000000
--- a/pkgs/tools/typesetting/docbookrx/Gemfile.lock
+++ /dev/null
@@ -1,38 +0,0 @@
-PATH
- remote: .
- specs:
- docbookrx (1.0.0.dev)
- nokogiri (~> 1.11.7)
-
-GEM
- remote: https://rubygems.org/
- specs:
- diff-lcs (1.4.4)
- nokogiri (1.11.7-x86_64-linux)
- racc (~> 1.4)
- racc (1.6.0)
- rake (13.0.6)
- rspec (3.9.0)
- rspec-core (~> 3.9.0)
- rspec-expectations (~> 3.9.0)
- rspec-mocks (~> 3.9.0)
- rspec-core (3.9.3)
- rspec-support (~> 3.9.3)
- rspec-expectations (3.9.4)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.9.0)
- rspec-mocks (3.9.1)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.9.0)
- rspec-support (3.9.4)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- docbookrx!
- rake (~> 13.0.0)
- rspec (~> 3.9.0)
-
-BUNDLED WITH
- 2.2.24
diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix
deleted file mode 100644
index 059233d09b08..000000000000
--- a/pkgs/tools/typesetting/docbookrx/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib
-, fetchFromGitHub
-, stdenv
-, ruby
-, bundlerEnv
-}:
-
-let
- env = bundlerEnv {
- name = "docbookrx-env";
- gemdir = ./.;
-
- inherit ruby;
-
- gemfile = ./Gemfile;
- lockfile = ./Gemfile.lock;
- gemset = ./gemset.nix;
- };
-
-in stdenv.mkDerivation {
-
- pname = "docbookrx";
- version = "unstable-2018-05-18";
-
- buildInputs = [ env.wrappedRuby ];
-
- src = fetchFromGitHub {
- owner = "asciidoctor";
- repo = "docbookrx";
- rev = "83d1d1235e3bb44506123eda337780a912581cd0";
- sha256 = "sha256-OdPRh7ZIhgM7hs5qPiuxLEUuMEtaXcgZ83M6i6CV6AY=";
- };
-
- # TODO: I don't know ruby packaging but this does the trick for now
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/bin
- cp -a bin/docbookrx $out/bin
- cp -a lib $out
-
- runHook postInstall
- '';
-
- meta = with lib; {
- description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby";
- homepage = "https://asciidoctor.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- platforms = platforms.unix;
- };
-
-}
diff --git a/pkgs/tools/typesetting/docbookrx/gemset.nix b/pkgs/tools/typesetting/docbookrx/gemset.nix
deleted file mode 100644
index fde67f2d4ee9..000000000000
--- a/pkgs/tools/typesetting/docbookrx/gemset.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- diff-lcs = {
- groups = ["default" "development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
- type = "gem";
- };
- version = "1.4.4";
- };
- docbookrx = {
- dependencies = ["nokogiri"];
- groups = ["default"];
- platforms = [];
- source = {
- path = ./.;
- type = "path";
- };
- version = "1.0.0.dev";
- };
- nokogiri = {
- dependencies = ["racc"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef";
- type = "gem";
- };
- version = "1.11.7";
- };
- racc = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
- type = "gem";
- };
- version = "1.6.0";
- };
- rake = {
- groups = ["development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
- type = "gem";
- };
- version = "13.0.6";
- };
- rspec = {
- dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
- groups = ["development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
- type = "gem";
- };
- version = "3.9.0";
- };
- rspec-core = {
- dependencies = ["rspec-support"];
- groups = ["default" "development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh";
- type = "gem";
- };
- version = "3.9.3";
- };
- rspec-expectations = {
- dependencies = ["diff-lcs" "rspec-support"];
- groups = ["default" "development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0gjqa3h4r8jna8dh22al4f6ks4x6l4knshx2b8jygkd1gk68n92q";
- type = "gem";
- };
- version = "3.9.4";
- };
- rspec-mocks = {
- dependencies = ["diff-lcs" "rspec-support"];
- groups = ["default" "development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
- type = "gem";
- };
- version = "3.9.1";
- };
- rspec-support = {
- groups = ["default" "development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ig6wk1ln6wy0d6fjlbfwxibps1nidc6111fcnm0jfa1z5nkqczl";
- type = "gem";
- };
- version = "3.9.4";
- };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0d98bf688189..861d649d0796 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -217,6 +217,7 @@ mapAliases ({
dmtx = dmtx-utils; # added 2018-04-25
dnnl = oneDNN; # added 2020-04-22
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
+ docbookrx = throw "docbookrx has been removed since it was unmaintained"; # added 2021-01-12
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
dolphinEmu = dolphin-emu; # added 2021-11-10
dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe1c97840eb7..617d876165cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4706,8 +4706,6 @@ with pkgs;
docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
- docbookrx = callPackage ../tools/typesetting/docbookrx { };
-
docear = callPackage ../applications/office/docear { };
dockbarx = callPackage ../applications/misc/dockbarx { };
@@ -5323,6 +5321,8 @@ with pkgs;
flvstreamer = callPackage ../tools/networking/flvstreamer { };
+ frr = callPackage ../servers/frr { };
+
hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { };
libbsd = callPackage ../development/libraries/libbsd { };
@@ -5337,6 +5337,8 @@ with pkgs;
fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
+ faraday-agent-dispatcher = callPackage ../tools/security/faraday-agent-dispatcher { };
+
faraday-cli = callPackage ../tools/security/faraday-cli { };
fastlane = callPackage ../tools/admin/fastlane { };
@@ -5595,6 +5597,8 @@ with pkgs;
gfbgraph = callPackage ../development/libraries/gfbgraph { };
+ gfold = callPackage ../applications/version-management/git-and-tools/gfold { };
+
ggobi = callPackage ../tools/graphics/ggobi { };
gh = callPackage ../applications/version-management/git-and-tools/gh { };
@@ -8724,6 +8728,8 @@ with pkgs;
pinnwand = callPackage ../servers/pinnwand { };
+ pinsel = callPackage ../tools/misc/pinsel { };
+
piping-server-rust = callPackage ../servers/piping-server-rust {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
@@ -9707,6 +9713,11 @@ with pkgs;
spicy = callPackage ../development/tools/spicy { };
+ spire = callPackage ../tools/security/spire { };
+ # to match naming of other package repositories
+ spire-agent = spire.agent;
+ spire-server = spire.server;
+
spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { };
@@ -14662,6 +14673,19 @@ with pkgs;
eweb = callPackage ../development/tools/literate-programming/eweb { };
+ funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
+
+ Literate = callPackage ../development/tools/literate-programming/Literate { };
+
+ md-tangle = callPackage ../development/tools/literate-programming/md-tangle { };
+
+ # NOTE: Override and set useIcon = false to use Awk instead of Icon.
+ noweb = callPackage ../development/tools/literate-programming/noweb { };
+
+ nuweb = callPackage ../development/tools/literate-programming/nuweb {
+ tex = texlive.combined.scheme-medium;
+ };
+
eztrace = callPackage ../development/tools/profiling/EZTrace { };
faas-cli = callPackage ../development/tools/faas-cli { };
@@ -14710,8 +14734,6 @@ with pkgs;
fundoc = callPackage ../development/tools/fundoc { };
- funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
-
gede = libsForQt5.callPackage ../development/tools/misc/gede { };
gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
@@ -14983,8 +15005,6 @@ with pkgs;
laminar = callPackage ../development/tools/continuous-integration/laminar { };
- Literate = callPackage ../development/tools/literate-programming/Literate {};
-
lcov = callPackage ../development/tools/analysis/lcov { };
leiningen = callPackage ../development/tools/build-managers/leiningen { };
@@ -15117,11 +15137,6 @@ with pkgs;
gconf = gnome2.GConf;
};
- # NOTE: Override and set useIcon = false to use Awk instead of Icon.
- noweb = callPackage ../development/tools/literate-programming/noweb { };
-
- nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; };
-
nrfutil = callPackage ../development/tools/misc/nrfutil { };
obelisk = callPackage ../development/tools/ocaml/obelisk { };
@@ -18161,6 +18176,8 @@ with pkgs;
libmad = callPackage ../development/libraries/libmad { };
+ llama = callPackage ../applications/misc/llama { };
+
malcontent = callPackage ../development/libraries/malcontent { };
malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { };
@@ -18672,7 +18689,9 @@ with pkgs;
libxmp = callPackage ../development/libraries/libxmp { };
- libxslt = callPackage ../development/libraries/libxslt { };
+ libxslt = callPackage ../development/libraries/libxslt {
+ python = python3;
+ };
libxsmm = callPackage ../development/libraries/libxsmm { };
@@ -18688,6 +18707,8 @@ with pkgs;
libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { };
+ libyang = callPackage ../development/libraries/libyang { };
+
libcyaml = callPackage ../development/libraries/libcyaml { };
rang = callPackage ../development/libraries/rang { };
@@ -20939,6 +20960,8 @@ with pkgs;
withExtraLibs = [];
};
+ prosody-filer = callPackage ../servers/xmpp/prosody-filer { };
+
biboumi = callPackage ../servers/xmpp/biboumi { };
elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin {
@@ -26702,6 +26725,8 @@ with pkgs;
kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
+ kup = libsForQt5.callPackage ../applications/misc/kup { };
+
kupfer = callPackage ../applications/misc/kupfer { };
kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { };
@@ -33932,9 +33957,7 @@ with pkgs;
python = python3;
};
- higan = callPackage ../misc/emulators/higan {
- inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
- };
+ higan = callPackage ../misc/emulators/higan { };
bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
inherit (gnome2) gtksourceview;
@@ -34318,4 +34341,10 @@ with pkgs;
};
zthrottle = callPackage ../tools/misc/zthrottle { };
+
+ honeymarker = callPackage ../servers/tracing/honeycomb/honeymarker { };
+
+ honeytail = callPackage ../servers/tracing/honeycomb/honeytail { };
+
+ honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { };
}
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
index 7c9327f697f2..2c2c5d5fb7ec 100644
--- a/pkgs/top-level/kodi-packages.nix
+++ b/pkgs/top-level/kodi-packages.nix
@@ -52,6 +52,8 @@ let self = rec {
a4ksubtitles = callPackage ../applications/video/kodi/addons/a4ksubtitles { };
+ arteplussept = callPackage ../applications/video/kodi/addons/arteplussept { };
+
controllers = {
default = callPackage ../applications/video/kodi/addons/controllers { controller = "default"; };
@@ -160,4 +162,6 @@ let self = rec {
websocket = callPackage ../applications/video/kodi/addons/websocket { };
+ xbmcswift2 = callPackage ../applications/video/kodi/addons/xbmcswift2 { };
+
}; in self
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 24a0dcb52fc3..8d70a2b95665 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4598,8 +4598,7 @@ in {
libxslt = (toPythonModule (pkgs.libxslt.override {
pythonSupport = true;
- python3 = python;
- inherit (self) libxml2;
+ inherit (self) python libxml2;
})).py;
license-expression = callPackage ../development/python-modules/license-expression { };