diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecdd53b8436..4d895d05792 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";
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 31cabce1d53..ec7013ca70a 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -651,6 +651,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/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/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/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index e74e03fc0b0..004abc48219 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -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/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 5b9065dec3c..41269426e9e 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 {
@@ -336,7 +336,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 +357,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 +370,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/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 9548ecb8ef6..48543d15499 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -219,6 +219,7 @@ in {
Section "InputClass"
Identifier "libinputConfiguration"
MatchDriver "libinput"
+ MatchTag "Touchpad"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index bd26fc906aa..98947d70eaa 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -345,6 +345,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/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/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/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/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/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/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/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/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/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/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/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/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e3714edc0ae..324b6bfde81 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-19";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "1428c7b29e50af56f53ee1d587679d97a027dd72";
- sha256 = "0zhrgfsk7fvs8wabgdp5ps73ggsghsw19cnjvlbw4cnib6p9176a";
+ rev = "4f254988064d075bd3c2e08038b501df4d07b78d";
+ sha256 = "15l3j6g3k4s08dbqnav1gns5vc5bxx2r4db6zw7ray26bxi1f2ch";
};
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 = "10a6cc172795d3ba6e9ccb8e1e4d4cdeee66956c";
+ sha256 = "1ag1j2szb19d7bi8sfpws3whhq8vzg5gbxygr1shif9bf0dlk447";
};
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,12 +785,12 @@ 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/";
};
@@ -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-18";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "e04bfc18b604c54ebc319d2eebf8fe3a830a9212";
- sha256 = "01bf55zbw2v2qzbpk0jm5j4dhq8rs78m2pbljsnl2772vll4iv38";
+ rev = "1a49407cf3eff03359de158151be174956b2ccbc";
+ sha256 = "10l91wxfm5019qq16ri316dgwv62ngss8xmf9vpv7lxwspzmc806";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -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/";
};
@@ -1630,6 +1630,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 +1836,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 +2053,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 +2101,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
- version = "2020-05-18";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
- rev = "c172131e0369672bc1b9454a2aec6d532d350dcc";
- sha256 = "04nxldbb885n11vwz61c1r4h65y26six5cs9invbz27h4pgyrvna";
+ rev = "3afa0102cede4687c05b7cb48b2e15beb236602f";
+ sha256 = "1qyf0jsh8fgnmq53dbdrkhlivznjki2vx4rmdp9dvv86zn7xr4mb";
};
meta.homepage = "https://github.com/itchyny/lightline.vim/";
};
@@ -2377,12 +2389,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 +2509,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 +2581,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/";
};
@@ -2665,12 +2677,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 +2809,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/";
};
@@ -3169,12 +3181,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 +3326,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 +3423,12 @@ let
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2020-01-22";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e";
- sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx";
+ rev = "ac40d8c89b9eba8eefdbb8383eba54ab98c13bd5";
+ sha256 = "16alf05qzf572nj7dbw9c2s6vxq2raz2kj61jjvdrcfplr0nqqha";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@@ -3807,12 +3819,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/";
};
@@ -4167,12 +4179,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 +4227,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 +4575,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 +4623,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2020-06-10";
+ version = "2020-06-18";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "e31e9bb35f7346caab4fcf972d44449bdfd3230a";
- sha256 = "1mmasjz0d6nyjjrlgwiz9kd420l16q90mhscwz3i65xw0zqlmcgj";
+ rev = "97a24e903a7841f410903087c19eaf728668ec81";
+ sha256 = "0qhs5dlnjdmlxcq81ycrcr58szwkqc347pdlz9aj60fss1gw49v5";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -4647,12 +4659,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 +4875,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 +5056,12 @@ let
vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc";
- version = "2020-06-09";
+ version = "2020-06-14";
src = fetchFromGitHub {
owner = "heavenshell";
repo = "vim-jsdoc";
- rev = "3b88595805ac7c0499dc05bc8aa5cc7909c6f5b7";
- sha256 = "04yjjcfmaby466krqzmvwg0cb2ydri6pj49x48z15h4s9ac47p66";
+ rev = "f541124a50410c39b1534a098600a20a7ad0661f";
+ sha256 = "1ldk9gh6k2qmdiy4am3rl63pkywk221lz4c4wbwp6kzs0imlhb7f";
};
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
};
@@ -5224,12 +5236,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 +5272,12 @@ let
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
- version = "2019-07-09";
+ version = "2020-06-16";
src = fetchFromGitHub {
owner = "plasticboy";
repo = "vim-markdown";
- rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946";
- sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c";
+ rev = "c179316755bccb44115d031d720037dc58d75e6c";
+ sha256 = "0ljvlh3glylm9q9fkdq6162i4jsxgyik13wcyjg44vrsgdim02qa";
};
meta.homepage = "https://github.com/plasticboy/vim-markdown/";
};
@@ -5668,12 +5680,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 +5812,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 +6244,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/";
};
@@ -6532,12 +6544,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 +6604,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 +6844,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2020-06-06";
+ version = "2020-06-19";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "bfd70f620d30dc756d8ae57056b7a67a3fbbff22";
- sha256 = "1a60qbswwdl58pqg6d9llj4l96h9vz7vp99s7ji0zjg8vzzklyxm";
+ rev = "4465a93001fe2f7800569f63257446114d347a5b";
+ sha256 = "1vhi7zqywk15yzigky9nhsgjcjn9qvnpfgdw8173bsxh260bf33k";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -6952,12 +6964,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 +6977,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 +7026,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..516ac691bc2 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
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 33fbbf66310..e198a35ad12 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -27,6 +27,11 @@ let
(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: {
protobuf = super.protobuf.override {
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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca857afc5ee..14a494a164f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5466,7 +5466,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 +7929,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 +10817,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 { });
@@ -12457,6 +12458,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 +13801,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;
@@ -19505,6 +19514,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 { };
@@ -23418,6 +23429,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 +23534,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 { };
@@ -26884,4 +26900,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";