diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5376d51a617..d68adc192e1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -193,3 +193,6 @@
/nixos/modules/virtualisation/cri-o.nix @NixOS/podman
/nixos/modules/virtualisation/podman.nix @NixOS/podman
/nixos/tests/podman.nix @NixOS/podman
+
+# Blockchains
+/pkgs/applications/blockchains @mmahut
diff --git a/README.md b/README.md
index da38b227b56..d1187b37280 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ the main ones:
* [Nix](https://github.com/NixOS/nix) - the purely functional package manager
* [NixOps](https://github.com/NixOS/nixops) - the tool to remotely deploy NixOS machines
+* [nixos-hardware](https://github.com/NixOS/nixos-hardware) - NixOS profiles to optimize settings for different hardware
* [Nix RFCs](https://github.com/NixOS/rfcs) - the formal process for making substantial changes to the community
* [NixOS homepage](https://github.com/NixOS/nixos-homepage) - the [NixOS.org](https://nixos.org) website
* [hydra](https://github.com/NixOS/hydra) - our continuous integration system
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecdd53b8436..46ed766e0cf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -139,6 +139,12 @@
githubId = 1517066;
name = "Aiken Cairncross";
};
+ aciceri = {
+ name = "Andrea Ciceri";
+ email = "andrea.ciceri@autistici.org";
+ github = "aciceri";
+ githubId = 2318843;
+ };
acowley = {
email = "acowley@gmail.com";
github = "acowley";
@@ -3530,6 +3536,12 @@
githubId = 117874;
name = "Jeroen de Haas";
};
+ jduan = {
+ name = "Jingjing Duan";
+ email = "duanjingjing@gmail.com";
+ github = "jduan";
+ githubId = 452450;
+ };
jefdaj = {
email = "jefdaj@gmail.com";
github = "jefdaj";
@@ -3692,6 +3704,12 @@
githubId = 1102396;
name = "Jussi Maki";
};
+ jobojeha = {
+ email = "jobojeha@jeppener.de";
+ github = "jobojeha";
+ githubId = 60272884;
+ name = "Jonathan Jeppener-Haltenhoff";
+ };
joelburget = {
email = "joelburget@gmail.com";
github = "joelburget";
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 31cabce1d53..12363e99921 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -499,6 +499,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
#89205.
+
+
+ In the resilio module, has been changed to listen to [::1] instead of 0.0.0.0.
+
+
@@ -651,6 +656,16 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
netbeans was upgraded to 12.0 and now defaults to OpenJDK 11. This might cause problems if your projects depend on packages that were removed in Java 11.
+
+
+ nextcloud has been updated to v19.
+
+
+ If you have an existing installation, please make sure that you're on
+ nextcloud18 before upgrading to nextcloud19
+ since Nextcloud doesn't support upgrades across multiple major versions.
+
+
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 627ac324cf5..516fe3fc673 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -43,7 +43,7 @@ pkgs.stdenv.mkDerivation {
# Make a crude approximation of the size of the target image.
# If the script starts failing, increase the fudge factors here.
numInodes=$(find $storePaths ./files | wc -l)
- numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.03) }')
+ numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.10) }')
bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks))
echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
index 56b91933477..752de41f26d 100644
--- a/nixos/modules/hardware/printers.nix
+++ b/nixos/modules/hardware/printers.nix
@@ -84,7 +84,7 @@ in {
model = mkOption {
type = types.str;
example = literalExample ''
- gutenprint.''${lib.version.majorMinor (lib.getVersion pkgs.cups)}://brother-hl-5140/expert
+ gutenprint.''${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}://brother-hl-5140/expert
'';
description = ''
Location of the ppd driver file for the printer.
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
index c545a1e7e24..79c835dc390 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
@@ -18,6 +18,7 @@
sdImage = {
firmwareSize = 128;
+ firmwarePartitionName = "NIXOS_BOOT";
# This is a hack to avoid replicating config.txt from boot.loader.raspberryPi
populateFirmwareCommands =
"${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware";
@@ -25,6 +26,12 @@
populateRootCommands = "";
};
+ fileSystems."/boot/firmware" = {
+ # This effectively "renames" the loaOf entry set in sd-image.nix
+ mountPoint = "/boot";
+ neededForBoot = true;
+ };
+
# the installation media is also the installation target,
# so we don't want to provide the installation configuration.nix.
installer.cloneConfig = false;
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 98c12e30633..c15befa59e2 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -63,6 +63,14 @@ in
'';
};
+ firmwarePartitionName = mkOption {
+ type = types.str;
+ default = "FIRMWARE";
+ description = ''
+ Name of the filesystem which holds the boot firmware.
+ '';
+ };
+
rootPartitionUUID = mkOption {
type = types.nullOr types.str;
default = null;
@@ -114,7 +122,7 @@ in
config = {
fileSystems = {
"/boot/firmware" = {
- device = "/dev/disk/by-label/FIRMWARE";
+ device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";
fsType = "vfat";
# Alternatively, this could be removed from the configuration.
# The filesystem is not needed at runtime, it could be treated
@@ -178,7 +186,7 @@ in
# Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
truncate -s $((SECTORS * 512)) firmware_part.img
- faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n FIRMWARE firmware_part.img
+ faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img
# Populate the files intended for /boot/firmware
mkdir firmware
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 448d432853d..0dba92f60c7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -757,6 +757,7 @@
./services/networking/v2ray.nix
./services/networking/vsftpd.nix
./services/networking/wakeonlan.nix
+ ./services/networking/wasabibackend.nix
./services/networking/websockify.nix
./services/networking/wg-quick.nix
./services/networking/wicd.nix
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index f4eb4a265a4..1d2a982ac53 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -21,6 +21,12 @@ let
${optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''}
${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''}
+ ${optionalString (cfg.fluidsynth) ''
+ decoder {
+ plugin "fluidsynth"
+ soundfont "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"
+ }
+ ''}
${cfg.extraConfig}
'';
@@ -133,6 +139,14 @@ in {
parameter is omitted from the configuration.
'';
};
+
+ fluidsynth = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If set, add fluidsynth soundfont and configure the plugin.
+ '';
+ };
};
};
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 8ce2437841b..0477254e7c1 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -240,6 +240,7 @@ in {
'');
serviceConfig = {
ExecStart = "${package}/bin/hass --config '${cfg.configDir}'";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = "hass";
Group = "hass";
Restart = "on-failure";
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index e74e03fc0b0..266318296d7 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -109,8 +109,8 @@ in
httpListenAddr = mkOption {
type = types.str;
- default = "0.0.0.0";
- example = "1.2.3.4";
+ default = "[::1]";
+ example = "0.0.0.0";
description = ''
HTTP address to bind to.
'';
@@ -206,16 +206,16 @@ in
If you would like to be able to modify the contents of this
directories, it is recommended that you make your user a
- member of the resilio group.
+ member of the rslsync group.
Directories in this list should be in the
- resilio group, and that group must have
+ rslsync group, and that group must have
write access to the directory. It is also recommended that
chmod g+s is applied to the directory
so that any sub directories created will also belong to
- the resilio group. Also,
- setfacl -d -m group:resilio:rwx and
- setfacl -m group:resilio:rwx should also
+ the rslsync group. Also,
+ setfacl -d -m group:rslsync:rwx and
+ setfacl -m group:rslsync:rwx should also
be applied so that the sub directories are writable by
the group.
'';
diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix
new file mode 100644
index 00000000000..6eacffe709b
--- /dev/null
+++ b/nixos/modules/services/networking/wasabibackend.nix
@@ -0,0 +1,158 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.wasabibackend;
+
+ inherit (lib) mkEnableOption mkIf mkOption optionalAttrs optionalString types;
+
+ confOptions = {
+ BitcoinRpcConnectionString = "${cfg.rpc.user}:${cfg.rpc.password}";
+ } // optionalAttrs (cfg.network == "mainnet") {
+ Network = "Main";
+ MainNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
+ MainNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
+ } // optionalAttrs (cfg.network == "testnet") {
+ Network = "TestNet";
+ TestNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
+ TestNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
+ } // optionalAttrs (cfg.network == "regtest") {
+ Network = "RegTest";
+ RegTestBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}";
+ RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
+ };
+
+ configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
+
+in {
+
+ options = {
+
+ services.wasabibackend = {
+ enable = mkEnableOption "Wasabi backend service";
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/lib/wasabibackend";
+ description = "The data directory for the Wasabi backend node.";
+ };
+
+ customConfigFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "Defines the path to a custom configuration file that is copied to the user's directory. Overrides any config options.";
+ };
+
+ network = mkOption {
+ type = types.enum [ "mainnet" "testnet" "regtest" ];
+ default = "mainnet";
+ description = "The network to use for the Wasabi backend service.";
+ };
+
+ endpoint = {
+ ip = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "IP address for P2P connection to bitcoind.";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8333;
+ description = "Port for P2P connection to bitcoind.";
+ };
+ };
+
+ rpc = {
+ ip = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "IP address for RPC connection to bitcoind.";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8332;
+ description = "Port for RPC connection to bitcoind.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "bitcoin";
+ description = "RPC user for the bitcoin endpoint.";
+ };
+
+ password = mkOption {
+ type = types.str;
+ default = "password";
+ description = "RPC password for the bitcoin endpoint. Warning: this is stored in cleartext in the Nix store! Use configFile or passwordFile if needed.";
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "File that contains the password of the RPC user.";
+ };
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "wasabibackend";
+ description = "The user as which to run the wasabibackend node.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = cfg.user;
+ description = "The group as which to run the wasabibackend node.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ systemd.tmpfiles.rules = [
+ "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -"
+ ];
+
+ systemd.services.wasabibackend = {
+ description = "wasabibackend server";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-online.target" ];
+ environment = {
+ DOTNET_PRINT_TELEMETRY_MESSAGE = "false";
+ DOTNET_CLI_TELEMETRY_OPTOUT = "true";
+ };
+ preStart = ''
+ mkdir -p ${cfg.dataDir}/.walletwasabi/backend
+ ${if cfg.customConfigFile != null then ''
+ cp -v ${cfg.customConfigFile} ${cfg.dataDir}/.walletwasabi/backend/Config.json
+ '' else ''
+ cp -v ${configFile} ${cfg.dataDir}/.walletwasabi/backend/Config.json
+ ${optionalString (cfg.rpc.passwordFile != null) ''
+ CONFIGTMP=$(mktemp)
+ cat ${cfg.dataDir}/.walletwasabi/backend/Config.json | ${pkgs.jq}/bin/jq --arg rpconnection "${cfg.rpc.user}:$(cat "${cfg.rpc.passwordFile}")" '. + { BitcoinRpcConnectionString: $rpconnection }' > $CONFIGTMP
+ mv $CONFIGTMP ${cfg.dataDir}/.walletwasabi/backend/Config.json
+ ''}
+ ''}
+ chmod ug+w ${cfg.dataDir}/.walletwasabi/backend/Config.json
+ '';
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ ExecStart = "${pkgs.wasabibackend}/bin/WasabiBackend";
+ ProtectSystem = "full";
+ };
+ };
+
+ users.users.${cfg.user} = {
+ name = cfg.user;
+ group = cfg.group;
+ description = "wasabibackend daemon user";
+ home = cfg.dataDir;
+ isSystemUser = true;
+ };
+
+ users.groups.${cfg.group} = {};
+
+ };
+}
diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix
index b184c0754d4..657b1a4fc5b 100644
--- a/nixos/modules/services/web-apps/gerrit.nix
+++ b/nixos/modules/services/web-apps/gerrit.nix
@@ -17,6 +17,10 @@ let
lib.generators.toGitINI cfg.settings
);
+ replicationConfig = pkgs.writeText "replication.conf" (
+ lib.generators.toGitINI cfg.replicationSettings
+ );
+
# Wrap the gerrit java with all the java options so it can be called
# like a normal CLI app
gerrit-cli = pkgs.writeShellScriptBin "gerrit" ''
@@ -106,6 +110,15 @@ in
'';
};
+ replicationSettings = mkOption {
+ type = gitIniType;
+ default = {};
+ description = ''
+ Replication configuration. This will be generated to the
+ etc/replication.config file.
+ '';
+ };
+
plugins = mkOption {
type = types.listOf types.package;
default = [];
@@ -138,6 +151,13 @@ in
config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.replicationSettings != {} -> elem "replication" cfg.builtinPlugins;
+ message = "Gerrit replicationSettings require enabling the replication plugin";
+ }
+ ];
+
services.gerrit.settings = {
cache.directory = "/var/cache/gerrit";
container.heapLimit = cfg.jvmHeapLimit;
@@ -194,6 +214,7 @@ in
# copy the config, keep it mutable because Gerrit
ln -sfv ${gerritConfig} etc/gerrit.config
+ ln -sfv ${replicationConfig} etc/replication.config
# install the plugins
rm -rf plugins
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 5b9065dec3c..328561dc800 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -69,7 +69,7 @@ in {
package = mkOption {
type = types.package;
description = "Which package to use for the Nextcloud instance.";
- relatedPackages = [ "nextcloud17" "nextcloud18" ];
+ relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ];
};
maxUploadSize = mkOption {
@@ -303,6 +303,14 @@ in {
'';
};
};
+ occ = mkOption {
+ type = types.package;
+ default = occ;
+ internal = true;
+ description = ''
+ The nextcloud-occ program preconfigured to target this Nextcloud instance.
+ '';
+ };
};
config = mkIf cfg.enable (mkMerge [
@@ -336,7 +344,16 @@ in {
server, and wait until the upgrade to 17 is finished.
Then, set `services.nextcloud.package` to `pkgs.nextcloud18` to upgrade to
- Nextcloud version 18.
+ Nextcloud version 18. Please note that Nextcloud 19 is already out and it's
+ recommended to upgrade to nextcloud19 after that.
+ '')
+ ++ (optional (versionOlder cfg.package.version "19") ''
+ A legacy Nextcloud install (from before NixOS 20.09/unstable) may be installed.
+
+ If/After nextcloud18 is installed successfully, you can safely upgrade to
+ nextcloud19. If not, please upgrade to nextcloud18 first since Nextcloud doesn't
+ support upgrades that skip multiple versions (i.e. an upgrade from 17 to 19 isn't
+ possible, but an upgrade from 18 to 19).
'');
services.nextcloud.package = with pkgs;
@@ -348,7 +365,8 @@ in {
`pkgs.nextcloud`.
''
else if versionOlder stateVersion "20.03" then nextcloud17
- else nextcloud18
+ else if versionOlder stateVersion "20.09" then nextcloud18
+ else nextcloud19
);
}
@@ -360,6 +378,11 @@ in {
};
systemd.services = {
+ # When upgrading the Nextcloud package, Nextcloud can report errors such as
+ # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"
+ # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround).
+ phpfpm-nextcloud.restartTriggers = [ cfg.package ];
+
nextcloud-setup = let
c = cfg.config;
writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
index fc454f8ba25..332e4d1ff3e 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -161,5 +161,11 @@
};
}
+
+
+ Ideally we should make sure that it's possible to jump two NixOS versions forward:
+ i.e. the warnings and the logic in the module should guard a user to upgrade from a
+ Nextcloud on e.g. 19.09 to a Nextcloud on 20.09.
+
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
index c8b5bf2e61a..0541ca1ba62 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
@@ -1,4 +1,7 @@
-#! @bash@/bin/sh -e
+#! @bash@/bin/sh
+
+# This can end up being called disregarding the shebang.
+set -e
shopt -s nullglob
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index bd26fc906aa..7056d414e9e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -236,6 +236,7 @@ in
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
nginx-sso = handleTest ./nginx-sso.nix {};
+ nginx-variants = handleTest ./nginx-variants.nix {};
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
@@ -345,6 +346,7 @@ in
vault = handleTest ./vault.nix {};
victoriametrics = handleTest ./victoriametrics.nix {};
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
+ wasabibackend = handleTest ./wasabibackend.nix {};
wireguard = handleTest ./wireguard {};
wordpress = handleTest ./wordpress.nix {};
xandikos = handleTest ./xandikos.nix {};
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 3365e74ba83..0d1fcedcd85 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -2,69 +2,53 @@ import ./make-test-python.nix ({ pkgs, ... }:
let
configDir = "/var/lib/foobar";
- apiPassword = "some_secret";
- mqttPassword = "another_secret";
- hassCli = "hass-cli --server http://hass:8123 --password '${apiPassword}'";
+ mqttPassword = "secret";
in {
name = "home-assistant";
meta = with pkgs.stdenv.lib; {
maintainers = with maintainers; [ dotlambda ];
};
- nodes = {
- hass =
- { pkgs, ... }:
- {
- environment.systemPackages = with pkgs; [
- mosquitto home-assistant-cli
- ];
- services.home-assistant = {
- inherit configDir;
- enable = true;
- package = pkgs.home-assistant.override {
- extraPackages = ps: with ps; [ hbmqtt ];
- };
- config = {
- homeassistant = {
- name = "Home";
- time_zone = "UTC";
- latitude = "0.0";
- longitude = "0.0";
- elevation = 0;
- auth_providers = [
- {
- type = "legacy_api_password";
- api_password = apiPassword;
- }
- ];
- };
- frontend = { };
- mqtt = { # Use hbmqtt as broker
- password = mqttPassword;
- };
- binary_sensor = [
- {
- platform = "mqtt";
- state_topic = "home-assistant/test";
- payload_on = "let_there_be_light";
- payload_off = "off";
- }
- ];
- };
- lovelaceConfig = {
- title = "My Awesome Home";
- views = [ {
- title = "Example";
- cards = [ {
- type = "markdown";
- title = "Lovelace";
- content = "Welcome to your **Lovelace UI**.";
- } ];
- } ];
- };
- lovelaceConfigWritable = true;
+ nodes.hass = { pkgs, ... }: {
+ environment.systemPackages = with pkgs; [ mosquitto ];
+ services.home-assistant = {
+ inherit configDir;
+ enable = true;
+ config = {
+ homeassistant = {
+ name = "Home";
+ time_zone = "UTC";
+ latitude = "0.0";
+ longitude = "0.0";
+ elevation = 0;
+ };
+ frontend = {};
+ # uses embedded mqtt broker
+ mqtt.password = mqttPassword;
+ binary_sensor = [{
+ platform = "mqtt";
+ state_topic = "home-assistant/test";
+ payload_on = "let_there_be_light";
+ payload_off = "off";
+ }];
+ logger = {
+ default = "info";
+ logs."homeassistant.components.mqtt" = "debug";
};
};
+ lovelaceConfig = {
+ title = "My Awesome Home";
+ views = [{
+ title = "Example";
+ cards = [{
+ type = "markdown";
+ title = "Lovelace";
+ content = "Welcome to your **Lovelace UI**.";
+ }];
+ }];
+ };
+ lovelaceConfigWritable = true;
+ };
};
testScript = ''
@@ -77,28 +61,13 @@ in {
with subtest("Check that Home Assistant's web interface and API can be reached"):
hass.wait_for_open_port(8123)
hass.succeed("curl --fail http://localhost:8123/lovelace")
- assert "API running" in hass.succeed(
- "curl --fail -H 'x-ha-access: ${apiPassword}' http://localhost:8123/api/"
- )
with subtest("Toggle a binary sensor using MQTT"):
- assert '"state": "off"' in hass.succeed(
- "curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}'"
- )
+ # wait for broker to become available
hass.wait_until_succeeds(
- "mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light"
- )
- assert '"state": "on"' in hass.succeed(
- "curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}'"
- )
- with subtest("Toggle a binary sensor using hass-cli"):
- assert '"state": "on"' in hass.succeed(
- "${hassCli} --output json state get binary_sensor.mqtt_binary_sensor"
+ "mosquitto_sub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -W 1 -t '*'"
)
hass.succeed(
- "${hassCli} state edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"
- )
- assert '"state": "off"' in hass.succeed(
- "curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}'"
+ "mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light"
)
with subtest("Print log to ease debugging"):
output_log = hass.succeed("cat ${configDir}/home-assistant.log")
@@ -107,5 +76,9 @@ in {
with subtest("Check that no errors were logged"):
assert "ERROR" not in output_log
+
+ # example line: 2020-06-20 10:01:32 DEBUG (MainThread) [homeassistant.components.mqtt] Received message on home-assistant/test: b'let_there_be_light'
+ with subtest("Check we received the mosquitto message"):
+ assert "let_there_be_light" in output_log
'';
})
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index 9cbecf01f57..a8fa0cae6f0 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -26,7 +26,9 @@ in {
};
};
- nextcloud = { config, pkgs, ... }: {
+ nextcloud = { config, pkgs, ... }: let
+ cfg = config;
+ in {
networking.firewall.allowedTCPPorts = [ 80 ];
services.nextcloud = {
@@ -42,6 +44,8 @@ in {
startAt = "20:00";
};
};
+
+ environment.systemPackages = [ cfg.services.nextcloud.occ ];
};
};
@@ -67,6 +71,8 @@ in {
in ''
start_all()
nextcloud.wait_for_unit("multi-user.target")
+ # This is just to ensure the nextcloud-occ program is working
+ nextcloud.succeed("nextcloud-occ status")
nextcloud.succeed("curl -sSf http://nextcloud/login")
nextcloud.succeed(
"${withRcloneEnv} ${copySharedFile}"
diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix
new file mode 100644
index 00000000000..ca4655391bc
--- /dev/null
+++ b/nixos/tests/nginx-variants.nix
@@ -0,0 +1,33 @@
+{ system ? builtins.currentSystem,
+ config ? {},
+ pkgs ? import ../.. { inherit system config; }
+}:
+
+with import ../lib/testing-python.nix { inherit system pkgs; };
+
+builtins.listToAttrs (
+ builtins.map
+ (nginxName:
+ {
+ name = nginxName;
+ value = makeTest {
+ name = "nginx-variant-${nginxName}";
+
+ machine = { pkgs, ... }: {
+ services.nginx = {
+ enable = true;
+ virtualHosts.localhost.locations."/".return = "200 'foo'";
+ package = pkgs."${nginxName}";
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("nginx")
+ machine.wait_for_open_port(80)
+ machine.succeed('test "$(curl -fvvv http://localhost/)" = foo')
+ '';
+ };
+ }
+ )
+ [ "nginxStable" "nginxUnstable" "nginxShibboleth" "openresty" "tengine" ]
+)
diff --git a/nixos/tests/wasabibackend.nix b/nixos/tests/wasabibackend.nix
new file mode 100644
index 00000000000..d169ad15272
--- /dev/null
+++ b/nixos/tests/wasabibackend.nix
@@ -0,0 +1,38 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "wasabibackend";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ mmahut ];
+ };
+
+ nodes = {
+ machine = { ... }: {
+ services.wasabibackend = {
+ enable = true;
+ network = "testnet";
+ rpc = {
+ user = "alice";
+ port = 18332;
+ };
+ };
+ services.bitcoind = {
+ enable = true;
+ testnet = true;
+ rpc.users = {
+ alice.passwordHMAC = "e7096bc21da60b29ecdbfcdb2c3acc62$f948e61cb587c399358ed99c6ed245a41460b4bf75125d8330c9f6fcc13d7ae7";
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("wasabibackend.service")
+ machine.wait_until_succeeds(
+ "grep 'Wasabi Backend started' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt"
+ )
+ machine.sleep(5)
+ machine.succeed(
+ "grep 'Config is successfully initialized' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt"
+ )
+ '';
+})
diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix
new file mode 100644
index 00000000000..384ac880fe1
--- /dev/null
+++ b/pkgs/applications/blockchains/bitcoin-knots.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, autoreconfHook
+, db5
+, openssl
+, boost
+, zlib
+, miniupnpc
+, libevent
+, protobuf
+, utillinux
+}:
+
+stdenv.mkDerivation rec {
+ pname = "bitcoind-knots";
+ version = "0.20.0";
+ versionDate = "20200614";
+
+ src = fetchFromGitHub {
+ owner = "bitcoinknots";
+ repo = "bitcoin";
+ rev = "v${version}.knots${versionDate}";
+ sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj";
+ };
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ openssl db5 openssl utillinux
+ protobuf boost zlib miniupnpc libevent ];
+
+ configureFlags = [ "--with-incompatible-bdb"
+ "--with-boost-libdir=${boost.out}/lib" ];
+
+ meta = with stdenv.lib; {
+ description = "An enhanced Bitcoin node software";
+ homepage = "https://bitcoinknots.org/";
+ license = licenses.mit;
+ maintainers = [ maintainers.mmahut ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh
new file mode 100644
index 00000000000..814f92a341a
--- /dev/null
+++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh
@@ -0,0 +1,98 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p dotnet-sdk_3 nixfmt
+
+# Run this script to generate deps.nix
+# ./create_deps.sh /path/to/package/source/checkout > deps.nix
+
+# TODO: consolidate with other dotnet deps generation scripts by which
+# this script is inspired:
+# - pkgs/servers/nosql/eventstore/create-deps.sh
+# - pkgs/development/dotnet-modules/python-language-server/create_deps.sh
+
+URLBASE="https://www.nuget.org/api/v2/package"
+
+DEPS_HEADER="
+{ fetchurl }:
+let
+ nugetUrlBase = \"$URLBASE\";
+ fetchNuGet = { name, version, sha256 }: fetchurl {
+ inherit sha256;
+ url = \"\${nugetUrlBase}/\${name}/\${version}\";
+ };
+in ["
+
+DEPS_FOOTER="]"
+
+DEPS_TEMPLATE="
+(fetchNuGet {
+ name = \"%s\";
+ version = \"%s\";
+ sha256 = \"%s\";
+})"
+
+
+function generate_restore_log() {
+ checkout_path=$1
+ >&2 echo "generating restore log for $checkout_path..."
+ cd $checkout_path
+ dotnet nuget locals all --clear
+ dotnet restore -v normal --no-cache WalletWasabi.Backend -r linux-x64
+ cd -
+}
+
+function process_restore_log() {
+ restore_log=$1
+ >&2 echo "processing restore log..."
+ while read line; do
+ if echo $line | grep -q "^[[:space:]]*Installing"; then
+ l=$(echo $line | xargs)
+ l=${l#Installing }
+ l=${l%.}
+ echo $l
+ fi
+ done < $restore_log
+}
+
+function prefetch_deps() {
+ processed_log=$1
+ >&2 echo "prefetching deps..."
+ while read line; do
+ name=$(echo $line | cut -d' ' -f1)
+ >&2 echo "prefetching '$name' version: $version"
+ version=$(echo $line | cut -d' ' -f2)
+ hash=$(nix-prefetch-url "$URLBASE/$name/$version" 2>/dev/null)
+ echo "$name $version $hash"
+ done < $processed_log
+}
+
+function generate_deps_expression() {
+ packages=$1
+ >&2 echo "generating deps nix-expression..."
+ echo $DEPS_HEADER
+ while read line; do
+ name=$(echo $line | cut -d' ' -f1)
+ version=$(echo $line | cut -d' ' -f2)
+ hash=$(echo $line | cut -d' ' -f3)
+ printf "$DEPS_TEMPLATE" $name $version $hash
+ done < $packages
+ echo $DEPS_FOOTER
+}
+
+function main() {
+ checkout_path=$1
+ tmpdir=$(mktemp -d)
+ generate_restore_log $checkout_path > $tmpdir/restore.log
+ process_restore_log $tmpdir/restore.log > $tmpdir/processed.log
+ prefetch_deps $tmpdir/processed.log > $tmpdir/prefetched.log
+ generate_deps_expression $tmpdir/prefetched.log > $tmpdir/deps.nix
+ nixfmt $tmpdir/deps.nix
+ cat $tmpdir/deps.nix
+ rm -rf $tmpdir
+}
+
+if [ ! -d "$1" ]; then
+ >&2 echo "First argument must be a directory, the path to the package source checkout"
+ exit 1
+fi
+
+main $@
diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix
new file mode 100644
index 00000000000..0324f024423
--- /dev/null
+++ b/pkgs/applications/blockchains/wasabibackend/default.nix
@@ -0,0 +1,100 @@
+{ stdenv
+, fetchFromGitHub
+, fetchurl
+, makeWrapper
+, Nuget
+, dotnetCorePackages
+, openssl
+, zlib
+}:
+
+let
+ deps = import ./deps.nix { inherit fetchurl; };
+
+ dotnet-sdk = dotnetCorePackages.sdk_3_1;
+ dotnet-aspnetcore = dotnetCorePackages.aspnetcore_3_1;
+
+ nugetSource = stdenv.mkDerivation {
+ pname = "${pname}-nuget-deps";
+ inherit version;
+
+ dontUnpack = true;
+ dontInstall = true;
+
+ nativeBuildInputs = [ Nuget ];
+
+ buildPhase = ''
+ export HOME=$(mktemp -d)
+ mkdir -p $out/lib
+
+ nuget sources Disable -Name "nuget.org"
+ for package in ${toString deps}; do
+ nuget add $package -Source $out/lib
+ done
+ '';
+ };
+
+ pname = "WasabiBackend";
+ version = "1.1.11.1";
+
+ projectName = "WalletWasabi.Backend";
+ projectConfiguration = "Release";
+ projectRuntime = "linux-x64";
+in
+
+stdenv.mkDerivation rec {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "zkSNACKs";
+ repo = "WalletWasabi";
+ rev = "v${version}";
+ sha256 = "0kxww8ywhld00b0qsv5jh5s19jqpahnb9mvshmjnp3cb840j12a7";
+ };
+
+ buildInputs = [
+ Nuget
+ dotnet-sdk
+ makeWrapper
+ ];
+
+ buildPhase = ''
+ export HOME=$(mktemp -d)
+ export DOTNET_CLI_TELEMETRY_OPTOUT=1
+ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+ export DOTNET_ROOT="${dotnet-sdk}/bin"
+
+ nuget sources Disable -Name "nuget.org"
+
+ dotnet restore \
+ --source ${nugetSource}/lib \
+ --runtime ${projectRuntime} \
+ ${projectName}
+
+ dotnet publish \
+ --no-restore \
+ --runtime ${projectRuntime} \
+ --configuration ${projectConfiguration} \
+ ${projectName}
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r ${projectName}/bin/${projectConfiguration}/netcoreapp3.1/${projectRuntime}/publish $out/lib
+ mkdir -p $out/bin
+ makeWrapper $out/lib/WalletWasabi.Backend $out/bin/${pname} \
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl zlib ]} \
+ --run "cd $out/lib"
+ '';
+
+ # If we don't disable stripping the executable fails to start with segfault
+ dontStrip = true;
+
+ meta = with stdenv.lib; {
+ description = "Backend for the Wasabi Wallet";
+ homepage = "https://wasabiwallet.io/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mmahut ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix
new file mode 100644
index 00000000000..ff5184ba860
--- /dev/null
+++ b/pkgs/applications/blockchains/wasabibackend/deps.nix
@@ -0,0 +1,951 @@
+{ fetchurl }:
+let
+ nugetUrlBase = "https://www.nuget.org/api/v2/package";
+ fetchNuGet = { name, version, sha256 }:
+ fetchurl {
+ inherit sha256;
+ url = "${nugetUrlBase}/${name}/${version}";
+ };
+in [
+
+ (fetchNuGet {
+ name = "System.Xml.XmlSerializer";
+ version = "4.0.11";
+ sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Overlapped";
+ version = "4.0.1";
+ sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188";
+ })
+ (fetchNuGet {
+ name = "System.Security.Principal";
+ version = "4.0.1";
+ sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p";
+ })
+ (fetchNuGet {
+ name = "System.Dynamic.Runtime";
+ version = "4.0.11";
+ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
+ })
+ (fetchNuGet {
+ name = "System.Private.DataContractSerialization";
+ version = "4.1.1";
+ sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Win32.Registry";
+ version = "4.0.0";
+ sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit.Lightweight";
+ version = "4.0.1";
+ sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit";
+ version = "4.0.1";
+ sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit.ILGeneration";
+ version = "4.0.1";
+ sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.DiagnosticSource";
+ version = "4.0.0";
+ sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m";
+ })
+ (fetchNuGet {
+ name = "System.Globalization.Extensions";
+ version = "4.0.1";
+ sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Cng";
+ version = "4.2.0";
+ sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.OpenSsl";
+ version = "4.0.0";
+ sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Csp";
+ version = "4.0.0";
+ sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System.Net.Http";
+ version = "4.0.1";
+ sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks.Extensions";
+ version = "4.0.0";
+ sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System.IO.Compression";
+ version = "4.1.0";
+ sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.FileProviders.Physical";
+ version = "2.0.0";
+ sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3";
+ })
+ (fetchNuGet {
+ name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts";
+ version = "2.0.2";
+ sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.App";
+ version = "2.0.5";
+ sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6";
+ })
+ (fetchNuGet {
+ name = "Microsoft.VisualStudio.Web.CodeGeneration.Tools";
+ version = "2.0.2";
+ sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6";
+ })
+ (fetchNuGet {
+ name = "NuGet.Frameworks";
+ version = "4.0.0";
+ sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System";
+ version = "4.0.0";
+ sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
+ })
+ (fetchNuGet {
+ name = "System.Buffers";
+ version = "4.0.0";
+ sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Build.Runtime";
+ version = "15.3.409";
+ sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q";
+ })
+ (fetchNuGet {
+ name = "Newtonsoft.Json";
+ version = "10.0.1";
+ sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.FileSystemGlobbing";
+ version = "2.0.0";
+ sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System.Security.Cryptography";
+ version = "4.0.0";
+ sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.FileProviders.Abstractions";
+ version = "2.0.0";
+ sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Targets";
+ version = "1.0.1";
+ sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Platforms";
+ version = "2.0.1";
+ sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.DotNetHostPolicy";
+ version = "2.0.5";
+ sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk";
+ })
+ (fetchNuGet {
+ name = "NETStandard.Library";
+ version = "2.0.1";
+ sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk";
+ })
+ (fetchNuGet {
+ name = "System.Globalization.Extensions";
+ version = "4.3.0";
+ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Primitives";
+ version = "4.3.0";
+ sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Numerics";
+ version = "4.3.0";
+ sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Formatters";
+ version = "4.3.0";
+ sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XmlDocument";
+ version = "4.3.0";
+ sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
+ })
+ (fetchNuGet {
+ name = "System.Collections";
+ version = "4.3.0";
+ sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Debug";
+ version = "4.3.0";
+ sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
+ })
+ (fetchNuGet {
+ name = "System.Resources.ResourceManager";
+ version = "4.3.0";
+ sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Extensions";
+ version = "4.3.0";
+ sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Handles";
+ version = "4.3.0";
+ sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding.Extensions";
+ version = "4.3.0";
+ sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
+ })
+ (fetchNuGet {
+ name = "System.Globalization";
+ version = "4.3.0";
+ sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
+ })
+ (fetchNuGet {
+ name = "System.Linq";
+ version = "4.3.0";
+ sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding";
+ version = "4.3.0";
+ sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
+ })
+ (fetchNuGet {
+ name = "System.ObjectModel";
+ version = "4.3.0";
+ sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.DotNetAppHost";
+ version = "2.0.5";
+ sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.CompilerServices.Unsafe";
+ version = "4.4.0";
+ sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29";
+ })
+ (fetchNuGet {
+ name = "System.Threading";
+ version = "4.3.0";
+ sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
+ })
+ (fetchNuGet {
+ name = "Microsoft.CSharp";
+ version = "4.3.0";
+ sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb";
+ })
+ (fetchNuGet {
+ name = "System.IO.Pipes";
+ version = "4.0.0";
+ sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za";
+ })
+ (fetchNuGet {
+ name = "System.Text.RegularExpressions";
+ version = "4.3.0";
+ sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
+ })
+ (fetchNuGet {
+ name = "System.Reflection";
+ version = "4.3.0";
+ sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
+ })
+ (fetchNuGet {
+ name = "System.IO";
+ version = "4.3.0";
+ sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XDocument";
+ version = "4.3.0";
+ sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks";
+ version = "4.3.0";
+ sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
+ })
+ (fetchNuGet {
+ name = "System.ComponentModel.TypeConverter";
+ version = "4.3.0";
+ sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Extensions";
+ version = "4.3.0";
+ sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60";
+ })
+ (fetchNuGet {
+ name = "System.Dynamic.Runtime";
+ version = "4.3.0";
+ sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
+ })
+ (fetchNuGet {
+ name = "System.Xml.ReaderWriter";
+ version = "4.3.0";
+ sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
+ })
+ (fetchNuGet {
+ name = "System.Linq.Expressions";
+ version = "4.3.0";
+ sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
+ })
+ (fetchNuGet {
+ name = "System.Runtime";
+ version = "4.3.0";
+ sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
+ })
+ (fetchNuGet {
+ name = "NETStandard.Library";
+ version = "1.6.0";
+ sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Build.Framework";
+ version = "15.3.409";
+ sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Build.Tasks.Core";
+ version = "15.3.409";
+ sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Build.Utilities.Core";
+ version = "15.3.409";
+ sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding.CodePages";
+ version = "4.0.1";
+ sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Build";
+ version = "15.3.409";
+ sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks.Dataflow";
+ version = "4.6.0";
+ sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Primitives";
+ version = "2.0.0";
+ sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.DotNetHostResolver";
+ version = "2.0.5";
+ sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Platforms";
+ version = "1.1.0";
+ sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Targets";
+ version = "1.1.0";
+ sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.TypeExtensions";
+ version = "4.3.0";
+ sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Primitives";
+ version = "4.3.0";
+ sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices";
+ version = "4.3.0";
+ sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Tools";
+ version = "4.3.0";
+ sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
+ })
+ (fetchNuGet {
+ name = "System.ComponentModel.Primitives";
+ version = "4.3.0";
+ sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
+ })
+ (fetchNuGet {
+ name = "System.ComponentModel";
+ version = "4.3.0";
+ sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
+ })
+ (fetchNuGet {
+ name = "System.Collections.NonGeneric";
+ version = "4.3.0";
+ sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
+ })
+ (fetchNuGet {
+ name = "System.Collections.Specialized";
+ version = "4.3.0";
+ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit.ILGeneration";
+ version = "4.3.0";
+ sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit";
+ version = "4.3.0";
+ sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem.Primitives";
+ version = "4.3.0";
+ sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks.Extensions";
+ version = "4.3.0";
+ sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem";
+ version = "4.3.0";
+ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit.Lightweight";
+ version = "4.3.0";
+ sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c";
+ })
+ (fetchNuGet {
+ name = "System.AppContext";
+ version = "4.1.0";
+ sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
+ })
+ (fetchNuGet {
+ name = "System.ObjectModel";
+ version = "4.0.12";
+ sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
+ })
+ (fetchNuGet {
+ name = "System.Collections.Concurrent";
+ version = "4.0.12";
+ sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem.Primitives";
+ version = "4.0.1";
+ sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Win32.Primitives";
+ version = "4.0.1";
+ sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Tracing";
+ version = "4.1.0";
+ sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
+ })
+ (fetchNuGet {
+ name = "System.Net.Sockets";
+ version = "4.1.0";
+ sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Timer";
+ version = "4.0.1";
+ sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Platforms";
+ version = "1.0.1";
+ sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr";
+ })
+ (fetchNuGet {
+ name = "System.Globalization.Calendars";
+ version = "4.0.1";
+ sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Encoding";
+ version = "4.0.0";
+ sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Primitives";
+ version = "4.0.1";
+ sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Tools";
+ version = "4.0.1";
+ sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";
+ })
+ (fetchNuGet {
+ name = "System.Console";
+ version = "4.0.0";
+ sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Handles";
+ version = "4.0.1";
+ sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Primitives";
+ version = "4.0.0";
+ sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Debug";
+ version = "4.0.11";
+ sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz";
+ })
+ (fetchNuGet {
+ name = "System.Collections";
+ version = "4.0.11";
+ sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Extensions";
+ version = "4.0.1";
+ sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem";
+ version = "4.0.1";
+ sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Numerics";
+ version = "4.0.1";
+ sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn";
+ })
+ (fetchNuGet {
+ name = "System.IO.Compression.ZipFile";
+ version = "4.0.1";
+ sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
+ })
+ (fetchNuGet {
+ name = "System.Resources.ResourceManager";
+ version = "4.0.1";
+ sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Algorithms";
+ version = "4.2.0";
+ sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85";
+ })
+ (fetchNuGet {
+ name = "System.Linq";
+ version = "4.1.0";
+ sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding";
+ version = "4.0.11";
+ sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices.RuntimeInformation";
+ version = "4.0.0";
+ sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
+ })
+ (fetchNuGet {
+ name = "System.IO.Compression";
+ version = "4.1.0";
+ sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding.Extensions";
+ version = "4.0.11";
+ sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
+ })
+ (fetchNuGet {
+ name = "System.Globalization";
+ version = "4.0.11";
+ sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
+ })
+ (fetchNuGet {
+ name = "System.Text.RegularExpressions";
+ version = "4.1.0";
+ sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
+ })
+ (fetchNuGet {
+ name = "System.Reflection";
+ version = "4.1.0";
+ sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XDocument";
+ version = "4.0.11";
+ sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18";
+ })
+ (fetchNuGet {
+ name = "System.Threading";
+ version = "4.0.11";
+ sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks";
+ version = "4.0.11";
+ sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
+ })
+ (fetchNuGet {
+ name = "System.Net.Primitives";
+ version = "4.0.11";
+ sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r";
+ })
+ (fetchNuGet {
+ name = "System.IO";
+ version = "4.1.0";
+ sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Extensions";
+ version = "4.1.0";
+ sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.X509Certificates";
+ version = "4.1.0";
+ sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
+ })
+ (fetchNuGet {
+ name = "System.Net.Http";
+ version = "4.1.0";
+ sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb";
+ })
+ (fetchNuGet {
+ name = "System.Xml.ReaderWriter";
+ version = "4.0.11";
+ sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices";
+ version = "4.1.0";
+ sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
+ })
+ (fetchNuGet {
+ name = "System.Linq.Expressions";
+ version = "4.1.0";
+ sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
+ })
+ (fetchNuGet {
+ name = "System.Runtime";
+ version = "4.1.0";
+ sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Thread";
+ version = "4.0.0";
+ sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.TraceSource";
+ version = "4.0.0";
+ sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.TypeExtensions";
+ version = "4.1.0";
+ sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Primitives";
+ version = "4.1.1";
+ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XmlDocument";
+ version = "4.0.1";
+ sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
+ version = "3.1.2";
+ sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.App.Runtime.linux-x64";
+ version = "3.1.2";
+ sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66";
+ })
+ (fetchNuGet {
+ name = "System.Collections.NonGeneric";
+ version = "4.0.1";
+ sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d";
+ })
+ (fetchNuGet {
+ name = "System.Resources.Reader";
+ version = "4.0.0";
+ sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XPath.XmlDocument";
+ version = "4.0.1";
+ sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Platforms";
+ version = "3.1.0";
+ sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
+ })
+ (fetchNuGet {
+ name = "Microsoft.CSharp";
+ version = "4.7.0";
+ sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XPath";
+ version = "4.0.1";
+ sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Logging.Abstractions";
+ version = "1.0.0";
+ sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka";
+ })
+ (fetchNuGet {
+ name = "System.Security.Principal.Windows";
+ version = "4.7.0";
+ sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
+ })
+ (fetchNuGet {
+ name = "System.Security.AccessControl";
+ version = "4.7.0";
+ sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.JsonPatch";
+ version = "3.1.1";
+ sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml";
+ })
+ (fetchNuGet {
+ name = "Newtonsoft.Json";
+ version = "12.0.2";
+ sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";
+ })
+ (fetchNuGet {
+ name = "System.Resources.Writer";
+ version = "4.0.0";
+ sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Metadata";
+ version = "1.3.0";
+ sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b";
+ })
+ (fetchNuGet {
+ name = "System.Collections.Immutable";
+ version = "1.2.0";
+ sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m";
+ })
+ (fetchNuGet {
+ name = "System.Linq.Parallel";
+ version = "4.0.1";
+ sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Process";
+ version = "4.1.0";
+ sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Xml";
+ version = "4.1.1";
+ sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk";
+ })
+ (fetchNuGet {
+ name = "System.Threading.ThreadPool";
+ version = "4.0.10";
+ sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Loader";
+ version = "4.0.0";
+ sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Contracts";
+ version = "4.0.1";
+ sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.FileVersionInfo";
+ version = "4.0.0";
+ sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3";
+ })
+ (fetchNuGet {
+ name = "NBitcoin.Secp256k1";
+ version = "1.0.1";
+ sha256 = "0j3a8iamqh06b7am6k8gh6d41zvrnmsif3525bw742jw5byjypdl";
+ })
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";
+ version = "3.1.1";
+ sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig";
+ })
+ (fetchNuGet {
+ name = "Newtonsoft.Json.Bson";
+ version = "1.0.2";
+ sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Win32.Registry";
+ version = "4.7.0";
+ sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
+ })
+ (fetchNuGet {
+ name = "Microsoft.OpenApi";
+ version = "1.1.4";
+ sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3";
+ })
+ (fetchNuGet {
+ name = "NBitcoin";
+ version = "5.0.29";
+ sha256 = "0a6jvdvnf5h9j6c3ii3pdnkq79shmcm1hf6anaqcwvi3gq19chak";
+ })
+ (fetchNuGet {
+ name = "Swashbuckle.AspNetCore.SwaggerUI";
+ version = "5.0.0";
+ sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd";
+ })
+ (fetchNuGet {
+ name = "Swashbuckle.AspNetCore";
+ version = "5.0.0";
+ sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09";
+ })
+ (fetchNuGet {
+ name = "Swashbuckle.AspNetCore.SwaggerGen";
+ version = "5.0.0";
+ sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.ApiDescription.Server";
+ version = "3.0.0";
+ sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh";
+ })
+ (fetchNuGet {
+ name = "Swashbuckle.AspNetCore.Swagger";
+ version = "5.0.0";
+ sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Private.Uri";
+ version = "4.0.1";
+ sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Text.Encoding";
+ version = "4.0.11";
+ sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Threading.Tasks";
+ version = "4.0.11";
+ sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk";
+ })
+ (fetchNuGet {
+ name = "System.Private.Uri";
+ version = "4.0.1";
+ sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Diagnostics.Tracing";
+ version = "4.1.0";
+ sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.IO";
+ version = "4.1.0";
+ sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.Handles";
+ version = "4.0.1";
+ sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection.Primitives";
+ version = "4.0.1";
+ sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime";
+ version = "4.1.0";
+ sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Resources.ResourceManager";
+ version = "4.0.1";
+ sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Globalization";
+ version = "4.0.11";
+ sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Collections";
+ version = "4.0.11";
+ sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Diagnostics.Debug";
+ version = "4.0.11";
+ sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Runtime.Extensions";
+ version = "4.1.0";
+ sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection";
+ version = "4.1.0";
+ sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.InteropServices";
+ version = "4.1.0";
+ sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z";
+ })
+]
\ No newline at end of file
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 3b37c805cdd..83c8533f5cd 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -104,6 +104,8 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optionals luaSupport [
"--with-lua-prefix=${lua}"
"--enable-luainterp"
+ ] ++ stdenv.lib.optional lua.pkgs.isLuaJIT [
+ "--with-luajit"
]
++ stdenv.lib.optionals pythonSupport [
"--enable-python${if isPython3 then "3" else ""}interp=yes"
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index d81a08e2900..c26243c0c59 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,25 +1,22 @@
{ stdenv, rustPlatform , fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "whitebox_tools";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "jblindsay";
repo = "whitebox-tools";
rev = "v${version}";
- sha256 = "0zi32d0wrbl2763dcllv2g0liwacsfiza5lkx52620prjjbhby8i";
+ sha256 = "0c9jmfjz6ys65y65zlllv9xvaaavr9jpqc1dc217iywhj07j8k2v";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
- cargoSha256 = "13k21akyfqgamywj39bw73sldby1s02vyvxfglxbaqq1x96xcy4i";
-
- # failures: structures::polyline::test::test_polyline_split
- doCheck = false;
+ cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4";
meta = with stdenv.lib; {
description = "An advanced geospatial data analysis platform";
- homepage = "http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html";
+ homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html";
license = licenses.mit;
maintainers = [ maintainers.mpickering ];
platforms = platforms.all;
diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix
new file mode 100644
index 00000000000..1f6a52aa0b0
--- /dev/null
+++ b/pkgs/applications/graphics/evilpixie/default.nix
@@ -0,0 +1,59 @@
+{ mkDerivation
+, lib
+, fetchFromGitHub
+, makeDesktopItem
+, qmake
+, qtbase
+, libpng
+, giflib
+, impy
+}:
+
+let
+ desktopItem = makeDesktopItem {
+ name = "EvilPixie";
+ desktopName = "EvilPixie";
+ exec = "evilpixie %F";
+ icon = "evilpixie";
+ genericName = "Image Editor";
+ categories = "Graphics;2DGraphics;RasterGraphics;";
+ mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;";
+ };
+
+in mkDerivation rec {
+ pname = "evilpixie";
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "bcampbell";
+ repo = "evilpixie";
+ rev = "v${version}";
+ sha256 = "1yg4ic3kcxqmr7k5bbvrv5iavlnhpdx6510z5wha9k9k5q9c4dvh";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ ];
+
+ buildInputs = [
+ qtbase
+ libpng
+ giflib
+ impy
+ ];
+
+ postInstall = ''
+ ln -s ${desktopItem}/share/applications $out/share
+ install -Dm 444 icon_128x128.png $out/share/icons/hicolor/128x128/apps/evilpixie.png
+ '';
+
+ meta = with lib; {
+ description = "Pixel-oriented paint program, modelled on Deluxe Paint";
+ homepage = "http://evilpixie.scumways.com/";
+ downloadPage = "https://github.com/bcampbell/evilpixie/releases";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 6bd35bd51eb..a1f45fc7ed1 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -90,8 +90,6 @@ rustPlatform.buildRustPackage rec {
--replace xdg-open ${xdg_utils}/bin/xdg-open
'';
- postBuild = lib.optionalString stdenv.isDarwin "make app";
-
installPhase = ''
runHook preInstall
@@ -100,7 +98,8 @@ rustPlatform.buildRustPackage rec {
'' + (
if stdenv.isDarwin then ''
mkdir $out/Applications
- cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app
+ cp -r extra/osx/Alacritty.app $out/Applications
+ ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS
'' else ''
install -D extra/linux/Alacritty.desktop -t $out/share/applications/
install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 8646b9864d9..98cd8a5a4fb 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -22,6 +22,11 @@ python3.pkgs.buildPythonApplication rec {
install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard
'';
+ preCheck = ''
+ # see https://github.com/scheibler/khard/issues/263
+ export COLUMNS=80
+ '';
+
meta = {
homepage = "https://github.com/scheibler/khard";
description = "Console carddav client";
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 80cf90ced16..12db0cd87e9 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -3,7 +3,7 @@
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
installShellFiles,
- which, dbus,
+ dbus,
Cocoa,
CoreGraphics,
Foundation,
@@ -20,14 +20,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.17.4";
+ version = "0.18.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x";
+ sha256 = "15i4ld65a5rfbaxxdh6kgg9h0ih73iqjskk82h8j72qgzkc6g3hf";
};
buildInputs = [
@@ -50,7 +50,7 @@ buildPythonApplication rec {
];
nativeBuildInputs = [
- pkgconfig which sphinx ncurses
+ pkgconfig sphinx ncurses
] ++ stdenv.lib.optionals stdenv.isDarwin [
imagemagick
libicns # For the png2icns tool.
@@ -63,13 +63,6 @@ buildPythonApplication rec {
patches = [
./fix-paths.patch
- ] ++ stdenv.lib.optionals stdenv.isLinux [
- (substituteAll {
- src = ./library-paths.patch;
- libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
- libcanberra = "${libcanberra}/lib/libcanberra.so";
- libEGL = "${stdenv.lib.getLib libGL}/lib/libEGL.so.1";
- })
] ++ stdenv.lib.optionals stdenv.isDarwin [
./no-lto.patch
];
@@ -77,11 +70,23 @@ buildPythonApplication rec {
# Causes build failure due to warning
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
+ dontConfigure = true;
+
buildPhase = if stdenv.isDarwin then ''
${python.interpreter} setup.py kitty.app --update-check-interval=0
make man
'' else ''
- ${python.interpreter} setup.py linux-package --update-check-interval=0
+ ${python.interpreter} setup.py linux-package \
+ --update-check-interval=0 \
+ --egl-library='${stdenv.lib.getLib libGL}/lib/libEGL.so.1' \
+ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \
+ --canberra-library='${libcanberra}/lib/libcanberra.so'
+ '';
+
+ checkInputs = [ pillow ];
+
+ checkPhase = ''
+ ${python.interpreter} test.py
'';
installPhase = ''
@@ -100,8 +105,6 @@ buildPythonApplication rec {
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
runHook postInstall
- # ZSH completions need to be invoked with `source`:
- # https://github.com/kovidgoyal/kitty/blob/8ceb941051b89b7c50850778634f0b6137aa5e6e/docs/index.rst#zsh
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
"$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish"
"$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash"
@@ -125,6 +128,7 @@ buildPythonApplication rec {
homepage = "https://github.com/kovidgoyal/kitty";
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
+ changelog = "https://sw.kovidgoyal.net/kitty/changelog.html";
platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ];
};
diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch
deleted file mode 100644
index 608dfb80d61..00000000000
--- a/pkgs/applications/misc/kitty/library-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/glfw/egl_context.c
-+++ b/glfw/egl_context.c
-@@ -314,7 +314,7 @@ bool _glfwInitEGL(void)
- #elif defined(__CYGWIN__)
- "libEGL-1.so",
- #else
-- "libEGL.so.1",
-+ "@libEGL@",
- #endif
- NULL
- };
-
---- a/kitty/desktop.c
-+++ b/kitty/desktop.c
-@@ -34,10 +34,7 @@ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
- done = true;
-
- const char* libnames[] = {
-- "libstartup-notification-1.so",
-- // some installs are missing the .so symlink, so try the full name
-- "libstartup-notification-1.so.0",
-- "libstartup-notification-1.so.0.0.0",
-+ "@libstartup_notification@",
- NULL
- };
- for (int i = 0; libnames[i]; i++) {
-@@ -113,10 +110,7 @@ load_libcanberra(void) {
- if (done) return;
- done = true;
- const char* libnames[] = {
-- "libcanberra.so",
-- // some installs are missing the .so symlink, so try the full name
-- "libcanberra.so.0",
-- "libcanberra.so.0.2.5",
-+ "@libcanberra@",
- NULL
- };
- for (int i = 0; libnames[i]; i++) {
diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch
index 8073c11fbd2..b1f38f9fd49 100644
--- a/pkgs/applications/misc/kitty/no-lto.patch
+++ b/pkgs/applications/misc/kitty/no-lto.patch
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
-@@ -277,10 +277,6 @@ def init_env(
+@@ -287,10 +287,6 @@ def init_env(
cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
cflags += shlex.split(os.environ.get('CFLAGS', ''))
ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 27eba126de9..cb442f67359 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -8,7 +8,6 @@
, dbus
, fontconfig
, freetype
-, gconf
, gdk-pixbuf
, glib
, glibc
@@ -27,9 +26,7 @@
, libXinerama
, libXrender
, libXt
-, libcanberra-gtk2
-, libgnome
-, libgnomeui
+, libcanberra
, libnotify
, gnome3
, libGLU, libGL
@@ -103,7 +100,6 @@ stdenv.mkDerivation {
dbus
fontconfig
freetype
- gconf
gdk-pixbuf
glib
glibc
@@ -122,9 +118,7 @@ stdenv.mkDerivation {
libXinerama
libXrender
libXt
- libcanberra-gtk2
- libgnome
- libgnomeui
+ libcanberra
libnotify
libGLU libGL
nspr
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 8060895a2e0..0eda0739eab 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -2,7 +2,7 @@
, src, unpackPhase ? null, patches ? []
, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }:
-{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL
+{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
@@ -104,7 +104,7 @@ stdenv.mkDerivation ({
patchFlags = [ "-p1" "-l" ];
buildInputs = [
- gtk2 perl zip libIDL libjpeg zlib bzip2
+ gtk2 perl zip libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
libnotify xorg.pixman yasm libGLU libGL
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index faf4e406935..be7a8725df1 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
+ setuptools,
pytest, faker, pytest-aiohttp, aioresponses,
@@ -9,7 +10,7 @@
buildPythonApplication rec {
pname = "pantalaimon";
- version = "0.6.1";
+ version = "0.6.3";
disabled = pythonOlder "3.6";
@@ -18,7 +19,7 @@ buildPythonApplication rec {
owner = "matrix-org";
repo = pname;
rev = version;
- sha256 = "0hn3731jh6xwyjayzdf41skhpdx002qs7n5l7ffh4dplhnv9vbxx";
+ sha256 = "1h1z701sj1qgcqlsk3pnzifnbcg9fshl7v6271h9x54hm3d6hg8a";
};
propagatedBuildInputs = [
@@ -32,6 +33,7 @@ buildPythonApplication rec {
matrix-nio
peewee
prompt_toolkit
+ setuptools
] ++ lib.optional enableDbusUi [
dbus-python
notify2
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 8f141b0eade..dbc6dc97ef2 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ipfs";
- version = "0.5.1";
+ version = "0.6.0";
rev = "v${version}";
# go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
- sha256 = "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm";
+ sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80";
};
# tarball contains multiple files/directories
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index e9217c84fc6..ba13d666ad9 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -1,5 +1,4 @@
{ stdenv, fetchurl, config, makeWrapper
-, gconf
, alsaLib
, at-spi2-atk
, atk
@@ -13,8 +12,6 @@
, gdk-pixbuf
, glib
, glibc
-, gst-plugins-base
-, gstreamer
, gtk2
, gtk3
, kerberos
@@ -30,9 +27,7 @@
, libXrender
, libXt
, libxcb
-, libcanberra-gtk2
-, libgnome
-, libgnomeui
+, libcanberra
, gnome3
, libGLU, libGL
, nspr
@@ -82,7 +77,6 @@ stdenv.mkDerivation {
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
- gconf
alsaLib
at-spi2-atk
atk
@@ -96,8 +90,6 @@ stdenv.mkDerivation {
gdk-pixbuf
glib
glibc
- gst-plugins-base
- gstreamer
gtk2
gtk3
kerberos
@@ -113,9 +105,7 @@ stdenv.mkDerivation {
libXrender
libXt
libxcb
- libcanberra-gtk2
- libgnome
- libgnomeui
+ libcanberra
libGLU libGL
nspr
nss
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 73536ae5fc1..e9ae6696def 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -18,7 +18,6 @@
, lib
, libGL
, libGLU
-, libIDL
, libevent
, libjpeg
, libnotify
@@ -113,7 +112,6 @@ stdenv.mkDerivation rec {
jemalloc
libGL
libGLU
- libIDL
libevent
libjpeg
libnotify
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 21ff7c5f8f9..9ca29096882 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,6 +1,5 @@
{ stdenv, buildGoPackage, fetchurl, makeWrapper
, git, bash, gzip, openssh, pam
-, fetchpatch
, sqliteSupport ? true
, pamSupport ? true
}:
@@ -9,11 +8,11 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.11.6";
+ version = "1.12.0";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "11nyq5faq0hy1pi3yhmc6y8is7jyiyfrb162fq9l33pkyw6qihqs";
+ sha256 = "1nsi7d2jackkjvinp5wglrzb61f2hihrn6qgwlp1zb185k2qpd23";
};
unpackPhase = ''
@@ -25,10 +24,6 @@ buildGoPackage rec {
patches = [
./static-root-path.patch
- (fetchpatch {
- url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch";
- sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i";
- })
];
postPatch = ''
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 7465eefc3c3..599dd67828c 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -42,6 +42,10 @@ mkDerivation rec {
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+ postPatch = ''
+ substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt
+ '';
+
meta = with lib; {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
homepage = "https://github.com/lxqt/pcmanfm-qt";
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index cce22207a36..16470f16827 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -14,14 +14,14 @@ let
in
with stdenv; mkDerivation rec {
pname = "nextpnr";
- version = "2020.03.25";
+ version = "2020.06.12";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
- rev = "a3ede0293a50c910e7d96319b2084d50f2501a6b";
- sha256 = "0ikfjva4gqmlx6y7mjamg03ad7x9gnz32ahqv798ynd87svq10aq";
+ rev = "c9e7d1448eaa4644d18073316e30586f2cb1d75a";
+ sha256 = "13jyg9d8q9xs1gpb8mz315hcyi3npr4kbfi31x2laz4zmki6ibai";
name = "nextpnr";
})
(fetchFromGitHub {
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 09e51e4c647..1ac34c24315 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
- version = "2020.06.16";
+ version = "2020.06.19";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
- rev = "39ba90a8b84d740b670a9f1df5148b824d441c63";
- sha256 = "1ncscbhyq4f07d28l32j37y5d84vyqxfx0fbzhb7nzfhplk8hh0s";
+ rev = "338ecbe02f8bb3cc4d69de1445c7f398a814b4e4";
+ sha256 = "0j5jwyxrq8rmwpyyidid6yp6g5bq7jwnhmn2ycj82kdj787p9vvs";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index 2eb3021ada7..e45077f89fd 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -3,9 +3,9 @@
let param =
if stdenv.lib.versionAtLeast coq.coq-version "8.8"
then {
- version = "3.0.3";
- uid = "38105";
- sha256 = "0y52lqx1jphv6fwf0d702vzprxmfmxggnh1hy3fznxyl4isfpg4j";
+ version = "3.1.0";
+ uid = "38287";
+ sha256 = "07436wkvnq9jyf7wyhp77bpl157s3qhba1ay5xrkxdi26qdf3h14";
} else {
version = "3.0.2";
uid = "37523";
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ];
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
};
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 35ee3037d07..9557d25e272 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2659,6 +2659,9 @@ package-maintainers:
- Agda
roberth:
- arion-compose
+ - hercules-ci-agent
+ - hercules-ci-api-core
+ - hercules-ci-api-agent
cdepillabout:
- pretty-simple
- spago
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 9f1bdb14793..342ae157d30 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -96,6 +96,7 @@ self: super: builtins.intersectAttrs super {
# profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
cachix = disableLibraryProfiling super.cachix;
+ hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput super.niv;
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 91166d9bfd4..814af36811c 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }:
+{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }:
stdenv.mkDerivation rec {
pname = "clojure";
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "06lg4z3q0fzxlbmx92g5qb0w3nw83dbwkzh3zjdy9ixrpm7b84i0";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [
+ installShellFiles
+ makeWrapper
+ ];
installPhase =
let
@@ -26,6 +29,8 @@ stdenv.mkDerivation rec {
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
+
+ installManPage clj.1 clojure.1
'';
doInstallCheck = true;
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 799375ba44d..0889fdd0d8f 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -9,14 +9,14 @@ assert useVulkan -> withExamples;
stdenv.mkDerivation rec {
pname = "dav1d";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
- sha256 = "0zmn4ald518vgs3cc0ga227aimr38h16mkliq5j8mg6p9dn7nx1w";
+ sha256 = "1yawrbaazj6a2rvvb58k6kh492fjxdwlm94bl6ipry0fqmz0rlnl";
};
nativeBuildInputs = [ meson ninja nasm pkgconfig ];
diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix
new file mode 100644
index 00000000000..c865b25c000
--- /dev/null
+++ b/pkgs/development/libraries/impy/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, libpng
+, zlib
+, giflib
+, libjpeg
+, SDL2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "impy";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "bcampbell";
+ repo = "impy";
+ rev = "v${version}";
+ sha256 = "1h45xjms56radhknspyx17a12dpnm7xgqm1x1chy42aw5ic8b5qf";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ libpng
+ zlib
+ giflib
+ libjpeg
+ SDL2
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A simple library for loading/saving images and animations, written in C";
+ homepage = "https://github.com/bcampbell/impy";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 1e49a72096a..972ca4c04a5 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -34,6 +34,16 @@ in stdenv.mkDerivation (rec {
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
+ ''
+ # This file was accidentally excluded from the sdist until
+ # 013720333c6ec1d38791689bc49ba039d98e16b3, post release.
+ # TODO make unconditional next mass rebuild
+ + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+ cp ${fetchurl {
+ url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh";
+ sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3";
+ }} ./src/gen-lock-obj.sh
+ chmod +x ./src/gen-lock-obj.sh
'';
outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix
new file mode 100644
index 00000000000..a2aac1241cd
--- /dev/null
+++ b/pkgs/development/libraries/utf8cpp/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "utf8cpp";
+ version = "3.1.1";
+
+ src = fetchFromGitHub {
+ owner = "nemtrif";
+ repo = "utfcpp";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "1s2pda75488z7c3w3a6qv31bj239248696yk5j2a1drbg2x1dpfh";
+ };
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=None"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DINSTALL_GTEST=OFF"
+ ];
+
+ nativeBuildInputs = [ cmake ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/nemtrif/utfcpp";
+ description = "UTF-8 with C++ in a Portable Way";
+ license = licenses.free;
+ maintainers = with maintainers; [ jobojeha ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix
index 0ae39db36a5..c8b0e8c1147 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/pkgs/development/python-modules/aioftp/default.nix
@@ -27,10 +27,13 @@ buildPythonPackage rec {
async-timeout
];
+ doCheck = false; # requires siosocks, not packaged yet
checkPhase = ''
pytest
'';
+ pythonImportsCheck = [ "aioftp" ];
+
meta = with lib; {
description = "Ftp client/server for asyncio";
homepage = "https://github.com/aio-libs/aioftp";
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index c58944a59d7..9dcd34c1d1b 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -62,6 +62,7 @@ buildPythonPackage rec {
"test_read_incomplete_chunk"
"test_request_tracing_exception"
] ++ lib.optionals stdenv.isDarwin [
+ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572
"test_close"
];
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 9034e6a6731..7b12cefc8c7 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
# Skip a test which makes requests to httpbin.org
checkPhase = ''
- pytest -k "not test_address_as_instance_of_url_combined_with_pass_through"
+ pytest -k "not (test_address_as_instance_of_url_combined_with_pass_through or test_pass_through_with_origin_params)"
'';
meta = {
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 07ae08ada78..03bb1fcc389 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
- version = "2.9.9";
+ version = "2.9.10";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
- sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml";
+ sha256 = "1979522k57gafvq9vx3lbc3zah7jq3kiy98ji9x5bmxyddmgr9ch";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/catalogue/1.nix b/pkgs/development/python-modules/catalogue/1.nix
deleted file mode 100644
index 9376377e9c7..00000000000
--- a/pkgs/development/python-modules/catalogue/1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, importlib-metadata
-}:
-
-buildPythonPackage rec {
- pname = "catalogue";
- version = "1.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d74d1d856c6b36a37bf14aa6dbbc27d0582667b7ab979a6108e61a575e8723f5";
- };
-
- propagatedBuildInputs = [ importlib-metadata ];
-
- meta = with stdenv.lib; {
- description = "Tiny library for adding function or object registries";
- homepage = "https://github.com/explosion/catalogue";
- license = licenses.mit;
- maintainers = with maintainers; [ danieldk ];
- };
-}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix
index 0697a4e6117..eb1aec37c63 100644
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/pkgs/development/python-modules/catalogue/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, pythonOlder
, importlib-metadata
}:
@@ -8,6 +9,8 @@ buildPythonPackage rec {
pname = "catalogue";
version = "2.0.0";
+ disabled = pythonOlder "3.6";
+
src = fetchPypi {
inherit pname version;
sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816";
diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 7bab3a93e55..da295806723 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -1,18 +1,18 @@
{ lib, buildPythonPackage, fetchPypi
, isPy27
-, pylev, pastel, typing, enum34 }:
+, pylev, pastel, typing, enum34, crashtest }:
buildPythonPackage rec {
pname = "clikit";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0603e3c19fa106f5df5f224826c92e57221f48ec969e42744173e0458d359354";
+ sha256 = "0ngdkmb73gkp5y00q7r9k1cdlfn0wyzws2wrqlshc4hlkbdyabj4";
};
propagatedBuildInputs = [
- pylev pastel
+ crashtest pylev pastel
] ++ lib.optionals isPy27 [ typing enum34 ];
# The Pypi tarball doesn't include tests, and the GitHub source isn't
diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix
new file mode 100644
index 00000000000..e4c7fb839f9
--- /dev/null
+++ b/pkgs/development/python-modules/crashtest/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, isPy27, pytest }:
+
+buildPythonPackage rec {
+ pname = "crashtest";
+ version = "0.3.0";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "056zzbznl3xfnbblfci8lvcam3h7k7va68vi6asrm4q0ck4nrh79";
+ };
+
+ # has tests, but only on GitHub, however the pyproject build fails for me
+ pythonImportsCheck = [
+ "crashtest.frame"
+ "crashtest.inspector"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/sdispater/crashtest";
+ description = "Manage Python errors with ease";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix
index 371c9bcc9e0..eb7a9d984ff 100644
--- a/pkgs/development/python-modules/entrance/default.nix
+++ b/pkgs/development/python-modules/entrance/default.nix
@@ -18,11 +18,11 @@ in
buildPythonPackage rec {
pname = "entrance";
- version = "1.1.12";
+ version = "1.1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "ef7cdf76226344f7cb92c8f81b6c03bbe944a095434f86275f178809c84108ca";
+ sha256 = "1vmyfhlpcz9fip89z7bl9va3bybz4p3clifn6x3329v1ms9bm1gc";
};
# The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later
diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix
new file mode 100644
index 00000000000..0c23a69a89c
--- /dev/null
+++ b/pkgs/development/python-modules/extension-helpers/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytestCheckHook
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+ pname = "extension-helpers";
+ version = "0.1";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc";
+ };
+
+ nativeBuildInputs = [
+ setuptools_scm
+ ];
+
+ propagatedBuildInputs = [
+ pytestCheckHook
+ ];
+
+ # avoid importing local module
+ preCheck = ''
+ cd extension_helpers
+ '';
+
+ # assumes setup.py is in pwd
+ disabledTests = [ "compiler_module" ];
+
+ meta = with lib; {
+ description = "Helpers to assist with building packages with compiled C/Cython extensions";
+ homepage = "https://github.com/astropy/extension-helpers";
+ license = licenses.bsd3;
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix
index 9cb4bad7a71..57c95cf8800 100644
--- a/pkgs/development/python-modules/flask-caching/default.nix
+++ b/pkgs/development/python-modules/flask-caching/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess, pytestcache }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytest, pytestcov, pytest-xprocess, pytestcache }:
buildPythonPackage rec {
pname = "Flask-Caching";
version = "1.9.0";
+ disabled = isPy27; # invalid python2 syntax
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix
index 0cc32dbc874..650235b2940 100644
--- a/pkgs/development/python-modules/influxdb/default.nix
+++ b/pkgs/development/python-modules/influxdb/default.nix
@@ -5,6 +5,8 @@
, dateutil
, pytz
, six
+, msgpack
+, fetchpatch
}:
buildPythonPackage rec {
@@ -16,9 +18,16 @@ buildPythonPackage rec {
sha256 = "9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch";
+ sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4";
+ })
+ ];
+
# ImportError: No module named tests
doCheck = false;
- propagatedBuildInputs = [ requests dateutil pytz six ];
+ propagatedBuildInputs = [ requests dateutil pytz six msgpack ];
meta = with stdenv.lib; {
description = "Python client for InfluxDB";
diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index fbfb72bb8a0..a97c075d30f 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -1,9 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils
, requests, filetype, pyparsing, configparser, arxiv2bib
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
-, pylibgen, click, python-slugify, habanero, isbnlib
+, click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml
-, python-doi, isPy3k, pythonOlder
+, python-doi, isPy3k, pythonOlder, pytestcov
#, optional, dependencies
, whoosh, pytest
, stdenv
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "papis";
- version = "0.9";
+ version = "0.10";
disabled = !isPy3k;
# Missing tests on Pypi
@@ -19,14 +19,14 @@ buildPythonPackage rec {
owner = "papis";
repo = pname;
rev = "v${version}";
- sha256 = "15i79q6nr7gcpcafdz5797axmp6r3081sys07k1k2vi5b2g3qc4k";
+ sha256 = "0fmrvxs6ixfwjlp96b69db7fpvyqfy2n3c23kdz8yr0vhnp82l93";
};
propagatedBuildInputs = [
requests filetype pyparsing configparser arxiv2bib
pyyaml chardet beautifulsoup4 colorama bibtexparser
- pylibgen click python-slugify habanero isbnlib
- prompt_toolkit pygments
+ click python-slugify habanero isbnlib
+ prompt_toolkit pygments typing-extensions
stevedore tqdm lxml
python-doi
# optional dependencies
@@ -36,6 +36,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "lxml<=4.3.5" "lxml~=4.3" \
+ --replace "isbnlib>=3.9.1,<3.10" "isbnlib~=3.9" \
--replace "python-slugify>=1.2.6,<4" "python-slugify"
'';
@@ -43,7 +44,7 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin && pythonOlder "3.8";
checkInputs = ([
- pytest
+ pytest pytestcov
]) ++ [
xdg_utils
];
@@ -54,7 +55,7 @@ buildPythonPackage rec {
checkPhase = ''
HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \
-k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \
- and not test_validate_arxivid and not test_downloader_getter"
+ and not test_validate_arxivid and not test_downloader_getter and not match"
'';
meta = {
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 3cc5c3eec49..ee3d08a173c 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "peewee";
- version = "3.11.2";
+ version = "3.13.3";
# pypi release does not provide tests
src = fetchFromGitHub {
owner = "coleifer";
repo = pname;
rev = version;
- sha256 = "097cafqgk46bf0innwm7xnmsfs6z37hv3alyvrfz6d0iy4scshm5";
+ sha256 = "1r67hxb9m6v0xbnbqfnsw6dahmdr94pf81b4x51jfw6x9sa4izi4";
};
@@ -38,6 +38,8 @@ buildPythonPackage rec {
] ++ (lib.optional withPostgres psycopg2)
++ (lib.optional withMysql mysql-connector);
+ doCheck = withPostgres;
+
meta = with stdenv.lib;{
description = "a small, expressive orm";
homepage = "http://peewee-orm.com";
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 46be9bc92a2..e0be5f5ed0a 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -1,74 +1,74 @@
-{ lib, buildPythonPackage, fetchPypi, callPackage
-, isPy27
-, pythonOlder
-, cleo
-, requests
-, cachy
-, requests-toolbelt
-, pyrsistent
-, pyparsing
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder
, cachecontrol
-, pkginfo
-, html5lib
-, shellingham
-, subprocess32
-, tomlkit
-, typing
-, pathlib2
-, virtualenv
-, functools32
+, cachy
+, cleo
, clikit
-, keyring
-, pexpect
+, html5lib
+, httpretty
, importlib-metadata
-, pytest
-, jsonschema
, intreehooks
+, jsonschema
+, keyring
, lockfile
+, pexpect
+, pkginfo
+, pygments
+, pyparsing
+, pyrsistent
+, pytestCheckHook
+, pytestcov
+, pytest-mock
+, requests
+, requests-toolbelt
+, shellingham
+, tomlkit
}:
-let
- glob2 = callPackage ./glob2.nix { };
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
pname = "poetry";
- version = "1.0.5";
+ version = "1.0.9";
format = "pyproject";
+ disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf";
+ src = fetchFromGitHub {
+ owner = "python-poetry";
+ repo = pname;
+ rev = version;
+ sha256 = "0gi1li55rim60hf1gdpgpx84zlkaj0wv12wbv7dib9malhfj3pnz";
};
postPatch = ''
substituteInPlace pyproject.toml \
- --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \
- --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \
+ --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.16.0\"" \
+ --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.1\"" \
--replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \
- 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}'
+ 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' \
+ --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"^0.6.0\"" \
+ --replace "cleo = \"^0.7.6\"" "cleo = \"^0.8.0\"" \
+ --replace "version = \"^20.0.1\", python = \"^3.5\"" "version = \"^21.0.0\", python = \"^3.5\"" \
+ --replace "clikit = \"^0.4.2\"" "clikit = \"^0.6.2\""
'';
nativeBuildInputs = [ intreehooks ];
propagatedBuildInputs = [
+ cachecontrol
+ cachy
cleo
clikit
- requests
- cachy
- requests-toolbelt
- jsonschema
- pyrsistent
- pyparsing
- cachecontrol
- pkginfo
html5lib
- shellingham
- tomlkit
- pexpect
+ jsonschema
keyring
lockfile
- ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ]
- ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+ pexpect
+ pkginfo
+ pyparsing
+ pyrsistent
+ requests
+ requests-toolbelt
+ shellingham
+ tomlkit
+ ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
@@ -79,12 +79,18 @@ in buildPythonPackage rec {
"$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
'';
- # No tests in Pypi tarball
- doCheck = false;
- checkInputs = [ pytest ];
- checkPhase = ''
- pytest tests
- '';
+ checkInputs = [ pytestCheckHook httpretty pytest-mock pygments pytestcov ];
+ preCheck = "export HOME=$TMPDIR";
+ disabledTests = [
+ # touches network
+ "git"
+ "solver"
+ "load"
+ "vcs"
+ "prereleases_if_they_are_compatible"
+ # requires git history to work correctly
+ "default_with_excluded_data"
+ ];
meta = with lib; {
homepage = "https://python-poetry.org/";
diff --git a/pkgs/development/python-modules/poetry/glob2.nix b/pkgs/development/python-modules/poetry/glob2.nix
deleted file mode 100644
index ca7d203492d..00000000000
--- a/pkgs/development/python-modules/poetry/glob2.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
- pname = "glob2";
- version = "0.6";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1miyz0pjyji4gqrzl04xsxcylk3h2v9fvi7hsg221y11zy3adc7m";
- };
-}
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 8e479dfaca2..69181af222c 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
# arch doesn't report frequency is the same way
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
- doCheck = stdenv.isDarwin || stdenv.isx86_64;
+ doCheck = !stdenv.isDarwin && stdenv.isx86_64;
checkInputs = [ pytest ]
++ lib.optionals isPy27 [ mock ipaddress ];
# out must be referenced as test import paths are relative
diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index 4013ea789af..cb628561fda 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchPypi
+, oauthlib
, requests
+, requests_oauthlib
}:
buildPythonPackage rec {
@@ -13,7 +15,7 @@ buildPythonPackage rec {
sha256 = "9949338833a27b6c3251b52bf70b73aa99c43c56153541338cb63001afafdd1e";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [ oauthlib requests requests_oauthlib ];
# Upstream provides no unit tests.
doCheck = false;
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 2725aca5a82..6e808a01058 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -38,9 +38,10 @@ buildPythonPackage rec {
postPatch = ''
sed -i \
- -e 's!click>=6.0,<7.0!click!' \
- -e 's!keyring>=8.0,<9.0!keyring!' \
- -e 's!keyrings.alt>=1.0,<2.0!keyrings.alt!' \
+ -e 's!click>=.*!click!' \
+ -e 's!keyring>=.*!keyring!' \
+ -e 's!keyrings.alt>=.*!keyrings.alt!' \
+ -e 's!tzlocal==.*!tzlocal!' \
requirements.txt
'';
diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix
deleted file mode 100644
index 9dc6689e900..00000000000
--- a/pkgs/development/python-modules/pylibgen/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, pythonOlder
-, requests
-, pytest
-, pre-commit
-}:
-
-buildPythonPackage rec {
- pname = "pylibgen";
- version = "2.0.2";
- disabled = pythonOlder "3.6";
-
- src = fetchFromGitHub {
- owner = "joshuarli";
- repo = pname;
- rev = "v${version}";
- sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1";
- };
-
- propagatedBuildInputs = [ requests ];
-
- checkInputs = [ pytest pre-commit ];
-
- # literally every tests does a network call
- doCheck = false;
-
- meta = with lib; {
- description = "Python interface to Library Genesis";
- homepage = "https://pypi.org/project/pylibgen/";
- license = licenses.mit;
- maintainers = [ maintainers.nico202 ];
- };
-}
diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
index 129ec21e05c..1e4b0d2adae 100644
--- a/pkgs/development/python-modules/pymetno/default.nix
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "PyMetno";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
repo = pname;
owner = "Danielhiversen";
rev = version;
- sha256 = "00v2r3nn48svni9rbmbf0a4ylgfcf93gk2wg7qnm1fv1qrkgscvg";
+ sha256 = "1ihq1lzgzcxbg916izakx9jp0kp1vdrcdwcwwwsws838wc08ax6m";
};
propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ];
diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix
new file mode 100644
index 00000000000..05c6135a4b9
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, pytestCheckHook
+, numpy
+, astropy
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-astropy-header";
+ version = "0.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g";
+ };
+
+ propagatedBuildInputs = [
+ pytest
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytestcov
+ numpy
+ astropy
+ ];
+
+ meta = with lib; {
+ description = "Plugin to add diagnostic information to the header of the test output";
+ homepage = "https://astropy.org";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix
index 3e03460ec2d..ae3bc04d0b4 100644
--- a/pkgs/development/python-modules/pytest-astropy/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy/default.nix
@@ -1,11 +1,15 @@
{ lib
, buildPythonPackage
, fetchPypi
+, hypothesis
, pytest
+, pytest-astropy-header
, pytest-doctestplus
+, pytest-filter-subpackage
, pytest-remotedata
, pytest-openfiles
, pytest-arraydiff
+, setuptools_scm
}:
buildPythonPackage rec {
@@ -17,16 +21,23 @@ buildPythonPackage rec {
sha256 = "619800eb2cbf64548fbea25268efe7c6f6ae206cb4825f34abd36f27bcf946a2";
};
+ nativeBuildInputs = [
+ setuptools_scm
+ ];
+
propagatedBuildInputs = [
+ hypothesis
pytest
+ pytest-astropy-header
pytest-doctestplus
+ pytest-filter-subpackage
pytest-remotedata
pytest-openfiles
pytest-arraydiff
];
# pytest-astropy is a meta package and has no tests
- doCheck = false;
+ checkPhase = ":";
meta = with lib; {
description = "Meta-package containing dependencies for testing";
diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix
index 36e0402dba2..421cca33984 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, isPy27
, six
, pytest
, numpy
@@ -9,6 +10,7 @@
buildPythonPackage rec {
pname = "pytest-doctestplus";
version = "0.7.0";
+ disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
new file mode 100644
index 00000000000..6caf4d9c772
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, pytest-doctestplus
+, pytestCheckHook
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-filter-subpackage";
+ version = "0.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1s4s2kd31yc65rfvl4xhy8xx806xhy59kc7668h6b6wq88xgrn5p";
+ };
+
+ nativeBuildInputs = [
+ setuptools_scm
+ ];
+
+ propagatedBuildInputs = [
+ pytest
+ pytest-doctestplus
+ pytestcov
+ pytestCheckHook
+ ];
+
+ # missing some files
+ disabledTests = [ "with_rst" ];
+
+ meta = with lib; {
+ description = "Meta-package containing dependencies for testing";
+ homepage = "https://astropy.org";
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index 43fd7fe67de..ccc76734461 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -6,30 +6,26 @@
, astropy
, astropy-healpix
, astropy-helpers
+, extension-helpers
, scipy
, pytest
, pytest-astropy
+, setuptools_scm
, cython
}:
buildPythonPackage rec {
pname = "reproject";
- version = "0.6";
+ version = "0.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "484fde86d70d972d703038f138d7c2966ddf51171a6e79bd84e82ea270e27af3";
+ sha256 = "1jsc3ad518vyys5987fr1achq8qvnz8rm80zp5an9qxlwr4zmh4m";
};
propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ];
- nativeBuildInputs = [ astropy-helpers cython ];
-
- # Fix tests
- patches = [ (fetchpatch {
- url = "https://github.com/astropy/reproject/pull/218/commits/4661e075137424813ed77f1ebcbc251fee1b8467.patch";
- sha256 = "13g3h824pqn2lgypzg1b87vkd44y7m302lhw3kh4rfww1dkzhm9v";
- }) ];
+ nativeBuildInputs = [ astropy-helpers cython extension-helpers setuptools_scm ];
# Disable automatic update of the astropy-helper module
postPatch = ''
diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix
index fb375fd501a..374627a1bb9 100644
--- a/pkgs/development/python-modules/requests-file/default.nix
+++ b/pkgs/development/python-modules/requests-file/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, requests, six }:
+{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, requests, six }:
buildPythonPackage rec {
pname = "requests-file";
@@ -11,6 +11,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ requests six ];
+ checkInputs = [ pytestCheckHook ];
+
meta = {
homepage = "https://github.com/dashea/requests-file";
description = "Transport adapter for fetching file:// URLs with the requests python library";
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index f0a143ec30c..51b04d372c5 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -54,9 +54,15 @@ buildPythonPackage rec {
# '';
postPatch = ''
- substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8"
+ substituteInPlace setup.cfg \
+ --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
+ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
+ --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \
+ --replace "thinc==7.4.1" "thinc>=7.4.1,<8"
'';
+ pythonImportsCheck = [ "spacy" ];
+
meta = with lib; {
description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
homepage = "https://github.com/explosion/spaCy";
diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix
index 3e520919f33..b0b3e4b8f65 100644
--- a/pkgs/development/python-modules/spectral-cube/default.nix
+++ b/pkgs/development/python-modules/spectral-cube/default.nix
@@ -1,6 +1,7 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
+, aplpy
, astropy
, radio_beam
, pytest
@@ -24,7 +25,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ astropy-helpers ];
- checkInputs = [ pytest pytest-astropy ];
+ checkInputs = [ aplpy pytest pytest-astropy ];
# Disable automatic update of the astropy-helper module
postPatch = ''
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 92e6b84afdf..54590f2e35a 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -15,6 +15,8 @@ buildPythonPackage rec {
pname = "srsly";
version = "2.0.1";
+ disabled = pythonOlder "3.6";
+
src = fetchPypi {
inherit pname version;
sha256 = "fa3c7375be8fe75f23c27feafbfb5f738d55ffdbf02964c6896fb7684f519a52";
@@ -22,8 +24,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ cython ];
- propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;
-
checkInputs = [
mock
numpy
@@ -35,6 +35,8 @@ buildPythonPackage rec {
# Possibly because of sandbox restrictions.
doCheck = false;
+ pythonImportsCheck = [ "srsly" ];
+
meta = with stdenv.lib; {
description = "Modern high-performance serialization utilities for Python";
homepage = "https://github.com/explosion/srsly";
diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 89b37bc8cf3..8f7e73a454a 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
+, pytest-asyncio
, python-rapidjson
, pretend
, freezegun
@@ -20,7 +21,7 @@ buildPythonPackage rec {
sha256 = "7a48375db6274ed1d0ae6123c486472aa1d0890b08d314d2b016f3aa7f35990b";
};
- checkInputs = [ pytest pretend freezegun simplejson twisted ]
+ checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ]
++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ];
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index e47e17094af..b32b996ffd6 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -58,10 +58,19 @@ buildPythonPackage rec {
# Cannot find cython modules.
doCheck = false;
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
+ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
+ --replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0"
+ '';
+
checkPhase = ''
pytest thinc/tests
'';
+ pythonImportsCheck = [ "thinc" ];
+
meta = with stdenv.lib; {
description = "Practical Machine Learning for NLP in Python";
homepage = "https://github.com/explosion/thinc";
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 109d8d8efab..567846b0aef 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -55,6 +55,9 @@ buildPythonPackage rec {
export TEST_DIR=$(mktemp -d)
cp -r tests $TEST_DIR
pushd $TEST_DIR
+ '' + lib.optionalString stdenv.isDarwin ''
+ # Some tests fail on Darwin
+ rm tests/test_[stu]*.py
'';
postCheck = ''
popd
diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index 43588361ca7..338dd93150b 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -5,6 +5,7 @@
, flake8-import-order
, pyflakes
, mock
+, setuptools
}:
buildPythonPackage rec {
@@ -23,12 +24,19 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pyflakes
flake8-import-order
+ setuptools
];
checkInputs = [
mock
];
+ checkPhase = ''
+ runHook preInstallCheck
+ PYTHONPATH= $out/bin/zimports --help >/dev/null
+ runHook postInstallCheck
+ '';
+
meta = with lib; {
description = "Python import rewriter";
homepage = "https://github.com/sqlalchemyorg/zimports";
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 9cacf76dbbf..b788e70a4de 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "13.0.1";
+ version = "13.1.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "1hrdi9fvni21lrc7lx8bjxdiqyf02cihl7pxlvcji0j1lmxyz721";
+ sha256 = "1x44vbfcmk95rjkhmfizfdmr1blyj7x1a84hdynrgcyg69m6zikn";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "0k41k6brmdh9rz6k4kis0wabgvrfl1vm63w36h2kk2vnwxg27s91";
+ sha256 = "08n3nrpwhb3d3znid2bibg54qxdw5z6r4j5fp8vjh33h45q47q0k";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "155f1lvvx1rq50xjfl4ligxnya9js2rkzp45vwwfdwrvy0qlx8sf";
+ sha256 = "0mbcpz1i0jmx5y67cvjwaizbj6jxdqml5m4m42dx96jqk0bv8g55";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
new file mode 100644
index 00000000000..c8316f4bb57
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
@@ -0,0 +1,21 @@
+{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }:
+let
+ inherit (haskell.lib) overrideCabal addBuildDepends;
+ inherit (lib) makeBinPath;
+ pkg =
+ # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
+ overrideCabal
+ (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-agent) [ makeWrapper ])
+ (o: {
+ postInstall = ''
+ ${o.postInstall or ""}
+ mkdir -p $out/libexec
+ mv $out/bin/hercules-ci-agent $out/libexec
+ makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]}
+ '';
+ });
+in pkg // {
+ meta = pkg.meta // {
+ position = toString ./default.nix + ":1";
+ };
+ }
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 607e2ffe4a9..360f1dbdcf3 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "icestorm";
- version = "2019.09.13";
+ version = "2020.04.22";
passthru = rec {
pythonPkg = if usePyPy then pypy3 else python3;
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
- rev = "0ec00d892a91cc68e45479b46161f649caea2933";
- sha256 = "1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1";
+ rev = "cd2610e0fa1c6a90e8e4e4cfe06db1b474e752bb";
+ sha256 = "05ckmmvgymr7vhrpnqsiafwm8z5rhc3h91v506lzi6jpjzcs23hj";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/misc/patchelf/0.9.nix b/pkgs/development/tools/misc/patchelf/0.9.nix
new file mode 100644
index 00000000000..c64d722ca71
--- /dev/null
+++ b/pkgs/development/tools/misc/patchelf/0.9.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, patchelf }:
+
+stdenv.mkDerivation rec {
+ name = "patchelf-0.9";
+
+ src = fetchurl {
+ url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+ sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
+ };
+
+ setupHook = [ ./setup-hook.sh ];
+
+ doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
+
+ inherit (patchelf) meta;
+}
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 45b6867197e..4bf87a2eda6 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "skopeo";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
- sha256 = "1zg0agf8x7fa8zdzfzgncm64j363lmxrqjhdzsx6mlig87k17p05";
+ sha256 = "1cxhwfrp5cjdq56vzy7gmidvm1z02f0rz2r1lv0d9ymnjlsjp9s3";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix
index d446511298f..a5087b3b52c 100644
--- a/pkgs/development/tools/tracy/default.nix
+++ b/pkgs/development/tools/tracy/default.nix
@@ -1,34 +1,38 @@
-{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit }:
+{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }:
stdenv.mkDerivation rec {
- name = "tracy-${version}";
- version = "0.6.3";
+ pname = "tracy";
+ version = "0.7";
src = fetchFromGitHub {
owner = "wolfpld";
repo = "tracy";
rev = "v${version}";
- sha256 = "0pgq8h5gq141zq1k4cgj6cp74kh4zqbp7h4wh29q4grjb04yy06i";
+ sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glfw ]
+ buildInputs = [ glfw capstone ]
++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ]
++ lib.optionals stdenv.isLinux [ gtk2 tbb ];
- NIX_CFLAGS_COMPILE = []
+ NIX_CFLAGS_COMPILE = [ ]
++ lib.optional stdenv.isLinux "-ltbb"
++ lib.optional stdenv.cc.isClang "-faligned-allocation";
buildPhase = ''
make -j $NIX_BUILD_CORES -C profiler/build/unix release
make -j $NIX_BUILD_CORES -C import-chrome/build/unix/ release
+ make -j $NIX_BUILD_CORES -C capture/build/unix/ release
+ make -j $NIX_BUILD_CORES -C update/build/unix/ release
'';
installPhase = ''
install -D ./profiler/build/unix/Tracy-release $out/bin/Tracy
install -D ./import-chrome/build/unix/import-chrome-release $out/bin/import-chrome
+ install -D ./capture/build/unix/capture-release $out/bin/capture
+ install -D ./update/build/unix/update-release $out/bin/update
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 13249273564..49484032ffb 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,18 +8,18 @@ let
in
stdenv.mkDerivation rec {
pname = "trellis";
- version = "2020.03.25";
+ version = "2020.06.12";
# git describe --tags
realVersion = with stdenv.lib; with builtins;
- "1.0-152-g${substring 0 7 (elemAt srcs 0).rev}";
+ "1.0-168-g${substring 0 7 (elemAt srcs 0).rev}";
srcs = [
(fetchFromGitHub {
owner = "SymbiFlow";
repo = "prjtrellis";
- rev = "c27bfc220a9f85f04173840d1ea081ba478adc9c";
- sha256 = "1fyl51246ns2njvij8g7k9a9axvhz8n8g09fny5dym9q7hcx08qh";
+ rev = "5c9f6ad076da75ea925def4297c528058d9bf54a";
+ sha256 = "1iwpfkibnb9a5kkw5wxyl1fpw1a72pf2icnp1c6sazrphiz8dbf7";
name = "trellis";
})
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 199d7f81fe0..95778c2544c 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "11rxfnjam1kr8piiw0s4r0qg8rj4qfpppp6dixk1hhsq2iwbnzj6";
+ sha256 = "0034c2qp8sf6li7d38rnd6h9vhhi82p5rysm0pkrdhlmfqkqdgma";
fetchSubmodules = true;
};
- cargoSha256 = "107i9zvlwiwad58c7lmh6zl9iwlqn1h8qk7zf7x68b6498p8nh7d";
+ cargoSha256 = "1wbqxv2mzbs27j617a88gd7z0fjnjr2z1nklqfk49y62v8f1vsm1";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
index 9218e8ad97d..32669a6111b 100644
--- a/pkgs/development/web/deno/deps.nix
+++ b/pkgs/development/web/deno/deps.nix
@@ -2,11 +2,11 @@
{}:
rec {
rustyV8Lib = {
- version = "0.5.0";
+ version = "0.5.1";
sha256s = {
- x86_64-linux = "1jmrqf5ns2y51cxx9r88my15m6gc6wmg54xadi3kphq47n4hmdfw";
- aarch64-linux = "14v57pxpkz1fs483rbbc8k55rc4x41dqi0k12zdrjwa5ycdam3m5";
- x86_64-darwin = "0466px7k2zvbsswwcrr342i5ml669gf76xd8yzzypsmb7l71s6vr";
+ x86_64-linux = "1gggnbki6b733qfx16gkqpplfsfmg1xv2a3nhh42xiykwsh987xl";
+ aarch64-linux = "1an5ylm0w2x0dm34m9z6sld8f067f2rnsndr6mh6smp19jl889ma";
+ x86_64-darwin = "1x1f5r8s8n00xag6d36j4h40rfc0r1w4wnmcr02sspzzkpyjxn2l";
};
};
}
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index 8c5675407d0..c4c512be2b8 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -19,14 +19,15 @@ let
in
-stdenv.mkDerivation {
- name = "gargoyle-2018-10-06";
+stdenv.mkDerivation rec {
+ pname = "gargoyle";
+ version = "2019.1.1";
src = fetchFromGitHub {
owner = "garglk";
repo = "garglk";
- rev = "d03391563fa75942fbf8f8deeeacf3a8be9fc3b0";
- sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9";
+ rev = version;
+ sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz";
};
nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e3714edc0ae..9e2120d9da3 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2020-06-11";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "1428c7b29e50af56f53ee1d587679d97a027dd72";
- sha256 = "0zhrgfsk7fvs8wabgdp5ps73ggsghsw19cnjvlbw4cnib6p9176a";
+ rev = "834d6f9c48ce349a4c3d72e98bd0de81aaa84042";
+ sha256 = "0b9606yspjvmfarjmgqcbsg9qp64gkr7b1w7py2gd1fvbmnkmac0";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -269,12 +269,12 @@ let
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar-vim";
- version = "2020-06-09";
+ version = "2020-06-15";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
- rev = "932648c890d27b3a1f0e5f5f63e4564384dfdb63";
- sha256 = "1p1lrxk45qphpmnkszhaks7li0h3y3biif9427n6mjckl860g5c7";
+ rev = "0cbf6ced3c1b6cfd1ab869a46165d69018747550";
+ sha256 = "0553m0v48kz2r0vasq4yd0834r066h1mha6sx5k0ls0s0074w10m";
};
meta.homepage = "https://github.com/itchyny/calendar.vim/";
};
@@ -401,12 +401,12 @@ let
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2020-06-13";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "2c98c9f34718f5f639bfaae1c193fbe39749f7fc";
- sha256 = "126yqr53y4y30p4sp7942nic6lql6lfx0a1wb0psrrvrc8ccbbpp";
+ rev = "c4af6c2ea44eb630049340becfc6c66ddfb8b01c";
+ sha256 = "1s8vlnabkjgzs2l5rwzcx5rfhhr7lszhl7mvk6l53rylc875zmd7";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
@@ -521,12 +521,12 @@ let
coc-metals = buildVimPluginFrom2Nix {
pname = "coc-metals";
- version = "2020-06-12";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "ckipp01";
repo = "coc-metals";
- rev = "b6ed6dad8c9f57e2ee84b60c0cf69c88c5ccf3bc";
- sha256 = "0abvls1vxyzxzsrlmm5javahsxxslgli43b1ffbrk7cz8cbhgdsy";
+ rev = "a75fb41cc7f766f048ed04ff24d2b9036c80a0c1";
+ sha256 = "024mpad6cpivxpf9fjrr9mh7iy8hq64d75yazhzm4kax6f121xk0";
};
meta.homepage = "https://github.com/ckipp01/coc-metals/";
};
@@ -569,12 +569,12 @@ let
coc-python = buildVimPluginFrom2Nix {
pname = "coc-python";
- version = "2020-05-08";
+ version = "2020-06-15";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-python";
- rev = "c4b450a62020ff37b27ea0b8d05de3e3c53344c6";
- sha256 = "1hk29c55nk21avhrk9i8dppcid62jnr1y2b9lml14c4y01yr4mpp";
+ rev = "241c6b39e6618279b619926269431ef45de87840";
+ sha256 = "1x3lrk4x7qhp9pg8x11k36pcgd5f45la4r77fq82jy307s5dny20";
};
meta.homepage = "https://github.com/neoclide/coc-python/";
};
@@ -605,12 +605,12 @@ let
coc-rust-analyzer = buildVimPluginFrom2Nix {
pname = "coc-rust-analyzer";
- version = "2020-06-11";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-rust-analyzer";
- rev = "a2e98801bcbe88d100f2fcb23087ba61203ad101";
- sha256 = "0a2a6pjvbb29syhh796z3gfrgjx4vpkbjirsgzdfb12icigbjdz7";
+ rev = "2079280b12e565ae5c437b675f09b7915f1f9d92";
+ sha256 = "0l4jz8mdbn352cb7gkycbdlaw18k9qf4v0vcljni7hxdqc6k1hiz";
};
meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/";
};
@@ -713,24 +713,24 @@ let
coc-tsserver = buildVimPluginFrom2Nix {
pname = "coc-tsserver";
- version = "2020-05-22";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-tsserver";
- rev = "bac002caef532d6dc58c10a2885eeed463082d4f";
- sha256 = "1b10bdlqbj82rragymka691fz0phgk6v63diijkyb1ia302q1613";
+ rev = "a065861bebc201b722145d3d39af76cdbaf92f46";
+ sha256 = "1iwp8gs5f49chncbqv5w7x435jhwqczlmw00clf345yvx2kirngn";
};
meta.homepage = "https://github.com/neoclide/coc-tsserver/";
};
coc-vetur = buildVimPluginFrom2Nix {
pname = "coc-vetur";
- version = "2020-05-14";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-vetur";
- rev = "679eb834ac8c16290a0cc50ab7c222e1144644f7";
- sha256 = "1jkz0qixrp7vzpv9l2ls0yl5kyqzi3bbvydpifdb858j8jqbk4dq";
+ rev = "6f106f10c981fd314d6a83cab29f8a464da6b34b";
+ sha256 = "1b2zac7z8ja1ymf4psd48gwm7cdkyiwyglinpqy5g2zyspc16qpg";
};
meta.homepage = "https://github.com/neoclide/coc-vetur/";
};
@@ -785,24 +785,24 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2020-06-13";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "d66250193333f786b0706d4f1aebbd3e17505c43";
- sha256 = "0k4f0xf9h6v5xhvkzklg233x6y15bn22yg07g3nkgh10b8mpspbs";
+ rev = "aa3647842f5bf436c8e1556667033046d83426d5";
+ sha256 = "0gzm0pm3gqis7y3qpmwjgnn5g11ym6s4fj18j5qmdfshbsajh9xv";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
colorizer = buildVimPluginFrom2Nix {
pname = "colorizer";
- version = "2018-06-16";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "lilydjwg";
repo = "colorizer";
- rev = "afc1491e5b9c36305ce710bdad2b48f069141183";
- sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7";
+ rev = "bafd4e98462a4ddeb275d02fa1448b4349e2e50f";
+ sha256 = "0j4x8vf3dj2v3jjjxqyhahrbfm99mgqryq2srnik0wbz7v1br2lh";
};
meta.homepage = "https://github.com/lilydjwg/colorizer/";
};
@@ -858,12 +858,12 @@ let
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2020-05-26";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "5cb5e37913fa6fe410ee150f5cd8c75e34b060c4";
- sha256 = "1h23qf0i97lcng1llc0q80jizsv7hkpnyvaj5dr3kfbwi84nfkmp";
+ rev = "778c8e711a23d6921a99986a00cdbb6d76e1b103";
+ sha256 = "1dk0j4f4dpl21rjc7gfl2r23sf0vjajcdyrc20pfr8kan86acz18";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -918,12 +918,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
- version = "2020-05-29";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
- rev = "c84fd12a226d7b3b8d4b7e77ed5ddd1c5fa970ad";
- sha256 = "1gjhbgwqf1zg813a3wcqj2x29gs4x7yc185mxi3lvnxghwj9j2i3";
+ rev = "e999936dc4873708b524f94ae0a42df950900ff8";
+ sha256 = "1im11fpavcsyk7pjhnk2kkdnl0q9a6ai3nk3g3av0drm2qvia41x";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@@ -1014,12 +1014,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2020-06-09";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "bc2a3fcbe9db21623dcc7c2d5c4c1b1289283dfc";
- sha256 = "00gyrfhz7mf93swqzi4n459vbk9rpcqsc9qfzgnv38myh800s2ih";
+ rev = "acd68311bbb3296aa81c5799695715e85326b738";
+ sha256 = "1rv8b7g6prjibl9hx5wapj71hfg0dd2ipkpdj8w1zj4b0inj5848";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -1074,12 +1074,12 @@ let
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2020-04-14";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "d438a6f550910a5688481ff0251771ac7dd09245";
- sha256 = "0p6kvl1pgf5d5rnag297dhjzzplmawvmi2j1r2m6p0732ls4qxrw";
+ rev = "5f23eef76ffe62ddd78a3f3318d4efc6d236f403";
+ sha256 = "0gi9r8rvf725s65jafbskkn7c90ld74ckdv9xxm1d6rql0n9dsbb";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -1172,12 +1172,12 @@ let
deoplete-jedi = buildVimPluginFrom2Nix {
pname = "deoplete-jedi";
- version = "2020-04-13";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "deoplete-plugins";
repo = "deoplete-jedi";
- rev = "42f4c24a951b0fb5e76a70e5234f16193a8a746d";
- sha256 = "1incjz7xsh4cfxw06ff07830ywn0p99b1zmml8pkapbnh3x2bjgc";
+ rev = "9ad4cbad7e8052bab042f724c71ba10621542f2c";
+ sha256 = "1hfrvgfl9av7c4v1pd04rnp5gcvnl1qwnfgq3vzh288mjs8z1yxk";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/";
@@ -1293,12 +1293,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2020-06-11";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "e04bfc18b604c54ebc319d2eebf8fe3a830a9212";
- sha256 = "01bf55zbw2v2qzbpk0jm5j4dhq8rs78m2pbljsnl2772vll4iv38";
+ rev = "2a44d0f331c57bc0527bef1c975153c274bd52f6";
+ sha256 = "0v61734kh3zz4q2bj1085kydkviycmjv6c45qmsxnvh9vcjz7ip3";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1378,12 +1378,12 @@ let
emmet-vim = buildVimPluginFrom2Nix {
pname = "emmet-vim";
- version = "2020-05-04";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "mattn";
repo = "emmet-vim";
- rev = "76285f8ec456a8c0d01ea0fa9d0b757c7eb0bab3";
- sha256 = "1qrqg4kr55hisi5f4qlkj1zvvlgfpby9pyynlb669d8414013f67";
+ rev = "dc6cb4fd074f4c371158eeab0c8e4ce4af33534b";
+ sha256 = "1cy201c5imbw2pw65f1s0nn8p6vwm00nqlvxwygh18dhy2qv4gfa";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/mattn/emmet-vim/";
@@ -1548,12 +1548,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2020-06-07";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "8f1e73b598d27d78dfb5843be19a73b6a3b222b1";
- sha256 = "0zdimx6q2fivimdvh0cnm6w718vjxj0abv67869ijh1d4mfrmvyf";
+ rev = "2bf85d25e203a536edb2c072c0d41b29e8e4cc1b";
+ sha256 = "0dj6nw7rgc4679vqqmls8f59r3ax1ys4lrq4dq1gby3yk8z7lcy9";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@@ -1584,12 +1584,12 @@ let
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
- version = "2020-06-06";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
- rev = "bddd18ffabbdb10ca1fadf25e7d7d1201470f444";
- sha256 = "1sxh3zdrwajz0nabqbzg24sxlc8kwiqrwh4mvrwavwyh7xr29jxd";
+ rev = "24e67a74e430da87f66fbd88acc01c9227842fde";
+ sha256 = "193acbbmkl1102fyhm3kj0jais5b3f6y1rnyhzkikwl3rjjf6gaj";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@@ -1606,6 +1606,18 @@ let
meta.homepage = "https://github.com/eagletmt/ghcmod-vim/";
};
+ git-messenger-vim = buildVimPluginFrom2Nix {
+ pname = "git-messenger-vim";
+ version = "2020-06-08";
+ src = fetchFromGitHub {
+ owner = "rhysd";
+ repo = "git-messenger.vim";
+ rev = "0c79022b267f10305cd2d0d3e978c77bcb67b617";
+ sha256 = "1657622w60g2xqxalvxjhx9blcppxy69kgn170jb65902x2bav7p";
+ };
+ meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
+ };
+
gitignore-vim = buildVimPluginFrom2Nix {
pname = "gitignore-vim";
version = "2014-03-16";
@@ -1630,6 +1642,18 @@ let
meta.homepage = "https://github.com/gregsexton/gitv/";
};
+ gotests-vim = buildVimPluginFrom2Nix {
+ pname = "gotests-vim";
+ version = "2019-04-10";
+ src = fetchFromGitHub {
+ owner = "buoto";
+ repo = "gotests-vim";
+ rev = "e0ad687be26875153ecd43d16db3b93a637394e4";
+ sha256 = "01w981v7rya9fnxwdhlka4vfzlnw87pxmfcqmvxh3p96lmi71xjm";
+ };
+ meta.homepage = "https://github.com/buoto/gotests-vim/";
+ };
+
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo-vim";
version = "2020-06-08";
@@ -1824,12 +1848,12 @@ let
iosvkem = buildVimPluginFrom2Nix {
pname = "iosvkem";
- version = "2020-01-18";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "neutaaaaan";
repo = "iosvkem";
- rev = "08e36b649c83eece7edbd2e04e42e077aebc78eb";
- sha256 = "0jawl7fs6wl3ny9vsmzqv5pnkv5nn6wj1nx7hzgdl41183958pni";
+ rev = "df359d91510be0c078905568d9033c891a3a2f4b";
+ sha256 = "0xqh5hr4m6hm2vfms1iqarzhgkmrgx6f5ywyh6qhwkbrdj8q3lyq";
};
meta.homepage = "https://github.com/neutaaaaan/iosvkem/";
};
@@ -2041,12 +2065,12 @@ let
lh-brackets = buildVimPluginFrom2Nix {
pname = "lh-brackets";
- version = "2020-06-03";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-brackets";
- rev = "d6ea4b24b14f3ead29dc8df2e2d942c2b0287948";
- sha256 = "0gh21v0gnwhq2gim1hhfd0376zk4jdhfn9dldczxvzipxw3jaknr";
+ rev = "0553fecb3425dafe65a724ad01d85427285ac184";
+ sha256 = "0ih6ccsqhqc9cynkzqfb55x5mfz743hvdrxzlhm0axrkxxn3nczb";
};
meta.homepage = "https://github.com/LucHermitte/lh-brackets/";
};
@@ -2089,12 +2113,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
- version = "2020-05-18";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
- rev = "c172131e0369672bc1b9454a2aec6d532d350dcc";
- sha256 = "04nxldbb885n11vwz61c1r4h65y26six5cs9invbz27h4pgyrvna";
+ rev = "afd88109a6e24c4cc0cb55ae70ca66c108f1c540";
+ sha256 = "1cjb7klyigsqxv827bxdgp22b8cc5wihb1jfk7a8l63skliyqmg2";
};
meta.homepage = "https://github.com/itchyny/lightline.vim/";
};
@@ -2377,12 +2401,12 @@ let
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim";
- version = "2020-06-13";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
- rev = "a52edf794bae0174a682131333c891717633994b";
- sha256 = "1k3ncjlikdbsjk33fi14y88yqywrpzdfz8kwzjfxjlidbzzlzk0w";
+ rev = "2c6c457e0655090639bd8c68f6eac4b01d071696";
+ sha256 = "0ca8im1kmj4d1wshjjgci7v2d0szia36hhgnb2dmsg601ninkvmw";
};
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
};
@@ -2497,12 +2521,12 @@ let
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
- version = "2019-12-17";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-vim";
- rev = "f06189a4c054fe8c22e46aca4d451e03456f2283";
- sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81";
+ rev = "2124a5a760fb6138b10f38ceac3fce5c19056b9a";
+ sha256 = "0g08kydqh58617lxjnlvbvjp0f730kzjpsz44v390sjx2a9xrk23";
};
meta.homepage = "https://github.com/arcticicestudio/nord-vim/";
};
@@ -2569,12 +2593,12 @@ let
nvim-lsp = buildVimPluginFrom2Nix {
pname = "nvim-lsp";
- version = "2020-06-13";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lsp";
- rev = "9ec118cdc7ce6442bf8beba903ab395b2f60190f";
- sha256 = "1idam76jwvs82c2384y4az4rqp5cg29qhic12fnpy8m74b3rqla8";
+ rev = "a82ce0ebff06ec85ddb2c61763158b8e97b9a85e";
+ sha256 = "0dsg79qklb942af0qhpzd8h2j1rllk1qgm88p0s49m7rprfah3g4";
};
meta.homepage = "https://github.com/neovim/nvim-lsp/";
};
@@ -2615,6 +2639,30 @@ let
meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
};
+ oceanic-next = buildVimPluginFrom2Nix {
+ pname = "oceanic-next";
+ version = "2019-04-10";
+ src = fetchFromGitHub {
+ owner = "mhartington";
+ repo = "oceanic-next";
+ rev = "08158eec24cd154afd1623686aeb336fad580be7";
+ sha256 = "1s2h9mnhl54ww7zpdllwlxz93d5i7l7rx3s9mr8w6sv8azcak3v8";
+ };
+ meta.homepage = "https://github.com/mhartington/oceanic-next/";
+ };
+
+ onedark-vim = buildVimPluginFrom2Nix {
+ pname = "onedark-vim";
+ version = "2020-05-01";
+ src = fetchFromGitHub {
+ owner = "joshdick";
+ repo = "onedark.vim";
+ rev = "4bd965e29811e29e1c1b0819f3a63671d3e6ef28";
+ sha256 = "168zim0ifkg441iwwpxdb93fq4ap2ps0rnrad5lqycpgwr0v0bg2";
+ };
+ meta.homepage = "https://github.com/joshdick/onedark.vim/";
+ };
+
onehalf = buildVimPluginFrom2Nix {
pname = "onehalf";
version = "2020-06-11";
@@ -2665,12 +2713,12 @@ let
papercolor-theme = buildVimPluginFrom2Nix {
pname = "papercolor-theme";
- version = "2019-11-06";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "NLKNguyen";
repo = "papercolor-theme";
- rev = "ddd09867ed4e020b3ba2eb47dc3ef365da5b0fed";
- sha256 = "1dhbnd99xs6l5alqhn9m1nynmr9sbvrqj2137l23ysisprl3rgmr";
+ rev = "c657f5c2d5964bbae633f8a42c16f8316f6d6733";
+ sha256 = "1vv1gd64isrgyxc4fyp5mzlhffwkzdc8agnv0aka4v7qdaca45ni";
};
meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";
};
@@ -2797,12 +2845,12 @@ let
quick-scope = buildVimPluginFrom2Nix {
pname = "quick-scope";
- version = "2020-05-09";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "unblevable";
repo = "quick-scope";
- rev = "95578ca8eef44fcdba5e144b78604018590c6cef";
- sha256 = "1h5kc2wffvaljdvggp2s74jkd7z88y2r5g1flqlgda2x1ihlhavm";
+ rev = "03f047175fc3bd3ed9828ccec48b646bc53ab204";
+ sha256 = "11wh5jy7b1ncqbgc0nmip38zhz9halglaa3bw9da4qk5fp6xr1a4";
};
meta.homepage = "https://github.com/unblevable/quick-scope/";
};
@@ -2999,6 +3047,18 @@ let
meta.homepage = "https://github.com/megaannum/self/";
};
+ semantic-highlight-vim = buildVimPluginFrom2Nix {
+ pname = "semantic-highlight-vim";
+ version = "2019-09-01";
+ src = fetchFromGitHub {
+ owner = "jaxbot";
+ repo = "semantic-highlight.vim";
+ rev = "7cf0aabbd0f9cb531b0045ac2148dff1131616de";
+ sha256 = "16dnqrdpxf6322az1rn67ay2a4clqz410xn6zqzr1w2y6x4yly1a";
+ };
+ meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/";
+ };
+
semshi = buildVimPluginFrom2Nix {
pname = "semshi";
version = "2019-12-01";
@@ -3169,12 +3229,12 @@ let
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
- version = "2020-06-11";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "03dc38772d59e78de3d87b27438fecab70dd6688";
- sha256 = "0xn972gppr87lx37p01x1ikh2nwn56szhgnikw1v269vnysic15m";
+ rev = "20e41455e1155f5989ecac007fc92c9415244822";
+ sha256 = "1jzqz0pi9zaf2ivdvb2prv5k86003dswpv2n3vh5vkmwgl1r3ml4";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -3314,12 +3374,12 @@ let
tcomment_vim = buildVimPluginFrom2Nix {
pname = "tcomment_vim";
- version = "2020-05-12";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "tomtom";
repo = "tcomment_vim";
- rev = "22f3707fd19e1573b4379f3b8db0e967f4ae6492";
- sha256 = "0nj7bsmkw8yc4hfnbsm32lf4qcwc4qd18nr5sb7vrkm6ipsr2qyz";
+ rev = "920d465b56bcf96c976fa22e9558d51aa55dcd9c";
+ sha256 = "0n7gwdyzim4f92mxnjz4zwfiyapyjhbf21b1l3dq9b07x9m40365";
};
meta.homepage = "https://github.com/tomtom/tcomment_vim/";
};
@@ -3411,12 +3471,12 @@ let
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2020-01-22";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e";
- sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx";
+ rev = "a1eea2431e19e441555442ce41738524042b2493";
+ sha256 = "1k8sw8yr9ak4dggd51ishvnljsq3iycrnpfikhzn9h8qgclx2lfl";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@@ -3807,12 +3867,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2020-06-11";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "ee85ed4c673b859cf8c3626a6669b8e3cd2392fa";
- sha256 = "1wayink1n9l590kfi28xp37kw186g7j0dr5kgfr7xz8mk2g0wg0k";
+ rev = "5ce3e636580dde6653a74535bb7b358725d1e37c";
+ sha256 = "02a5nhhyi7k4645jmmgjdj28l46knv7l6219lkgixrbgdq5gc43h";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -4129,6 +4189,18 @@ let
meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/";
};
+ vim-crates = buildVimPluginFrom2Nix {
+ pname = "vim-crates";
+ version = "2019-11-11";
+ src = fetchFromGitHub {
+ owner = "mhinz";
+ repo = "vim-crates";
+ rev = "addbb157d0652ce5288c5b5b6f32f8716eb47898";
+ sha256 = "1pczfm9vjjna3xdqym9h69gi47kiwi97lzjf9jjlkmyg1s4pwlsp";
+ };
+ meta.homepage = "https://github.com/mhinz/vim-crates/";
+ };
+
vim-csharp = buildVimPluginFrom2Nix {
pname = "vim-csharp";
version = "2017-03-29";
@@ -4167,12 +4239,12 @@ let
vim-cursorword = buildVimPluginFrom2Nix {
pname = "vim-cursorword";
- version = "2020-05-02";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "itchyny";
repo = "vim-cursorword";
- rev = "109604ab6f35744e133802d7cf61795721612cac";
- sha256 = "1mrkkl6pchrmd2s5wjdh46p54hchv7jvgdbjjxmvzhg5ndk0zxvf";
+ rev = "cc8114226ceefb5cafe1890e0900d3efb7dab1fd";
+ sha256 = "1x5ljk82bxc3qhrq5pz0dsab8rg1234syd1xmpkgvif52s9g4mfk";
};
meta.homepage = "https://github.com/itchyny/vim-cursorword/";
};
@@ -4215,12 +4287,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
- version = "2020-06-12";
+ version = "2020-06-17";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
- rev = "84ec4562c21882dfe80b779cd645c607ec9d9727";
- sha256 = "1nv7aivnrxa91b2ylxzfiss46r9m2qf13v8wlhav85mgd51nhj99";
+ rev = "50eb8e2d88be4e8bbcd8e5ddccbe499b3a1f473d";
+ sha256 = "0hgbi7l4qlblmp28gbzzdw0bpfnw1mghyl7prk4zzf8w4m4vsrpa";
};
meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
};
@@ -4563,12 +4635,12 @@ let
vim-ghost = buildVimPluginFrom2Nix {
pname = "vim-ghost";
- version = "2020-06-04";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "raghur";
repo = "vim-ghost";
- rev = "fd3665df734c1f8d3620b11fc8bdfacb2faae35e";
- sha256 = "0p1y5g9fj58m48z9c6vdis7d4zajlv9j0y8065rmivws3df9n50j";
+ rev = "77330855a36350e75393cdeefb743da1040627ce";
+ sha256 = "0g3wvp02cv69v7xcsbib35bw9yf36iq6ffny7lmaf0s1pj2kwpzz";
};
meta.homepage = "https://github.com/raghur/vim-ghost/";
};
@@ -4611,12 +4683,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2020-06-10";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "e31e9bb35f7346caab4fcf972d44449bdfd3230a";
- sha256 = "1mmasjz0d6nyjjrlgwiz9kd420l16q90mhscwz3i65xw0zqlmcgj";
+ rev = "d82f2721424762f14587240e09cfb0dc499779da";
+ sha256 = "1ynl6jdnij2hi0gmpgq2b01r5g2db5582jzsqbz079ydb2kbp1jp";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -4647,12 +4719,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2020-06-09";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "354774cd7aea891cf553c34d79582be3346c1615";
- sha256 = "0pqmm6s50vxs9788f6avgwrdp1vi5mv3lzrxi2nxqdxvrcxngk93";
+ rev = "4ebfb5967fa2aa3269edb3962b347a7e5e213a1b";
+ sha256 = "1x8bg9c5yrfydaqkprf0cvl1jl0lncl0y1zrw1y5gvbq0cgdplqp";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -4863,12 +4935,12 @@ let
vim-hybrid-material = buildVimPluginFrom2Nix {
pname = "vim-hybrid-material";
- version = "2018-11-12";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "vim-hybrid-material";
- rev = "f2e92ac7e5c4bb75d72f0abaea939e4364e00e2e";
- sha256 = "01b9n598106qh68ky3fykczq13pldi221r7lrxvg0vnv2zp1z5qd";
+ rev = "ad031275c63a05b6acb6014a2401d8719a290bd4";
+ sha256 = "0qjg25cfdx9706svw4b527arfdq4ypshay11ak62yswirkvgsc2c";
};
meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/";
};
@@ -5044,12 +5116,12 @@ let
vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc";
- version = "2020-06-09";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "heavenshell";
repo = "vim-jsdoc";
- rev = "3b88595805ac7c0499dc05bc8aa5cc7909c6f5b7";
- sha256 = "04yjjcfmaby466krqzmvwg0cb2ydri6pj49x48z15h4s9ac47p66";
+ rev = "ca3c880f77b4cec6b14d9436b07f4152bebc2712";
+ sha256 = "04sq7wips3rybmaqwpxmf7920nv4nrm82lvbr5s9jdn0594lkg9c";
};
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
};
@@ -5090,6 +5162,18 @@ let
meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/";
};
+ vim-jsx-typescript = buildVimPluginFrom2Nix {
+ pname = "vim-jsx-typescript";
+ version = "2020-04-29";
+ src = fetchFromGitHub {
+ owner = "peitalin";
+ repo = "vim-jsx-typescript";
+ rev = "7b47d06819b5778de78cfbb28c225c3ab276f700";
+ sha256 = "0pm40psql6mzrzy750vm6jk71pp467hz9231izicp0554mq6qmsn";
+ };
+ meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/";
+ };
+
vim-kitty-navigator = buildVimPluginFrom2Nix {
pname = "vim-kitty-navigator";
version = "2019-11-04";
@@ -5224,12 +5308,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2020-06-10";
+ version = "2020-06-15";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "b34ad0fdd1223e5c1c39d23c01f13954ca2ad500";
- sha256 = "1zqk0zimq2qyqhhfb5693zkcxz16vyrd7k2wd488avqi1jbhiffc";
+ rev = "632cd869663ecccd5a309c5dbfc20e1fc881d4b7";
+ sha256 = "0w04fjci16l08c76fgqxv176jarm9iiv3rx46l8a45spkyb10lm0";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
@@ -5260,12 +5344,12 @@ let
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
- version = "2019-07-09";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "plasticboy";
repo = "vim-markdown";
- rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946";
- sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c";
+ rev = "139b6f666cd00e2c3180454fb794fd6cee788f0f";
+ sha256 = "1yk185l6g5ga2wlbxf0mcwc0dsc6c1nmz1ynl0hfnrbpfnn4sw1p";
};
meta.homepage = "https://github.com/plasticboy/vim-markdown/";
};
@@ -5668,12 +5752,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2020-06-13";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "a86c0179ebc99b15d403e3f1d4a4cfff83b47de8";
- sha256 = "0bsq2nvzxb6j0zn6c9hvrsz47ahcp3iki5acz4l1y841xgd880zm";
+ rev = "8b6c06e7239eb46d5b5096fd7fe9507aca88b091";
+ sha256 = "1j4fg0xhnwk0hf89djv0l2gzrj5dna1a9g8vjdxgdq0pilz5hqnj";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@@ -5800,12 +5884,12 @@ let
vim-racer = buildVimPluginFrom2Nix {
pname = "vim-racer";
- version = "2020-03-06";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "vim-racer";
- rev = "950b78f36e568134f5dcabc9a146c61e0084d220";
- sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l";
+ rev = "250e9fd496edde1516a5e68e9837ccf5e46cc895";
+ sha256 = "1ar5wv776xslxrs2mmxr5kzz5pp4a4v8jydh9s6cqbfzglgr9kw5";
};
meta.homepage = "https://github.com/racer-rust/vim-racer/";
};
@@ -6232,12 +6316,12 @@ let
vim-SyntaxRange = buildVimPluginFrom2Nix {
pname = "vim-SyntaxRange";
- version = "2020-05-09";
+ version = "2020-06-17";
src = fetchFromGitHub {
owner = "inkarkat";
repo = "vim-SyntaxRange";
- rev = "35d116cd1c70d2066b332a76ddbf354786cbb996";
- sha256 = "0mxih2ixaqnzh915w8zycdjxf07ax648dw5nvglcp7ym4r8fzg0q";
+ rev = "63c382eabfb5dd0b1e837dc6a42b14f3fe000ff9";
+ sha256 = "1c62m2k08vnla3zd3rb716y6vp5ijn8b36fv48jw77y579k9l6pk";
};
meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/";
};
@@ -6292,12 +6376,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2020-06-08";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "2f185e0e5b0e7344c1e391045dc33a2e7a41d8eb";
- sha256 = "1djl6phjc7vzhwbaxsc70mqp1f83iz99bcfyghphs9fhgdg46jiz";
+ rev = "a125012ad09d4531dc7f13097fa4a5e3f1ad09a7";
+ sha256 = "1dhg81glzfbmcrna45062n41vcfnd7mliphpa6rpd5d9ci54hl08";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -6532,12 +6616,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2020-06-08";
+ version = "2020-06-14";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "f972b5357af0e5c9b840f8e82eceb313891ef8b2";
- sha256 = "0ngvl4ikd45d1nhfpnpp003mfwx9mv5ywgk9mi5fjn2bc9a2y4l7";
+ rev = "507c498c7dac31c396ed64bfddcd92551a93669d";
+ sha256 = "0jq1ywz4fwlln93qwwxl28dlq43c5vaybhi1y365hcn03nz526cc";
};
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
};
@@ -6592,12 +6676,12 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
- version = "2020-06-10";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
- rev = "dffbb044f7974bf4615960689a3ff64e63daeab3";
- sha256 = "0ggnz2bz6mh9i38cgpkf87j27bhr8klk9a4ws57rkwfz3qppd4lj";
+ rev = "b9409149a5a8a386322cc4246d890c8c4c07d11d";
+ sha256 = "0jrz1v63a9kv7bkksdw7vxq83d49f0dvhp1sd9vaiya7a93raxdx";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@@ -6832,12 +6916,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2020-06-06";
+ version = "2020-06-21";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "bfd70f620d30dc756d8ae57056b7a67a3fbbff22";
- sha256 = "1a60qbswwdl58pqg6d9llj4l96h9vz7vp99s7ji0zjg8vzzklyxm";
+ rev = "0b5ece152b56e424b6df6ca9545517007ceb840f";
+ sha256 = "1dr98fibcpq6c1adsb4bnbbgg6gpk9brfy3kkrbl49jqf2120zww";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -6952,12 +7036,12 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
- version = "2020-05-15";
+ version = "2020-06-20";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
- rev = "fbbb4b2fa346f556aee8424c98ee51e849949bb1";
- sha256 = "1plgig0m7zb4zk7mqj5g12nc622dpngj4g4wvkg2ffic2krz9fdx";
+ rev = "7f4e88b3ba11261e6ec4c7364c5a420d48e253ac";
+ sha256 = "1q98pf0cr38k1z9czm57pvb0mari57q89swsk4aq0pl6b6cvi5d5";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@@ -6965,12 +7049,12 @@ let
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2020-06-12";
+ version = "2020-06-14";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "8bc02ee4877bfe07ed92cc4d471c353f1ab84ef6";
- sha256 = "1m1qhyqax7pdrsw9zdwy64d8rg5hcvmbyl8fqmbhz22lxdg5bvzv";
+ rev = "f9906f804b02e6b7e70a7f1a6f949e905784b5b9";
+ sha256 = "0jg5g2yzaf4xs14phak7k1s5s7jfnsx5ijjgx2arddgaxbvpxlrs";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -7014,12 +7098,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2020-05-21";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "912e9c792702519ca03cd3e3048e8d276a5d3947";
- sha256 = "1svy3bp8rhcbimcp5p4crz57fiv1p2xvcr4xs90frsncq1r483q9";
+ rev = "fdc73a51d168677ec9a1da68afbe30c8ddb6263a";
+ sha256 = "14qkrlh07qg6192m2lgbjh3dshgrlbwni2i00vm04xax8dm436j1";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e22ddc50ddd..9bd1657e4bd 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -35,6 +35,7 @@ bohlender/vim-smt2
brennanfee/vim-gui-position
bronson/vim-trailing-whitespace
brooth/far.vim
+buoto/gotests-vim
carlitux/deoplete-ternjs
ccarpita/rtorrent-syntax-file
cespare/vim-toml
@@ -155,6 +156,7 @@ itchyny/vim-gitbranch
ivanov/vim-ipython
jacoborus/tender.vim
jaredgorski/SpaceCamp
+jaxbot/semantic-highlight.vim
JazzCore/ctrlp-cmatcher
jceb/vim-hier
jceb/vim-orgmode
@@ -175,6 +177,7 @@ jonbri/vim-colorstepper
jonsmithers/vim-html-template-literals
joonty/vim-xdebug
josa42/coc-go
+joshdick/onedark.vim
jpalardy/vim-slime
jparise/vim-graphql
jparise/vim-phabricator
@@ -282,6 +285,8 @@ megaannum/self
mengelbrecht/lightline-bufferline
mfukar/robotframework-vim
mg979/vim-visual-multi
+mhartington/oceanic-next
+mhinz/vim-crates
mhinz/vim-grepper
mhinz/vim-janah
mhinz/vim-sayonara
@@ -373,6 +378,7 @@ overcache/NeoSolarized
pangloss/vim-javascript
parsonsmatt/intero-neovim
pearofducks/ansible-vim
+peitalin/vim-jsx-typescript
peterbjorgensen/sved
peterhoeg/vim-qml
phanviet/vim-monokai-pro
@@ -400,6 +406,7 @@ rbgrouleff/bclose.vim
reedes/vim-pencil
reedes/vim-wordy
rhysd/committia.vim
+rhysd/git-messenger.vim
rhysd/vim-grammarous
rhysd/vim-operator-surround
rodjek/vim-puppet
@@ -565,6 +572,7 @@ vimwiki/vimwiki
vito-c/jq.vim
vmchale/ats-vim
vmchale/dhall-vim
+voldikss/vim-floaterm
VundleVim/Vundle.vim
w0ng/vim-hybrid
wakatime/vim-wakatime
diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index acb4676a3f5..c5f293011db 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -15,11 +15,11 @@ let
in
stdenv.mkDerivation rec {
name = "mwprocapture-1.2.${version}-${kernel.version}";
- version = "4054";
+ version = "4177";
src = fetchurl {
url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
- sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2";
+ sha256 = "1nf51w9yixpvr767k49sfdb9n9rv5qc72f5yki1mkghbmabw7vys";
};
nativeBuildInputs = [ kernel.moduleBuildDependencies ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a87c6947a1a..9b4f8ae9ee5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.111.0";
+ version = "0.111.4";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"acer_projector" = ps: with ps; [ pyserial];
@@ -19,7 +19,7 @@
"alarm_control_panel" = ps: with ps; [ ];
"alarmdecoder" = ps: with ps; [ alarmdecoder];
"alert" = ps: with ps; [ ];
- "alexa" = ps: with ps; [ aiohttp-cors];
+ "alexa" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond
"alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage
"amazon_polly" = ps: with ps; [ boto3];
@@ -35,7 +35,7 @@
"apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
"api" = ps: with ps; [ aiohttp-cors];
"apns" = ps: with ps; [ ]; # missing inputs: apns2
- "apple_tv" = ps: with ps; [ pyatv];
+ "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf];
"apprise" = ps: with ps; [ apprise];
"aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy
"aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
@@ -57,13 +57,13 @@
"aurora" = ps: with ps; [ ];
"aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
"auth" = ps: with ps; [ aiohttp-cors];
- "automation" = ps: with ps; [ ];
+ "automation" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"avea" = ps: with ps; [ ]; # missing inputs: avea
"avion" = ps: with ps; [ ]; # missing inputs: avion
"avri" = ps: with ps; [ ]; # missing inputs: avri-api
"awair" = ps: with ps; [ ]; # missing inputs: python_awair
"aws" = ps: with ps; [ ]; # missing inputs: aiobotocore
- "axis" = ps: with ps; [ ]; # missing inputs: axis
+ "axis" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: axis
"azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub
"azure_service_bus" = ps: with ps; [ azure-servicebus];
"baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip
@@ -104,7 +104,7 @@
"calendar" = ps: with ps; [ aiohttp-cors];
"camera" = ps: with ps; [ aiohttp-cors];
"canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary
- "cast" = ps: with ps; [ PyChromecast];
+ "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend
"cert_expiry" = ps: with ps; [ ];
"channels" = ps: with ps; [ ]; # missing inputs: pychannels
"circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
@@ -117,7 +117,7 @@
"clicksend" = ps: with ps; [ ];
"clicksend_tts" = ps: with ps; [ ];
"climate" = ps: with ps; [ ];
- "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa];
+ "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend
"cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns
"cmus" = ps: with ps; [ ]; # missing inputs: pycmus
"co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
@@ -166,7 +166,7 @@
"directv" = ps: with ps; [ ]; # missing inputs: directv
"discogs" = ps: with ps; [ discogs_client];
"discord" = ps: with ps; [ discordpy];
- "discovery" = ps: with ps; [ netdisco];
+ "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf];
"dlib_face_detect" = ps: with ps; [ face_recognition];
"dlib_face_identify" = ps: with ps; [ face_recognition];
"dlink" = ps: with ps; [ ]; # missing inputs: pyW215
@@ -183,10 +183,10 @@
"dublin_bus_transport" = ps: with ps; [ ];
"duckdns" = ps: with ps; [ ];
"dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd
- "dwd_weather_warnings" = ps: with ps; [ ];
+ "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict];
"dweet" = ps: with ps; [ ]; # missing inputs: dweepy
"dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
- "dyson" = ps: with ps; [ ]; # missing inputs: libpurecool
+ "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool
"ebox" = ps: with ps; [ ]; # missing inputs: pyebox
"ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
"ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface
@@ -263,14 +263,14 @@
"foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
"foursquare" = ps: with ps; [ aiohttp-cors];
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
- "freebox" = ps: with ps; [ ]; # missing inputs: aiofreepybox
+ "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox
"freedns" = ps: with ps; [ ];
"fritz" = ps: with ps; [ fritzconnection];
"fritzbox" = ps: with ps; [ ]; # missing inputs: pyfritzhome
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection];
"fritzbox_netmonitor" = ps: with ps; [ fritzconnection];
"fronius" = ps: with ps; [ ]; # missing inputs: pyfronius
- "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "frontend" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
"futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip
"garadget" = ps: with ps; [ ];
@@ -320,7 +320,7 @@
"hangouts" = ps: with ps; [ ]; # missing inputs: hangups
"harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
"harmony" = ps: with ps; [ aioharmony];
- "hassio" = ps: with ps; [ aiohttp-cors];
+ "hassio" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"haveibeenpwned" = ps: with ps; [ ];
"hddtemp" = ps: with ps; [ ];
"hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC
@@ -337,7 +337,7 @@
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
"home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect
"homeassistant" = ps: with ps; [ ];
- "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg]; # missing inputs: PyTurboJPEG base36 fnvhash
+ "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg sqlalchemy zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash home-assistant-frontend
"homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP]
"homematic" = ps: with ps; [ pyhomematic];
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
@@ -454,7 +454,7 @@
"mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner
"manual" = ps: with ps; [ ];
"manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
- "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "map" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"marytts" = ps: with ps; [ ]; # missing inputs: speak2mary
"mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py
"matrix" = ps: with ps; [ matrix-client];
@@ -485,7 +485,7 @@
"minio" = ps: with ps; [ minio];
"mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt
"mjpeg" = ps: with ps; [ ];
- "mobile_app" = ps: with ps; [ pynacl aiohttp-cors];
+ "mobile_app" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend
"mochad" = ps: with ps; [ ]; # missing inputs: pymochad
"modbus" = ps: with ps; [ ]; # missing inputs: pymodbus
"modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem
@@ -504,7 +504,7 @@
"mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
"myq" = ps: with ps; [ ]; # missing inputs: pymyq
- "mysensors" = ps: with ps; [ ]; # missing inputs: pymysensors
+ "mysensors" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: pymysensors
"mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom
"mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns
"n26" = ps: with ps; [ ]; # missing inputs: n26
@@ -516,7 +516,7 @@
"nello" = ps: with ps; [ ]; # missing inputs: pynello
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
"nest" = ps: with ps; [ ]; # missing inputs: python-nest
- "netatmo" = ps: with ps; [ aiohttp-cors pyatmo];
+ "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo sqlalchemy]; # missing inputs: home-assistant-frontend
"netdata" = ps: with ps; [ ]; # missing inputs: netdata
"netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
"netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
@@ -548,7 +548,7 @@
"nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
"oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
"obihai" = ps: with ps; [ ]; # missing inputs: pyobihai
- "octoprint" = ps: with ps; [ ];
+ "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf];
"oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
"ohmconnect" = ps: with ps; [ defusedxml];
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
@@ -577,13 +577,13 @@
"orvibo" = ps: with ps; [ ]; # missing inputs: orvibo
"osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
"otp" = ps: with ps; [ pyotp];
- "owntracks" = ps: with ps; [ pynacl aiohttp-cors];
- "ozw" = ps: with ps; [ ]; # missing inputs: python-openzwave-mqtt
+ "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa hbmqtt paho-mqtt sqlalchemy]; # missing inputs: home-assistant-frontend
+ "ozw" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: python-openzwave-mqtt
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect];
- "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
- "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+ "panel_custom" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
+ "panel_iframe" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a
"pencom" = ps: with ps; [ ]; # missing inputs: pencompy
"persistent_notification" = ps: with ps; [ ];
@@ -598,8 +598,8 @@
"pioneer" = ps: with ps; [ ];
"pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2
"plaato" = ps: with ps; [ aiohttp-cors];
- "plant" = ps: with ps; [ ];
- "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket];
+ "plant" = ps: with ps; [ sqlalchemy];
+ "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos];
"plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
@@ -619,7 +619,7 @@
"pushbullet" = ps: with ps; [ pushbullet];
"pushover" = ps: with ps; [ pushover-complete];
"pushsafer" = ps: with ps; [ ];
- "pvoutput" = ps: with ps; [ ];
+ "pvoutput" = ps: with ps; [ jsonpath xmltodict];
"pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc
"pyload" = ps: with ps; [ ];
"python_script" = ps: with ps; [ restrictedpython];
@@ -630,7 +630,7 @@
"quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
"qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro
"qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
- "rachio" = ps: with ps; [ aiohttp-cors]; # missing inputs: rachiopy
+ "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend rachiopy
"radarr" = ps: with ps; [ ];
"radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm
"rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird
@@ -670,18 +670,18 @@
"rtorrent" = ps: with ps; [ ];
"russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
"russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
- "sabnzbd" = ps: with ps; [ ]; # missing inputs: pysabnzbd
- "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend
+ "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd
+ "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend
"saj" = ps: with ps; [ ]; # missing inputs: pysaj
"salt" = ps: with ps; [ ]; # missing inputs: saltbox
"samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket]
"satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
"scene" = ps: with ps; [ ];
"schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
- "scrape" = ps: with ps; [ beautifulsoup4];
+ "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict];
"script" = ps: with ps; [ ];
"scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
- "search" = ps: with ps; [ aiohttp-cors];
+ "search" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
"season" = ps: with ps; [ ephem];
"sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid
"sense" = ps: with ps; [ ]; # missing inputs: sense_energy
@@ -716,7 +716,7 @@
"sma" = ps: with ps; [ ]; # missing inputs: pysma
"smappee" = ps: with ps; [ ]; # missing inputs: smappy
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
- "smartthings" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmartapp pysmartthings
+ "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend pysmartapp pysmartthings
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
"smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
"sms" = ps: with ps; [ ]; # missing inputs: python-gammu
@@ -737,7 +737,7 @@
"songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
"sonos" = ps: with ps; [ pysonos];
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
- "soundtouch" = ps: with ps; [ libsoundtouch];
+ "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf];
"spaceapi" = ps: with ps; [ aiohttp-cors];
"spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
"speedtestdotnet" = ps: with ps; [ speedtest-cli];
@@ -747,11 +747,11 @@
"spotify" = ps: with ps; [ aiohttp-cors spotipy];
"sql" = ps: with ps; [ sqlalchemy];
"squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox
- "ssdp" = ps: with ps; [ defusedxml netdisco];
+ "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf];
"starline" = ps: with ps; [ ]; # missing inputs: starline
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
"startca" = ps: with ps; [ xmltodict];
- "statistics" = ps: with ps; [ ];
+ "statistics" = ps: with ps; [ sqlalchemy];
"statsd" = ps: with ps; [ statsd];
"steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
"stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron
@@ -796,7 +796,7 @@
"telnet" = ps: with ps; [ ];
"temper" = ps: with ps; [ ]; # missing inputs: temperusb
"template" = ps: with ps; [ ];
- "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow];
+ "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: tensorflow
"tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy
"tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
"thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke
@@ -911,7 +911,7 @@
"xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
"xiaomi" = ps: with ps; [ ha-ffmpeg];
- "xiaomi_aqara" = ps: with ps; [ ]; # missing inputs: PyXiaomiGateway
+ "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway
"xiaomi_miio" = ps: with ps; [ construct python-miio];
"xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv
"xmpp" = ps: with ps; [ slixmpp];
@@ -921,7 +921,7 @@
"yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast
"yandex_transport" = ps: with ps; [ ]; # missing inputs: ya_ma
"yandextts" = ps: with ps; [ ];
- "yeelight" = ps: with ps; [ ]; # missing inputs: yeelight
+ "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
"yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
"yi" = ps: with ps; [ aioftp ha-ffmpeg];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 33fbbf66310..366415dd9e2 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6
+{ stdenv, nixosTests, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6
# Look up dependencies of specified components in component-packages.nix
, extraComponents ? [ ]
@@ -22,10 +22,10 @@ let
defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py
- # used by check_config script
- # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
- (mkOverride "colorlog" "4.0.2"
- "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42")
+ # required by the sun/moon plugins
+ # https://github.com/home-assistant/core/issues/36636
+ (mkOverride "astral" "1.10.1"
+ "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
# required by aioesphomeapi
(self: super: {
@@ -67,7 +67,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.111.0";
+ hassVersion = "0.111.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "0zg7fng3cfksn4hr8vixsmj8cbag8h4dg4qi69n56hc71rnpl9kw";
+ sha256 = "08dkqczpmdaz8k9fsshgvgma7i7sffzgmhsi49qki7vwn20hl2hf";
};
propagatedBuildInputs = [
@@ -123,6 +123,9 @@ in with py.pkgs; buildPythonApplication rec {
passthru = {
inherit (py.pkgs) hass-frontend;
+ tests = {
+ inherit (nixosTests) home-assistant;
+ };
};
meta = with lib; {
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index a2445dad324..fcb68896c29 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20200603.2";
+ version = "20200603.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1p99f5q8frk5k5lh1gjxyq539p1iv9fslpbfirh8njx3d0a85l84";
+ sha256 = "12bbvqckry6yr7409dir49pjcaa31z74fy6vb0mgr9xzvri5c2s8";
};
# no Python tests implemented
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index f802485d6c6..3c6d0c4bcab 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -24,7 +24,7 @@ import sys
import tarfile
import tempfile
from io import BytesIO
-from typing import Dict, Optional
+from typing import Dict, Optional, Set, Any
from urllib.request import urlopen
COMPONENT_PREFIX = "homeassistant.components"
@@ -79,11 +79,14 @@ def parse_components(version: str = "master"):
# Recursively get the requirements of a component and its dependencies
-def get_reqs(components, component):
+def get_reqs(components: Dict[str, Dict[str, Any]], component: str, processed: Set[str]) -> Set[str]:
requirements = set(components[component].get("requirements", []))
deps = components[component].get("dependencies", [])
+ deps.extend(components[component].get("after_dependencies", []))
+ processed.add(component)
for dependency in deps:
- requirements.update(get_reqs(components, dependency))
+ if dependency not in processed:
+ requirements.update(get_reqs(components, dependency, processed))
return requirements
@@ -143,7 +146,7 @@ def main() -> None:
for component in sorted(components.keys()):
attr_paths = []
missing_reqs = []
- reqs = sorted(get_reqs(components, component))
+ reqs = sorted(get_reqs(components, component, set()))
for req in reqs:
# Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
# Therefore, if there's a "#" in the line, only take the part after it
diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh
new file mode 100755
index 00000000000..11189cf3577
--- /dev/null
+++ b/pkgs/servers/home-assistant/update.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p nix -p jq -p curl -p bash -p git -p nix-update -i bash
+
+set -eux
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$DIR"
+
+CURRENT_VERSION=$(nix eval --raw '(with import ../../.. {}; home-assistant.version)')
+TARGET_VERSION=$(curl https://api.github.com/repos/home-assistant/core/releases/latest | jq -r '.name')
+MANIFEST=$(curl https://raw.githubusercontent.com/home-assistant/core/${TARGET_VERSION}/homeassistant/components/frontend/manifest.json)
+FRONTEND_VERSION=$(echo $MANIFEST | jq -r '.requirements[] | select(startswith("home-assistant-frontend")) | sub(".*==(?.*)"; .vers)')
+
+if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
+ echo "home-assistant is up-to-date: ${CURRENT_VERSION}"
+ exit 0
+fi
+
+
+sed -i -e "s/version =.*/version = \"${TARGET_VERSION}\";/" \
+ component-packages.nix
+
+sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \
+ default.nix
+
+./parse-requirements.py
+(
+ cd ../../..
+ nix-update --version "$FRONTEND_VERSION" home-assistant.hass-frontend
+ nix-update --version "$TARGET_VERSION" --build home-assistant
+)
+
+git add ./component-packages.nix ./default.nix ./frontend.nix
+git commit -m "homeassistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 80bc1458ad7..6ec5b0a7851 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -4,6 +4,7 @@
, withDebug ? false
, withStream ? true
, withMail ? false
+, withPerl ? true
, modules ? []
, ...
}:
@@ -87,7 +88,7 @@ stdenv.mkDerivation {
] ++ optionals withMail [
"--with-mail"
"--with-mail_ssl_module"
- ] ++ optional (perl != null) [
+ ] ++ optionals withPerl [
"--with-http_perl_module"
"--with-perl=${perl}/bin/perl"
"--with-perl_modules_path=lib/perl5"
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 9c01cfb19e1..d845d92ec8a 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -34,6 +34,8 @@ callPackage ../nginx/generic.nix args rec {
postInstall = ''
ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty
ln -s $out/nginx/sbin/nginx $out/bin/nginx
+ ln -s $out/nginx/conf $out/conf
+ ln -s $out/nginx/html $out/html
'';
meta = {
diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix
new file mode 100644
index 00000000000..e5597451062
--- /dev/null
+++ b/pkgs/servers/misc/navidrome/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ pname = "navidrome";
+ version = "0.23.1";
+
+ src = fetchurl {
+ url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
+ sha256 = "0hrnlpaq32f8slgmyl629v5b46ar2mq97q0cgrxy6ahfabfw2vih";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ unpackPhase = ''
+ tar xvf $src navidrome
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp navidrome $out/bin
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/navidrome \
+ --prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)}
+ '';
+
+ meta = {
+ description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic";
+ homepage = "https://www.navidrome.org/";
+ license = licenses.gpl3;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ aciceri ];
+ };
+}
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 048de16ceed..4c43f141d18 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -36,4 +36,9 @@ in {
version = "18.0.6";
sha256 = "1chmkg31jc1nr53y8r886mmd2jzb78094mrx7ggcfpjfkkv8b89s";
};
+
+ nextcloud19 = generic {
+ version = "19.0.0";
+ sha256 = "1bhazqj5f02sclh5pmifzqfahhhfqypixbvkgrnlgqy5ayb44gfj";
+ };
}
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index fb7870eac95..2ecd9242818 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,20 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "0v83faz0jwnx603acmkc3bsl7vg2xxsm1jfw88fmnj6zcsa5b9ql";
+ sha256 = "0imsshvdwd2isq58kplc27za30nabp62ypf1hq95aq94pjm2zp39";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "1z9liqzgwfavh3m3q1s871gxnwnsxdbny2vqzh9sjlwdk26f76gi";
+ sha256 = "1905rj36md5iszbxw78ylvkljr4d54i50x23r1r6k1xw7i93yfwq";
};
}.${system};
- strip = if stdenv.isDarwin then "strip -x" else "strip";
-
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "286.0.0";
+ version = "297.0.1";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -93,9 +91,6 @@ in stdenv.mkDerivation rec {
jq -c . $path > $path.min
mv $path.min $path
done
-
- # strip the Cython gRPC library
- ${strip} $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 662dba65be4..0f73b353169 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -185,6 +185,11 @@ in pythonPackages.buildPythonApplication rec {
./replaygain-default-bs1770gain.patch
./keyfinder-default-bin.patch
./mutagen-1.43.patch
+ (fetchpatch {
+ # Fixes failing testcases around the werkzeug component; can dropped after 1.4.9
+ url = "https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8.patch";
+ sha256 = "13n2gzmcgfi0m2ycl2r1hpczgksplnkc3y6b66vg57rx5y8nnv5c";
+ })
];
postPatch = ''
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 46f6bb404ae..c5b02e1bdb8 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "0dv62kyc8hvwb4gkhyxzwagp87nv0mr1612dz6q835is1vqav134";
+ sha256 = "0zrxq0s3dlgjarn8l519czwffp2s5ibykc00vfrpayg547dgj342";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix
index 0088422c6a4..cbb48fe3728 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/pkgs/tools/graphics/lepton/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, git, glibc }:
stdenv.mkDerivation rec {
- version = "1.2.1";
- pname = "lepton";
+ version = "2019-08-20";
+ pname = "lepton-unstable";
src = fetchFromGitHub {
repo = "lepton";
owner = "dropbox";
- rev = version;
- sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba";
+ rev = "3d1bc19da9f13a6e817938afd0f61a81110be4da";
+ sha256 = "0aqs6nvcbq8cbfv8699fa634bsz7csmk0169n069yvv17d1c07fd";
};
nativeBuildInputs = [ cmake git ];
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 554d7f9e1dd..d0cf1b4e5b8 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
- sha256 = "1ggzx4w69fmvaxm5gfqhh8ncr2mdx528zm6vwrrwz165lga2fvw6";
+ sha256 = "1vhwv9yb8acz4iq9zmg1qkf072z1py84lz4ddj8gmg6rq7g8n4mb";
};
- cargoSha256 = "0gcq0fww9hl3avh3qcnpnwmpwda4cymr7x3kd3frdizrs8i643mr";
+ cargoSha256 = "19z6d72ssqwm8i7bnfqgsndy1f2wxzkvhs8swy16gnqfqjqdf26d";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/tools/misc/esphome/default.nix
similarity index 94%
rename from pkgs/servers/home-assistant/esphome.nix
rename to pkgs/tools/misc/esphome/default.nix
index 2dc023df5a2..3dd79969554 100644
--- a/pkgs/servers/home-assistant/esphome.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -18,11 +18,11 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "esphome";
- version = "1.14.3";
+ version = "1.14.4";
src = python.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0xnsl000c5a2li9qw9anrzzq437qn1n4hcfc24i4rfq37awzmig7";
+ sha256 = "10krdmpbafvii0qlg5w94vdv573f3zdqm78ck79d6q0frdd9q9yn";
};
ESPHOME_USE_SUBPROCESS = "";
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 71fdcc947d3..3e7719c40d4 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -5,9 +5,6 @@
}:
let
- optional = stdenv.lib.optional;
- version = "3.31";
- name = "libreswan-${version}";
binPath = stdenv.lib.makeBinPath [
bash iproute iptables procps coreutils gnused gawk nss.tools which python
];
@@ -16,13 +13,13 @@ in
assert docs -> xmlto != null;
assert stdenv.isLinux -> libselinux != null;
-stdenv.mkDerivation {
- inherit name;
- inherit version;
+stdenv.mkDerivation rec {
+ pname = "libreswan";
+ version = "3.32";
src = fetchurl {
- url = "https://download.libreswan.org/${name}.tar.gz";
- sha256 = "1wxqsv11nqgfj5and5xzfgh6ayqvl47midcghd5ryynh60mp7naa";
+ url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
+ sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3";
};
# These flags were added to compile v3.18. Try to lift them when updating.
@@ -37,8 +34,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
libcap_ng curl nspr nss python ldns ]
- ++ optional docs xmlto
- ++ optional stdenv.isLinux libselinux;
+ ++ stdenv.lib.optional docs xmlto
+ ++ stdenv.lib.optional stdenv.isLinux libselinux;
prePatch = ''
# Correct bash path
diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix
new file mode 100644
index 00000000000..4ea24328b9c
--- /dev/null
+++ b/pkgs/tools/text/fastmod/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "fastmod";
+ version = "0.4.0";
+
+ src = fetchFromGitHub {
+ owner = "facebookincubator";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0089a17h0wgan3fs6x1la35lzjs1pib7p81wqkh3zcwvx8ffa8z8";
+ };
+
+ cargoSha256 = "02nkxjwfiljndmi0pv98chfsw9vmjzgmp5r14mchpayp4943qk9m";
+
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
+ meta = with stdenv.lib; {
+ description = "A utility that makes sweeping changes to large, shared code bases";
+ homepage = "https://github.com/facebookincubator/fastmod";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jduan ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca857afc5ee..d293d0000b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -955,6 +955,10 @@ in
libfx2 = with python3Packages; toPythonApplication fx2;
+ fastmod = callPackage ../tools/text/fastmod {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { };
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
@@ -1784,7 +1788,7 @@ in
eschalot = callPackage ../tools/security/eschalot { };
- esphome = callPackage ../servers/home-assistant/esphome.nix { };
+ esphome = callPackage ../tools/misc/esphome { };
esptool = callPackage ../tools/misc/esptool { };
@@ -5466,7 +5470,7 @@ in
grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {})
- nextcloud17 nextcloud18;
+ nextcloud17 nextcloud18 nextcloud19;
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
@@ -7929,8 +7933,8 @@ in
zssh = callPackage ../tools/networking/zssh { };
zstd = callPackage ../tools/compression/zstd {
- cmake = cmake.override {
- libarchive = libarchive.override { zstd = null; };
+ cmake = buildPackages.cmake.override {
+ libarchive = buildPackages.libarchive.override { zstd = null; };
};
};
@@ -10817,6 +10821,7 @@ in
parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
patchelf = callPackage ../development/tools/misc/patchelf { };
+ patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { };
patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });
@@ -11413,6 +11418,8 @@ in
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+ hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
+
niv = haskellPackages.niv.bin;
ormolu = haskellPackages.ormolu.bin;
@@ -12457,6 +12464,8 @@ in
imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ;
+ impy = callPackage ../development/libraries/impy { };
+
ineffassign = callPackage ../development/tools/ineffassign { };
ijs = callPackage ../development/libraries/ijs { };
@@ -13798,7 +13807,13 @@ in
llvmPackages = llvmPackages_9;
inherit (darwin.apple_sdk.frameworks) OpenGL;
inherit (darwin.apple_sdk.libs) Xplugin;
- };
+ }
+ # Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145
+ // { drivers = (mesa.overrideAttrs (a: {
+ nativeBuildInputs = [ patchelf_0_9 ] ++ a.nativeBuildInputs or [];
+ })).drivers;
+ }
+ ;
mesa_glu = callPackage ../development/libraries/mesa-glu {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
@@ -15918,14 +15933,14 @@ in
nginx = nginxStable;
nginxStable = callPackage ../servers/http/nginx/stable.nix {
- perl = null;
+ withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
};
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
- perl = null;
+ withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.dav nginxModules.moreheaders ];
@@ -15955,7 +15970,9 @@ in
openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; };
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
- openresty = callPackage ../servers/http/openresty { };
+ openresty = callPackage ../servers/http/openresty {
+ withPerl = false;
+ };
opensmtpd = callPackage ../servers/mail/opensmtpd { };
opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
@@ -19505,6 +19522,8 @@ in
evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
+ evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };
+
exercism = callPackage ../applications/misc/exercism { };
go-motion = callPackage ../development/tools/go-motion { };
@@ -19760,7 +19779,6 @@ in
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
callPackage = pkgs.newScope {
- inherit (gnome2) libIDL;
libpng = libpng_apng;
python = python2;
gnused = gnused_422;
@@ -19781,8 +19799,6 @@ in
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
channel = "release";
generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
- gconf = pkgs.gnome2.GConf;
- inherit (pkgs.gnome2) libgnome libgnomeui;
};
firefox-bin = wrapFirefox firefox-bin-unwrapped {
@@ -19794,8 +19810,6 @@ in
firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
channel = "beta";
generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
- gconf = pkgs.gnome2.GConf;
- inherit (pkgs.gnome2) libgnome libgnomeui;
};
firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
@@ -19807,8 +19821,6 @@ in
firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
channel = "devedition";
generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
- gconf = pkgs.gnome2.GConf;
- inherit (pkgs.gnome2) libgnome libgnomeui;
};
firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
@@ -22462,7 +22474,6 @@ in
thonny = callPackage ../applications/editors/thonny { };
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
- inherit (gnome2) libIDL;
inherit (rustPackages_1_42) rustc;
libpng = libpng_apng;
gtk3Support = true;
@@ -22470,10 +22481,7 @@ in
thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
- thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
- gconf = pkgs.gnome2.GConf;
- inherit (pkgs.gnome2) libgnome libgnomeui;
- };
+ thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { };
ticpp = callPackage ../development/libraries/ticpp { };
@@ -23418,6 +23426,9 @@ in
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
+
+ bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; };
+
clightning = callPackage ../applications/blockchains/clightning.nix { };
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
@@ -23520,6 +23531,8 @@ in
wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
+ wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; };
+
wownero = callPackage ../applications/blockchains/wownero.nix {};
zcash = callPackage ../applications/blockchains/zcash { };
@@ -26398,6 +26411,8 @@ in
urbit = callPackage ../misc/urbit { };
+ utf8cpp = callPackage ../development/libraries/utf8cpp { };
+
utf8proc = callPackage ../development/libraries/utf8proc { };
unicode-paracode = callPackage ../tools/misc/unicode { };
@@ -26884,4 +26899,6 @@ in
vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {};
gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
+
+ navidrome = callPackage ../servers/misc/navidrome {};
}
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e212da33769..b3e44398f6a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13707,9 +13707,16 @@ let
url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz";
sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc";
};
- nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ];
+ nativeBuildInputs = [ buildPackages.pkgconfig ];
buildInputs = [ pkgs.dbus TestPod TestPodCoverage ];
propagatedBuildInputs = [ XMLTwig ];
+
+ # https://gitlab.com/berrange/perl-net-dbus/-/merge_requests/19
+ patches = (fetchpatch {
+ url = "https://gitlab.com/berrange/perl-net-dbus/-/commit/6bac8f188fb06e5e5edd27aee672d66b7c28caa4.patch";
+ sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb";
+ });
+
meta = {
homepage = "http://www.freedesktop.org/wiki/Software/dbus";
description = "Extension for the DBus bindings";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ecba8ceb46..4d4a3ad052b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -569,10 +569,7 @@ in {
cadquery = callPackage ../development/python-modules/cadquery { };
- catalogue = if isPy3k then
- callPackage ../development/python-modules/catalogue { }
- else
- callPackage ../development/python-modules/catalogue/1.nix { };
+ catalogue = callPackage ../development/python-modules/catalogue { };
cbeams = callPackage ../misc/cbeams { };
@@ -2033,6 +2030,8 @@ in {
cornice = callPackage ../development/python-modules/cornice { };
+ crashtest = callPackage ../development/python-modules/crashtest { };
+
cram = callPackage ../development/python-modules/cram { };
crc16 = callPackage ../development/python-modules/crc16 { };
@@ -2499,6 +2498,10 @@ in {
pytest-astropy = callPackage ../development/python-modules/pytest-astropy { };
+ pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { };
+
+ pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { };
+
pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { };
pytestcache = callPackage ../development/python-modules/pytestcache { };
@@ -5484,7 +5487,7 @@ in {
pylibacl = callPackage ../development/python-modules/pylibacl { };
- pylibgen = callPackage ../development/python-modules/pylibgen { };
+ pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pyliblo = callPackage ../development/python-modules/pyliblo { };
@@ -6011,6 +6014,8 @@ in {
extras = callPackage ../development/python-modules/extras { };
+ extension-helpers = callPackage ../development/python-modules/extension-helpers { };
+
texttable = callPackage ../development/python-modules/texttable { };
textwrap3 = callPackage ../development/python-modules/textwrap3 { };