diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md
index 16e4baa966b..317c9430cd0 100644
--- a/doc/builders/fetchers.chapter.md
+++ b/doc/builders/fetchers.chapter.md
@@ -72,3 +72,7 @@ This is used with Savannah repositories. The arguments expected are very similar
## `fetchFromRepoOrCz`
This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
+
+## `fetchFromSourcehut`
+
+This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name!
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index cab4c067e0d..5f70f74d5d9 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -448,6 +448,17 @@ import ./make-test-python.nix {
Python code…
'';
}
+
+ This will produce a Nix warning at evaluation time. To fully disable the
+ linter, wrap the test script in comment directives to disable the Black linter
+ directly (again, don't commit this within the Nixpkgs repository):
+
+ testScript =
+ ''
+ # fmt: off
+ Python code…
+ # fmt: on
+ '';
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index 16f5f18e8ba..b4cf1a20241 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -29,7 +29,7 @@
GNURadio 3.8 was
- finnally
+ finally
packaged, along with a rewrite to the Nix expressions, allowing users to
override the features upstream supports selecting to compile or not to.
Additionally, the attribute gnuradio and gnuradio3_7
@@ -567,6 +567,21 @@ self: super:
The kindlegen package is gone, because it is no longer supported or hosted by Amazon. Sadly, its replacement, Kindle Previewer, has no Linux support. However, there are other ways to generate MOBI files. See the discussion for more info.
+
+
+ The apacheKafka packages are now built with
+ version-matched JREs. Versions 2.6 and above, the ones that recommend it,
+ use jdk11, while versions below remain on jdk8. The NixOS service has
+ been adjusted to start the service using the same version as the package,
+ adjustable with the new
+ services.apache-kafka.jre
+ option. Furthermore, the default list of
+ services.apache-kafka.jvmOptions
+ have been removed. You should set your own according to the
+ upstream documentation
+ for your Kafka version.
+
+
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index f3a650a260f..69dfadfe54e 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -90,19 +90,7 @@ in {
jvmOptions = mkOption {
description = "Extra command line options for the JVM running Kafka.";
- default = [
- "-server"
- "-Xmx1G"
- "-Xms1G"
- "-XX:+UseCompressedOops"
- "-XX:+UseParNewGC"
- "-XX:+UseConcMarkSweepGC"
- "-XX:+CMSClassUnloadingEnabled"
- "-XX:+CMSScavengeBeforeRemark"
- "-XX:+DisableExplicitGC"
- "-Djava.awt.headless=true"
- "-Djava.net.preferIPv4Stack=true"
- ];
+ default = [];
type = types.listOf types.str;
example = [
"-Djava.net.preferIPv4Stack=true"
@@ -118,6 +106,13 @@ in {
type = types.package;
};
+ jre = mkOption {
+ description = "The JRE with which to run Kafka";
+ default = cfg.package.passthru.jre;
+ defaultText = "pkgs.apacheKafka.passthru.jre";
+ type = types.package;
+ };
+
};
config = mkIf cfg.enable {
@@ -138,7 +133,7 @@ in {
after = [ "network.target" ];
serviceConfig = {
ExecStart = ''
- ${pkgs.jre}/bin/java \
+ ${cfg.jre}/bin/java \
-cp "${cfg.package}/libs/*" \
-Dlog4j.configuration=file:${logConfig} \
${toString cfg.jvmOptions} \
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 940f2818937..115ecbf12b5 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -3,7 +3,7 @@
let
inherit (lib) concatStrings foldl foldl' genAttrs literalExample maintainers
mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption
- optional types;
+ optional types mkOptionDefault flip attrNames;
cfg = config.services.prometheus.exporters;
@@ -22,6 +22,7 @@ let
exporterOpts = genAttrs [
"apcupsd"
+ "artifactory"
"bind"
"bird"
"blackbox"
@@ -31,6 +32,7 @@ let
"fritzbox"
"json"
"keylight"
+ "knot"
"lnd"
"mail"
"mikrotik"
@@ -51,6 +53,7 @@ let
"smokeping"
"sql"
"surfboard"
+ "systemd"
"tor"
"unifi"
"unifi-poller"
@@ -64,7 +67,7 @@ let
mkExporterOpts = ({ name, port }: {
enable = mkEnableOption "the prometheus ${name} exporter";
port = mkOption {
- type = types.int;
+ type = types.port;
default = port;
description = ''
Port to listen on.
@@ -92,9 +95,8 @@ let
'';
};
firewallFilter = mkOption {
- type = types.str;
- default = "-p tcp -m tcp --dport ${toString cfg.${name}.port}";
- defaultText = "-p tcp -m tcp --dport ${toString port}";
+ type = types.nullOr types.str;
+ default = null;
example = literalExample ''
"-i eth0 -p tcp -m tcp --dport ${toString port}"
'';
@@ -122,12 +124,14 @@ let
mkSubModule = { name, port, extraOpts, imports }: {
${name} = mkOption {
- type = types.submodule {
+ type = types.submodule [{
inherit imports;
options = (mkExporterOpts {
inherit name port;
} // extraOpts);
- };
+ } ({ config, ... }: mkIf config.openFirewall {
+ firewallFilter = mkOptionDefault "-p tcp -m tcp --dport ${toString config.port}";
+ })];
internal = true;
default = {};
};
@@ -232,7 +236,13 @@ in
Please specify either 'services.prometheus.exporters.sql.configuration' or
'services.prometheus.exporters.sql.configFile'
'';
- } ];
+ } ] ++ (flip map (attrNames cfg) (exporter: {
+ assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
+ message = ''
+ The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless
+ `openFirewall' is set to `true'!
+ '';
+ }));
}] ++ [(mkIf config.services.minio.enable {
services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix b/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix
new file mode 100644
index 00000000000..2adcecc728b
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix
@@ -0,0 +1,59 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.artifactory;
+in
+{
+ port = 9531;
+ extraOpts = {
+ scrapeUri = mkOption {
+ type = types.str;
+ default = "http://localhost:8081/artifactory";
+ description = ''
+ URI on which to scrape JFrog Artifactory.
+ '';
+ };
+
+ artiUsername = mkOption {
+ type = types.str;
+ description = ''
+ Username for authentication against JFrog Artifactory API.
+ '';
+ };
+
+ artiPassword = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Password for authentication against JFrog Artifactory API.
+ One of the password or access token needs to be set.
+ '';
+ };
+
+ artiAccessToken = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Access token for authentication against JFrog Artifactory API.
+ One of the password or access token needs to be set.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-artifactory-exporter}/bin/artifactory_exporter \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ --artifactory.scrape-uri ${cfg.scrapeUri} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ Environment = [
+ "ARTI_USERNAME=${cfg.artiUsername}"
+ "ARTI_PASSWORD=${cfg.artiPassword}"
+ "ARTI_ACCESS_TOKEN=${cfg.artiAccessToken}"
+ ];
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/nixos/modules/services/monitoring/prometheus/exporters/knot.nix
new file mode 100644
index 00000000000..46c28fe0a57
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/knot.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.knot;
+in {
+ port = 9433;
+ extraOpts = {
+ knotLibraryPath = mkOption {
+ type = types.str;
+ default = "${pkgs.knot-dns.out}/lib/libknot.so";
+ defaultText = "\${pkgs.knot-dns}/lib/libknot.so";
+ description = ''
+ Path to the library of knot-dns.
+ '';
+ };
+
+ knotSocketPath = mkOption {
+ type = types.str;
+ default = "/run/knot/knot.sock";
+ description = ''
+ Socket path of knotd
+ 8.
+ '';
+ };
+
+ knotSocketTimeout = mkOption {
+ type = types.int;
+ default = 2000;
+ description = ''
+ Timeout in seconds.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-knot-exporter}/bin/knot_exporter \
+ --web-listen-addr ${cfg.listenAddress} \
+ --web-listen-port ${toString cfg.port} \
+ --knot-library-path ${cfg.knotLibraryPath} \
+ --knot-socket-path ${cfg.knotSocketPath} \
+ --knot-socket-timeout ${toString cfg.knotSocketTimeout} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ SupplementaryGroups = [ "knot" ];
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix b/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix
new file mode 100644
index 00000000000..0514469b8a6
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let cfg = config.services.prometheus.exporters.systemd;
+
+in {
+ port = 9558;
+
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index f1a9c6029cb..7c22b7d09b9 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -205,9 +205,8 @@ in
users.groups.privoxy = {};
- systemd.tmpfiles.rules = with cfg.settings; [
- "d ${certificate-directory} 0770 privoxy privoxy ${cfg.certsLifetime}"
- ];
+ systemd.tmpfiles.rules = optional cfg.inspectHttps
+ "d ${cfg.settings.certificate-directory} 0770 privoxy privoxy ${cfg.certsLifetime}";
systemd.services.privoxy = {
description = "Filtering web proxy";
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 5636415f6a0..9a541aba6e4 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -10,7 +10,7 @@ let
extensions = { enabled, all }:
(with all;
enabled
- ++ [ imagick ] # Always enabled
+ ++ optional (!cfg.disableImagemagick) imagick
# Optionally enabled depending on caching settings
++ optional cfg.caching.apcu apcu
++ optional cfg.caching.redis redis
@@ -303,6 +303,18 @@ in {
};
};
+ disableImagemagick = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to not load the ImageMagick module into PHP.
+ This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF).
+ You may want to disable it for increased security. In that case, previews will still be available
+ for some images (e.g. JPEG and PNG).
+ See https://github.com/nextcloud/server/issues/13099
+ '';
+ };
+
caching = {
apcu = mkOption {
type = types.bool;
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 6638ec4927c..1cc554d002b 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -254,5 +254,21 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
"docker rmi ${examples.layeredStoreSymlink.imageName}",
)
+
+ with subtest("buildImage supports registry/ prefix in image name"):
+ docker.succeed(
+ "docker load --input='${examples.prefixedImage}'"
+ )
+ docker.succeed(
+ "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedImage.imageName}'"
+ )
+
+ with subtest("buildLayeredImage supports registry/ prefix in image name"):
+ docker.succeed(
+ "docker load --input='${examples.prefixedLayeredImage}'"
+ )
+ docker.succeed(
+ "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedLayeredImage.imageName}'"
+ )
'';
})
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index d5c54f7d991..034601c815b 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -30,11 +30,6 @@ let
'';
package = kafkaPackage;
zookeeper = "zookeeper1:2181";
- # These are the default options, but UseCompressedOops doesn't work with 32bit JVM
- jvmOptions = [
- "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled"
- "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true"
- ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ];
};
networking.firewall.allowedTCPPorts = [ 9092 ];
@@ -82,4 +77,5 @@ let
in with pkgs; {
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
+ kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6;
}
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index 0b8e1937128..5074b6cdafe 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -7,7 +7,7 @@ in {
maintainers = [ globin eqyiel ];
};
- nodes = {
+ nodes = rec {
# The only thing the client needs to do is download a file.
client = { ... }: {
services.davfs2.enable = true;
@@ -47,9 +47,14 @@ in {
environment.systemPackages = [ cfg.services.nextcloud.occ ];
};
+
+ nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }:
+ lib.mkMerge
+ [ (nextcloud args)
+ { services.nextcloud.disableImagemagick = true; } ];
};
- testScript = let
+ testScript = { nodes, ... }: let
withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
#!${pkgs.runtimeShell}
export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
@@ -68,8 +73,19 @@ in {
#!${pkgs.runtimeShell}
diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
'';
+
+ findInClosure = what: drv: pkgs.runCommand "find-in-closure" { exportReferencesGraph = [ "graph" drv ]; inherit what; } ''
+ test -e graph
+ grep "$what" graph >$out || true
+ '';
+ nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.config.system.build.vm;
+ nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.config.system.build.vm;
in ''
- start_all()
+ assert open("${nextcloudUsesImagick}").read() != ""
+ assert open("${nextcloudWithoutDoesntUseIt}").read() == ""
+
+ nextcloud.start()
+ client.start()
nextcloud.wait_for_unit("multi-user.target")
# This is just to ensure the nextcloud-occ program is working
nextcloud.succeed("nextcloud-occ status")
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 89d17c9de8c..78a3afad0ba 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -75,6 +75,21 @@ let
'';
};
+ artifactory = {
+ exporterConfig = {
+ enable = true;
+ artiUsername = "artifactory-username";
+ artiPassword = "artifactory-password";
+ };
+ exporterTest = ''
+ wait_for_unit("prometheus-artifactory-exporter.service")
+ wait_for_open_port(9531)
+ succeed(
+ "curl -sSf http://localhost:9531/metrics | grep -q 'artifactory_up'"
+ )
+ '';
+ };
+
bind = {
exporterConfig = {
enable = true;
@@ -248,6 +263,24 @@ let
'';
};
+ knot = {
+ exporterConfig = {
+ enable = true;
+ };
+ metricProvider = {
+ services.knot = {
+ enable = true;
+ extraArgs = [ "-v" ];
+ };
+ };
+ exporterTest = ''
+ wait_for_unit("knot.service")
+ wait_for_unit("prometheus-knot-exporter.service")
+ wait_for_open_port(9433)
+ succeed("curl -sSf 'localhost:9433' | grep -q 'knot_server_zone_count 0.0'")
+ '';
+ };
+
keylight = {
# A hardware device is required to properly test this exporter, so just
# perform a couple of basic sanity checks that the exporter is running
@@ -802,6 +835,22 @@ let
'';
};
+ systemd = {
+ exporterConfig = {
+ enable = true;
+ };
+ metricProvider = { };
+ exporterTest = ''
+ wait_for_unit("prometheus-systemd-exporter.service")
+ wait_for_open_port(9558)
+ succeed(
+ "curl -sSf localhost:9558/metrics | grep -q '{}'".format(
+ 'systemd_unit_state{name="basic.target",state="active",type="target"} 1'
+ )
+ )
+ '';
+ };
+
tor = {
exporterConfig = {
enable = true;
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
new file mode 100644
index 00000000000..9d891d30234
--- /dev/null
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -0,0 +1,82 @@
+{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
+, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
+, nss, pango, udev, xorg
+}:
+
+let
+ version = "4.7.1";
+
+ deps = [
+ alsaLib
+ atk
+ at-spi2-atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ GConf
+ gdk-pixbuf
+ glib
+ gtk2
+ gtk3
+ libpulseaudio
+ nspr
+ nss
+ pango
+ stdenv.cc.cc
+ udev
+ xorg.libX11
+ xorg.libxcb
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libXtst
+ ];
+
+in
+
+stdenv.mkDerivation {
+ pname = "google-play-music-desktop-player";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
+ sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
+ };
+
+ dontBuild = true;
+ nativeBuildInputs = [ dpkg makeWrapper ];
+
+ unpackPhase = ''
+ dpkg -x $src .
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r ./usr/share $out
+ cp -r ./usr/bin $out
+
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
+
+ wrapProgram $out/bin/google-play-music-desktop-player \
+ --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}"
+ '';
+
+ meta = {
+ homepage = "https://www.googleplaymusicdesktopplayer.com/";
+ description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music";
+ license = lib.licenses.mit;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with lib.maintainers; [ anna328p SuprDewd ];
+ };
+}
diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
index 8cc876ab19e..13141729320 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://musescore.org/";
license = licenses.gpl2;
platforms = platforms.darwin;
- maintainers = with maintainers; [ yurrriq ];
+ maintainers = [];
repositories.git = "https://github.com/musescore/MuseScore";
};
}
diff --git a/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch b/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch
new file mode 100644
index 00000000000..5c8008abb18
--- /dev/null
+++ b/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch
@@ -0,0 +1,19 @@
+Bump security-framework from 2.1.1 to 2.1.2
+
+security-framework=2.1.1 doesn't build on Darwin 10.12.
+https://github.com/kornelski/rust-security-framework/issues/124
+
+--- c/Cargo.lock
++++ i/Cargo.lock
+@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+ [[package]]
+ name = "security-framework"
+-version = "2.1.1"
++version = "2.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
++checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
+ dependencies = [
+ "bitflags 1.2.1",
+ "core-foundation",
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index e78eaca5490..ad8d64b9720 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl
+{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
, withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
@@ -14,22 +14,25 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g=";
+ sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
};
- cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ=";
+ cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
nativeBuildInputs = [ pkg-config ];
+ cargoPatches = [ ./bump-security-framework-crate.patch ];
+
buildInputs = [ ncurses openssl ]
+ ++ lib.optional stdenv.isDarwin libiconv
++ lib.optional withALSA alsaLib
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index c484f6e1924..a26af9023a8 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
let
pname = "plexamp";
- version = "3.4.1";
+ version = "3.4.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
- sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U=";
+ sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
};
appimageContents = appimageTools.extractType2 {
@@ -32,8 +32,9 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
license = licenses.unfree;
- maintainers = with maintainers; [ killercup ];
+ maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 8e70bff2b97..19def55a15c 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "reaper";
- version = "6.23";
+ version = "6.25";
src = fetchurl {
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
- sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd";
+ sha256 = "0i1idlr4ar28wvwcvwn9hqzb63kki1x1995cr87a9slxfa7zcshb";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index 7c03d06da59..597db2ae8ff 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "4.0.7";
+ version = "4.0.8";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4=";
+ sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 4dab912cf15..0f99f28b42f 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -8,13 +8,13 @@ let
in buildGoModule rec {
pname = "go-ethereum";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI=";
+ sha256 = "sha256-4lHT0P8Euau0AJNtg1YstJJRQ58WTUlIH+HCKEjCq/s=";
};
runVend = true;
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 87990b6eae8..9db68f71ea8 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -1,27 +1,19 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
, qtscript, poppler, hunspell
, withLua ? true, lua
, withPython ? true, python3 }:
mkDerivation rec {
pname = "texworks";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchFromGitHub {
owner = "TeXworks";
repo = "texworks";
rev = "release-${version}";
- sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z";
+ sha256 = "0l8jl1b8lpas7yz6m0qc2nikyn54lx2ljzmjjz3zgxgd6l502006";
};
- patches = [
- (fetchpatch {
- name = "fix-compilation-with-qt-5.15.patch";
- url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch";
- sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6";
- })
- ];
-
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtscript poppler hunspell ]
++ lib.optional withLua lua
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index e772796c34e..ba03bb65c26 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0c0m5qkqv3zhcxmwx72b7z67sjcd1miv8d10kxpk9vffyrxkmj93";
- x86_64-darwin = "1spd5rbhra4n38lp0sgxd2cr1bngsmi32a43g02vdmmhkmk0iixc";
- aarch64-linux = "1ql3hn6c59g7d0cwhg54ixww2i9jmkjw3nyzz97yw8wk63zwz024";
- armv7l-linux = "0pdqcbw7rygvdzys787kf8ag17g9qyv7k33dqhi5h2zc96j867c0";
+ x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw";
+ x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf";
+ aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw";
+ armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8";
}.${system};
in
callPackage ./generic.nix rec {
@@ -25,7 +25,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.53.2";
+ version = "1.54.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix
index 29aaed1278d..1a703378845 100644
--- a/pkgs/applications/graphics/megapixels/default.nix
+++ b/pkgs/applications/graphics/megapixels/default.nix
@@ -7,10 +7,11 @@
, wrapGAppsHook
, gtk3
, gnome3
+, zbar
, tiffSupport ? true
, libraw
, jpgSupport ? true
-, imagemagick
+, graphicsmagick
, exiftool
}:
@@ -20,24 +21,24 @@ let
inherit (lib) makeBinPath optional optionals optionalString;
runtimePath = makeBinPath (
optional tiffSupport libraw
- ++ optionals jpgSupport [ imagemagick exiftool ]
+ ++ optionals jpgSupport [ graphicsmagick exiftool ]
);
in
stdenv.mkDerivation rec {
pname = "megapixels";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchgit {
url = "https://git.sr.ht/~martijnbraam/megapixels";
rev = version;
- sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw";
+ sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
- buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ]
++ optional tiffSupport libraw
- ++ optional jpgSupport imagemagick;
+ ++ optional jpgSupport graphicsmagick;
preFixup = optionalString (tiffSupport || jpgSupport) ''
gappsWrapperArgs+=(
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index 924e006c4cc..fc653953e54 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.9.26";
+ version = "8.0.27";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8=";
+ hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix
index b8029b6229d..eb5dc8950f9 100644
--- a/pkgs/applications/misc/almanah/default.nix
+++ b/pkgs/applications/misc/almanah/default.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "almanah";
- version = "0.12.2";
+ version = "0.12.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24=";
+ sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index ffdcf021b02..d62d96e530e 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "cointop";
- version = "1.6.2";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4Ae8lzaec7JeYfmeLleatUS/xQUjea7O4XJ9DOgJIMs=";
+ sha256 = "sha256-h4102oWYSuY4uq/Pyo9u25Pdsai7AK2W9yUmS/zdjrw=";
};
goPackagePath = "github.com/miguelmota/cointop";
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index aa19ce2c53e..73295c96e4b 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
- version = "1.13.2";
+ version = "1.13.4";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-++8vTK0OR44Mcdh5g2bJEq7aO+fWySKw0XlSz2KJNio=";
+ sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0=";
};
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 65e86bb7dbe..5dffbf56a36 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -2,7 +2,7 @@
, pkg-config, which, perl, libXrandr
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
, gtk3, wayland, wayland-protocols
-, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
+, libXinerama, libnotify, pango, xorgproto, librsvg
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
- sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
+ sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga";
};
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
@@ -29,15 +29,12 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=$(out)"
"VERSION=$(version)"
+ "SYSCONFDIR=$(out)/etc"
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
];
- buildFlags = if dunstify then [ "dunstify" ] else [];
-
- postInstall = lib.optionalString dunstify ''
- install -Dm755 dunstify $out/bin
- '' + ''
+ postInstall = ''
wrapProgram $out/bin/dunst \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix
index 5810607e8d1..c48e151e8ae 100644
--- a/pkgs/applications/misc/free42/default.nix
+++ b/pkgs/applications/misc/free42/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "free42";
- version = "3.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
- sha256 = "jzNopLndYH9dIdm30pyDaZNksHwS4i5LTZUXRmcrTp8=";
+ sha256 = "sha256-Htk2NHgYVL622URx67BUtounAUopLTahaSqfAqd3+ZI=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 8eee8c1f09f..010d28eef59 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,5 +1,20 @@
-{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch
-, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }:
+{ mkDerivation
+, lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, qmake
+, qttools
+, qttranslations
+, gdal
+, proj
+, qtsvg
+, qtwebkit
+, withGeoimage ? true, exiv2
+, withGpsdlib ? (!stdenv.isDarwin), gpsd
+, withLibproxy ? false, libproxy
+, withZbar ? false, zbar
+}:
mkDerivation rec {
pname = "merkaartor";
@@ -13,24 +28,48 @@ mkDerivation rec {
};
patches = [
+ # Fix build with Qt 5.15 (missing QPainterPath include)
(fetchpatch {
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
})
+ # Added a condition to use the new timespec_t on gpsd APIs >= 9
+ (fetchpatch {
+ url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch";
+ sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb";
+ })
];
- nativeBuildInputs = [ qmake pkg-config ];
+ nativeBuildInputs = [ qmake qttools ];
- buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
+ buildInputs = [ gdal proj qtsvg qtwebkit ]
+ ++ lib.optional withGeoimage exiv2
+ ++ lib.optional withGpsdlib gpsd
+ ++ lib.optional withLibproxy libproxy
+ ++ lib.optional withZbar zbar;
- enableParallelBuilding = true;
+ preConfigure = ''
+ lrelease src/src.pro
+ '';
- NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
+ qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ]
+ ++ lib.optional withGeoimage "GEOIMAGE=1"
+ ++ lib.optional withGpsdlib "GPSDLIB=1"
+ ++ lib.optional withLibproxy "LIBPROXY=1"
+ ++ lib.optional withZbar "ZBAR=1";
+
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ mkdir -p $out/Applications
+ mv binaries/bin/merkaartor.app $out/Applications
+ mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents
+ wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor
+ '';
meta = with lib; {
description = "OpenStreetMap editor";
homepage = "http://merkaartor.be/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix
index c904c221260..c83cd772659 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/pkgs/applications/misc/sidequest/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
- version = "0.10.11";
+ version = "0.10.19";
desktopItem = makeDesktopItem rec {
name = "SideQuest";
@@ -15,8 +15,8 @@
inherit pname version;
src = fetchurl {
- url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
- sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
+ url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
+ sha256 = "14zqp12nigc4kv6hppyx2s59mmriimnzczay4xi3vh7zcw207px2";
};
nativeBuildInputs = [ makeWrapper ];
@@ -46,8 +46,8 @@
meta = with lib; {
description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
- homepage = "https://github.com/the-expanse/SideQuest";
- downloadPage = "https://github.com/the-expanse/SideQuest/releases";
+ homepage = "https://github.com/SideQuestVR/SideQuest";
+ downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
license = licenses.mit;
maintainers = with maintainers; [ joepie91 rvolosatovs ];
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index f7ca7259415..945b0b32491 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
+{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }:
stdenv.mkDerivation rec {
pname = "todoist-electron";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
- makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+ makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
'';
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 0de942a1728..430f9e38e26 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.21.73";
+ version = "1.21.74";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "12jkj9h1smipqlkidnd3r492yfnncl0b2dmjq22qp2vsrscc3jfg";
+ sha256 = "2csyjwn5j5+cRmjq0+gHLWvIVjtaSaN9rVZ8ikI0gec=";
};
dontConfigure = true;
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://brave.com/";
description = "Privacy-oriented browser for Desktop and Laptop computers";
- changelog = "https://github.com/brave/brave-browser/blob/v${version}/CHANGELOG.md";
+ changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md";
longDescription = ''
Brave browser blocks the ads and trackers that slow you down,
chew up your bandwidth, and invade your privacy. Brave lets you
diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix
index daead82e485..259a8780901 100644
--- a/pkgs/applications/networking/browsers/castor/default.nix
+++ b/pkgs/applications/networking/browsers/castor/default.nix
@@ -1,5 +1,5 @@
{ lib
-, fetchurl
+, fetchFromSourcehut
, rustPlatform
, pkg-config
, wrapGAppsHook
@@ -15,9 +15,11 @@ rustPlatform.buildRustPackage rec {
pname = "castor";
version = "0.8.16";
- src = fetchurl {
- url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz";
- sha256 = "1qwsprwazkzcs70h219fhh5jj5s5hm1k120fn3pk4qivii4lyhah";
+ src = fetchFromSourcehut {
+ owner = "~julienxx";
+ repo = pname;
+ rev = version;
+ sha256 = "0rwg1w7srjwa23mkypl8zk6674nhph4xsc6nc01f6g5k959szylr";
};
cargoSha256 = "0yn2kfiaz6d8wc8rdqli2pwffp5vb1v3zi7520ysrd5b6fc2csf2";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6c77ed3d181..3197e272f0e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -17,7 +17,7 @@
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
, jre8
-, pipewire_0_2
+, pipewire
, libva
, libdrm, wayland, mesa, libxkbcommon # Ozone
@@ -140,7 +140,7 @@ let
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
jre
- pipewire_0_2
+ pipewire
libva
libdrm wayland mesa.drivers libxkbcommon
] ++ optional gnomeKeyringSupport libgnome-keyring3
@@ -263,6 +263,7 @@ let
use_pulseaudio = true;
link_pulseaudio = true;
} // optionalAttrs (chromiumVersionAtLeast "89") {
+ rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
chrome_pgo_phase = 0;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 79899d822b0..cf2fedde97e 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -2,7 +2,7 @@
, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
-, pipewire_0_2
+, pipewire
, gcc, nspr, nss, runCommand
, lib
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
- libPath = lib.makeLibraryPath [ libva pipewire_0_2 ];
+ libPath = lib.makeLibraryPath [ libva pipewire ];
in with lib; ''
mkdir -p "$out/bin"
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 4ee7adf65c5..98fe3397733 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,15 +18,15 @@
}
},
"beta": {
- "version": "89.0.4389.72",
- "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll",
- "sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby",
+ "version": "90.0.4430.19",
+ "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
+ "sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
"deps": {
"gn": {
- "version": "2021-01-07",
+ "version": "2021-02-09",
"url": "https://gn.googlesource.com/gn",
- "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
- "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
+ "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
+ "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
}
}
},
@@ -44,19 +44,19 @@
}
},
"ungoogled-chromium": {
- "version": "88.0.4324.182",
- "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h",
- "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b",
+ "version": "89.0.4389.82",
+ "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz",
+ "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q",
"deps": {
"gn": {
- "version": "2020-11-05",
+ "version": "2021-01-07",
"url": "https://gn.googlesource.com/gn",
- "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
- "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
+ "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
+ "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
},
"ungoogled-patches": {
- "rev": "88.0.4324.182-1",
- "sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay"
+ "rev": "89.0.4389.82-1",
+ "sha256": "183w22q6mpmw7s1l65dzvc5i422vl7qax6q4xpgr3krcx4y00878"
}
}
}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 1bcaecdfbb8..925374d38e8 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "86.0";
+ ffversion = "86.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f";
+ sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214";
};
meta = {
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index d53abe3569c..bef5d230ece 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "helm-secrets";
- version = "3.4.1";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "jkroepke";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
+ hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 5ac152c849b..3c6d6676906 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.138.6";
+ version = "0.138.7";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg=";
+ sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs=";
};
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 5bfceefad5a..8f445315160 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }:
buildGoModule rec {
pname = "kube3d";
- version = "4.2.0";
+ version = "4.3.0";
excludedPackages = "tools";
@@ -10,20 +10,17 @@ buildGoModule rec {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
- sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18=";
+ sha256 = "sha256-ybEYKr0rQY8Qg74V1mXqShq5Z2d/Adf0bSSbEMIyo3I=";
};
vendorSha256 = null;
nativeBuildInputs = [ installShellFiles ];
- buildFlagsArray = [
- "-ldflags="
- "-w"
- "-s"
- "-X github.com/rancher/k3d/v4/version.Version=v${version}"
- "-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}"
- ];
+ preBuild = let t = "github.com/rancher/k3d/v4/version"; in
+ ''
+ buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}")
+ '';
doCheck = false;
@@ -36,6 +33,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://github.com/rancher/k3d";
+ changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
longDescription = ''
k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
@@ -44,7 +42,7 @@ buildGoModule rec {
multi-node k3s cluster on a single machine using docker.
'';
license = licenses.mit;
- platforms = platforms.linux;
maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 66ff583e8c9..79cfebd2aff 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.18.0";
+ version = "1.18.1";
- vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2";
+ vendorSha256 = "sha256-rw1tqz+Y5iSXWIxXV4433Hwgyfz8jYMzKWurCi2hmhM=";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2";
+ sha256 = "sha256-8QI/Kn5LHSD3at7icmEDhjuYP811A4l+2KrRmKTwi8w=";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix
index 2fc858860e1..84a6cd644ec 100644
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -2,6 +2,7 @@
, buildGoModule
, fetchFromGitHub
, makeWrapper
+, installShellFiles
, buildkit
, cni-plugins
, extraPackages ? [ ]
@@ -9,23 +10,20 @@
buildGoModule rec {
pname = "nerdctl";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "AkihiroSuda";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-z5Ekryaa5KMShrjdsmFk9bXahtuc+6tec7dxH5/w7+A=";
+ sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ=";
};
- vendorSha256 = "sha256-ovmVNtzTQbg141IvbaF/+k5WHxX8wuK7z5gH9l2g5UE=";
+ vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4=";
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper installShellFiles ];
- preBuild =
- let
- t = "github.com/AkihiroSuda/nerdctl/pkg/version";
- in
+ preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in
''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=")
'';
@@ -37,17 +35,19 @@ buildGoModule rec {
wrapProgram $out/bin/nerdctl \
--prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
--prefix CNI_PATH : "${cni-plugins}/bin"
+
+ # nerdctl panics without XDG_RUNTIME_DIR set
+ export XDG_RUNTIME_DIR=$TMPDIR
+
+ installShellCompletion --cmd nerdctl \
+ --bash <($out/bin/nerdctl completion bash)
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
- # nerdctl expects XDG_RUNTIME_DIR to be set
- export XDG_RUNTIME_DIR=$TMPDIR
-
$out/bin/nerdctl --help
- # --version will error without containerd.sock access
- $out/bin/nerdctl --help | grep "${version}"
+ $out/bin/nerdctl --version | grep "nerdctl version ${version}"
runHook postInstallCheck
'';
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 581af59f0c8..847e3f64ca6 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,23 +2,20 @@
buildGoModule rec {
pname = "tektoncd-cli";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q=";
+ sha256 = "sha256-IyYlmatgcVbUj1WCPAFVOIgn1iHM80P4ie6d1YD3ISM=";
};
vendorSha256 = null;
- buildFlagsArray = [
- "-ldflags="
- "-s"
- "-w"
- "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}"
- ];
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
+ '';
nativeBuildInputs = [ installShellFiles ];
@@ -40,6 +37,14 @@ buildGoModule rec {
--zsh <($out/bin/tkn completion zsh)
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/tkn --help
+ $out/bin/tkn version | grep "Client version: ${version}"
+ runHook postInstallCheck
+ '';
+
meta = with lib; {
homepage = "https://tekton.dev";
changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 4a6e95057a4..a74f5df58fd 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -157,9 +157,9 @@ in rec {
});
terraform_0_14 = pluggable (generic {
- version = "0.14.7";
- sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la";
- vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb";
+ version = "0.14.8";
+ sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0";
+ vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index d92aefca84f..61910895927 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.8";
+ version = "0.28.9";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-A/sSVStXW1b2QOb01f9sink4LMz/52W9voV4VpqQQ4E=";
+ sha256 = "sha256-sqwR+bXx5ab5OsmW44C5MIXjzQFM1QsBvsM0R3pL3H8=";
};
- vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";
+ vendorSha256 = "sha256-9DBCP/4mp/Gr2ie0nk7WGfL+M7snMEztdHZzxdIFbzM=";
doCheck = false;
diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
index feffbe312d5..d10c5359e35 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
@@ -2,19 +2,20 @@
, fetchurl
, appimageTools
, makeWrapper
-, electron_10
+, electron_12
+, xorg
}:
let
- electron = electron_10;
+ electron = electron_12;
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
- version = "2.4.2";
+ version = "2.7.0";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
- sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p";
+ sha256 = "1g8was4anrsdpv4h11z544mi0v79him2xjyknixyrqfy87cbh97n";
name = "${pname}-${version}.AppImage";
};
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst ]}"
'';
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 0ef024225f6..05ab8b49a69 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
- version = "0.8.0";
+ version = "0.8.1";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
- sha256 = "sha256-0YzeGtdsCUG8N7Av/zzHoC9KKu1rqjQDToaOEXzuoJc=";
+ sha256 = "sha256-Lq1RSJ1VIa6MFTiTbGqNy7IqliJwGeuegm/1+RRtu+I=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 3fe88c287c5..deb01f1ef22 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
+{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config libxslt ];
- buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
+ buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
checkInputs = [ dbus.daemon ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index 74e4d1039e7..11acf05c19e 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }:
+{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
stdenv.mkDerivation rec {
pname = "telepathy-haze";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
};
- buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
+ buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
nativeBuildInputs = [ pkg-config libxslt ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 041ec5e7c5b..fe7ef49cd0d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
+{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
stdenv.mkDerivation rec {
pname = "telepathy-idle";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
+ buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index bae29f4b31f..a6b1a5256f4 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config
+{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib
- dbus telepathy-glib.python
+ dbus python2
];
configureFlags = [ "--enable-call" ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index cf166f7e2d3..99465cc7971 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
+{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
, libuuid, openssl, pcre, sqlite, pkg-config }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
- sqlite pcre telepathy-glib.python ];
+ sqlite pcre python2 ];
nativeBuildInputs = [ libxslt pkg-config ];
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 02f1e7ed344..3421050d1ed 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "remmina";
- version = "1.4.10";
+ version = "1.4.12";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw=";
+ sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 5c5bb1ff96e..cc179dc1e1d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
-, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
+, libssh, nghttp2, zlib, cmake, makeWrapper
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with lib;
let
- version = "3.4.3";
+ version = "3.4.4";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
+ sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j";
};
cmakeFlags = [
@@ -33,13 +33,11 @@ in stdenv.mkDerivation {
# Avoid referencing -dev paths because of debug assertions.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
- nativeBuildInputs = [
- bison cmake flex pkg-config
- ] ++ optional withQt qt5.wrapQtAppsHook;
+ nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
- libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
+ libgpgerror gnutls geoip c-ares python3 glib zlib
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
@@ -96,7 +94,7 @@ in stdenv.mkDerivation {
meta = with lib; {
homepage = "https://www.wireshark.org/";
description = "Powerful network protocol analyzer";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
longDescription = ''
Wireshark (formerly known as "Ethereal") is a powerful network
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index f89fe3e1db3..4700402ff21 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -2,32 +2,44 @@
, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
, readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGL, libGLU, xorg, fltk
+, enableMicroPy ? false, python3
}:
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
- version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade
+ version = "1.6.0-47"; # TODO try to remove preCheck phase on upgrade
src = fetchurl {
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
- sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv";
+ sha256 = "sha256-c5A9/I6L/o3Y3dxEPoTKpw/fJqYMr6euLldaQ1HWT5c=";
};
- patches = lib.optionals (!enableGUI) [
- # when enableGui is false, giac is compiled without fltk. That means some
- # outputs differ in the make check. Patch around this:
+ patches = [
(fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
+ name = "pari_2_11.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";
+ sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";
+ })
+ ] ++ lib.optionals (!enableGUI) [
+ # when enableGui is false, giac is compiled without fltk. That
+ # means some outputs differ in the make check. Patch around this:
+ (fetchpatch {
+ name = "nofltk-check.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
})
];
postPatch = ''
- for i in doc/*/Makefile*; do
+ for i in doc/*/Makefile* micropython*/xcas/Makefile*; do
substituteInPlace "$i" --replace "/bin/cp" "cp";
done;
+ '' +
+ # workaround for 1.6.0-47, should not be necessary in future versions
+ lib.optionalString (!enableMicroPy) ''
+ sed -i -e 's/micropython-[0-9.]* //' Makefile*
'';
nativeBuildInputs = [
@@ -44,7 +56,7 @@ stdenv.mkDerivation rec {
lapack blas
] ++ lib.optionals enableGUI [
libGL libGLU fltk xorg.libX11
- ];
+ ] ++ lib.optional enableMicroPy python3;
/* fixes:
configure:16211: checking for main in -lntl
@@ -58,13 +70,12 @@ stdenv.mkDerivation rec {
outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc";
doCheck = true;
- preCheck = ''
- # One test in this file fails. That test just tests a part of the pari
- # interface that isn't actually used in giac. Of course it would be better
- # to only remove that one test, but that would require a patch.
- # Removing the whole test set should be good enough for now.
- # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326
- echo > check/chk_fhan11
+ preCheck = lib.optionalString (!enableGUI) ''
+ # even with the nofltk patch, some changes in src/misc.cc (grep
+ # for HAVE_LIBFLTK) made it so that giac behaves differently
+ # when fltk is disabled. disable these tests for now.
+ echo > check/chk_fhan2
+ echo > check/chk_fhan9
'';
enableParallelBuilding = true;
@@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
"--enable-ao" "--enable-ecm" "--enable-glpk"
] ++ lib.optionals enableGUI [
"--enable-gui" "--with-x"
- ];
+ ] ++ lib.optional (!enableMicroPy) "--disable-micropy";
postInstall = ''
# example Makefiles contain the full path to some commands
diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix
index 2866b4b9469..ffe17bc3dec 100644
--- a/pkgs/applications/science/math/palp/default.nix
+++ b/pkgs/applications/science/math/palp/default.nix
@@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
pname = "palp";
- version = "2.11";
+ version = "2.20";
src = fetchurl {
- url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz";
- sha256 = "00jpm73fw9jjq58z6rysr1mwv489j6rpfqqlhm9ab0dln4kyhh05";
+ url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/${pname}-${version}.tar.gz";
+ sha256 = "1q1cl3vpdir16szy0jcadysydcrjp48hqxyx42kr8g9digkqjgkj";
};
hardeningDisable = [
diff --git a/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch b/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch
deleted file mode 100644
index 374c7207919..00000000000
--- a/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
-index 88a33b0349..b3321f0bec 100644
---- a/src/sage/interfaces/singular.py
-+++ b/src/sage/interfaces/singular.py
-@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect):
- """
- Send an interrupt to Singular. If needed, additional
- semi-colons are sent until we get back at the prompt.
--
-- TESTS:
--
-- The following works without restarting Singular::
--
-- sage: a = singular(1)
-- sage: _ = singular._expect.sendline('1+') # unfinished input
-- sage: try:
-- ....: alarm(0.5)
-- ....: singular._expect_expr('>') # interrupt this
-- ....: except KeyboardInterrupt:
-- ....: pass
-- Control-C pressed. Interrupting Singular. Please wait a few seconds...
--
-- We can still access a::
--
-- sage: 2*a
-- 2
- """
- # Work around for Singular bug
- # http://www.singular.uni-kl.de:8002/trac/ticket/727
diff --git a/pkgs/applications/science/math/sage/patches/pillow-update.patch b/pkgs/applications/science/math/sage/patches/pillow-update.patch
deleted file mode 100644
index 19d61552262..00000000000
--- a/pkgs/applications/science/math/sage/patches/pillow-update.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py
-index d7d00b0..cd1607a 100644
---- a/src/sage/repl/image.py
-+++ b/src/sage/repl/image.py
-@@ -77,7 +77,7 @@ class Image(SageObject):
-
- - ``size`` -- 2-tuple, containing (width, height) in pixels.
-
-- - ``color`` -- string or tuple of numeric. What colour to use
-+ - ``color`` -- string, numeric or tuple of numeric. What colour to use
- for the image. Default is black. If given, this should be a
- a tuple with one value per band. When creating RGB images,
- you can also use colour strings as supported by the
-@@ -91,9 +91,15 @@ class Image(SageObject):
- EXAMPLES::
-
- sage: from sage.repl.image import Image
-- sage: Image('P', (16, 16), (13,))
-+ sage: Image('P', (16, 16), 13)
- 16x16px 8-bit Color image
- """
-+ # pillow does not support Sage integers as color
-+ from sage.rings.integer import Integer
-+ if isinstance(color, Integer):
-+ color = int(color)
-+ elif isinstance(color, tuple):
-+ color = tuple(int(i) if isinstance(i, Integer) else i for i in color)
- self._pil = PIL.Image.new(mode, size, color)
-
- @property
-@@ -233,7 +239,7 @@ class Image(SageObject):
- EXAMPLES::
-
- sage: from sage.repl.image import Image
-- sage: img = Image('P', (12, 34), (13,))
-+ sage: img = Image('P', (12, 34), 13)
- sage: filename = tmp_filename(ext='.png')
- sage: img.save(filename)
- sage: with open(filename, 'rb') as f:
diff --git a/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch b/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch
deleted file mode 100644
index 83bd83a6d33..00000000000
--- a/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
-index cb3667659e..867f547d71 100644
---- a/src/sage/doctest/forker.py
-+++ b/src/sage/doctest/forker.py
-@@ -200,6 +200,15 @@ def init_sage(controller=None):
- from sage.cpython._py2_random import Random
- sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random
-
-+ # IPython's pretty printer sorts the repr of dicts by their keys by default
-+ # (or their keys' str() if they are not otherwise orderable). However, it
-+ # disables this for CPython 3.6+ opting to instead display dicts' "natural"
-+ # insertion order, which is preserved in those versions).
-+ # However, this order is random in some instances.
-+ # Also modifications of code may affect the order.
-+ # So here we fore sorted dict printing.
-+ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
-+
- if controller is None:
- import sage.repl.ipython_kernel.all_jupyter
- else:
-@@ -222,15 +231,6 @@ def init_sage(controller=None):
- from sage.repl.rich_output.backend_doctest import BackendDoctest
- dm.switch_backend(BackendDoctest())
-
-- # IPython's pretty printer sorts the repr of dicts by their keys by default
-- # (or their keys' str() if they are not otherwise orderable). However, it
-- # disables this for CPython 3.6+ opting to instead display dicts' "natural"
-- # insertion order, which is preserved in those versions).
-- # However, this order is random in some instances.
-- # Also modifications of code may affect the order.
-- # So here we fore sorted dict printing.
-- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
--
- # Switch on extra debugging
- from sage.structure.debug_options import debug
- debug.refine_category_hash_check = True
diff --git a/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch b/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch
deleted file mode 100644
index 2ee5db3e29c..00000000000
--- a/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx
-index 9041238f1d..469befbc66 100644
---- a/src/sage/interfaces/sagespawn.pyx
-+++ b/src/sage/interfaces/sagespawn.pyx
-@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess):
- Check that the process eventually dies after calling
- ``terminate_async``::
-
-- sage: s.ptyproc.terminate_async(interval=0.2)
-+ sage: s.ptyproc.terminate_async(interval=float(0.2))
- sage: while True:
- ....: try:
- ....: os.kill(s.pid, 0)
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 99a163eb0b8..3e4ed900a92 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -9,6 +9,20 @@
# This is done because multiple derivations rely on these sources and they should
# all get the same sources with the same patches applied.
+let
+ # Fetch a diff between `base` and `rev` on sage's git server.
+ # Used to fetch trac tickets by setting the `base` to the last release and the
+ # `rev` to the last commit of the ticket.
+ fetchSageDiff = { base, name, rev, sha256, ...}@args: (
+ fetchpatch ({
+ inherit name sha256;
+ url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
+ # We don't care about sage's own build system (which builds all its dependencies).
+ # Exclude build system changes to avoid conflicts.
+ excludes = [ "build/*" ];
+ } // builtins.removeAttrs args [ "rev" "base" "sha256" ])
+ );
+in
stdenv.mkDerivation rec {
version = "9.2";
pname = "sage-src";
@@ -40,17 +54,13 @@ stdenv.mkDerivation rec {
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
./patches/sphinx-docbuild-subprocesses.patch
- # Sage's workaround to pretty print dicts (in
- # src/sage/doctest/forker.py:init_sage) runs too late (after
- # controller.load_environment(), which imports sage.all.*) to to
- # affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer.
- # Due to the sandpiles module being lazily loaded, this only
- # affects the first run (subsequent runs read from an import cache
- # at ~/.sage/cache and are not affected), which is probably why
- # other distributions don't hit this bug. This breaks two sandpile
- # tests, so do the workaround a little bit earlier.
- # https://trac.sagemath.org/ticket/31053
- ./patches/register-pretty-printer-earlier.patch
+ # Register sorted dict pprinter earlier (https://trac.sagemath.org/ticket/31053)
+ (fetchSageDiff {
+ base = "9.3.beta4";
+ name = "register-pretty-printer-earlier.patch";
+ rev = "d658230ce06ca19f4a3b3a4576297ee82f2d2151";
+ sha256 = "sha256-9mPUV7K5PoLDH2vVaYaOfvDLDpmxU0Aj7m/eaXYotDs=";
+ })
];
# Since sage unfortunately does not release bugfix releases, packagers must
@@ -63,17 +73,20 @@ stdenv.mkDerivation rec {
# fix intermittent errors in Sage 9.2's psage.py (this patch is
# already included in Sage 9.3): https://trac.sagemath.org/ticket/30730
- (fetchpatch {
+ (fetchSageDiff {
+ base = "9.2.rc2";
name = "fix-psage-is-locked.patch";
- url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9";
+ rev = "75df605f216ddc7b6ca719be942d666b241520e9";
sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q";
})
# fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052
- ./patches/sagespawn-implicit-casting.patch
-
- # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945)
- ./patches/disable-pexpect-intermittent-failure.patch
+ (fetchSageDiff {
+ base = "9.2";
+ name = "sagespawn-implicit-casting.patch";
+ rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6";
+ sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0=";
+ })
];
# Patches needed because of package updates. We could just pin the versions of
@@ -82,20 +95,7 @@ stdenv.mkDerivation rec {
# compatible with never dependency versions when possible. All these changes
# should come from or be proposed to upstream. This list will probably never
# be empty since dependencies update all the time.
- packageUpgradePatches = let
- # Fetch a diff between `base` and `rev` on sage's git server.
- # Used to fetch trac tickets by setting the `base` to the last release and the
- # `rev` to the last commit of the ticket.
- fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
- fetchpatch ({
- inherit name;
- url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
- # We don't care about sage's own build system (which builds all its dependencies).
- # Exclude build system changes to avoid conflicts.
- excludes = [ "build/*" ];
- } // builtins.removeAttrs args [ "rev" "base" ])
- );
- in [
+ packageUpgradePatches = [
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
# now set the cache dir to be withing the .sage directory. This is not
# strictly necessary, but keeps us from littering in the user's HOME.
@@ -105,7 +105,20 @@ stdenv.mkDerivation rec {
./patches/ignore-cmp-deprecation.patch
# adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971)
- ./patches/pillow-update.patch
+ (fetchSageDiff {
+ base = "9.3.beta2";
+ name = "pillow-8.0.1-update.patch";
+ rev = "f05f2d0aac9c4b5abe68105cee2cc7f2c8461847";
+ sha256 = "sha256-uY2UlgSd5hhOUUukB4Xc3Gjy0/e7p/qyq9jdvz10IOs=";
+ })
+
+ # don't use deprecated numpy type aliases (https://trac.sagemath.org/ticket/31364)
+ (fetchSageDiff {
+ base = "9.3.beta7";
+ name = "dont-use-deprecated-numpy-type-aliases.patch";
+ rev = "dfdef60515d4a4269e82d91280f76a7fdf10bf97";
+ sha256 = "sha256-77/3LkT5J7DQN8IPlGJKB6ZcJPaF7xwje06JNns+0AE=";
+ })
# fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
./patches/sympy-1.7-update.patch
@@ -115,6 +128,31 @@ stdenv.mkDerivation rec {
# updated eclib output has punctuation changes and tidier whitespace
./patches/eclib-20210223-test-formatting.patch
+
+ # upgrade arb to 2.18.1 (https://trac.sagemath.org/ticket/28623)
+ (fetchSageDiff {
+ base = "9.3.beta3";
+ name = "arb-2.18.1-update.patch";
+ rev = "0c9c4ed35c2eaf34ae0d19387c07b7f460e4abce";
+ sha256 = "sha256-CjOJIsyyVCziAfvE6pWSihPO35IZMcY2/taXAsqhPLY=";
+ })
+
+ # giac 1.6.0-47 update (https://trac.sagemath.org/ticket/30537)
+ (fetchSageDiff {
+ base = "9.3.beta7";
+ name = "giac-1.6.0-47-update.patch";
+ rev = "f05720bf63dfaf33a4e3b6d3ed2c2c0ec46b5d31";
+ sha256 = "sha256-gDUq+84eXd5GxLBWUSI61GMJpBF2KX4LBVOt3mS1NF8=";
+ })
+
+ # Make gcd/lcm interact better with pari and gmpy2 (https://trac.sagemath.org/ticket/30849)
+ # needed for pari 2.13.1 update, which we will do in the future
+ (fetchSageDiff {
+ base = "9.3.beta0";
+ name = "make-gcd-lcm-interact-better-with-pari-and-gmpy2.patch";
+ rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
+ sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index da3c25def3f..9b2073bc799 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -25,11 +25,11 @@ assert !withQT -> default != "qt5";
stdenv.mkDerivation rec {
pname = "avidemux";
- version = "2.7.6";
+ version = "2.7.8";
src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
- sha256 = "1kwkn976ppahrcr74bnv6sqx75pzl9y21m1mvr5ksi1m6lgp924s";
+ sha256 = "sha256-YopAT1If8oEnYHAK4+KqeOWBaw/z+2/QWsPnUkjZdAE=";
};
patches = [
diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix
index 3e6a06db1a8..eed4c030cfa 100644
--- a/pkgs/applications/video/droidcam/default.nix
+++ b/pkgs/applications/video/droidcam/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "droidcam";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "aramg";
repo = "droidcam";
rev = "v${version}";
- sha256 = "sha256-f7wLi4ReExkqb+SfOK0juzKbwdcqUVkklIUOIMtmnxM=";
+ sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index a1ccc353d56..84b5e2a1d73 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -16,12 +16,11 @@ mkDerivation rec {
fetchSubmodules = true;
};
- buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
nativeBuildInputs = [ qmake qttools ];
- qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
+ buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
- enableParallelBuilding = true;
+ qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
meta = with lib; {
description = "Stand-alone YouTube video player";
diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index a4e5d7f7028..93ac815346e 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cagebreak";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "project-repo";
repo = "cagebreak";
rev = version;
- hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E=";
+ hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk=";
};
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dxwayland=${lib.boolToString withXwayland}"
"-Dversion_override=${version}"
+ "-Dman-pages=true"
];
postInstall = ''
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index e9014a88954..fec289f0ff1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -447,7 +447,7 @@ rec {
let
stream = streamLayeredImage args;
in
- runCommand "${name}.tar.gz" {
+ runCommand "${baseNameOf name}.tar.gz" {
inherit (stream) imageName;
passthru = { inherit (stream) imageTag; };
nativeBuildInputs = [ pigz ];
@@ -746,8 +746,10 @@ rec {
(lib.assertMsg (maxLayers > 1)
"the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})");
let
+ baseName = baseNameOf name;
+
streamScript = writePython3 "stream" {} ./stream_layered_image.py;
- baseJson = writeText "${name}-base.json" (builtins.toJSON {
+ baseJson = writeText "${baseName}-base.json" (builtins.toJSON {
inherit config;
architecture = defaultArch;
os = "linux";
@@ -759,7 +761,7 @@ rec {
# things like permissions set on 'extraCommands' are not overriden
# by Nix. Then we precompute the sha256 for performance.
customisationLayer = symlinkJoin {
- name = "${name}-customisation-layer";
+ name = "${baseName}-customisation-layer";
paths = contentsList;
inherit extraCommands;
postBuild = ''
@@ -788,7 +790,7 @@ rec {
# so they'll be excluded from the created images.
unnecessaryDrvs = [ baseJson overallClosure ];
- conf = runCommand "${name}-conf.json" {
+ conf = runCommand "${baseName}-conf.json" {
inherit maxLayers created;
imageName = lib.toLower name;
passthru.imageTag =
@@ -841,18 +843,20 @@ rec {
cat ${baseJson} | jq '
. + {
+ "store_dir": $store_dir,
"store_layers": $store_layers,
"customisation_layer", $customisation_layer,
"repo_tag": $repo_tag,
"created": $created
}
- ' --argjson store_layers "$store_layers" \
+ ' --arg store_dir "${storeDir}" \
+ --argjson store_layers "$store_layers" \
--arg customisation_layer ${customisationLayer} \
--arg repo_tag "$imageName:$imageTag" \
--arg created "$created" |
tee $out
'';
- result = runCommand "stream-${name}" {
+ result = runCommand "stream-${baseName}" {
inherit (conf) imageName;
passthru = {
inherit (conf) imageTag;
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 86375a40baa..9e33a42af23 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -427,4 +427,18 @@ rec {
tag = "latest";
contents = [ pkgs.bash symlink ];
} // { passthru = { inherit symlink; }; };
+
+ # image with registry/ prefix
+ prefixedImage = pkgs.dockerTools.buildImage {
+ name = "registry-1.docker.io/image";
+ tag = "latest";
+ config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+ };
+
+ # layered image with registry/ prefix
+ prefixedLayeredImage = pkgs.dockerTools.buildLayeredImage {
+ name = "registry-1.docker.io/layered-image";
+ tag = "latest";
+ config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+ };
}
diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py
index e35bd0b0e8c..60d67442c16 100644
--- a/pkgs/build-support/docker/stream_layered_image.py
+++ b/pkgs/build-support/docker/stream_layered_image.py
@@ -130,12 +130,13 @@ class ExtractChecksum:
LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"])
-def add_layer_dir(tar, paths, mtime):
+def add_layer_dir(tar, paths, store_dir, mtime):
"""
Appends given store paths to a TarFile object as a new layer.
tar: 'tarfile.TarFile' object for the new layer to be added to.
paths: List of store paths.
+ store_dir: the root directory of the nix store
mtime: 'mtime' of the added files and the layer tarball.
Should be an integer representing a POSIX time.
@@ -143,9 +144,9 @@ def add_layer_dir(tar, paths, mtime):
the layer added.
"""
- invalid_paths = [i for i in paths if not i.startswith("/nix/store/")]
+ invalid_paths = [i for i in paths if not i.startswith(store_dir)]
assert len(invalid_paths) == 0, \
- "Expecting absolute store paths, but got: {invalid_paths}"
+ f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}"
# First, calculate the tarball checksum and the size.
extract_checksum = ExtractChecksum()
@@ -245,6 +246,7 @@ def main():
else datetime.fromisoformat(conf["created"])
)
mtime = int(created.timestamp())
+ store_dir = conf["store_dir"]
with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar:
layers = []
@@ -253,7 +255,7 @@ def main():
"Creating layer", num,
"from paths:", store_layer,
file=sys.stderr)
- info = add_layer_dir(tar, store_layer, mtime=mtime)
+ info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime)
layers.append(info)
print("Creating the customisation layer...", file=sys.stderr)
diff --git a/pkgs/build-support/fetchsourcehut/default.nix b/pkgs/build-support/fetchsourcehut/default.nix
new file mode 100644
index 00000000000..ed2f074200c
--- /dev/null
+++ b/pkgs/build-support/fetchsourcehut/default.nix
@@ -0,0 +1,25 @@
+{ fetchzip, lib }:
+
+{ owner
+, repo, rev
+, domain ? "sr.ht"
+, vc ? "git"
+, name ? "source"
+, ... # For hash agility
+} @ args:
+
+with lib;
+
+assert (lib.assertOneOf "vc" vc [ "hg" "git" ]);
+
+let
+ baseUrl = "https://${vc}.${domain}/${owner}/${repo}";
+
+in fetchzip (recursiveUpdate {
+ inherit name;
+ url = "${baseUrl}/archive/${rev}.tar.gz";
+ meta.homepage = "${baseUrl}/";
+ extraPostFetch = optionalString (vc == "hg") ''
+ rm -f "$out/.hg_archival.txt"
+ ''; # impure file; see #12002
+} (removeAttrs args [ "owner" "repo" "rev" "domain" "vc" ])) // { inherit rev; }
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index ee10c5bd18b..26d67ba170e 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "5.0.4";
+ version = "5.0.5";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 10f8cc67c7e..6c31d3edb74 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,26 +1,26 @@
# This file was autogenerated. DO NOT EDIT!
{
- iosevka = "0g32pzxij72fjy0ycwzy23dg06ypmxcg24dk4scvhjp9b5ajx79k";
- iosevka-aile = "0yynkwhanza4y593ajn8hkshk46dl9g84qf1shmy21wd3lqr7psx";
- iosevka-curly = "0zd5hh0hr6prn32yd7fibl2wighv9f6p7jwgfrwcizljai44adnx";
- iosevka-curly-slab = "147bzw9lr8f54yh0hv8887sxy4571563mxjcag0dfw8z3rfffw8c";
- iosevka-etoile = "04jjg4vp0fag7xgiqxnql60gyvlpjmgqqj5q4j3rys9nyw3pl0gi";
- iosevka-slab = "10qwardvknnw6l3yiyji9v02450vfj76lvnlszijv78lfm1xp1qk";
- iosevka-ss01 = "12z1yjspzcbzgs224n1dxis4ghybfkzpw4dwr1wzza553kplwz6w";
- iosevka-ss02 = "08vrlzcyqa83mn2155p4h6hsk20jx3sv0yqimxfsyrwcalc63dcq";
- iosevka-ss03 = "0rhp4rdza36hazs20h4bk524xsgx54pxbw69k235km71m9x6ba59";
- iosevka-ss04 = "1ijjcy8z0fbfrw2fjqnmxbi9l6r41sixk72h3vp75gzrkq7dbh86";
- iosevka-ss05 = "06q9wxkyp7iv9pz3xj6d3v8ay82425wcgl9dybr3dfp4mcsdn7zz";
- iosevka-ss06 = "10pdw28dgdk5343rzbbj5mgmagv4ndl2gg4f02kzq0vlv5xh8vj6";
- iosevka-ss07 = "16xym710sq398zi223cjzxpcblc851ypl7v2dzhvskgsasvj4ypr";
- iosevka-ss08 = "14mqs6gi71p544asr1sz48g6q9zl6zj6sadhhcf8gdsnwa475ds2";
- iosevka-ss09 = "049va8vpzjczslirsxklwcpcsiaqrpc2zm9rmnf5qfyf7f1rn4yd";
- iosevka-ss10 = "1g8s9d7vlb2yx5d8cgsxcl5hb38g1f80d3l04lj2gr22lzk0y271";
- iosevka-ss11 = "15j3wfz8ybszp702c8ycv8kwnbdpa07w8kw9njhsfzvb5iw1xx0i";
- iosevka-ss12 = "1k5250sik2yfa5s5dxaqp0s45wfbxh1s1xn06qjj81ywmw9hy6yg";
- iosevka-ss13 = "1ym8mn2qqwys01wrkplx11kajkfi0x5vzn8m234cbzn8drlgh0l5";
- iosevka-ss14 = "0wkc7kwz6bzxxijycm4d4samy83zsghd8lyq0yn6g48rb6kj9fgw";
- iosevka-ss15 = "0j46sr85vcq25n8ia7nk8rgr3rmgr69wwf7pgllllscablacw73k";
- iosevka-ss16 = "017vipi1cmcjglx0x6da6ans1bsr3xlr43n4mv5qj7h50j1dv3l6";
- iosevka-ss17 = "0kbvy54v543znrzb9584mv6h96hfp9fndxb6wg32clqhzm2yh7fw";
+ iosevka = "1fva80sxdcmsl8y3m23ndif3ff54if37g1xqpda1f13yrbd9ii8q";
+ iosevka-aile = "0fy58yd17k8k41j5f48572d4vad3zz7c2mbc6vsiii9abfkwwalr";
+ iosevka-curly = "1lxw8na3qvc5g04prczl7qprdkvd0zf91ybmv276dnkq27abnjn4";
+ iosevka-curly-slab = "19b6xr5vjnb20j34x2ynfji63qibczn0mm2j76d01py304839bws";
+ iosevka-etoile = "0fhcn69idb6w8abpmmvpdp9c08zdhy0zwn8nbyy9jcznwj8vwb7m";
+ iosevka-slab = "0jlm3l13p9c965zx6z4df65lzxzj9yjjvpwlnx94ipayinxa1iff";
+ iosevka-ss01 = "1i6bvslpxj87p3xi198l486ba40ixicdkmj29vcb1d7w1hhr6wnm";
+ iosevka-ss02 = "1raczi1ja4barvjg5cp3j96kyph4aj8qlp9i10q7835sy29q3285";
+ iosevka-ss03 = "0cn9hi5w9rx8xhbh9a75c7s9pxa3dkqfhd24lbp72hwfgv5nk1v0";
+ iosevka-ss04 = "0v8fvif71604vyqanphq9mmlmx4xy0y2bykvplhrj1zmrj6v2ing";
+ iosevka-ss05 = "1fh99av3ml2zhjvdif02r2f82n4hsswpgd2i42d964swjdplxdga";
+ iosevka-ss06 = "0b0kl49djpc77qpmr1g2nzrg0q477xkjiqxb2i33pkrjsxn4vhn7";
+ iosevka-ss07 = "1d2by3najsambqxyzapnmd200hah39jq0mqdalidb2kjh5lx9n6k";
+ iosevka-ss08 = "05m03zn9pfl1khvl9xvgmlaygh1ni67lj2pc8zjgqydyls1vmxl4";
+ iosevka-ss09 = "1hzglj7sclg6h4jc9ibb1777apl11885w1gpscv81b8n1h0qhnb7";
+ iosevka-ss10 = "1fr52sclgp10k0lh86scjn3aylvsfnr7msg7jfsr3bkg61f5x1da";
+ iosevka-ss11 = "1cmdjmlqvhn3qvqdfflwa4wgza364jn9gbj5vq8rsd6qili175ix";
+ iosevka-ss12 = "0bk56hh9894z59rpkk5s9hhmkz1b2gmvfys46frijg3am54xh03q";
+ iosevka-ss13 = "1kgxlxz1cdkzrfbnkavscf48im9lwiya9rcqlaa10k0ssas28br5";
+ iosevka-ss14 = "06djgn86r2yy3ll2ask5mr9qhqibqzr7v95db5dzxcbz7hrmaaxf";
+ iosevka-ss15 = "0qcld7h38c7cif518sa84x50igxjkh38ckav9qhhv7ls1n5h0jpm";
+ iosevka-ss16 = "0qa6h8qx60rajbpp0v4wxia5n3yinp2nvwy2dsi1270prra7r49x";
+ iosevka-ss17 = "1s04vlkll42am6w3lcka518zv2dlrwwnykdid0sp81najwmq0fk3";
}
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index 36c76c358e9..b9409605f24 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "tali";
- version = "3.38.0";
+ version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9";
+ sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk=";
};
passthru = {
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index 25d35adff94..4d046cd7f84 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mruby";
- version = "2.1.2";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
- sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3";
+ sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c=";
};
nativeBuildInputs = [ ruby bison rake ];
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 5e648c9de4a..8e70ca8dac2 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
};
- patches = [ ./ocaml-4.03.patch ];
+ patches = [ ./ocaml-4.03.patch ./ocaml-4.04.patch ];
# Paths so the opa compiler code generation will use the same programs as were
# used to build opa.
diff --git a/pkgs/development/compilers/opa/ocaml-4.04.patch b/pkgs/development/compilers/opa/ocaml-4.04.patch
new file mode 100644
index 00000000000..45cae411fb3
--- /dev/null
+++ b/pkgs/development/compilers/opa/ocaml-4.04.patch
@@ -0,0 +1,75 @@
+diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml
+index b9f75bd1..171af065 100644
+--- a/compiler/libbsl/bslLib.ml
++++ b/compiler/libbsl/bslLib.ml
+@@ -726,7 +726,7 @@ struct
+ let root elt = !(elt.root)
+ let elt_name elt = elt.name
+ let elts e = e
+- let children = List.map (fun e -> e.name, e)
++ let children m = List.map (fun e -> e.name, e) m
+ let is_root e = Path.is_root e.pwd
+
+ let parent e =
+diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml
+index f4354a3f..81253d32 100644
+--- a/compiler/passes/surfaceAstDependencies.ml
++++ b/compiler/passes/surfaceAstDependencies.ml
+@@ -66,7 +66,6 @@ open SurfaceAst
+
+ (* shorthands *)
+ module SAH = SurfaceAstHelper
+-module C = SurfaceAstCons.ExprIdentCons
+ module D = SurfaceAstDecons
+ module S = SurfaceAst
+
+diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml
+index 10edf5cb..00de59fa 100644
+--- a/compiler/passes/surfaceAstPasses.ml
++++ b/compiler/passes/surfaceAstPasses.ml
+@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes
+
+ (* alias *)
+ module C = SurfaceAstCons.ExprIdentCons
+-module CS = SurfaceAstCons.StringCons
+
+
+
+diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml
+index 2eebd96b..04ce77c8 100644
+--- a/compiler/qmlslicer/qmlSimpleSlicer.ml
++++ b/compiler/qmlslicer/qmlSimpleSlicer.ml
+@@ -17,7 +17,6 @@
+ *)
+ module Format = Base.Format
+ module List = Base.List
+-module String = Base.String
+ module Q = QmlAst
+ module Package = ObjectFiles.Package
+
+diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
+index da2d9736..82d72963 100644
+--- a/ocamllib/libbase/baseObj.mli
++++ b/ocamllib/libbase/baseObj.mli
+@@ -21,7 +21,7 @@ type t = Obj.t
+ external repr : 'a -> t = "%identity"
+ external obj : t -> 'a = "%identity"
+ external magic : 'a -> 'b = "%identity"
+-external is_block : t -> bool = "caml_obj_is_block"
++val [@inline always] is_block : t -> bool
+ external is_int : t -> bool = "%obj_is_int"
+ external tag : t -> int = "caml_obj_tag"
+ external set_tag : t -> int -> unit = "caml_obj_set_tag"
+diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml
+index 640ce2fa..6931c608 100644
+--- a/ocamllib/libbase/baseString.ml
++++ b/ocamllib/libbase/baseString.ml
+@@ -20,7 +20,7 @@
+ (* depends *)
+ module Char = BaseChar
+
+-include Bytes
++include String
+
+ let compare_int (a:int) b = Pervasives.compare a b
+
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 7d63c903795..003727c608f 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -1,17 +1,24 @@
{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed,
- lib, version ? null }:
+ hierarchy-builder, lib, version ? null }:
-with lib; mkCoqDerivation {
+with lib;
+let mca = mkCoqDerivation {
namePrefix = [ "coq" "mathcomp" ];
pname = "analysis";
owner = "math-comp";
+ release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5";
+ release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c";
+ release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867";
release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8";
release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
+ { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; }
+ { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
+ { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
{ cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }
] null;
@@ -25,4 +32,12 @@ with lib; mkCoqDerivation {
maintainers = [ maintainers.cohencyril ];
license = licenses.cecill-c;
};
-}
+}; in
+mca.overrideAttrs (o:
+ let ext = { propagatedBuildInputs = o.propagatedBuildInputs
+ ++ [ hierarchy-builder ]; };
+ in with versions; switch o.version [
+ {case = "dev"; out = ext;}
+ {case = isGe "0.3.4"; out = ext;}
+ ] {}
+)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 441410ce138..ad242777ec1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl";
+ sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -727,8 +727,19 @@ self: super: {
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
+ # 2021-03-12: All of this libraries have to restrictive upper bounds
+ # https://github.com/diagrams/diagrams-core/issues/112
+ active = doJailbreak super.active;
+ statestack = doJailbreak super.statestack;
+ force-layout = doJailbreak super.force-layout;
+ size-based = doJailbreak super.size-based;
+ dual-tree = doJailbreak super.dual-tree;
+ diagrams-core = doJailbreak super.diagrams-core;
+ diagrams-postscript = doJailbreak super.diagrams-postscript;
+ diagrams-svg = doJailbreak super.diagrams-svg;
+ diagrams-contrib = doJailbreak super.diagrams-contrib;
# https://github.com/diagrams/diagrams-lib/issues/288
- diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
+ diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }));
# https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion;
@@ -1413,17 +1424,21 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
- # 2021-02-11: Jailbreaking because of syntax error on bound revision
- hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
+ # 2021-03-09: Overrides because nightly is to old for hls 1.0.0
+ lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
- # 2021-02-08: Overrides because nightly is to old for hls 0.9.0
- lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7);
- haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0;
- haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0;
+ # 2021-03-09: Golden tests seem to be missing in hackage release:
+ # https://github.com/haskell/haskell-language-server/issues/1536
+ hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
- # 1. test requires internet
- # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
- ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
+ # 2021-03-21 Test hangs
+ # https://github.com/haskell/haskell-language-server/issues/1562
+ ghcide = dontCheck super.ghcide;
+
+ # 2020-03-09: Tests broken in hackage release
+ # fixed on upstream, but not released in hiedb 0.3.0.1
+ # https://github.com/wz1000/HieDb/issues/30
+ hiedb = dontCheck super.hiedb;
data-tree-print = doJailbreak super.data-tree-print;
@@ -1515,8 +1530,25 @@ self: super: {
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
- # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
- hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
+ hercules-ci-agent = super.hercules-ci-agent.override {
+ cachix =
+ # https://github.com/cachix/cachix/pull/361
+ (appendPatch
+ (addBuildDepend super.cachix super.hercules-ci-cnix-store)
+ (pkgs.fetchpatch {
+ name = "cachix-361.patch";
+ url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
+ sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
+ stripLen = 1;
+ includes = ["*.cabal" "*.hs"];
+ })
+ );
+ };
+
+ hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
+ # See hercules-ci-optparse-applicative in non-hackage-packages.nix.
+ addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
+ );
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
@@ -1602,4 +1634,31 @@ self: super: {
];
});
+ # cabal-install switched to build type simple in 3.2.0.0
+ # as a result, the cabal(1) man page is no longer installed
+ # automatically. Instead we need to use the `cabal man`
+ # command which generates the man page on the fly and
+ # install it to $out/share/man/man1 ourselves in this
+ # override.
+ # The commit that introduced this change:
+ # https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7
+ cabal-install = overrideCabal super.cabal-install (old: {
+ postInstall = old.postInstall + ''
+ mkdir -p "$out/share/man/man1"
+ "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
+ '';
+ });
+
+ # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
+ amazonka = appendPatches (doJailbreak super.amazonka) [
+ (pkgs.fetchpatch {
+ stripLen = 1;
+ url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
+ sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3";
+ })
+ ];
+
+ # Test suite does not compile.
+ feed = dontCheck super.feed;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 5e39a8047bd..f1af62b1f51 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -50,6 +50,12 @@ self: super: {
random = super.random_1_2_0;
};
+ # cabal-install-parsers is written for Cabal 3.4
+ cabal-install-parsers = super.cabal-install-parsers.override {
+ Cabal = super.Cabal_3_4_0_0;
+ base16-bytestring = super.base16-bytestring_1_0_1_0;
+ };
+
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;
system-fileio = doJailbreak super.system-fileio;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index e6e0f690fe7..996d2182602 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -52,9 +52,15 @@ self: super: {
haddock = self.haddock_2_23_1;
haddock-api = self.haddock-api_2_23_1;
- # These builds need Cabal 3.2.x.
+ # These builds need newer versions of Cabal.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
- cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
+ cabal-install = super.cabal-install.override {
+ Cabal = super.Cabal_3_4_0_0;
+ hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
+ # Using dontCheck to break test dependency cycles
+ edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
+ random = super.random_1_2_0;
+ };
# Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 0a41a91aaa3..e3099bfe510 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -93,4 +93,7 @@ self: super: {
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
+ # The test suite seems pretty broken.
+ base64-bytestring = dontCheck super.base64-bytestring;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ca8b927cc17..263cf833b16 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -73,15 +73,8 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- # Don't update yet to remain compatible with haskell-language-server-0.9.0.
- - ghcide < 0.7.4
- - hls-class-plugin < 1
- - hls-explicit-imports-plugin < 0.1.0.1
- - hls-haddock-comments-plugin < 1
- - hls-plugin-api < 0.7.1.0
- - hls-retrie-plugin < 0.1.1.1
- - hls-tactics-plugin < 1
- # Stackage Nightly 2021-03-01
+
+ # Stackage Nightly 2021-03-12
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -215,8 +208,8 @@ default-package-overrides:
- amazonka-waf ==1.6.1
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- - amqp ==0.20.0.1
- - amqp-utils ==0.4.5.1
+ - amqp ==0.21.0
+ - amqp-utils ==0.6.1.0
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.10.3
- ansi-wl-pprint ==0.6.9
@@ -229,7 +222,7 @@ default-package-overrides:
- ap-normalize ==0.1.0.0
- appar ==0.1.8
- appendmap ==0.1.5
- - apply-refact ==0.9.1.0
+ - apply-refact ==0.9.2.0
- apportionment ==0.0.0.3
- approximate ==0.3.4
- approximate-equality ==1.1.0.2
@@ -271,7 +264,7 @@ default-package-overrides:
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- aur ==7.0.6
- - aura ==3.2.3
+ - aura ==3.2.4
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
@@ -306,6 +299,8 @@ default-package-overrides:
- basic-prelude ==0.7.0
- bazel-runfiles ==0.12
- bbdb ==0.8
+ - bcp47 ==0.2.0.3
+ - bcp47-orphans ==0.1.0.2
- bcrypt ==0.0.11
- bech32 ==1.1.0
- bech32-th ==1.0.2
@@ -348,11 +343,11 @@ default-package-overrides:
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.2.1
- blaze-html ==0.9.1.2
- - blaze-markup ==0.8.2.7
+ - blaze-markup ==0.8.2.8
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
- - BNFC ==2.9.0
+ - BNFC ==2.9.1
- board-games ==0.3
- boltzmann-samplers ==0.1.1.0
- Boolean ==0.2.4
@@ -427,7 +422,7 @@ default-package-overrides:
- cassava-megaparsec ==2.0.2
- cast ==0.1.0.2
- category ==0.2.5.0
- - cayley-client ==0.4.13
+ - cayley-client ==0.4.14
- cborg ==0.2.4.0
- cborg-json ==0.2.2.0
- cereal ==0.5.8.1
@@ -462,7 +457,7 @@ default-package-overrides:
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- circular ==0.3.1.1
- - citeproc ==0.3.0.7
+ - citeproc ==0.3.0.8
- clash-ghc ==1.2.5
- clash-lib ==1.2.5
- clash-prelude ==1.2.5
@@ -525,17 +520,17 @@ default-package-overrides:
- concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- - conduit ==1.3.4
+ - conduit ==1.3.4.1
- conduit-algorithms ==0.0.11.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-extra ==1.3.5
- conduit-parse ==0.2.1.0
- conduit-zstd ==0.0.2.0
- - conferer ==1.0.0.1
- - conferer-aeson ==1.0.0.0
- - conferer-hspec ==1.0.0.0
- - conferer-warp ==1.0.0.0
+ - conferer ==1.1.0.0
+ - conferer-aeson ==1.1.0.0
+ - conferer-hspec ==1.1.0.0
+ - conferer-warp ==1.1.0.0
- ConfigFile ==1.1.4
- config-ini ==0.2.4.0
- configurator ==0.3.0.0
@@ -547,7 +542,7 @@ default-package-overrides:
- constraint ==0.1.4.0
- constraints ==0.12
- constraint-tuples ==0.1.2
- - construct ==0.3
+ - construct ==0.3.0.1
- contravariant ==1.5.3
- contravariant-extras ==0.3.5.2
- control-bool ==0.2.1
@@ -658,7 +653,7 @@ default-package-overrides:
- declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- - deferred-folds ==0.9.16
+ - deferred-folds ==0.9.17
- dejafu ==2.4.0.1
- dense-linear-algebra ==0.1.0.0
- depq ==0.4.1.0
@@ -700,6 +695,7 @@ default-package-overrides:
- doctemplates ==0.9
- doctest ==0.16.3
- doctest-discover ==0.2.0.0
+ - doctest-driver-gen ==0.3.0.3
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doldol ==0.4.1.2
@@ -815,6 +811,7 @@ default-package-overrides:
- fakedata-parser ==0.1.0.0
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
+ - faktory ==1.0.2.1
- fast-digits ==0.3.0.0
- fast-logger ==3.0.3
- fast-math ==1.0.2
@@ -823,7 +820,7 @@ default-package-overrides:
- feature-flags ==0.1.0.1
- fedora-dists ==1.1.2
- fedora-haskell-tools ==0.9
- - feed ==1.3.0.1
+ - feed ==1.3.2.0
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- fgl ==5.7.0.3
@@ -840,7 +837,7 @@ default-package-overrides:
- FindBin ==0.0.5
- fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
- - first-class-families ==0.8.0.0
+ - first-class-families ==0.8.0.1
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.8
- fixed ==0.3
@@ -916,6 +913,7 @@ default-package-overrides:
- generic-optics ==2.0.0.0
- GenericPretty ==1.2.2
- generic-random ==1.3.0.1
+ - generics-eot ==0.4.0.1
- generics-sop ==0.5.1.1
- generics-sop-lens ==0.2.0.1
- geniplate-mirror ==0.7.7
@@ -934,8 +932,14 @@ default-package-overrides:
- genvalidity-mergeful ==0.2.0.0
- genvalidity-mergeless ==0.2.0.0
- genvalidity-path ==0.3.0.4
+ - genvalidity-persistent ==0.0.0.0
- genvalidity-property ==0.5.0.1
- genvalidity-scientific ==0.2.1.1
+ - genvalidity-sydtest ==0.0.0.0
+ - genvalidity-sydtest-aeson ==0.0.0.0
+ - genvalidity-sydtest-hashable ==0.0.0.0
+ - genvalidity-sydtest-lens ==0.0.0.0
+ - genvalidity-sydtest-persistent ==0.0.0.1
- genvalidity-text ==0.7.0.2
- genvalidity-time ==0.3.0.0
- genvalidity-typed-uuid ==0.0.0.2
@@ -1006,7 +1010,7 @@ default-package-overrides:
- gluturtle ==0.0.58.1
- gnuplot ==0.5.6.1
- google-isbn ==1.0.3
- - gothic ==0.1.5
+ - gothic ==0.1.6
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
- graphite ==0.10.0.1
@@ -1028,9 +1032,9 @@ default-package-overrides:
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.9.0
- - hadolint ==1.22.1
+ - hadolint ==1.23.0
- hadoop-streaming ==0.2.0.3
- - hakyll-convert ==0.3.0.3
+ - hakyll-convert ==0.3.0.4
- half ==0.3.1
- hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3
@@ -1074,7 +1078,7 @@ default-package-overrides:
- hdaemonize ==0.5.6
- HDBC ==2.4.0.3
- HDBC-session ==0.1.2.0
- - headroom ==0.3.2.0
+ - headroom ==0.4.0.0
- heap ==1.0.4
- heaps ==0.3.6.1
- hebrew-time ==0.1.2
@@ -1109,7 +1113,7 @@ default-package-overrides:
- hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1
- - hmatrix ==0.20.1
+ - hmatrix ==0.20.2
- hmatrix-backprop ==0.1.3.0
- hmatrix-gsl ==0.19.0.1
- hmatrix-gsl-stats ==0.4.1.8
@@ -1163,6 +1167,7 @@ default-package-overrides:
- hspec-core ==2.7.8
- hspec-discover ==2.7.8
- hspec-expectations ==0.8.2
+ - hspec-expectations-json ==1.0.0.2
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- hspec-golden ==0.1.0.3
@@ -1274,7 +1279,7 @@ default-package-overrides:
- immortal-queue ==0.1.0.1
- inbox ==0.1.0
- include-file ==0.1.0.4
- - incremental-parser ==0.5.0.1
+ - incremental-parser ==0.5.0.2
- indents ==0.5.0.1
- indexed ==0.1.3
- indexed-containers ==0.1.0.2
@@ -1290,7 +1295,7 @@ default-package-overrides:
- inline-c-cpp ==0.4.0.3
- inline-r ==0.10.4
- inliterate ==0.1.0
- - input-parsers ==0.1.0.1
+ - input-parsers ==0.2.1
- insert-ordered-containers ==0.2.4
- inspection-testing ==0.4.3.0
- instance-control ==0.1.2.0
@@ -1317,7 +1322,7 @@ default-package-overrides:
- io-streams ==1.5.2.0
- io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.1
- - iproute ==1.7.10
+ - iproute ==1.7.11
- IPv6Addr ==1.1.5
- ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.1
@@ -1546,16 +1551,16 @@ default-package-overrides:
- mixed-types-num ==0.4.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- - mmark ==0.0.7.2
+ - mmark ==0.0.7.3
- mmark-cli ==0.0.5.0
- - mmark-ext ==0.2.1.2
+ - mmark-ext ==0.2.1.3
- mmorph ==1.1.5
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
- mock-time ==0.1.0
- mod ==0.1.2.1
- model ==0.5
- - modern-uri ==0.3.4.0
+ - modern-uri ==0.3.4.1
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3
@@ -1673,8 +1678,9 @@ default-package-overrides:
- no-value ==1.0.0.0
- nowdoc ==0.1.1.0
- nqe ==0.6.3
- - nri-env-parser ==0.1.0.4
- - nri-prelude ==0.4.0.0
+ - nri-env-parser ==0.1.0.5
+ - nri-observability ==0.1.0.0
+ - nri-prelude ==0.5.0.0
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@@ -1690,7 +1696,7 @@ default-package-overrides:
- ObjectName ==1.1.0.1
- o-clock ==1.2.0.1
- odbc ==0.2.2
- - oeis2 ==1.0.4
+ - oeis2 ==1.0.5
- ofx ==0.4.4.0
- old-locale ==1.0.0.7
- old-time ==1.1.0.3
@@ -1702,7 +1708,7 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.1.0
- OpenAL ==1.7.0.5
- - openapi3 ==3.0.1.0
+ - openapi3 ==3.0.2.0
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
@@ -1733,10 +1739,10 @@ default-package-overrides:
- packcheck ==0.5.1
- packdeps ==0.6.0.0
- pager ==0.1.1.0
- - pagination ==0.2.1
+ - pagination ==0.2.2
- pagure-cli ==0.2
- pandoc ==2.11.4
- - pandoc-plot ==1.0.2.1
+ - pandoc-plot ==1.1.0
- pandoc-types ==1.22
- pantry ==0.5.1.4
- parallel ==3.2.2.0
@@ -1907,7 +1913,7 @@ default-package-overrides:
- pureMD5 ==2.1.3
- purescript-bridge ==0.14.0.0
- pushbullet-types ==0.4.1.0
- - pusher-http-haskell ==2.0.0.3
+ - pusher-http-haskell ==2.1.0.0
- pvar ==1.0.0.0
- PyF ==0.9.0.3
- qchas ==1.1.0.1
@@ -1968,7 +1974,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.6.1
- - record-dot-preprocessor ==0.2.9
+ - record-dot-preprocessor ==0.2.10
- record-hasfield ==1.0
- records-sop ==0.1.0.3
- record-wrangler ==0.1.1.0
@@ -2042,6 +2048,7 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
- safe ==0.3.19
+ - safe-coloured-text ==0.0.0.0
- safecopy ==0.10.4.1
- safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.1
@@ -2095,7 +2102,7 @@ default-package-overrides:
- seqalign ==0.2.0.4
- seqid ==0.6.2
- seqid-streams ==0.7.2
- - sequence-formats ==1.6.0
+ - sequence-formats ==1.6.1
- sequenceTools ==1.4.0.5
- serf ==0.1.1.0
- serialise ==0.2.3.0
@@ -2216,7 +2223,7 @@ default-package-overrides:
- squeal-postgresql ==0.7.0.1
- squeather ==0.6.0.0
- srcloc ==0.5.1.2
- - stache ==2.2.0
+ - stache ==2.2.1
- stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2
- stateref ==0.3
@@ -2265,14 +2272,14 @@ default-package-overrides:
- string-random ==0.1.4.0
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
- - stripe-concepts ==1.0.2.4
+ - stripe-concepts ==1.0.2.6
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
- stripe-tests ==2.6.2
- strive ==5.0.13
- structs ==0.1.5
- - structured ==0.1
+ - structured ==0.1.0.1
- structured-cli ==2.6.0.0
- subcategories ==0.1.0.0
- sum-type-boilerplate ==0.1.1
@@ -2284,6 +2291,12 @@ default-package-overrides:
- sweet-egison ==0.1.1.3
- swish ==0.10.0.4
- syb ==0.7.2.1
+ - sydtest ==0.1.0.0
+ - sydtest-discover ==0.0.0.0
+ - sydtest-persistent-sqlite ==0.0.0.0
+ - sydtest-servant ==0.0.0.0
+ - sydtest-wai ==0.0.0.0
+ - sydtest-yesod ==0.0.0.0
- symbol ==0.2.4
- symengine ==0.1.2.0
- symmetry-operations-symbols ==0.0.2.1
@@ -2531,13 +2544,14 @@ default-package-overrides:
- utility-ht ==0.0.15
- uuid ==1.3.14
- uuid-types ==1.0.4
- - validation ==1.1
+ - validation ==1.1.1
- validation-selective ==0.1.0.0
- validity ==0.11.0.0
- validity-aeson ==0.2.0.4
- validity-bytestring ==0.4.1.1
- validity-containers ==0.5.0.4
- validity-path ==0.4.0.1
+ - validity-persistent ==0.0.0.0
- validity-primitive ==0.0.0.1
- validity-scientific ==0.2.0.3
- validity-text ==0.3.1.1
@@ -2669,16 +2683,17 @@ default-package-overrides:
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- - yamlparse-applicative ==0.1.0.2
+ - yamlparse-applicative ==0.1.0.3
- yesod ==1.6.1.0
- yesod-auth ==1.6.10.1
- yesod-auth-hashdb ==1.7.1.5
- - yesod-auth-oauth2 ==0.6.1.7
+ - yesod-auth-oauth2 ==0.6.2.3
- yesod-bin ==1.6.1
- yesod-core ==1.6.18.8
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
+ - yesod-markdown ==0.12.6.6
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.4
- yesod-paginator ==1.1.1.0
@@ -2790,8 +2805,12 @@ package-maintainers:
roberth:
- arion-compose
- hercules-ci-agent
+ - hercules-ci-api
- hercules-ci-api-agent
- hercules-ci-api-core
+ - hercules-ci-cli
+ - hercules-ci-cnix-expr
+ - hercules-ci-cnix-store
cdepillabout:
- pretty-simple
- spago
@@ -2807,6 +2826,7 @@ package-maintainers:
- releaser
- taskwarrior
- haskell-language-server
+ - shake-bench
sorki:
- cayene-lpp
- data-stm32
@@ -3070,7 +3090,6 @@ broken-packages:
- acme-zero
- acousticbrainz-client
- ActionKid
- - active
- activehs
- activehs-base
- activitypub
@@ -3181,7 +3200,6 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- - amazonka
- amazonka-s3-streaming
- amby
- AMI
@@ -3837,7 +3855,6 @@ broken-packages:
- cabal-install-bundle
- cabal-install-ghc72
- cabal-install-ghc74
- - cabal-install-parsers
- cabal-lenses
- cabal-meta
- cabal-mon
@@ -3988,7 +4005,6 @@ broken-packages:
- character-cases
- charade
- chart-cli
- - Chart-diagrams
- Chart-fltkhs
- chart-histogram
- Chart-simple
@@ -4679,27 +4695,21 @@ broken-packages:
- dhrun
- dia-base
- dia-functions
- - diagrams
- diagrams-boolean
- diagrams-braille
- diagrams-builder
- diagrams-cairo
- diagrams-canvas
- - diagrams-contrib
- - diagrams-core
- diagrams-graphviz
- diagrams-gtk
- diagrams-haddock
- diagrams-html5
- - diagrams-lib
- diagrams-pandoc
- diagrams-pdf
- diagrams-pgf
- - diagrams-postscript
- diagrams-qrcode
- diagrams-rasterific
- diagrams-rubiks-cube
- - diagrams-svg
- diagrams-tikz
- diagrams-wx
- dib
@@ -4807,7 +4817,6 @@ broken-packages:
- docrecords
- DocTest
- doctest-discover-configurator
- - doctest-driver-gen
- doctest-prop
- docusign-base
- docusign-base-minimal
@@ -4870,7 +4879,6 @@ broken-packages:
- dtd
- dtd-text
- dtw
- - dual-tree
- dualizer
- duet
- dumb-cas
@@ -5151,8 +5159,6 @@ broken-packages:
- FailureT
- fake
- fake-type
- - fakedata
- - fakedata-quickcheck
- faktory
- falling-turnip
- fallingblocks
@@ -5344,7 +5350,6 @@ broken-packages:
- foo
- for-free
- forbidden-fruit
- - force-layout
- fordo
- forecast-io
- foreign-var
@@ -6454,7 +6459,6 @@ broken-packages:
- hid-examples
- hidden-char
- hie-core
- - hiedb
- hieraclus
- hierarchical-clustering-diagrams
- hierarchical-exceptions
@@ -8165,7 +8169,6 @@ broken-packages:
- Monocle
- monoid
- monoid-absorbing
- - monoid-extras
- monoid-owns
- monoidplus
- monoids
@@ -10002,6 +10005,7 @@ broken-packages:
- sha1
- shade
- shadower
+ - shake-bench
- shake-bindist
- shake-cabal-build
- shake-dhall
@@ -10115,7 +10119,6 @@ broken-packages:
- sirkel
- sitepipe
- sixfiguregroup
- - size-based
- sized-grid
- sized-types
- sized-vector
@@ -10395,7 +10398,6 @@ broken-packages:
- state-plus
- state-record
- stateful-mtl
- - statestack
- static-canvas
- static-closure
- static-tensor
@@ -10484,7 +10486,6 @@ broken-packages:
- strictly
- string-isos
- string-quote
- - string-random
- string-typelits
- stringlike
- stringtable-atom
@@ -10542,12 +10543,10 @@ broken-packages:
- sv-svfactor
- SVD2HS
- svfactor
- - svg-builder
- svg-builder-fork
- SVG2Q
- svg2q
- svgcairo
- - SVGFonts
- svgone
- svgutils
- svm-light-utils
@@ -10746,7 +10745,6 @@ broken-packages:
- testbench
- testCom
- testcontainers
- - testing-feat
- testloop
- testpack
- testpattern
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 21aa86ee5a4..492b8ac72d3 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -446,9 +446,6 @@ self: super: builtins.intersectAttrs super {
# requires an X11 display in test suite
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
- # depends on 'hie' executable
- lsp-test = dontCheck super.lsp-test;
-
# tests depend on executable
ghcide = overrideCabal super.ghcide (drv: {
preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';
@@ -812,4 +809,11 @@ self: super: builtins.intersectAttrs super {
# hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
# https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
hadolint = disableCabalFlag super.hadolint "static";
+
+ # Test suite tries to execute the build product "doctest-driver-gen", but it's not in $PATH.
+ doctest-driver-gen = dontCheck super.doctest-driver-gen;
+
+ # Tests access internet
+ prune-juice = dontCheck super.prune-juice;
+
}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 44f0b4ec51b..81fc6341938 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1278,34 +1278,6 @@ self: {
}) {};
"BNFC" = callPackage
- ({ mkDerivation, alex, array, base, Cabal, cabal-doctest
- , containers, deepseq, directory, doctest, filepath, happy, hspec
- , hspec-discover, HUnit, mtl, pretty, process, QuickCheck
- , string-qq, temporary, time
- }:
- mkDerivation {
- pname = "BNFC";
- version = "2.9.0";
- sha256 = "1h5365978q43r4sik1kmbrxnxa6lxnb54lhp7bi9599rnav8nw0z";
- isLibrary = true;
- isExecutable = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- array base containers deepseq directory filepath mtl pretty process
- string-qq time
- ];
- libraryToolDepends = [ alex happy ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- array base containers deepseq directory doctest filepath hspec
- HUnit mtl pretty process QuickCheck string-qq temporary time
- ];
- testToolDepends = [ alex happy hspec-discover ];
- description = "A compiler front-end generator";
- license = lib.licenses.bsd3;
- }) {};
-
- "BNFC_2_9_1" = callPackage
({ mkDerivation, alex, array, base, Cabal, cabal-doctest
, containers, deepseq, directory, doctest, filepath, happy, hspec
, hspec-discover, HUnit, mtl, pretty, process, QuickCheck
@@ -1331,7 +1303,6 @@ self: {
testToolDepends = [ alex happy hspec-discover ];
description = "A compiler front-end generator";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"BNFC-meta" = callPackage
@@ -3071,8 +3042,6 @@ self: {
];
description = "Diagrams backend for Charts";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"Chart-fltkhs" = callPackage
@@ -10969,8 +10938,8 @@ self: {
pname = "HsYAML";
version = "0.2.1.0";
sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0";
- revision = "1";
- editedCabalFile = "0bfwdwwj5wgqrrbw1cwaxwxy9970dzln7w20f21mlg2l374wnqvf";
+ revision = "2";
+ editedCabalFile = "0f7867jfzlmlqnkv3fjrzjvvfzjlvhbm10kmg7n0qk69ic8grkbc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -11857,8 +11826,8 @@ self: {
pname = "JuicyPixels-scale-dct";
version = "0.1.2";
sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
- revision = "5";
- editedCabalFile = "0aar0h109fiy6pads3rlmhjsaj5528yn4zay5ps0zf8yb9dyd82s";
+ revision = "6";
+ editedCabalFile = "0np8wqf0s0pwqnjfhs8zw9h133p2x173xbv984c4dn5a1xhn0azq";
libraryHaskellDepends = [
base base-compat carray fft JuicyPixels
];
@@ -17363,8 +17332,8 @@ self: {
}:
mkDerivation {
pname = "RtMidi";
- version = "0.4.0.0";
- sha256 = "075j6d7vmihyz33b5ikv2l0c0alnhjzy1wpnzdrca6l201vab2mw";
+ version = "0.5.0.0";
+ sha256 = "0yb52a4c03x28nbq8shpzqsczr04ngi0fa1hw0mflhql5rzd7yy5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base deepseq unliftio-core vector ];
@@ -17911,8 +17880,6 @@ self: {
];
description = "Fonts from the SVG-Font format";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"SVGPath" = callPackage
@@ -22010,6 +21977,8 @@ self: {
pname = "Z-Data";
version = "0.7.0.0";
sha256 = "1b4ycsq5g459ynp989kldq6r3ssawr64a2hp3dzy804pwrp8v62m";
+ revision = "1";
+ editedCabalFile = "057si6f4hz5kda3gyr2b8kni17dmv28z82b64qi142gjr3gx415i";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq ghc-prim
@@ -22036,8 +22005,8 @@ self: {
}:
mkDerivation {
pname = "Z-IO";
- version = "0.6.4.0";
- sha256 = "1d651q0xda38652n249swh84kkn2jgw63db01aia00304h9cbcgf";
+ version = "0.7.0.0";
+ sha256 = "1yw0ym2iw1hi3jn2xrp1hwi6vbv69d0fpvvz3n2328v4i0ryjdjf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -23910,8 +23879,6 @@ self: {
];
description = "Abstractions for animation";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"activehs" = callPackage
@@ -25337,15 +25304,19 @@ self: {
}) {};
"aeson-via" = callPackage
- ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, text
+ ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, tasty
+ , tasty-hunit, text
}:
mkDerivation {
pname = "aeson-via";
- version = "0.1.0";
- sha256 = "0zlx4pxfh3qll8ymfya0rfqx3gd7ag0wag86fa8fvni6h07ynryf";
+ version = "0.1.1";
+ sha256 = "18b1pxvkrva6531v8x38vhqmyj48iddi49vgc79s0jx8sgb39l8d";
libraryHaskellDepends = [
aeson aeson-casing base newtype-generics text
];
+ testHaskellDepends = [
+ aeson aeson-casing base newtype-generics tasty tasty-hunit text
+ ];
description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses";
license = lib.licenses.bsd3;
}) {};
@@ -26547,17 +26518,17 @@ self: {
"algorithmic-composition-basic" = callPackage
({ mkDerivation, base, bytestring, directory, foldable-ix
, mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common
- , phonetic-languages-simplified-base, process
+ , phonetic-languages-simplified-base, process, process-sequential
, ukrainian-phonetics-basic-array
}:
mkDerivation {
pname = "algorithmic-composition-basic";
- version = "0.2.2.0";
- sha256 = "0ij3yh29mxkj9zph33g3r46afh3s4vhqxmhkpnm2mgzad7xqca2m";
+ version = "0.3.1.0";
+ sha256 = "0vpqi398nhlawh7dipfzvq6zsk1g9gpjbr35mizm5rms4sj3mfsk";
libraryHaskellDepends = [
base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l
mmsyn7ukr-common phonetic-languages-simplified-base process
- ukrainian-phonetics-basic-array
+ process-sequential ukrainian-phonetics-basic-array
];
description = "Helps to create experimental music from a file (or its part) and a Ukrainian text";
license = lib.licenses.mit;
@@ -26599,6 +26570,17 @@ self: {
license = lib.licenses.mit;
}) {};
+ "algorithmic-composition-overtones" = callPackage
+ ({ mkDerivation, algorithmic-composition-basic, base }:
+ mkDerivation {
+ pname = "algorithmic-composition-overtones";
+ version = "0.1.0.0";
+ sha256 = "0phdwds12jmv7dp88z6lk6h58jayn9cpjn1sgrglymgww87h88d9";
+ libraryHaskellDepends = [ algorithmic-composition-basic base ];
+ description = "Some variants of the overtones functions to generate a timbre";
+ license = lib.licenses.mit;
+ }) {};
+
"align" = callPackage
({ mkDerivation, base, containers, transformers, vector }:
mkDerivation {
@@ -27196,8 +27178,6 @@ self: {
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Comprehensive Amazon Web Services SDK";
license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"amazonka-alexa-business" = callPackage
@@ -29674,8 +29654,8 @@ self: {
}:
mkDerivation {
pname = "amqp";
- version = "0.20.0.1";
- sha256 = "10qj4776b3sjifij3qic2bafd01jn8s0pfgm1yd74nyhjx50s19p";
+ version = "0.21.0";
+ sha256 = "1sni1bl2rmc2fq2zla0h093acd7yisfdizd5wrxclammzav7x0gk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -29740,8 +29720,8 @@ self: {
}:
mkDerivation {
pname = "amqp-utils";
- version = "0.4.5.1";
- sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap";
+ version = "0.6.1.0";
+ sha256 = "0h0mjgaiyhhx8y6zd3zxm1jzd0vgc6crq3980l5cal0zv6vs9zc1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -29753,27 +29733,6 @@ self: {
license = lib.licenses.gpl3;
}) {};
- "amqp-utils_0_5_0_0" = callPackage
- ({ mkDerivation, amqp, base, bytestring, connection, containers
- , data-default-class, directory, hinotify, magic, network, process
- , text, time, tls, unix, utf8-string, x509-system
- }:
- mkDerivation {
- pname = "amqp-utils";
- version = "0.5.0.0";
- sha256 = "140awzxj14h9wa13wfl15dqndqvyy046zmyg0q643r40nbyggl8r";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- amqp base bytestring connection containers data-default-class
- directory hinotify magic network process text time tls unix
- utf8-string x509-system
- ];
- description = "AMQP toolset for the command line";
- license = lib.licenses.gpl3;
- hydraPlatforms = lib.platforms.none;
- }) {};
-
"amqp-worker" = callPackage
({ mkDerivation, aeson, amqp, base, bytestring, data-default
, exceptions, monad-control, monad-loops, mtl, resource-pool
@@ -31943,8 +31902,8 @@ self: {
}:
mkDerivation {
pname = "apply-refact";
- version = "0.9.1.0";
- sha256 = "1b9ib5ix643aagzsw5vk8d789a784pggsm6qv36bxkcsx89s2bjm";
+ version = "0.9.2.0";
+ sha256 = "1j0afdl6g51wyb3g47wss15v0yl50n23k3icbyla8h89rxh74lcx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33697,6 +33656,8 @@ self: {
pname = "asciidiagram";
version = "1.3.3.3";
sha256 = "09k1kdaa0xi2fx9vfdlv2w2nxx5x1vnlkz7gp8s998a325w1x7q1";
+ revision = "1";
+ editedCabalFile = "1j7p9smyfmkayx6n7inssxcg9cr4zdm6329fpvba7504b96aprdk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -35504,8 +35465,8 @@ self: {
}:
mkDerivation {
pname = "aura";
- version = "3.2.3";
- sha256 = "1gq4nkwil64h4armg39vbl3wjsbnqsa0vg5b41kq19dp9rmpfsp5";
+ version = "3.2.4";
+ sha256 = "0d3v3kpy4acd7pyysy5dw25b4154v7jwgydipmrczfxicrf02aa0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -36601,8 +36562,8 @@ self: {
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime-wai";
- version = "2.0.0";
- sha256 = "1m95hcfl72v9rrks0clzrz3md35jsk5jgc5ds81vrknzxr0b0fgj";
+ version = "2.0.1";
+ sha256 = "13h0cxmxzr7bgma1ry1yj9dhqzqvh5sgzv6nqyvb0xy8n3gysbcn";
libraryHaskellDepends = [
aeson aws-lambda-haskell-runtime base binary bytestring
case-insensitive http-types iproute network text
@@ -38471,8 +38432,8 @@ self: {
pname = "basement";
version = "0.0.11";
sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37";
- revision = "2";
- editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg";
+ revision = "3";
+ editedCabalFile = "1indgsrk0yhkbqlxj39qqb5xqicwkmcliggb8wn87vgfswxpi1dn";
libraryHaskellDepends = [ base ghc-prim ];
description = "Foundation scrap box of array & string";
license = lib.licenses.bsd3;
@@ -40476,6 +40437,21 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "binary-generic-combinators" = callPackage
+ ({ mkDerivation, base, binary, generic-arbitrary, hspec, QuickCheck
+ }:
+ mkDerivation {
+ pname = "binary-generic-combinators";
+ version = "0.4.2.0";
+ sha256 = "1z1ngjcssb0nrkyd1chklmv19xf2qz7vqh2idsvkxa67ryp5g4a3";
+ libraryHaskellDepends = [ base binary QuickCheck ];
+ testHaskellDepends = [
+ base binary generic-arbitrary hspec QuickCheck
+ ];
+ description = "Combinators and utilities to make Generic-based deriving of Binary easier and more expressive";
+ license = lib.licenses.bsd3;
+ }) {};
+
"binary-ieee754" = callPackage
({ mkDerivation, array, base, binary }:
mkDerivation {
@@ -40784,8 +40760,8 @@ self: {
pname = "binary-tagged";
version = "0.3";
sha256 = "1bvzwhdjxxr7b3lk23rwcygi34d6a5mairi2j2gh7k3p8983fgss";
- revision = "1";
- editedCabalFile = "1swaxiyz16wmsi0qdm9nfs56ld37hg9vqp73j3lvdq84f1s0ck2l";
+ revision = "2";
+ editedCabalFile = "0h397jzajqiw01nf7fkjmqzsmzd08d1z6f9ff2rvcj4s6wsqkik8";
libraryHaskellDepends = [
array base base16-bytestring binary bytestring containers
structured tagged
@@ -43581,6 +43557,8 @@ self: {
pname = "blaze-html";
version = "0.9.1.2";
sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30";
+ revision = "1";
+ editedCabalFile = "0wvlfb3rd9cm3p894p5rl9kggrsr5da3n8x9ydrbagx91yvkxns9";
libraryHaskellDepends = [
base blaze-builder blaze-markup bytestring text
];
@@ -43664,23 +43642,6 @@ self: {
}) {};
"blaze-markup" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
- , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "blaze-markup";
- version = "0.8.2.7";
- sha256 = "1r4fij8qs1z4dfrh6cjzjbnx9f3jyx01zgj15wvy961d8bnqjr4b";
- libraryHaskellDepends = [ base blaze-builder bytestring text ];
- testHaskellDepends = [
- base blaze-builder bytestring containers HUnit QuickCheck tasty
- tasty-hunit tasty-quickcheck text
- ];
- description = "A blazingly fast markup combinator library for Haskell";
- license = lib.licenses.bsd3;
- }) {};
-
- "blaze-markup_0_8_2_8" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
}:
@@ -43695,7 +43656,6 @@ self: {
];
description = "A blazingly fast markup combinator library for Haskell";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"blaze-shields" = callPackage
@@ -48851,8 +48811,6 @@ self: {
];
description = "Utilities to work with cabal-install files";
license = "GPL-2.0-or-later AND BSD-3-Clause";
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"cabal-lenses" = callPackage
@@ -50254,8 +50212,8 @@ self: {
}:
mkDerivation {
pname = "camfort";
- version = "1.0";
- sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52";
+ version = "1.0.1";
+ sha256 = "1jwlkrf4aja71sbxxlxsd7syh6sb4vgv2pb18mvj5ppm6al2ykp3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -52033,8 +51991,8 @@ self: {
}:
mkDerivation {
pname = "cayley-client";
- version = "0.4.13";
- sha256 = "1sak0rg9gydcwk7ahx51czp3akispxrkkfgq94n6hgg3dqvm646l";
+ version = "0.4.14";
+ sha256 = "1hczhvqqpx8kqg90h5qb2vjindn4crxmq6lwbj8ix45fnkijv4xg";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring exceptions http-client
http-conduit lens lens-aeson mtl text transformers
@@ -54861,32 +54819,6 @@ self: {
}) {};
"citeproc" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring
- , case-insensitive, containers, data-default, Diff, directory
- , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe
- , scientific, text, timeit, transformers, uniplate, vector
- , xml-conduit
- }:
- mkDerivation {
- pname = "citeproc";
- version = "0.3.0.7";
- sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring case-insensitive containers
- data-default file-embed filepath pandoc-types rfc5051 safe
- scientific text transformers uniplate vector xml-conduit
- ];
- testHaskellDepends = [
- aeson base bytestring containers Diff directory filepath mtl pretty
- text timeit transformers
- ];
- description = "Generates citations and bibliography from CSL styles";
- license = lib.licenses.bsd2;
- }) {};
-
- "citeproc_0_3_0_8" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring
, case-insensitive, containers, data-default, Diff, directory
, file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe
@@ -54910,7 +54842,6 @@ self: {
];
description = "Generates citations and bibliography from CSL styles";
license = lib.licenses.bsd2;
- hydraPlatforms = lib.platforms.none;
}) {};
"citeproc-hs" = callPackage
@@ -55293,6 +55224,38 @@ self: {
broken = true;
}) {};
+ "clash-ghc_1_4_0" = callPackage
+ ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
+ , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
+ , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim
+ , ghc-typelits-extra, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp
+ , lens, mtl, primitive, process, reflection, split
+ , template-haskell, text, time, transformers, uniplate, unix
+ , unordered-containers, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "clash-ghc";
+ version = "1.4.0";
+ sha256 = "18nm5x6rk69pd506yqp4pwp1i56x81bb56ly9x7adkmjk7j3l6y2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bifunctors bytestring Cabal clash-lib clash-prelude
+ concurrent-supply containers deepseq directory exceptions extra
+ filepath ghc ghc-boot ghc-prim ghc-typelits-extra
+ ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable
+ haskeline integer-gmp lens mtl primitive process reflection split
+ template-haskell text time transformers uniplate unix
+ unordered-containers utf8-string vector
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Clash: a functional hardware description language - GHC frontend";
+ license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"clash-lib" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
, bytestring, clash-prelude, concurrent-supply, containers
@@ -55332,6 +55295,50 @@ self: {
broken = true;
}) {};
+ "clash-lib_1_4_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array
+ , attoparsec, base, base16-bytestring, binary, bytestring
+ , clash-prelude, concurrent-supply, containers, cryptohash-sha256
+ , data-binary-ieee754, data-default, deepseq, directory, dlist
+ , errors, exceptions, extra, filepath, ghc, ghc-boot-th
+ , ghc-typelits-knownnat, hashable, haskell-src-exts
+ , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl
+ , ordered-containers, parsers, pretty-show, prettyprinter
+ , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, terminal-size
+ , text, text-show, time, transformers, trifecta
+ , unordered-containers, utf8-string, vector
+ , vector-binary-instances
+ }:
+ mkDerivation {
+ pname = "clash-lib";
+ version = "1.4.0";
+ sha256 = "1i0zmz26p35hfp89s45s6g7x2rvhyjc3lrx35r06cnllw6xvp60z";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty ansi-terminal array attoparsec base
+ base16-bytestring binary bytestring clash-prelude concurrent-supply
+ containers cryptohash-sha256 data-binary-ieee754 data-default
+ deepseq directory dlist errors exceptions extra filepath ghc
+ ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
+ lens mtl ordered-containers parsers pretty-show prettyprinter
+ primitive process reducers template-haskell temporary terminal-size
+ text text-show time transformers trifecta unordered-containers
+ utf8-string vector vector-binary-instances
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base base16-bytestring bytestring clash-prelude
+ concurrent-supply containers data-default deepseq ghc
+ ghc-typelits-knownnat haskell-src-exts lens pretty-show
+ quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell
+ text transformers unordered-containers
+ ];
+ description = "Clash: a functional hardware description language - As a library";
+ license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"clash-multisignal" = callPackage
({ mkDerivation, base, clash-prelude, deepseq
, ghc-typelits-knownnat, QuickCheck
@@ -55388,6 +55395,48 @@ self: {
broken = true;
}) {};
+ "clash-prelude_1_4_0" = callPackage
+ ({ mkDerivation, array, arrows, base, bifunctors, binary
+ , bytestring, Cabal, cabal-doctest, constraints, containers
+ , criterion, data-binary-ieee754, data-default-class, deepseq
+ , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, half, hashable, hedgehog, hint
+ , integer-gmp, interpolate, lens, QuickCheck
+ , quickcheck-classes-base, recursion-schemes, reflection
+ , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+ , tasty-th, template-haskell, text, text-show, th-abstraction
+ , th-lift, th-orphans, time, transformers, type-errors, uniplate
+ , vector
+ }:
+ mkDerivation {
+ pname = "clash-prelude";
+ version = "1.4.0";
+ sha256 = "168gjdjj9v69gr4d44njly70qr30nz3z4gfdy4nd4pay377i6vlw";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ array arrows base bifunctors binary bytestring constraints
+ containers data-binary-ieee754 data-default-class deepseq ghc-prim
+ ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
+ half hashable integer-gmp interpolate lens QuickCheck
+ recursion-schemes reflection singletons template-haskell text
+ text-show th-abstraction th-lift th-orphans time transformers
+ type-errors uniplate vector
+ ];
+ testHaskellDepends = [
+ base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat
+ ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base
+ tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
+ template-haskell
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq template-haskell
+ ];
+ description = "Clash: a functional hardware description language - Prelude library";
+ license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"clash-prelude-quickcheck" = callPackage
({ mkDerivation, base, clash-prelude, QuickCheck }:
mkDerivation {
@@ -57539,8 +57588,8 @@ self: {
}:
mkDerivation {
pname = "cobot-io";
- version = "0.1.3.17";
- sha256 = "1x289bmzrj1yrr934b51v3amldhjdanjv4kxnay89n8avix899yw";
+ version = "0.1.3.18";
+ sha256 = "1xyri98rlg4ph9vyjicivq8vb1kk085pbpv43ydw6qvpqlp97wk5";
libraryHaskellDepends = [
array attoparsec base binary bytestring containers data-msgpack
deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -58053,8 +58102,8 @@ self: {
}:
mkDerivation {
pname = "coinbase-pro";
- version = "0.9.0.0";
- sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1";
+ version = "0.9.2.0";
+ sha256 = "0x7wmm123rf7zk9802bymx1b9pbsnmzhkabyacwini01gb56bwxy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -60869,34 +60918,6 @@ self: {
}) {};
"conduit" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , exceptions, filepath, gauge, hspec, kan-extensions
- , mono-traversable, mtl, mwc-random, primitive, QuickCheck
- , resourcet, safe, silently, split, text, transformers, unix
- , unliftio, unliftio-core, vector
- }:
- mkDerivation {
- pname = "conduit";
- version = "1.3.4";
- sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz";
- libraryHaskellDepends = [
- base bytestring directory exceptions filepath mono-traversable mtl
- primitive resourcet text transformers unix unliftio-core vector
- ];
- testHaskellDepends = [
- base bytestring containers directory exceptions filepath hspec
- mono-traversable mtl QuickCheck resourcet safe silently split text
- transformers unliftio vector
- ];
- benchmarkHaskellDepends = [
- base containers deepseq gauge hspec kan-extensions mwc-random
- transformers vector
- ];
- description = "Streaming data processing library";
- license = lib.licenses.mit;
- }) {};
-
- "conduit_1_3_4_1" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, exceptions, filepath, gauge, hspec, kan-extensions
, mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -60922,7 +60943,6 @@ self: {
];
description = "Streaming data processing library";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"conduit-algorithms" = callPackage
@@ -61423,25 +61443,6 @@ self: {
}) {};
"conferer" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , filepath, hspec, QuickCheck, text
- }:
- mkDerivation {
- pname = "conferer";
- version = "1.0.0.1";
- sha256 = "0cfn6aj265qs1qk5z942g5l2cz2gsj35bapxynj4c90wjl89wz5r";
- libraryHaskellDepends = [
- base bytestring containers directory filepath text
- ];
- testHaskellDepends = [
- base bytestring containers deepseq directory filepath hspec
- QuickCheck text
- ];
- description = "Configuration management library";
- license = lib.licenses.mpl20;
- }) {};
-
- "conferer_1_1_0_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, filepath, hspec, QuickCheck, text
}:
@@ -61458,30 +61459,9 @@ self: {
];
description = "Configuration management library";
license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"conferer-aeson" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
- , directory, hspec, text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "conferer-aeson";
- version = "1.0.0.0";
- sha256 = "0adqblmpbyqfqybgmjnnwsnaxw8qiqvw5c2bj4avsikz7fhcp0nl";
- libraryHaskellDepends = [
- aeson base bytestring conferer directory text unordered-containers
- vector
- ];
- testHaskellDepends = [
- aeson aeson-qq base bytestring conferer directory hspec text
- unordered-containers vector
- ];
- description = "conferer's source for reading json files";
- license = lib.licenses.mpl20;
- }) {};
-
- "conferer-aeson_1_1_0_0" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
, directory, hspec, text, unordered-containers, vector
}:
@@ -61489,6 +61469,8 @@ self: {
pname = "conferer-aeson";
version = "1.1.0.0";
sha256 = "0kslxj2wcycygj07x7v06fcx2i47dwp96da9djws6mjdmr1a9i96";
+ revision = "1";
+ editedCabalFile = "1ic6nichx1c3s7fnr2q90hzm1qykg8rkqfwl2k5yhhwb1fdnhb6q";
libraryHaskellDepends = [
aeson base bytestring conferer directory text unordered-containers
vector
@@ -61499,7 +61481,6 @@ self: {
];
description = "conferer's source for reading json files";
license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"conferer-dhall" = callPackage
@@ -61510,6 +61491,8 @@ self: {
pname = "conferer-dhall";
version = "1.1.0.0";
sha256 = "0whxxjz5askw1qxcxdn5094bqm2hy3zp49567v57gqikgv6rcnp1";
+ revision = "1";
+ editedCabalFile = "1bbc5a3iy5fcp7ahxndhfg8v0sk74q0hs00miiv8gqg7f3l5b20j";
libraryHaskellDepends = [
base bytestring conferer conferer-aeson dhall dhall-json directory
text
@@ -61528,8 +61511,8 @@ self: {
({ mkDerivation, base, conferer, hedis, hspec, text }:
mkDerivation {
pname = "conferer-hedis";
- version = "1.0.0.0";
- sha256 = "0x150z08x1grzr80fdpkbxprldn08908fgz2mpg3qg219nx4r5n2";
+ version = "1.1.0.0";
+ sha256 = "10rk5w3f99ql46yvzg7a0ac59dvpyfhdpv138w0w5ghgz5azcd19";
libraryHaskellDepends = [ base conferer hedis text ];
testHaskellDepends = [ base conferer hedis hspec text ];
description = "conferer's FromConfig instances for hedis settings";
@@ -61540,8 +61523,8 @@ self: {
({ mkDerivation, base, conferer, hspec, hspec-core, text }:
mkDerivation {
pname = "conferer-hspec";
- version = "1.0.0.0";
- sha256 = "02c4z2999pa04r78n8xzx7idvgg028wlb2fgyk0878wb1gahzsxp";
+ version = "1.1.0.0";
+ sha256 = "0q9v26df3c2rxll6rk2zmmd9yrpqz1j1wdp59qlw2s6c2w7dxq35";
libraryHaskellDepends = [ base conferer hspec-core text ];
testHaskellDepends = [ base conferer hspec hspec-core text ];
description = "conferer's FromConfig instances for hspec Config";
@@ -61620,6 +61603,8 @@ self: {
pname = "conferer-snap";
version = "1.0.0.0";
sha256 = "15gz77b5jf35hmcnd6kza1wgzpbgk3pcvhi7mp7yk64ybksld98r";
+ revision = "1";
+ editedCabalFile = "08bji5mw7lzxpx9s1mlim5nfcz7j6828zj75pn670jfip0in4j19";
libraryHaskellDepends = [
base conferer snap-core snap-server text
];
@@ -61698,8 +61683,8 @@ self: {
}:
mkDerivation {
pname = "conferer-warp";
- version = "1.0.0.0";
- sha256 = "14wrd50dfgc2m6lyfvsx4w605r8krf6ha96j3685vgy6fylff1bd";
+ version = "1.1.0.0";
+ sha256 = "0zbgxq229jr7xwzw6q20rwnslbci07b1vk324izm8hxcp3kb76mj";
libraryHaskellDepends = [ base conferer http-types text wai warp ];
testHaskellDepends = [
base conferer hspec http-types text wai warp
@@ -61714,6 +61699,8 @@ self: {
pname = "conferer-yaml";
version = "1.1.0.0";
sha256 = "0pqxwwaskj96virs65p7cb6shkjbczmnqwla7rbfga2l0rw9ww0r";
+ revision = "1";
+ editedCabalFile = "0lw22wp8ivza6inm17pbjvr9mwj6p778wn6w6975hb8gf3wa8grf";
libraryHaskellDepends = [ base conferer conferer-aeson yaml ];
testHaskellDepends = [ base conferer conferer-aeson hspec yaml ];
description = "Configuration for reading yaml files";
@@ -61837,10 +61824,10 @@ self: {
}:
mkDerivation {
pname = "config-schema";
- version = "1.2.1.0";
- sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf";
+ version = "1.2.2.0";
+ sha256 = "10mp76j2gxcb51865lb6cf3nkc2nc7fwarkghb6yz71q6sbrg3yx";
revision = "1";
- editedCabalFile = "056iks8k9lhbv34pqk8nisqc7vwzqq0shknixbpkd3vgbd3yksyf";
+ editedCabalFile = "0wswgb6m2whyxddm214fbrq69d9i2wrr6j2hhq1dn8p3gx91q3kv";
libraryHaskellDepends = [
base config-value containers free kan-extensions pretty
semigroupoids text transformers
@@ -62616,8 +62603,8 @@ self: {
}:
mkDerivation {
pname = "construct";
- version = "0.3";
- sha256 = "06h3b1lbq0gdpzz2q5ga0dpgbvyh186z1brzslrwdmkp8qxx883x";
+ version = "0.3.0.1";
+ sha256 = "09x70cvfvkl2rw3r850whw3rbc47yp2w66qmfjzdd9fki31612kc";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
@@ -63710,15 +63697,14 @@ self: {
}:
mkDerivation {
pname = "copilot";
- version = "3.2";
- sha256 = "1d1b70kal17aiflhvzz59ahc6iyyln3d70xvhjjjh7j7la03xm8h";
+ version = "3.2.1";
+ sha256 = "1gxa2sc6n7hswkzqrr9dzzgwynw7sdvccyigfhm7gcy1l79gl3iq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base copilot-c99 copilot-core copilot-language copilot-libraries
copilot-theorem directory filepath optparse-applicative
];
- executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
description = "A stream DSL for writing embedded C programs";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -63733,8 +63719,8 @@ self: {
}:
mkDerivation {
pname = "copilot-c99";
- version = "3.2";
- sha256 = "0q0v8xwmcbvi2yvz0nn1kc3ms0i3g74f2k66gwhnznnvldr99qh2";
+ version = "3.2.1";
+ sha256 = "0wi4bd0hmh05z6m7mjl69z1arhnw08v75hnwzxl6dibkrymmq286";
libraryHaskellDepends = [
base containers copilot-core directory filepath language-c99
language-c99-simple language-c99-util mtl pretty
@@ -63771,8 +63757,8 @@ self: {
({ mkDerivation, base, dlist, mtl, pretty }:
mkDerivation {
pname = "copilot-core";
- version = "3.2";
- sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga";
+ version = "3.2.1";
+ sha256 = "1h9wqv75s49vvqagcdkxx8n5vwn0fsh271v2jm60msssdd7ljwp6";
libraryHaskellDepends = [ base dlist mtl pretty ];
description = "An intermediate representation for Copilot";
license = lib.licenses.bsd3;
@@ -63784,8 +63770,8 @@ self: {
}:
mkDerivation {
pname = "copilot-language";
- version = "3.2";
- sha256 = "1vx2i20ndphcb7gl252wnk2bim2dcg3552yfa0rpkh8axkiwmnpa";
+ version = "3.2.1";
+ sha256 = "03r50k3i24rzjkc1maklq7351flzjv3cc2i6d1shib3dklzjsw8l";
libraryHaskellDepends = [
array base containers copilot-core copilot-theorem data-reify
ghc-prim mtl
@@ -63802,8 +63788,8 @@ self: {
}:
mkDerivation {
pname = "copilot-libraries";
- version = "3.2";
- sha256 = "0sjl6bk2fzba2zj0m41si0i2jr8pcwf96zc1vscwmhfg48hqxjg1";
+ version = "3.2.1";
+ sha256 = "1grcpc9lmqvsi3cb9j45w6hvqdljv7z0yylxf3i2i5y931gj6gpv";
libraryHaskellDepends = [
array base containers copilot-language data-reify mtl parsec
];
@@ -63831,17 +63817,19 @@ self: {
}) {};
"copilot-theorem" = callPackage
- ({ mkDerivation, ansi-terminal, base, bimap, containers
- , copilot-core, data-default, directory, mtl, parsec, pretty
- , process, random, transformers, xml
+ ({ mkDerivation, ansi-terminal, base, bimap, bv-sized, containers
+ , copilot-core, data-default, directory, filepath, mtl, panic
+ , parameterized-utils, parsec, pretty, process, random
+ , transformers, what4, xml
}:
mkDerivation {
pname = "copilot-theorem";
- version = "3.2";
- sha256 = "1l0vmxlrygvxq23nvjss8x53qlfhbshp5vlh3cs6mviv1hmpbg7v";
+ version = "3.2.1";
+ sha256 = "1vns5bavlm95hc57qwwjpzaq0xj5pv3dk2n1ac0rbjdbpsa3dl4l";
libraryHaskellDepends = [
- ansi-terminal base bimap containers copilot-core data-default
- directory mtl parsec pretty process random transformers xml
+ ansi-terminal base bimap bv-sized containers copilot-core
+ data-default directory filepath mtl panic parameterized-utils
+ parsec pretty process random transformers what4 xml
];
description = "k-induction for Copilot";
license = lib.licenses.bsd3;
@@ -65711,8 +65699,8 @@ self: {
pname = "crypt-sha512";
version = "0";
sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
- revision = "4";
- editedCabalFile = "0a4282bhh21l7vk79hpgcz7kj9n05r0ilgdksjkimkydg7sxgldb";
+ revision = "5";
+ editedCabalFile = "0gyfz45izn6s7syd028bbwczp4a8qfhbkbvpir5ssfhqbql4qsv1";
libraryHaskellDepends = [
attoparsec base bytestring cryptohash-sha512
];
@@ -66815,8 +66803,8 @@ self: {
}:
mkDerivation {
pname = "css-selectors";
- version = "0.2.0.0";
- sha256 = "1wyc06f14nj5v5ysjly3jimja3y47pvnm8vm2knlw3sli1h0pgxi";
+ version = "0.2.1.0";
+ sha256 = "1kcxbvp96imhkdrd7w9g2z4d586lmdcpnbgl8g5w04ri85qsq162";
libraryHaskellDepends = [
aeson array base blaze-markup data-default Decimal QuickCheck
shakespeare template-haskell text
@@ -72128,28 +72116,6 @@ self: {
}) {};
"deferred-folds" = callPackage
- ({ mkDerivation, base, bytestring, containers, foldl, hashable
- , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
- , tasty-hunit, tasty-quickcheck, text, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "deferred-folds";
- version = "0.9.16";
- sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1";
- libraryHaskellDepends = [
- base bytestring containers foldl hashable primitive text
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- QuickCheck quickcheck-instances rerebase tasty tasty-hunit
- tasty-quickcheck
- ];
- description = "Abstractions over deferred folds";
- license = lib.licenses.mit;
- }) {};
-
- "deferred-folds_0_9_17" = callPackage
({ mkDerivation, base, bytestring, containers, foldl, hashable
, primitive, QuickCheck, quickcheck-instances, rerebase, tasty
, tasty-hunit, tasty-quickcheck, text, transformers
@@ -72169,7 +72135,6 @@ self: {
];
description = "Abstractions over deferred folds";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"definitive-base" = callPackage
@@ -74328,8 +74293,6 @@ self: {
doHaddock = false;
description = "Embedded domain-specific language for declarative vector graphics";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"diagrams-boolean" = callPackage
@@ -74474,8 +74437,6 @@ self: {
];
description = "Collection of user contributions to diagrams EDSL";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"diagrams-core" = callPackage
@@ -74495,8 +74456,6 @@ self: {
];
description = "Core libraries for diagrams EDSL";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"diagrams-graphviz" = callPackage
@@ -74633,8 +74592,6 @@ self: {
benchmarkHaskellDepends = [ base criterion diagrams-core ];
description = "Embedded domain-specific language for declarative graphics";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"diagrams-pandoc" = callPackage
@@ -74722,8 +74679,6 @@ self: {
];
description = "Postscript backend for diagrams drawing EDSL";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"diagrams-qrcode" = callPackage
@@ -74836,8 +74791,6 @@ self: {
];
description = "SVG backend for diagrams drawing EDSL";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"diagrams-tikz" = callPackage
@@ -76005,8 +75958,8 @@ self: {
pname = "directory";
version = "1.3.6.1";
sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi";
- revision = "1";
- editedCabalFile = "1rf2w9gx0vy74mgsf5q1y82bhm5ngb9mi0i2v2h6ss9gscyvgb7j";
+ revision = "2";
+ editedCabalFile = "14kwmqa1pf1bij7qang5aihw38ch7m5prsics0p0y72jkxx98y48";
libraryHaskellDepends = [ base filepath time unix ];
testHaskellDepends = [ base filepath time unix ];
description = "Platform-agnostic library for filesystem operations";
@@ -78357,8 +78310,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "Generate driver file for doctest's cabal integration";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"doctest-exitcode-stdio" = callPackage
@@ -79845,20 +79796,20 @@ self: {
"dsv" = callPackage
({ mkDerivation, attoparsec, base, bytestring, cassava, containers
- , doctest, foldl, hedgehog, pipes, pipes-bytestring, pipes-safe
+ , foldl, hedgehog, pipes, pipes-bytestring, pipes-safe
, safe-exceptions, template-haskell, text, validation, vector
}:
mkDerivation {
pname = "dsv";
- version = "1.0.0.0";
- sha256 = "0fjfpa8qfaiy7wxmq9lsacxywrsqahl8s8wamxfiai7mzq2201gn";
+ version = "1.0.0.1";
+ sha256 = "1lf6fan0mis0hs30yfpslfyj0gpk028z24wca3lylq877pq7z6nz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
attoparsec base bytestring cassava containers foldl pipes
pipes-bytestring pipes-safe template-haskell text validation vector
];
testHaskellDepends = [
- base bytestring containers doctest foldl hedgehog safe-exceptions
+ base bytestring containers foldl hedgehog pipes safe-exceptions
text vector
];
description = "DSV (delimiter-separated values)";
@@ -80014,8 +79965,6 @@ self: {
];
description = "Rose trees with cached and accumulating monoidal annotations";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"dualizer" = callPackage
@@ -88484,8 +88433,6 @@ self: {
];
description = "Library for producing fake data";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"fakedata-parser" = callPackage
@@ -88513,8 +88460,6 @@ self: {
];
description = "Fake a -> Gen a";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"fakefs" = callPackage
@@ -88565,8 +88510,8 @@ self: {
}:
mkDerivation {
pname = "faktory";
- version = "1.0.2.0";
- sha256 = "1i16g4sj5qrbyldyylggcammr2fs0dvi9hc986ijpv3iy0ryqkmw";
+ version = "1.0.2.1";
+ sha256 = "0n1pcchzb5bxhykdjdri84g0hnbrzd76brpqqx8f6yhwll5vaxsq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89740,27 +89685,25 @@ self: {
}) {};
"feed" = callPackage
- ({ mkDerivation, base, base-compat, bytestring, HUnit
- , markdown-unlit, old-locale, old-time, safe, syb, test-framework
- , test-framework-hunit, text, time, time-locale-compat, utf8-string
- , xml-conduit, xml-types
+ ({ mkDerivation, base, base-compat, bytestring, doctest
+ , doctest-driver-gen, HUnit, markdown-unlit, old-locale, old-time
+ , safe, syb, test-framework, test-framework-hunit, text, time
+ , time-locale-compat, utf8-string, xml-conduit, xml-types
}:
mkDerivation {
pname = "feed";
- version = "1.3.0.1";
- sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj";
- revision = "1";
- editedCabalFile = "0wlffsawz87ks8zf686q01qvcwzi3352l45f1yww5w063ih6j7ld";
+ version = "1.3.2.0";
+ sha256 = "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base base-compat bytestring old-locale old-time safe text time
time-locale-compat utf8-string xml-conduit xml-types
];
testHaskellDepends = [
- base base-compat HUnit old-time syb test-framework
- test-framework-hunit text time xml-conduit xml-types
+ base base-compat doctest doctest-driver-gen HUnit old-time syb
+ test-framework test-framework-hunit text time xml-conduit xml-types
];
- testToolDepends = [ markdown-unlit ];
+ testToolDepends = [ doctest-driver-gen markdown-unlit ];
description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
license = lib.licenses.bsd3;
}) {};
@@ -90680,8 +90623,8 @@ self: {
pname = "file-embed-lzma";
version = "0";
sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78";
- revision = "5";
- editedCabalFile = "1rkya7m491b3asfhpygwz97gzfh46f9h1bi6b4isbslpj50k2h6l";
+ revision = "6";
+ editedCabalFile = "0m2ay6krrjs2cgmy7divlavx0wvgwhwgba97f1m3ppcxxm1y4ikv";
libraryHaskellDepends = [
base base-compat bytestring directory filepath lzma
template-haskell text th-lift-instances transformers
@@ -91550,16 +91493,14 @@ self: {
}) {};
"first-class-families" = callPackage
- ({ mkDerivation, base, doctest, Glob }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "first-class-families";
- version = "0.8.0.0";
- sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav";
- revision = "1";
- editedCabalFile = "02z6wixk9kdgshxsz99lag29lb70kadg9wn6vsgk906wj014fv52";
+ version = "0.8.0.1";
+ sha256 = "0wnsq69f2br9h9hnf8sx41pchwjag86hb41ivjl7wx81psyqy72a";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base doctest Glob ];
- description = "First class type families";
+ testHaskellDepends = [ base ];
+ description = "First-class type families";
license = lib.licenses.mit;
}) {};
@@ -91766,6 +91707,24 @@ self: {
broken = true;
}) {};
+ "fix-whitespace" = callPackage
+ ({ mkDerivation, base, directory, extra, filepath, filepattern
+ , text, yaml
+ }:
+ mkDerivation {
+ pname = "fix-whitespace";
+ version = "0.0.5";
+ sha256 = "1774h18dqarkbsdq47cx1zrxx0k1a7asxngz85yz5vrc2aa37hy7";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base directory extra filepath filepattern text yaml
+ ];
+ description = "Fixes whitespace issues";
+ license = "unknown";
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"fixed" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -92757,10 +92716,8 @@ self: {
}:
mkDerivation {
pname = "flock";
- version = "0.3.1.8";
- sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
- revision = "6";
- editedCabalFile = "04cz4avwglnjgmsbkaadlfrzaadcfkcqzrbc4x9nbzi695zs8k21";
+ version = "0.3.2";
+ sha256 = "0zi04gmrjda11zp8y7zx6r9hkz00wplvjj7sn6q7lbm2h5kv20xr";
libraryHaskellDepends = [
base lifted-base monad-control transformers unix
];
@@ -93928,8 +93885,6 @@ self: {
];
description = "Simple force-directed layout";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"fordo" = callPackage
@@ -99901,6 +99856,32 @@ self: {
license = lib.licenses.mit;
}) {};
+ "genvalidity-persistent" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq, genvalidity
+ , genvalidity-containers, genvalidity-criterion, genvalidity-hspec
+ , hspec, persistent, persistent-template, QuickCheck
+ , validity-containers, validity-persistent
+ }:
+ mkDerivation {
+ pname = "genvalidity-persistent";
+ version = "0.0.0.0";
+ sha256 = "01gnwvfa1hlyr35rafvdb9rz8axbnqw7nl182wf6j4pjy40iff17";
+ libraryHaskellDepends = [
+ base containers genvalidity genvalidity-containers persistent
+ QuickCheck validity-containers validity-persistent
+ ];
+ testHaskellDepends = [
+ base genvalidity genvalidity-hspec hspec persistent
+ persistent-template QuickCheck validity-containers
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq genvalidity genvalidity-criterion persistent
+ persistent-template
+ ];
+ description = "GenValidity support for Persistent";
+ license = lib.licenses.mit;
+ }) {};
+
"genvalidity-property" = callPackage
({ mkDerivation, base, directory, doctest, filepath, genvalidity
, hspec, pretty-show, QuickCheck, validity
@@ -99935,6 +99916,107 @@ self: {
license = lib.licenses.mit;
}) {};
+ "genvalidity-sydtest" = callPackage
+ ({ mkDerivation, base, genvalidity, pretty-show, QuickCheck
+ , sydtest, sydtest-discover, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-sydtest";
+ version = "0.0.0.0";
+ sha256 = "1jgrhdjxin1zwgf2b03fpcfivyq30idnh2qcw3604bsq5cn0wca0";
+ libraryHaskellDepends = [
+ base genvalidity pretty-show QuickCheck sydtest validity
+ ];
+ testHaskellDepends = [ base genvalidity QuickCheck sydtest ];
+ testToolDepends = [ sydtest-discover ];
+ description = "Standard properties for functions on `Validity` types for the sydtest framework";
+ license = lib.licenses.mit;
+ }) {};
+
+ "genvalidity-sydtest-aeson" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, deepseq, genvalidity
+ , genvalidity-aeson, genvalidity-sydtest, genvalidity-text
+ , QuickCheck, sydtest, sydtest-discover, text, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-sydtest-aeson";
+ version = "0.0.0.0";
+ sha256 = "1lpiinb06hl8y91nxp4n4id2vyxs3yww5wb5jczpr9fk1fbb6qbz";
+ libraryHaskellDepends = [
+ aeson base bytestring deepseq genvalidity genvalidity-sydtest
+ QuickCheck sydtest
+ ];
+ testHaskellDepends = [
+ aeson base genvalidity genvalidity-aeson genvalidity-sydtest
+ genvalidity-text QuickCheck sydtest text validity
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "Standard spec's for aeson-related instances in sydtest";
+ license = lib.licenses.mit;
+ }) {};
+
+ "genvalidity-sydtest-hashable" = callPackage
+ ({ mkDerivation, base, genvalidity, genvalidity-sydtest, hashable
+ , QuickCheck, sydtest, sydtest-discover, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-sydtest-hashable";
+ version = "0.0.0.0";
+ sha256 = "0ii3s69alncyrjz410d1cvx5rgdff1cyc9ddin0xrsrz23sxi06m";
+ libraryHaskellDepends = [
+ base genvalidity genvalidity-sydtest hashable QuickCheck sydtest
+ validity
+ ];
+ testHaskellDepends = [
+ base genvalidity genvalidity-sydtest hashable QuickCheck sydtest
+ validity
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "Standard spec's for Hashable instances for sydtest";
+ license = lib.licenses.mit;
+ }) {};
+
+ "genvalidity-sydtest-lens" = callPackage
+ ({ mkDerivation, base, genvalidity, genvalidity-sydtest, microlens
+ , QuickCheck, sydtest, sydtest-discover, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-sydtest-lens";
+ version = "0.0.0.0";
+ sha256 = "1f8wb0pa703r6hgdbhi343rfjcf2q78qfn6x3dmc94d3vd17wyvj";
+ libraryHaskellDepends = [
+ base genvalidity genvalidity-sydtest microlens QuickCheck sydtest
+ ];
+ testHaskellDepends = [
+ base genvalidity genvalidity-sydtest microlens sydtest validity
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "Standard spec's for lens for sydtest";
+ license = lib.licenses.mit;
+ }) {};
+
+ "genvalidity-sydtest-persistent" = callPackage
+ ({ mkDerivation, base, genvalidity, genvalidity-sydtest
+ , genvalidity-text, persistent, QuickCheck, sydtest
+ , sydtest-discover, text, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-sydtest-persistent";
+ version = "0.0.0.1";
+ sha256 = "07y7478lcmpb44bwj7pppv4pfb44wh9hynwawx1czkjf6jnggwcm";
+ libraryHaskellDepends = [
+ base genvalidity genvalidity-sydtest persistent QuickCheck sydtest
+ text
+ ];
+ testHaskellDepends = [
+ base genvalidity genvalidity-sydtest genvalidity-text persistent
+ QuickCheck sydtest text validity
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "Standard spec's for persistent-related instances for sydtest";
+ license = lib.licenses.mit;
+ }) {};
+
"genvalidity-text" = callPackage
({ mkDerivation, array, base, criterion, genvalidity
, genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck
@@ -100749,6 +100831,26 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "ghc-events_0_16_0" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, containers, text
+ , vector
+ }:
+ mkDerivation {
+ pname = "ghc-events";
+ version = "0.16.0";
+ sha256 = "0cr6aj4v9j2fadwhhifjlbg4anyc05phfmy3pvd9h7gn12a2ydr9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers text vector
+ ];
+ executableHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base ];
+ description = "Library and tool for parsing .eventlog files from GHC";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-events-analyze" = callPackage
({ mkDerivation, base, blaze-svg, bytestring, containers
, diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens
@@ -101054,14 +101156,14 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "ghc-lib-parser-ex_9_0_0_3" = callPackage
+ "ghc-lib-parser-ex_9_0_0_4" = callPackage
({ mkDerivation, base, bytestring, containers, directory, extra
, filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate
}:
mkDerivation {
pname = "ghc-lib-parser-ex";
- version = "9.0.0.3";
- sha256 = "1kc6p5ciymq8rbgk4jj1hawmjhkj1yjzkxj9jjyqlgzs09i3dsw3";
+ version = "9.0.0.4";
+ sha256 = "11j1k26h7px9fydrwi5x9d9ckivc4xdsw4gzb7xhpzdq60f8af66";
libraryHaskellDepends = [
base bytestring containers ghc-lib-parser uniplate
];
@@ -101507,6 +101609,22 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "ghc-syntax-highlighter_0_0_7_0" = callPackage
+ ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text
+ }:
+ mkDerivation {
+ pname = "ghc-syntax-highlighter";
+ version = "0.0.7.0";
+ sha256 = "123kvcdlzx18n14122xbpp587byfd8w0z886grlxkzinb53bmzg6";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base ghc-lib-parser text ];
+ testHaskellDepends = [ base hspec text ];
+ testToolDepends = [ hspec-discover ];
+ description = "Syntax highlighter for Haskell using lexer of GHC itself";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghc-tags-core" = callPackage
({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion
, deepseq, directory, filepath, filepath-bytestring, ghc, lattices
@@ -101957,68 +102075,6 @@ self: {
}) {};
"ghcide" = callPackage
- ({ mkDerivation, aeson, array, async, base, base16-bytestring
- , binary, bytestring, case-insensitive, containers, cryptohash-sha1
- , data-default, deepseq, directory, dlist, extra, filepath
- , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
- , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
- , haddock-library, hashable, haskell-lsp, haskell-lsp-types
- , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty
- , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
- , opentelemetry, optparse-applicative, parallel, prettyprinter
- , prettyprinter-ansi-terminal, process, QuickCheck
- , quickcheck-instances, record-dot-preprocessor, record-hasfield
- , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
- , shake, shake-bench, sorted-list, stm, syb, tasty
- , tasty-expected-failure, tasty-hunit, tasty-quickcheck
- , tasty-rerun, text, time, transformers, unix, unordered-containers
- , utf8-string, vector, yaml
- }:
- mkDerivation {
- pname = "ghcide";
- version = "0.7.3.0";
- sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson array async base base16-bytestring binary bytestring
- case-insensitive containers cryptohash-sha1 data-default deepseq
- directory dlist extra filepath fingertree fuzzy ghc ghc-boot
- ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library
- hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat
- hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri
- opentelemetry parallel prettyprinter prettyprinter-ansi-terminal
- regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake
- sorted-list stm syb text time transformers unix
- unordered-containers utf8-string vector
- ];
- executableHaskellDepends = [
- aeson base bytestring containers data-default directory extra
- filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
- hie-bios hls-plugin-api lens lsp-test optparse-applicative process
- safe-exceptions shake text unordered-containers
- ];
- testHaskellDepends = [
- aeson base binary bytestring containers data-default directory
- extra filepath ghc ghc-typelits-knownnat haddock-library
- haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test
- network-uri optparse-applicative process QuickCheck
- quickcheck-instances record-dot-preprocessor record-hasfield
- rope-utf16-splay safe safe-exceptions shake tasty
- tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
- text
- ];
- benchmarkHaskellDepends = [
- aeson base directory filepath shake shake-bench text yaml
- ];
- benchmarkToolDepends = [ hp2pretty ];
- description = "The core of an IDE";
- license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {shake-bench = null;};
-
- "ghcide_1_0_0_0" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, bytestring-encoding, case-insensitive
, containers, cryptohash-sha1, data-default, deepseq, dependent-map
@@ -102079,9 +102135,7 @@ self: {
benchmarkToolDepends = [ hp2pretty implicit-hie ];
description = "The core of an IDE";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {shake-bench = null;};
+ }) {};
"ghcjs-ajax" = callPackage
({ mkDerivation, aeson, base, http-types, text }:
@@ -103804,8 +103858,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "8.20210223";
- sha256 = "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832";
+ version = "8.20210310";
+ sha256 = "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -105346,15 +105400,15 @@ self: {
, bytestring, Cabal, config-schema, config-value, containers
, directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
, HUnit, irc-core, kan-extensions, lens, network, process, psqueues
- , random, regex-tdfa, semigroupoids, split, stm, template-haskell
- , text, time, transformers, unix, unordered-containers, vector, vty
+ , random, regex-tdfa, split, stm, template-haskell, text, time
+ , transformers, unix, unordered-containers, vector, vty
}:
mkDerivation {
pname = "glirc";
- version = "2.37";
- sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn";
+ version = "2.38";
+ sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7";
revision = "1";
- editedCabalFile = "19y9hhn24w6lqdwv1skijrvj5plqs3xqcz3h8wv1ax8g8ak07xsx";
+ editedCabalFile = "04f35w57jq6gpi6d3d83c9bswwl724rbd0dbl835ilhl18kpfscj";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -105362,8 +105416,8 @@ self: {
async attoparsec base base64-bytestring bytestring config-schema
config-value containers directory filepath free gitrev hashable
hookup HsOpenSSL irc-core kan-extensions lens network process
- psqueues random regex-tdfa semigroupoids split stm template-haskell
- text time transformers unix unordered-containers vector vty
+ psqueues random regex-tdfa split stm template-haskell text time
+ transformers unix unordered-containers vector vty
];
executableHaskellDepends = [ base lens text vty ];
testHaskellDepends = [ base HUnit ];
@@ -109208,8 +109262,8 @@ self: {
}:
mkDerivation {
pname = "gothic";
- version = "0.1.5";
- sha256 = "1f8n15cxh4c5m3pylssfksiw3qary8jkl7wabq4gl5zqw2r9ki62";
+ version = "0.1.6";
+ sha256 = "0p1hc4gpgn0djvyksc9nyi4r4lqapk6x5vfv2x514szw8z11h44s";
libraryHaskellDepends = [
aeson base binary bytestring connection exceptions hashable
http-client http-client-tls http-conduit http-types lens lens-aeson
@@ -109497,22 +109551,22 @@ self: {
}) {};
"grammatical-parsers" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest
- , checkers, containers, criterion, deepseq, doctest, input-parsers
+ ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, checkers
+ , containers, criterion, deepseq, doctest, input-parsers
, markdown-unlit, monoid-subclasses, parsers, QuickCheck
, rank2classes, size-based, tasty, tasty-quickcheck, testing-feat
- , text, transformers
+ , text, transformers, witherable-class
}:
mkDerivation {
pname = "grammatical-parsers";
- version = "0.5";
- sha256 = "1kf3wwbk1skp6cm78h6fs2494597sdz82gaq5zx3cwfzgn4swmgx";
+ version = "0.5.1";
+ sha256 = "1y5w49bcfbadchy580q5dnkgl0k5daqykc2jhz8yai94pr43ishg";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- attoparsec base bytestring containers input-parsers
- monoid-subclasses parsers rank2classes transformers
+ attoparsec base containers input-parsers monoid-subclasses parsers
+ rank2classes transformers witherable-class
];
executableHaskellDepends = [
base containers monoid-subclasses parsers rank2classes
@@ -113444,8 +113498,8 @@ self: {
pname = "hackage-repo-tool";
version = "0.1.1.2";
sha256 = "1zgsmibi24w2wsd828hnls1yv9lrl9xwsi2aay3d603j8mg8vd0r";
- revision = "1";
- editedCabalFile = "1x8cqmfyc168jrmvg2c8as1gj4qys10hyr71nmcyskvqrk5bsxf8";
+ revision = "2";
+ editedCabalFile = "1djx6x1y6d7j319ba211hl7scwh4pfyd7vrrbvhdralwnwsx5zkp";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -113471,8 +113525,8 @@ self: {
pname = "hackage-security";
version = "0.6.0.1";
sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli";
- revision = "4";
- editedCabalFile = "06d4xqmpqarisxlm0sp87w2z9rl62p08z5ra5swkvfwn36i9zr15";
+ revision = "5";
+ editedCabalFile = "0vr2fcgp3pjjnp0sy7mvbabqh92215alw62f70pjys9i4z1ks977";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring Cabal
containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -113496,6 +113550,8 @@ self: {
pname = "hackage-security-HTTP";
version = "0.1.1.1";
sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2";
+ revision = "1";
+ editedCabalFile = "18b22jjg5nbfvb83yc36gy25y9v5d1p4z2n89cazzn16hlf813xk";
libraryHaskellDepends = [
base bytestring hackage-security HTTP mtl network network-uri zlib
];
@@ -113990,35 +114046,6 @@ self: {
}) {};
"hadolint" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, containers
- , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit
- , language-docker, megaparsec, mtl, optparse-applicative, parallel
- , ShellCheck, split, text, void
- }:
- mkDerivation {
- pname = "hadolint";
- version = "1.22.1";
- sha256 = "0138hn6c7lrq9xjsmngdj1h2m2ayxx6wqqgjw66pv7sgxsfy0zji";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson async base bytestring containers cryptonite directory
- filepath HsYAML language-docker megaparsec mtl parallel ShellCheck
- split text void
- ];
- executableHaskellDepends = [
- base containers gitrev language-docker megaparsec
- optparse-applicative text
- ];
- testHaskellDepends = [
- aeson base bytestring hspec HsYAML HUnit language-docker megaparsec
- ShellCheck split text
- ];
- description = "Dockerfile Linter JavaScript API";
- license = lib.licenses.gpl3;
- }) {};
-
- "hadolint_1_23_0" = callPackage
({ mkDerivation, aeson, async, base, bytestring, colourista
, containers, cryptonite, deepseq, directory, filepath, gitrev
, hspec, HsYAML, HUnit, ilist, language-docker, megaparsec, mtl
@@ -114045,7 +114072,6 @@ self: {
];
description = "Dockerfile Linter JavaScript API";
license = lib.licenses.gpl3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hadoop-formats" = callPackage
@@ -114753,10 +114779,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-convert";
- version = "0.3.0.3";
- sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf";
- revision = "2";
- editedCabalFile = "0jzc6c8z173mcvrndxny5dx24mx5p10p7pkp68lkl1jl135np6bp";
+ version = "0.3.0.4";
+ sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118541,49 +118565,51 @@ self: {
}) {};
"haskell-language-server" = callPackage
- ({ mkDerivation, aeson, base, binary, blaze-markup, brittany
- , bytestring, containers, data-default, deepseq, directory, extra
- , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths
- , ghcide, gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin
- , hls-eval-plugin, hls-explicit-imports-plugin
- , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api
- , hls-retrie-plugin, hls-splice-plugin, hls-tactics-plugin
- , hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test
+ ({ mkDerivation, aeson, async, base, base16-bytestring, binary
+ , blaze-markup, brittany, bytestring, containers, cryptohash-sha1
+ , data-default, deepseq, directory, extra, filepath, floskell
+ , fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev
+ , hashable, hie-bios, hiedb, hls-class-plugin, hls-eval-plugin
+ , hls-explicit-imports-plugin, hls-haddock-comments-plugin
+ , hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
+ , hls-splice-plugin, hls-tactics-plugin, hslogger, hspec
+ , hspec-core, hspec-expectations, lens, lsp, lsp-test, megaparsec
, mtl, optparse-applicative, optparse-simple, ormolu, process
- , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty
- , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
- , tasty-rerun, temporary, text, transformers, unordered-containers
- , with-utf8, yaml
+ , regex-tdfa, safe-exceptions, shake, sqlite-simple, stm
+ , stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure
+ , tasty-golden, tasty-hunit, tasty-rerun, temporary, text
+ , transformers, unordered-containers, with-utf8, yaml
}:
mkDerivation {
pname = "haskell-language-server";
- version = "0.9.0.0";
- sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm";
- revision = "7";
- editedCabalFile = "11dfc9887aq521ywm0m5gpmihvvkypkr3y1cfk6afg210ij6ka40";
+ version = "1.0.0.0";
+ sha256 = "0jchps7rwsbfq1fsyyf4jgxb4b11d8c3iaq2p4c5vz7vz2d6w1s3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers data-default directory extra filepath ghc ghcide
- gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
- optparse-simple process shake text unordered-containers
+ async base base16-bytestring bytestring containers cryptohash-sha1
+ data-default directory extra filepath ghc ghcide gitrev hie-bios
+ hiedb hls-plugin-api hslogger lsp optparse-applicative
+ optparse-simple process safe-exceptions shake sqlite-simple text
+ unordered-containers
];
executableHaskellDepends = [
- aeson base binary brittany bytestring containers deepseq directory
- extra filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths
- ghcide gitrev hashable haskell-lsp hie-bios hls-class-plugin
- hls-eval-plugin hls-explicit-imports-plugin
- hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api
- hls-retrie-plugin hls-splice-plugin hls-tactics-plugin hslogger
- lens mtl optparse-applicative optparse-simple ormolu process
- regex-tdfa safe-exceptions shake stylish-haskell temporary text
- transformers unordered-containers with-utf8
+ aeson async base base16-bytestring binary brittany bytestring
+ containers cryptohash-sha1 data-default deepseq directory extra
+ filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide
+ gitrev hashable hie-bios hiedb hls-class-plugin hls-eval-plugin
+ hls-explicit-imports-plugin hls-haddock-comments-plugin
+ hls-hlint-plugin hls-plugin-api hls-retrie-plugin hls-splice-plugin
+ hls-tactics-plugin hslogger lens lsp mtl optparse-applicative
+ optparse-simple ormolu process regex-tdfa safe-exceptions shake
+ sqlite-simple stylish-haskell temporary text transformers
+ unordered-containers with-utf8
];
testHaskellDepends = [
- aeson base blaze-markup bytestring containers data-default
- directory extra filepath ghcide haskell-lsp hie-bios hls-plugin-api
- hslogger hspec hspec-core hspec-expectations lens lsp-test process
- stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
+ aeson base blaze-markup bytestring containers data-default deepseq
+ directory extra filepath ghcide hie-bios hls-plugin-api hslogger
+ hspec hspec-core hspec-expectations lens lsp lsp-test megaparsec
+ process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
tasty-hunit tasty-rerun temporary text transformers
unordered-containers yaml
];
@@ -119439,21 +119465,21 @@ self: {
"haskell-to-elm" = callPackage
({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop, text
- , time, unordered-containers
+ , time, unordered-containers, vector
}:
mkDerivation {
pname = "haskell-to-elm";
- version = "0.3.1.0";
- sha256 = "0gplmz0s874zi8y8m06mlr3lipyffw0p6lfz6snl0sgdmynjg786";
+ version = "0.3.2.0";
+ sha256 = "17r1yf2xp1idpq22f67192i511w7ydpfw728f5g3fz67lbahpq3k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bound elm-syntax generics-sop text time
- unordered-containers
+ unordered-containers vector
];
testHaskellDepends = [
aeson base bound elm-syntax generics-sop text time
- unordered-containers
+ unordered-containers vector
];
description = "Generate Elm types and JSON encoders and decoders from Haskell types";
license = lib.licenses.bsd3;
@@ -120806,8 +120832,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.17.1";
- sha256 = "07p58jf2vn7hyk260ijimg2lyg3jcsqnza8v6kjcn6rjlsvcakvp";
+ version = "0.17.2";
+ sha256 = "04i8016qrrwzbz8yxnppfzlrba1d86zp2j71dqd0p7lc3341caa8";
libraryHaskellDepends = [
base bytestring cereal conduit conduit-extra containers
data-default hashable haskoin-core monad-logger mtl network nqe
@@ -120891,8 +120917,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.47.3";
- sha256 = "0z3rhxfnk1985lmfzajipkzajya2vrfh0p5c66kk03vysvssjzpi";
+ version = "0.49.0";
+ sha256 = "126krbi29jxi978my3wg8cl2gqpr0xn0fmbz6fxqcbbcwi75fa30";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -120937,8 +120963,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store-data";
- version = "0.47.3";
- sha256 = "0i7jf832q2lv8h82sf4y3a81j8y4ipw653q32jfnxhjjbnfxccly";
+ version = "0.49.0";
+ sha256 = "1v9zb3m1pvhbqm6pxzy2w8ipyxnv80gw8xlsr25fj0g2ylifkjb2";
libraryHaskellDepends = [
aeson base binary bytes bytestring cereal containers data-default
deepseq hashable haskoin-core http-client http-types lens mtl
@@ -123272,18 +123298,16 @@ self: {
, bytestring, clock, concurrent-extra, containers, data-default
, directory, ekg, ekg-core, exceptions, fast-logger, filepath
, hashable, hashtables, heavy-logger, hsyslog, http-types
- , megaparsec, microlens, monad-metrics, mtl, mwc-random
+ , megaparsec, microlens, monad-metrics, mtl, mwc-random, network
, optparse-applicative, psqueues, random, random-access-file
- , scotty, stm, stm-containers, store, template-haskell, text
- , text-format-heavy, unix, unix-bytestring, unordered-containers
- , yaml
+ , random-shuffle, scotty, stm, stm-containers, store
+ , template-haskell, text, text-format-heavy, unix, unix-bytestring
+ , unordered-containers, vector, wai, warp, yaml
}:
mkDerivation {
pname = "hcheckers";
- version = "0.1.0.0";
- sha256 = "17px41lgaqxpwmmj315s49hnchq5pn017k58wcla8cmw4n3a2aw0";
- revision = "1";
- editedCabalFile = "1bfm9wndgwz18gxws456h4faw3fa6d1020kxjc7b3rzb9c0nr2vq";
+ version = "0.1.0.1";
+ sha256 = "1l4cj7v4scnz5cq05294ym4gyv163ry09bpxp1vg1m1v88ww5i2w";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -123291,9 +123315,10 @@ self: {
concurrent-extra containers data-default directory ekg ekg-core
exceptions fast-logger filepath hashable hashtables heavy-logger
hsyslog http-types megaparsec microlens monad-metrics mtl
- mwc-random optparse-applicative psqueues random random-access-file
- scotty stm stm-containers store template-haskell text
- text-format-heavy unix unix-bytestring unordered-containers yaml
+ mwc-random network optparse-applicative psqueues random
+ random-access-file random-shuffle scotty stm stm-containers store
+ template-haskell text text-format-heavy unix unix-bytestring
+ unordered-containers vector wai warp yaml
];
description = "Implementation of checkers (\"draughts\") board game - server application";
license = lib.licenses.bsd3;
@@ -124019,33 +124044,6 @@ self: {
}) {};
"headroom" = callPackage
- ({ mkDerivation, aeson, base, data-default-class, doctest, either
- , file-embed, hspec, hspec-discover, microlens, microlens-th
- , mustache, optparse-applicative, pcre-heavy, pcre-light
- , QuickCheck, rio, template-haskell, time, yaml
- }:
- mkDerivation {
- pname = "headroom";
- version = "0.3.2.0";
- sha256 = "0770d1b8ikijkmqqnb6nygqj7cv6fphz1165x478ry61sr3i6hs3";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base data-default-class either file-embed microlens
- microlens-th mustache optparse-applicative pcre-heavy pcre-light
- rio template-haskell time yaml
- ];
- executableHaskellDepends = [ base optparse-applicative rio ];
- testHaskellDepends = [
- aeson base doctest hspec optparse-applicative pcre-light QuickCheck
- rio time
- ];
- testToolDepends = [ hspec-discover ];
- description = "License Header Manager";
- license = lib.licenses.bsd3;
- }) {};
-
- "headroom_0_4_0_0" = callPackage
({ mkDerivation, aeson, base, doctest, either, file-embed
, generic-data, hspec, hspec-discover, microlens, microlens-th, mtl
, mustache, optparse-applicative, pcre-heavy, pcre-light
@@ -124070,7 +124068,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "License Header Manager";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"heap" = callPackage
@@ -124450,6 +124447,31 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hedgehog_1_0_5" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, bytestring
+ , concurrent-output, containers, deepseq, directory, erf
+ , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show
+ , primitive, random, resourcet, stm, template-haskell, text, time
+ , transformers, transformers-base, wl-pprint-annotated
+ }:
+ mkDerivation {
+ pname = "hedgehog";
+ version = "1.0.5";
+ sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6";
+ libraryHaskellDepends = [
+ ansi-terminal async base bytestring concurrent-output containers
+ deepseq directory erf exceptions lifted-async mmorph monad-control
+ mtl pretty-show primitive random resourcet stm template-haskell
+ text time transformers transformers-base wl-pprint-annotated
+ ];
+ testHaskellDepends = [
+ base containers mmorph mtl pretty-show text transformers
+ ];
+ description = "Release with confidence";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hedgehog-checkers" = callPackage
({ mkDerivation, base, containers, either, hedgehog, semigroupoids
, semigroups
@@ -125406,40 +125428,41 @@ self: {
, bdw-gc, binary, binary-conduit, boost, bytestring, cachix
, cachix-api, conduit, conduit-extra, containers, directory, dlist
, exceptions, filepath, hercules-ci-api-agent, hercules-ci-api-core
- , hostname, hspec, http-client, http-client-tls, http-conduit
- , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async
- , lifted-base, monad-control, mtl, network, network-uri, nix
- , optparse-applicative, process, protolude, safe-exceptions
- , servant, servant-auth-client, servant-client, servant-client-core
- , stm, temporary, text, time, tomland, transformers
- , transformers-base, unbounded-delays, unix, unliftio
+ , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec
+ , http-client, http-client-tls, http-conduit, inline-c
+ , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base
+ , monad-control, mtl, network, network-uri, nix
+ , optparse-applicative, process, process-extras, protolude
+ , safe-exceptions, servant, servant-auth-client, servant-client
+ , servant-client-core, stm, temporary, text, time, tomland
+ , transformers, transformers-base, unbounded-delays, unix, unliftio
, unliftio-core, unordered-containers, uuid, vector, websockets
, wuss
}:
mkDerivation {
pname = "hercules-ci-agent";
- version = "0.7.5";
- sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq";
+ version = "0.8.0";
+ sha256 = "1nwdi442ccm1x2isxdlh3rpcw627wjccdb4y40w2qna6dchx7v9z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson async base binary binary-conduit bytestring cachix conduit
- containers dlist exceptions hercules-ci-api-agent inline-c
- inline-c-cpp katip lifted-async lifted-base monad-control mtl
- network-uri optparse-applicative process protolude safe-exceptions
- stm text time transformers-base unbounded-delays unliftio
- unliftio-core uuid websockets wuss
+ aeson async base binary binary-conduit bytestring conduit
+ containers directory dlist exceptions filepath
+ hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store
+ katip lens lens-aeson lifted-async lifted-base monad-control mtl
+ network-uri process process-extras protolude safe-exceptions stm
+ temporary text time transformers-base unbounded-delays unix
+ unliftio unliftio-core uuid websockets wuss
];
- librarySystemDepends = [ boost ];
- libraryPkgconfigDepends = [ bdw-gc nix ];
executableHaskellDepends = [
aeson async attoparsec base base64-bytestring binary binary-conduit
bytestring cachix cachix-api conduit conduit-extra containers
directory dlist exceptions filepath hercules-ci-api-agent
- hercules-ci-api-core hostname http-client http-client-tls
- http-conduit inline-c inline-c-cpp katip lens lens-aeson
- lifted-async lifted-base monad-control mtl network network-uri
- optparse-applicative process protolude safe-exceptions servant
+ hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store
+ hostname http-client http-client-tls http-conduit inline-c
+ inline-c-cpp katip lens lens-aeson lifted-async lifted-base
+ monad-control mtl network network-uri optparse-applicative process
+ process-extras protolude safe-exceptions servant
servant-auth-client servant-client servant-client-core stm
temporary text time tomland transformers transformers-base unix
unliftio unliftio-core unordered-containers uuid vector websockets
@@ -125450,41 +125473,69 @@ self: {
testHaskellDepends = [
aeson async attoparsec base binary binary-conduit bytestring
conduit containers exceptions filepath hercules-ci-api-agent
- hercules-ci-api-core hspec katip lifted-async lifted-base
- monad-control optparse-applicative process protolude
+ hercules-ci-api-core hercules-ci-cnix-store hspec katip
+ lifted-async lifted-base monad-control process protolude
safe-exceptions text transformers-base unliftio-core
];
- doHaddock = false;
description = "Runs Continuous Integration tasks on your machines";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ roberth ];
}) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
+ "hercules-ci-api" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, cookie
+ , exceptions, hashable, hercules-ci-api-core, http-api-data
+ , http-media, lens, lens-aeson, memory, network-uri, profunctors
+ , servant, servant-auth, servant-auth-swagger, servant-swagger
+ , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid
+ }:
+ mkDerivation {
+ pname = "hercules-ci-api";
+ version = "0.6.0.0";
+ sha256 = "11ha3jvwg501n9all4v5r057qr9m9qbmbrkiv5l04mrsi5pvhpw7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers cookie exceptions hashable
+ hercules-ci-api-core http-api-data http-media lens lens-aeson
+ memory network-uri profunctors servant servant-auth
+ servant-auth-swagger servant-swagger servant-swagger-ui-core
+ string-conv swagger2 text time uuid
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring containers cookie exceptions hashable
+ http-api-data http-media lens memory network-uri profunctors
+ servant servant-auth servant-auth-swagger servant-swagger
+ servant-swagger-ui-core string-conv swagger2 text time uuid
+ ];
+ description = "Hercules CI API definition with Servant";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ roberth ];
+ }) {};
+
"hercules-ci-api-agent" = callPackage
({ mkDerivation, aeson, base, base64-bytestring-type, bytestring
- , containers, cookie, exceptions, hashable, hercules-ci-api-core
- , hspec, http-api-data, http-media, lens, lens-aeson, memory
- , network-uri, profunctors, QuickCheck, servant, servant-auth
- , servant-auth-swagger, servant-swagger, servant-swagger-ui-core
- , string-conv, swagger2, text, time, uuid, vector
+ , containers, cookie, deepseq, exceptions, hashable
+ , hercules-ci-api-core, hspec, http-api-data, http-media, lens
+ , lens-aeson, memory, network-uri, profunctors, QuickCheck
+ , quickcheck-classes, servant, servant-auth, string-conv, swagger2
+ , text, time, uuid, vector
}:
mkDerivation {
pname = "hercules-ci-api-agent";
- version = "0.2.2.0";
- sha256 = "1pp0ink132wwj2wzj7ficxzxhj09bl3fm62fmslrl3l579ycbp7d";
+ version = "0.3.0.0";
+ sha256 = "161ghlz5n6na4sviwyxxq78hj37yk89kri0367xx9dbsllgfc7g6";
libraryHaskellDepends = [
aeson base base64-bytestring-type bytestring containers cookie
- exceptions hashable hercules-ci-api-core http-api-data http-media
- lens lens-aeson memory servant servant-auth servant-auth-swagger
- servant-swagger servant-swagger-ui-core string-conv swagger2 text
- time uuid vector
+ deepseq exceptions hashable hercules-ci-api-core http-api-data
+ http-media lens lens-aeson memory servant servant-auth string-conv
+ swagger2 text time uuid vector
];
testHaskellDepends = [
aeson base bytestring containers cookie exceptions hashable hspec
http-api-data http-media lens memory network-uri profunctors
- QuickCheck servant servant-auth servant-auth-swagger
- servant-swagger servant-swagger-ui-core string-conv swagger2 text
- time uuid
+ QuickCheck quickcheck-classes servant servant-auth string-conv
+ swagger2 text time uuid vector
];
description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
license = lib.licenses.asl20;
@@ -125493,17 +125544,17 @@ self: {
"hercules-ci-api-core" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, cookie
- , exceptions, hashable, http-api-data, http-media, katip, lens
- , lifted-base, memory, monad-control, safe-exceptions, servant
- , servant-auth, servant-auth-swagger, servant-swagger
+ , deepseq, exceptions, hashable, http-api-data, http-media, katip
+ , lens, lifted-base, memory, monad-control, safe-exceptions
+ , servant, servant-auth, servant-auth-swagger, servant-swagger
, servant-swagger-ui-core, string-conv, swagger2, text, time, uuid
}:
mkDerivation {
pname = "hercules-ci-api-core";
- version = "0.1.1.0";
- sha256 = "19qxbarnl65gqg52ysl12nggyc64860chdcl0vm3i3fny4vsqbcq";
+ version = "0.1.2.0";
+ sha256 = "1p2vv5dviac73qi42x7kf09wgc3qjdkpldn7yj5vhmxhcnj7yj6x";
libraryHaskellDepends = [
- aeson base bytestring containers cookie exceptions hashable
+ aeson base bytestring containers cookie deepseq exceptions hashable
http-api-data http-media katip lens lifted-base memory
monad-control safe-exceptions servant servant-auth
servant-auth-swagger servant-swagger servant-swagger-ui-core
@@ -125514,6 +125565,67 @@ self: {
maintainers = with lib.maintainers; [ roberth ];
}) {};
+ "hercules-ci-cli" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, atomic-write, attoparsec
+ , base, bytestring, conduit, containers, data-has, directory
+ , exceptions, filepath, hercules-ci-agent, hercules-ci-api
+ , hercules-ci-api-core, hercules-ci-cnix-expr
+ , hercules-ci-cnix-store, hercules-ci-optparse-applicative
+ , hostname, hspec, http-client, http-client-tls, http-types, katip
+ , lifted-base, monad-control, network-uri, process, protolude
+ , QuickCheck, rio, safe-exceptions, servant, servant-auth-client
+ , servant-client, servant-client-core, servant-conduit, temporary
+ , text, transformers-base, unix, unliftio, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hercules-ci-cli";
+ version = "0.1.0";
+ sha256 = "1fcg1fd2jd0334nhwsipyf468a4kkdhbibyhhjyspqagswaanm9q";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty atomic-write attoparsec base bytestring conduit
+ containers data-has directory exceptions filepath hercules-ci-agent
+ hercules-ci-api hercules-ci-api-core hercules-ci-cnix-expr
+ hercules-ci-cnix-store hercules-ci-optparse-applicative hostname
+ http-client http-client-tls http-types katip lifted-base
+ monad-control network-uri process protolude rio safe-exceptions
+ servant servant-auth-client servant-client servant-client-core
+ servant-conduit temporary text transformers-base unix unliftio
+ unordered-containers
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec protolude QuickCheck
+ unordered-containers
+ ];
+ description = "The hci command for working with Hercules CI";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = with lib.maintainers; [ roberth ];
+ broken = true;
+ }) {hercules-ci-optparse-applicative = null;};
+
+ "hercules-ci-cnix-expr" = callPackage
+ ({ mkDerivation, aeson, base, bdw-gc, boost, bytestring, conduit
+ , containers, exceptions, hercules-ci-cnix-store, inline-c
+ , inline-c-cpp, nix, protolude, text
+ }:
+ mkDerivation {
+ pname = "hercules-ci-cnix-expr";
+ version = "0.1.0.0";
+ sha256 = "1f9pq6z5xvmq7hd136dshazybazydsmah5f5h8w82yi12ccyqlaz";
+ libraryHaskellDepends = [
+ aeson base bytestring conduit containers exceptions
+ hercules-ci-cnix-store inline-c inline-c-cpp protolude text
+ ];
+ librarySystemDepends = [ boost ];
+ libraryPkgconfigDepends = [ bdw-gc nix ];
+ description = "Bindings for the Nix evaluator";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ roberth ];
+ }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
+
"hercules-ci-cnix-store" = callPackage
({ mkDerivation, base, boost, bytestring, conduit, containers
, inline-c, inline-c-cpp, nix, protolude, unliftio-core
@@ -125530,6 +125642,7 @@ self: {
libraryPkgconfigDepends = [ nix ];
description = "Haskell bindings for Nix's libstore";
license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ roberth ];
}) {inherit (pkgs) boost; inherit (pkgs) nix;};
"here" = callPackage
@@ -127416,8 +127529,6 @@ self: {
];
description = "Generates a references DB from .hie files";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"hieraclus" = callPackage
@@ -129114,8 +129225,8 @@ self: {
}:
mkDerivation {
pname = "hledger";
- version = "1.20.4";
- sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95";
+ version = "1.21";
+ sha256 = "07fcfkmv4cy92njnf2qc7jh0naz96q962hxldcd7hk4k7ddv0mss";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129240,10 +129351,8 @@ self: {
}:
mkDerivation {
pname = "hledger-iadd";
- version = "1.3.12";
- sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048";
- revision = "2";
- editedCabalFile = "1n43j7fh3d9f8jn1y40vhkfh7yfwb4sixm3wyrfj20mkr7yyr732";
+ version = "1.3.13";
+ sha256 = "19i5cr11zm4d27x2gddxy4993jgmf4ghgpvx8fw4acadwbvlnjvg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129271,10 +129380,8 @@ self: {
}:
mkDerivation {
pname = "hledger-interest";
- version = "1.6.0";
- sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq";
- revision = "1";
- editedCabalFile = "10v3fwyzbaqzrldaswvn031hncxy2sra302n10k4zkxg41bz7f73";
+ version = "1.6.1";
+ sha256 = "0i97y7rs5kd2dqk3qwd2jg17vs9ib4yvkaqlljnb32x16gphpvhc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -129311,20 +129418,20 @@ self: {
, cassava, cassava-megaparsec, cmdargs, containers, data-default
, Decimal, directory, doctest, extra, file-embed, filepath, Glob
, hashtables, megaparsec, mtl, old-time, parser-combinators
- , pretty-simple, regex-tdfa, safe, split, tabular, tasty
- , tasty-hunit, template-haskell, text, time, timeit, transformers
- , uglymemo, unordered-containers, utf8-string
+ , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit
+ , template-haskell, text, time, timeit, transformers, uglymemo
+ , unordered-containers, utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.20.4";
- sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw";
+ version = "1.21";
+ sha256 = "00prslqk8vnbyz388cpc0nsamzy8xcjzday5q9n3m9lx4p2dhb5y";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
cmdargs containers data-default Decimal directory extra file-embed
filepath Glob hashtables megaparsec mtl old-time parser-combinators
- pretty-simple regex-tdfa safe split tabular tasty tasty-hunit
+ pretty-simple regex-tdfa safe tabular tasty tasty-hunit
template-haskell text time timeit transformers uglymemo
unordered-containers utf8-string
];
@@ -129333,9 +129440,9 @@ self: {
blaze-markup bytestring call-stack cassava cassava-megaparsec
cmdargs containers data-default Decimal directory doctest extra
file-embed filepath Glob hashtables megaparsec mtl old-time
- parser-combinators pretty-simple regex-tdfa safe split tabular
- tasty tasty-hunit template-haskell text time timeit transformers
- uglymemo unordered-containers utf8-string
+ parser-combinators pretty-simple regex-tdfa safe tabular tasty
+ tasty-hunit template-haskell text time timeit transformers uglymemo
+ unordered-containers utf8-string
];
description = "A reusable library providing the core functionality of hledger";
license = lib.licenses.gpl3;
@@ -129394,8 +129501,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.20.4";
- sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i";
+ version = "1.21";
+ sha256 = "1h9d686z0y8cvq6780g6r8fdrs76y9649js0c350b6xnhzggbx0l";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -129441,8 +129548,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.20.4";
- sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4";
+ version = "1.21";
+ sha256 = "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129710,23 +129817,6 @@ self: {
}) {};
"hls-class-plugin" = callPackage
- ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
- , ghcide, haskell-lsp, hls-plugin-api, lens, shake, text
- , transformers, unordered-containers
- }:
- mkDerivation {
- pname = "hls-class-plugin";
- version = "0.1.0.1";
- sha256 = "198r8kly4fgm9xsngkzhljbq1j764asc0xba757zasmgndvri2r7";
- libraryHaskellDepends = [
- aeson base containers ghc ghc-exactprint ghcide haskell-lsp
- hls-plugin-api lens shake text transformers unordered-containers
- ];
- description = "Class/instance management plugin for Haskell Language Server";
- license = lib.licenses.asl20;
- }) {};
-
- "hls-class-plugin_1_0_0_0" = callPackage
({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
, ghcide, hls-plugin-api, lens, lsp, shake, text, transformers
, unordered-containers
@@ -129741,27 +129831,26 @@ self: {
];
description = "Class/instance management plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hls-eval-plugin" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
, dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
- , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens
- , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck
- , safe-exceptions, shake, temporary, text, time, transformers
+ , hashable, hls-plugin-api, lens, lsp, lsp-types, megaparsec, mtl
+ , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
+ , shake, temporary, text, time, transformers, unliftio
, unordered-containers
}:
mkDerivation {
pname = "hls-eval-plugin";
- version = "0.2.0.0";
- sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5";
+ version = "1.0.0.0";
+ sha256 = "0pslyhgvs6xrwijkyf4jdh873mnsb8iijmkbc9aq3dljdy080fdg";
libraryHaskellDepends = [
aeson base containers deepseq Diff directory dlist extra filepath
- ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp
- haskell-lsp-types hls-plugin-api lens megaparsec mtl
- parser-combinators pretty-simple QuickCheck safe-exceptions shake
- temporary text time transformers unordered-containers
+ ghc ghc-boot-th ghc-paths ghcide hashable hls-plugin-api lens lsp
+ lsp-types megaparsec mtl parser-combinators pretty-simple
+ QuickCheck safe-exceptions shake temporary text time transformers
+ unliftio unordered-containers
];
description = "Eval plugin for Haskell Language Server";
license = lib.licenses.asl20;
@@ -129785,58 +129874,22 @@ self: {
}) {};
"hls-explicit-imports-plugin" = callPackage
- ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
- , haskell-lsp-types, hls-plugin-api, shake, text
- , unordered-containers
- }:
- mkDerivation {
- pname = "hls-explicit-imports-plugin";
- version = "0.1.0.0";
- sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2";
- revision = "1";
- editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms";
- libraryHaskellDepends = [
- aeson base containers deepseq ghc ghcide haskell-lsp-types
- hls-plugin-api shake text unordered-containers
- ];
- description = "Explicit imports plugin for Haskell Language Server";
- license = lib.licenses.asl20;
- }) {};
-
- "hls-explicit-imports-plugin_0_1_0_2" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
, hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers
}:
mkDerivation {
pname = "hls-explicit-imports-plugin";
- version = "0.1.0.2";
- sha256 = "0cfkb7ph6ryakybjxmyf6cc615p57wzv6ys2zy4fak1iib8bzwyx";
+ version = "1.0.0.0";
+ sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w";
libraryHaskellDepends = [
aeson base containers deepseq ghc ghcide hls-plugin-api lsp
lsp-types shake text unordered-containers
];
description = "Explicit imports plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hls-haddock-comments-plugin" = callPackage
- ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
- , haskell-lsp-types, hls-plugin-api, text, unordered-containers
- }:
- mkDerivation {
- pname = "hls-haddock-comments-plugin";
- version = "0.1.1.0";
- sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn";
- libraryHaskellDepends = [
- base containers ghc ghc-exactprint ghcide haskell-lsp-types
- hls-plugin-api text unordered-containers
- ];
- description = "Haddock comments plugin for Haskell Language Server";
- license = lib.licenses.asl20;
- }) {};
-
- "hls-haddock-comments-plugin_1_0_0_0" = callPackage
({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
, hls-plugin-api, lsp-types, text, unordered-containers
}:
@@ -129850,49 +129903,30 @@ self: {
];
description = "Haddock comments plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hls-hlint-plugin" = callPackage
({ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
- , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp
- , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake
- , temporary, text, transformers, unordered-containers
+ , filepath, ghc, ghc-exactprint, ghcide, hashable, hlint
+ , hls-plugin-api, hslogger, lens, lsp, regex-tdfa, shake, temporary
+ , text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-hlint-plugin";
- version = "0.2.0.0";
- sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d";
+ version = "1.0.0.1";
+ sha256 = "0hnfh6x8l20nrj54hpkkq2yj8xkgw15xcba27hagapam2yxi1xga";
libraryHaskellDepends = [
aeson apply-refact base binary bytestring containers data-default
deepseq Diff directory extra filepath ghc ghc-exactprint ghcide
- hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa
- shake temporary text transformers unordered-containers
+ hashable hlint hls-plugin-api hslogger lens lsp regex-tdfa shake
+ temporary text transformers unordered-containers
];
description = "Hlint integration plugin with Haskell Language Server";
license = lib.licenses.asl20;
}) {};
"hls-plugin-api" = callPackage
- ({ mkDerivation, aeson, base, containers, data-default, Diff
- , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
- , text, unix, unordered-containers
- }:
- mkDerivation {
- pname = "hls-plugin-api";
- version = "0.7.0.0";
- sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55";
- libraryHaskellDepends = [
- aeson base containers data-default Diff hashable haskell-lsp
- hslogger lens process regex-tdfa shake text unix
- unordered-containers
- ];
- description = "Haskell Language Server API for plugin communication";
- license = lib.licenses.asl20;
- }) {};
-
- "hls-plugin-api_1_0_0_0" = callPackage
({ mkDerivation, aeson, base, containers, data-default
, dependent-map, dependent-sum, Diff, dlist, hashable, hslogger
, lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix
@@ -129909,37 +129943,17 @@ self: {
];
description = "Haskell Language Server API for plugin communication";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hls-retrie-plugin" = callPackage
- ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
- , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
- , hls-plugin-api, retrie, safe-exceptions, shake, text
- , transformers, unordered-containers
- }:
- mkDerivation {
- pname = "hls-retrie-plugin";
- version = "0.1.1.0";
- sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj";
- libraryHaskellDepends = [
- aeson base containers deepseq directory extra ghc ghcide hashable
- haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
- shake text transformers unordered-containers
- ];
- description = "Retrie integration plugin for Haskell Language Server";
- license = lib.licenses.asl20;
- }) {};
-
- "hls-retrie-plugin_0_1_1_1" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, directory, extra
, ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
, safe-exceptions, shake, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-retrie-plugin";
- version = "0.1.1.1";
- sha256 = "1k85wgnd5f1jqjd09y9gacc5w8kypy84qaly32411xsw4hfsil8a";
+ version = "1.0.0.0";
+ sha256 = "1m4r6nxbq1lvjkl6g1i0lbxdx4zimw6g478alnqv8n208q6fiw26";
libraryHaskellDepends = [
aeson base containers deepseq directory extra ghc ghcide hashable
hls-plugin-api lsp lsp-types retrie safe-exceptions shake text
@@ -129947,56 +129961,27 @@ self: {
];
description = "Retrie integration plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hls-splice-plugin" = callPackage
- ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc
- , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie
- , shake, syb, text, transformers, unordered-containers
+ ({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc
+ , ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake
+ , syb, text, transformers, unliftio-core, unordered-containers
}:
mkDerivation {
pname = "hls-splice-plugin";
- version = "0.3.0.0";
- sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv";
+ version = "1.0.0.0";
+ sha256 = "1xm9ji64g89fn4b81gd5g0ijv88b2zhyn303hr3jxhydqpfcipjb";
libraryHaskellDepends = [
- aeson base containers dlist foldl ghc ghc-exactprint ghcide
- haskell-lsp hls-plugin-api lens retrie shake syb text transformers
- unordered-containers
+ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide
+ hls-plugin-api lens lsp retrie shake syb text transformers
+ unliftio-core unordered-containers
];
description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
license = lib.licenses.asl20;
}) {};
"hls-tactics-plugin" = callPackage
- ({ mkDerivation, aeson, base, checkers, containers, deepseq
- , directory, extra, filepath, fingertree, generic-lens, ghc
- , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp
- , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl
- , QuickCheck, refinery, retrie, shake, syb, text, transformers
- }:
- mkDerivation {
- pname = "hls-tactics-plugin";
- version = "0.5.1.0";
- sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52";
- revision = "1";
- editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl";
- libraryHaskellDepends = [
- aeson base containers deepseq directory extra filepath fingertree
- generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
- haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
- transformers
- ];
- testHaskellDepends = [
- base checkers containers ghc hie-bios hls-plugin-api hspec mtl
- QuickCheck
- ];
- testToolDepends = [ hspec-discover ];
- description = "Tactics plugin for Haskell Language Server";
- license = lib.licenses.asl20;
- }) {};
-
- "hls-tactics-plugin_1_0_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, checkers, containers
, data-default, deepseq, directory, extra, filepath, fingertree
, generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen
@@ -130031,7 +130016,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Wingman plugin for Haskell Language Server";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hlwm" = callPackage
@@ -130109,8 +130093,8 @@ self: {
}:
mkDerivation {
pname = "hmatrix";
- version = "0.20.1";
- sha256 = "0v690zml7yqj6ndjszwqpfsad2vma3m6rdkjs6bnb9k2v35l905i";
+ version = "0.20.2";
+ sha256 = "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg";
configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
libraryHaskellDepends = [
array base binary bytestring deepseq primitive random semigroups
@@ -130641,18 +130625,19 @@ self: {
"hmp3-ng" = callPackage
({ mkDerivation, array, base, binary, bytestring, clock, containers
- , directory, hscurses, monad-extras, mtl, ncurses, pcre-light
- , process, random, unix, utf8-string, zlib
+ , directory, filepath, hscurses, monad-extras, mtl, ncurses
+ , pcre-light, process, random, unix, utf8-string, zlib
}:
mkDerivation {
pname = "hmp3-ng";
- version = "2.9.3";
- sha256 = "0h1lg4faffqf86wk2hi68x3f0y2r2nypqcvb879wal24whh31v7v";
+ version = "2.11.0";
+ sha256 = "1wxjxx7ijw7fsvsfjvfdss5cg8yyd885i3wpnzryv0bhqqa96i1d";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- array base binary bytestring clock containers directory hscurses
- monad-extras mtl pcre-light process random unix utf8-string zlib
+ array base binary bytestring clock containers directory filepath
+ hscurses monad-extras mtl pcre-light process random unix
+ utf8-string zlib
];
executableSystemDepends = [ ncurses ];
description = "A 2019 fork of an ncurses mp3 player written in Haskell";
@@ -131952,8 +131937,8 @@ self: {
}:
mkDerivation {
pname = "hookup";
- version = "0.5";
- sha256 = "1kpwg5jik2z8xrw192mglacgnm2clg9yca68jzk4gk0569krysnf";
+ version = "0.6";
+ sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528";
libraryHaskellDepends = [
async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system
network stm
@@ -132930,8 +132915,8 @@ self: {
}:
mkDerivation {
pname = "hpath";
- version = "0.11.0";
- sha256 = "07p5h68sz079rvhbz9sig4146127l29xsrphd1i3y4gskzwdvy1a";
+ version = "0.12.1";
+ sha256 = "1v5i8gdsb05s2klsrby82ms4sphvgk6k1xvhj2c7g2r3zsn6rxws";
libraryHaskellDepends = [
base bytestring deepseq exceptions hpath-filepath template-haskell
utf8-string word8
@@ -132948,8 +132933,8 @@ self: {
}:
mkDerivation {
pname = "hpath-directory";
- version = "0.14.0";
- sha256 = "1rv2f0vqbivzqgpk3msxgymqmwp159bi6h2hcdgf65v5j3rhv52n";
+ version = "0.14.2";
+ sha256 = "04lkan37v8i1clw459csn8jvkzasz0p8ik8q8slqb9g3a5j68hjy";
libraryHaskellDepends = [
base bytestring exceptions hpath-filepath hpath-posix IfElse
safe-exceptions streamly streamly-bytestring streamly-posix time
@@ -132981,8 +132966,8 @@ self: {
}:
mkDerivation {
pname = "hpath-io";
- version = "0.14.0";
- sha256 = "12awqghnway7fhcyzyy6dj5f9p1z15gbp31r1781n892w3vvk4l9";
+ version = "0.14.2";
+ sha256 = "1xbxkzajzf46qdbhnyn866v12rkynhbsk610ypcfgaj2rm413flr";
libraryHaskellDepends = [
base bytestring exceptions hpath hpath-directory hpath-posix
safe-exceptions streamly time unix
@@ -132995,8 +132980,8 @@ self: {
({ mkDerivation, base, bytestring, hpath-filepath, unix }:
mkDerivation {
pname = "hpath-posix";
- version = "0.13.2";
- sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf";
+ version = "0.13.3";
+ sha256 = "1qnz2y6k5axy1pzgx1hgygxv6rdqx9w9kzjmaf890zifv0vv46as";
libraryHaskellDepends = [ base bytestring hpath-filepath unix ];
description = "Some low-level POSIX glue code, that is not in 'unix'";
license = lib.licenses.bsd3;
@@ -141327,8 +141312,8 @@ self: {
}:
mkDerivation {
pname = "hurl";
- version = "2.1.0.0";
- sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0";
+ version = "2.1.0.1";
+ sha256 = "16j7kxxp60i0nbiscc1x5a14s7n8qyv8rzjm6a03pqdpbmfzrrwq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142543,6 +142528,26 @@ self: {
license = lib.licenses.mit;
}) {};
+ "hw-tar" = callPackage
+ ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog
+ , hw-hspec-hedgehog, process
+ }:
+ mkDerivation {
+ pname = "hw-tar";
+ version = "0.0.0.1";
+ sha256 = "0hzmw0xb10h09q3h25f4lk2pygl0w7nckysa04qr1c26n4hsvrq2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base hedgehog hspec hw-hedgehog hw-hspec-hedgehog process
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Library for creating and extracting tar archives";
+ license = lib.licenses.bsd3;
+ }) {};
+
"hw-uri" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
, antiope-core, antiope-optparse-applicative, antiope-s3, base
@@ -146186,8 +146191,8 @@ self: {
}:
mkDerivation {
pname = "incremental-parser";
- version = "0.5.0.1";
- sha256 = "1j0x52rwp44wdjdyxw3jh6m61vhwa2bf80dfxhqi6iniyc8qzm68";
+ version = "0.5.0.2";
+ sha256 = "15437dkn8j17ba71c3h6ck2f6sbnmp3acg2grg97awb962azm9fj";
libraryHaskellDepends = [
base input-parsers monoid-subclasses parsers rank2classes
transformers
@@ -146659,8 +146664,8 @@ self: {
}:
mkDerivation {
pname = "infernal";
- version = "0.5.0";
- sha256 = "0zn4zj9c9jhvchg6yli3ig2c0hnwpk9na2r0bbizjlngzky6vfrr";
+ version = "0.6.0";
+ sha256 = "1qk0d5k7kjkhqxpkm1fnah1syd0la1z88l5mwv3z6ly5njvj78fl";
libraryHaskellDepends = [
aeson base binary bytestring case-insensitive exceptions hashable
http-client http-types little-logger little-rio microlens
@@ -146796,6 +146801,34 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "influxdb_1_9_1_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, clock, containers, doctest, foldl, http-client
+ , http-types, lens, network, optional-args, raw-strings-qq
+ , scientific, tagged, tasty, tasty-hunit, template-haskell, text
+ , time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "influxdb";
+ version = "1.9.1.1";
+ sha256 = "1qdfrl5ragkn726ymh16p0shgc6sn72gd1hh6a6bw19m527pdcc0";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring clock containers foldl http-client
+ http-types lens network optional-args scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base containers doctest lens raw-strings-qq tasty tasty-hunit
+ template-haskell time vector
+ ];
+ description = "InfluxDB client library for Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"informative" = callPackage
({ mkDerivation, base, containers, csv, highlighting-kate
, http-conduit, monad-logger, pandoc, persistent
@@ -147122,8 +147155,8 @@ self: {
}:
mkDerivation {
pname = "input-parsers";
- version = "0.1.0.1";
- sha256 = "0wqp98ly2f9vnqd97q9jphmxqr284aal40dlrgi4hwy216p67vzz";
+ version = "0.2.1";
+ sha256 = "0hxadh4p007785knx8vah3b2bawaidvi7z4kgyyahj98a5k7qr18";
libraryHaskellDepends = [
attoparsec base binary bytestring monoid-subclasses parsec parsers
text transformers
@@ -147243,16 +147276,17 @@ self: {
"instana-haskell-trace-sdk" = callPackage
({ mkDerivation, aeson, aeson-extra, base, binary, bytestring
- , containers, directory, ekg-core, exceptions, hslogger
- , http-client, http-client-tls, http-types, HUnit, network, process
- , random, regex-base, regex-compat, regex-pcre, regex-tdfa, retry
- , scientific, servant, servant-server, stm, sysinfo, text, time
- , transformers, unix, unordered-containers, wai, warp
+ , case-insensitive, containers, directory, ekg-core, exceptions
+ , hslogger, http-client, http-client-tls, http-types, HUnit
+ , network, process, random, regex-base, regex-compat, regex-pcre
+ , regex-tdfa, retry, scientific, servant, servant-server, stm
+ , sysinfo, text, time, transformers, unix, unordered-containers
+ , wai, warp
}:
mkDerivation {
pname = "instana-haskell-trace-sdk";
- version = "0.5.0.1";
- sha256 = "1414c9jahmkszpag40iyzrr0g346dp9l1ssz60693ivcm0q16pii";
+ version = "0.6.0.0";
+ sha256 = "0b27fvvq1xxici2w33m823xnj7fwq1irjhwrcaav1khz3h93qv85";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -147262,9 +147296,9 @@ self: {
scientific stm sysinfo text time unix unordered-containers wai
];
executableHaskellDepends = [
- aeson base binary bytestring hslogger http-client http-types
- servant servant-server text time transformers unix
- unordered-containers wai warp
+ aeson base binary bytestring case-insensitive containers hslogger
+ http-client http-types servant servant-server text time
+ transformers unix unordered-containers wai warp
];
testHaskellDepends = [
aeson aeson-extra base bytestring directory ekg-core exceptions
@@ -148294,25 +148328,25 @@ self: {
}) {};
"inventory" = callPackage
- ({ mkDerivation, appendmap, base, bytestring, containers, directory
- , filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit
+ ({ mkDerivation, appendmap, array, base, bytestring, containers
+ , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit
}:
mkDerivation {
pname = "inventory";
- version = "0.1.0.2";
- sha256 = "1ykfxlsgnim45b4birflpwj0p3grjw8y4p9vwqnmhss6krl2qk3x";
+ version = "0.1.0.3";
+ sha256 = "1zja3w6xkah7ydzkn5ydibagn4g3fa16xdjsqvkrkv6yfq54g2j7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- appendmap base bytestring containers directory filepath ghc
+ appendmap array base bytestring containers directory filepath ghc
ghc-paths mtl
];
executableHaskellDepends = [
- appendmap base bytestring containers directory filepath ghc
+ appendmap array base bytestring containers directory filepath ghc
ghc-paths mtl
];
testHaskellDepends = [
- appendmap base bytestring containers directory filepath ghc
+ appendmap array base bytestring containers directory filepath ghc
ghc-paths mtl tasty tasty-hunit
];
description = "Project statistics and definition analysis";
@@ -148870,22 +148904,23 @@ self: {
({ mkDerivation, aeson, base, bytestring, directory, directory-tree
, doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson
, monad-logger, QuickCheck, regex-compat, rio, servant
- , servant-client, servant-server, swagger2, text, vector, yaml
+ , servant-client, servant-multipart, servant-server, swagger2, text
+ , vector, yaml
}:
mkDerivation {
pname = "ipfs";
- version = "1.2.0.0";
- sha256 = "12aibxpdkgwym8k8hibb8a77bbf7wd6z5czwpakg48x9gxmvhygn";
+ version = "1.3.0.0";
+ sha256 = "1ag3rx7p4gp39rhgwap083ny5x00z5p8aks1lwvrsmdlvn83ym6l";
libraryHaskellDepends = [
aeson base bytestring envy flow Glob http-media ip lens
- monad-logger regex-compat rio servant servant-client servant-server
- swagger2 text vector
+ monad-logger regex-compat rio servant servant-client
+ servant-multipart servant-server swagger2 text vector
];
testHaskellDepends = [
aeson base bytestring directory directory-tree doctest envy flow
Glob http-media ip lens lens-aeson monad-logger QuickCheck
- regex-compat rio servant servant-client servant-server swagger2
- text vector yaml
+ regex-compat rio servant servant-client servant-multipart
+ servant-server swagger2 text vector yaml
];
description = "Access IPFS locally and remotely";
license = lib.licenses.asl20;
@@ -148975,10 +149010,8 @@ self: {
}:
mkDerivation {
pname = "iproute";
- version = "1.7.10";
- sha256 = "0libq5v22cm6bj1lga1rrkgww50bhnpns7rz7da90yycqv2k7d5m";
- revision = "1";
- editedCabalFile = "02nh8r0c1p8gzq2y82q8n210y3bs146kjv2v7mr8z0m3k0sh5qqs";
+ version = "1.7.11";
+ sha256 = "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90";
libraryHaskellDepends = [
appar base byteorder bytestring containers network
];
@@ -149164,10 +149197,8 @@ self: {
}:
mkDerivation {
pname = "irc-core";
- version = "2.9";
- sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b";
- revision = "1";
- editedCabalFile = "12z28f96iw9jni57rdzy8kz7sa1zwfs5k3fvfmf6sgx6wzhwcm6h";
+ version = "2.10";
+ sha256 = "1x1vmpzmgwxkwcza20yzmymgb7bj04f17xiqvcqg29h53pimnvxj";
libraryHaskellDepends = [
attoparsec base base64-bytestring bytestring hashable primitive
text time vector
@@ -152860,13 +152891,13 @@ self: {
"jsonrpc-conduit" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
- , conduit-extra, hspec, mtl, text, transformers
+ , conduit-extra, hspec, hspec-discover, mtl, text, transformers
, unordered-containers
}:
mkDerivation {
pname = "jsonrpc-conduit";
- version = "0.3.0";
- sha256 = "0kh1s78zqgb4zdy18vckhzjadg33lr98jzpcqgad51phlbkhf94y";
+ version = "0.3.2";
+ sha256 = "00ssz471iv1vc67cbn3q3ghfd0ic8rjrsvkidx7vd6jd1mgw94ga";
libraryHaskellDepends = [
aeson attoparsec base bytestring conduit conduit-extra mtl text
transformers unordered-containers
@@ -152874,6 +152905,7 @@ self: {
testHaskellDepends = [
aeson base bytestring conduit conduit-extra hspec text
];
+ testToolDepends = [ hspec-discover ];
description = "JSON-RPC 2.0 server over a Conduit.";
license = lib.licenses.gpl3;
hydraPlatforms = lib.platforms.none;
@@ -154404,8 +154436,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "keep-alive";
- version = "0.1.1.0";
- sha256 = "1h1x28adh7y561pmmbw064vyz9qx013spkcr8pwg9hjcnzn03yvw";
+ version = "0.2.0.0";
+ sha256 = "1hkmm1933y6dlzr88p75kkl6qiw5jnb1f4klfbwbl2d3jx8fg92k";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "TCP keep alive implementation";
@@ -159666,8 +159698,8 @@ self: {
({ mkDerivation, base, bytestring, text }:
mkDerivation {
pname = "leanpub-concepts";
- version = "1.1";
- sha256 = "0zy26sccxyqhmlk6dfbd7jghwmfi9zkcljb9rcl82ysw7cwyl3qw";
+ version = "1.1.0.1";
+ sha256 = "0ip2kkkkbjf95h9dk9h4c21jz5ygpl1r1rsjdm47dmbvwih6v14c";
libraryHaskellDepends = [ base bytestring text ];
description = "Types for the Leanpub API";
license = lib.licenses.mit;
@@ -159675,15 +159707,17 @@ self: {
"leanpub-wreq" = callPackage
({ mkDerivation, aeson, base, bytestring, exceptions
- , leanpub-concepts, lens, rando, text, time, transformers
+ , leanpub-concepts, mwc-random, text, time, transformers
, unordered-containers, wreq
}:
mkDerivation {
pname = "leanpub-wreq";
- version = "1.1";
- sha256 = "1mk188r1bxg3qhv24nxkqw5vk5jyifxvg171h8bx93s9mmrikzdv";
+ version = "1.1.0.2";
+ sha256 = "1d1lj4ppvir8s2pv0zcsnadhns30h2axzppf6pkgbcnyis75an1h";
+ revision = "1";
+ editedCabalFile = "0zmwi2sfxv29rj28lri4xky0rbz8xky7jnwmbsynqckzn767a2k9";
libraryHaskellDepends = [
- aeson base bytestring exceptions leanpub-concepts lens rando text
+ aeson base bytestring exceptions leanpub-concepts mwc-random text
time transformers unordered-containers wreq
];
description = "Use the Leanpub API via Wreq";
@@ -160217,6 +160251,8 @@ self: {
pname = "lens-family";
version = "2.0.0";
sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7";
+ revision = "1";
+ editedCabalFile = "1nf0zxhwqkg54mc3kimnqcvg9b732rn35r1rjs1fzf0vwssla3zw";
libraryHaskellDepends = [
base containers lens-family-core mtl transformers
];
@@ -160224,14 +160260,14 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "lens-family_2_1_0" = callPackage
+ "lens-family_2_1_1" = callPackage
({ mkDerivation, base, containers, lens-family-core, mtl
, transformers
}:
mkDerivation {
pname = "lens-family";
- version = "2.1.0";
- sha256 = "06imgyd97zyvhd3ifq7wvfvfs10x6gsg4cw4a0y9wa0rm81960hl";
+ version = "2.1.1";
+ sha256 = "1ra31r3y672nyqf7147kxws1qvksgics8pgd6fasyf1v0l3c798j";
libraryHaskellDepends = [
base containers lens-family-core mtl transformers
];
@@ -167752,8 +167788,8 @@ self: {
pname = "lzma";
version = "0.0.0.3";
sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
- revision = "5";
- editedCabalFile = "1m1a3w8cjqz8h4iibkgykzgmrmkxxgz9sm0zn52dbvczdiqbs5y5";
+ revision = "6";
+ editedCabalFile = "1sh2g5wkh0m6646cxnii0k20f0crwdcnprfl9jfg7gxn5875bkip";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ lzma ];
testHaskellDepends = [
@@ -170035,8 +170071,8 @@ self: {
}:
mkDerivation {
pname = "mason";
- version = "0.2.3";
- sha256 = "0iwbdkrlbjn44gj0g43lfajx35jbihw4in5pc8by33ajwix43y5j";
+ version = "0.2.4";
+ sha256 = "1ic2h2mj31hb972x146wn7p29hlmx9p30f5gi2ccqv2ww96l56fv";
libraryHaskellDepends = [
array base bytestring ghc-prim integer-gmp network text
];
@@ -172337,9 +172373,7 @@ self: {
];
description = "Support for using mergeful from persistent-based databases";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {genvalidity-persistent = null; validity-persistent = null;};
+ }) {};
"mergeless" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, mtl, validity
@@ -172377,9 +172411,7 @@ self: {
];
description = "Support for using mergeless from persistent-based databases";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {genvalidity-persistent = null;};
+ }) {};
"merkle-log" = callPackage
({ mkDerivation, base, bytestring, cereal, criterion, cryptonite
@@ -174755,6 +174787,24 @@ self: {
broken = true;
}) {};
+ "mit-3qvpPyAi6mH" = callPackage
+ ({ mkDerivation, base, base64, clock, directory, process
+ , record-dot-preprocessor, record-hasfield, text, text-ansi, unix
+ }:
+ mkDerivation {
+ pname = "mit-3qvpPyAi6mH";
+ version = "2";
+ sha256 = "1cdax4sjjpv7jiszv1319b7n26510pcir1icl6rfq4qbynrg4l00";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base base64 clock directory process record-dot-preprocessor
+ record-hasfield text text-ansi unix
+ ];
+ description = "A git wrapper with a streamlined UX";
+ license = lib.licenses.mit;
+ }) {};
+
"miv" = callPackage
({ mkDerivation, async, base, bytestring, concurrent-output
, containers, directory, filepath, filepattern, ghc-prim, hspec
@@ -174977,10 +175027,8 @@ self: {
}:
mkDerivation {
pname = "mmark";
- version = "0.0.7.2";
- sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm";
- revision = "3";
- editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p";
+ version = "0.0.7.3";
+ sha256 = "1gfl9jhqm1jaqxi0yxd8r4z3ai5c3f1wv53vjs0ln84qjpcqp30s";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers deepseq dlist email-validate
@@ -175031,10 +175079,8 @@ self: {
}:
mkDerivation {
pname = "mmark-ext";
- version = "0.2.1.2";
- sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c";
- revision = "3";
- editedCabalFile = "02i6577qislr0qvgmfamcixpxgb7bh68lg18n3vkq6xbnjxdpwpx";
+ version = "0.2.1.3";
+ sha256 = "1hc95gvw4dyjlf2y4nli68zavjd0aj9br55n7417r7g70si1m82s";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
@@ -175504,32 +175550,6 @@ self: {
}) {};
"modern-uri" = callPackage
- ({ mkDerivation, base, bytestring, containers, contravariant
- , criterion, deepseq, exceptions, hspec, hspec-discover
- , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
- , reflection, tagged, template-haskell, text, weigh
- }:
- mkDerivation {
- pname = "modern-uri";
- version = "0.3.4.0";
- sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk";
- libraryHaskellDepends = [
- base bytestring containers contravariant deepseq exceptions
- megaparsec mtl profunctors QuickCheck reflection tagged
- template-haskell text
- ];
- testHaskellDepends = [
- base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [
- base bytestring criterion deepseq megaparsec text weigh
- ];
- description = "Modern library for working with URIs";
- license = lib.licenses.bsd3;
- }) {};
-
- "modern-uri_0_3_4_1" = callPackage
({ mkDerivation, base, bytestring, containers, contravariant
, criterion, deepseq, exceptions, hspec, hspec-discover
, hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
@@ -175553,7 +175573,6 @@ self: {
];
description = "Modern library for working with URIs";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"modify-fasta" = callPackage
@@ -177113,8 +177132,8 @@ self: {
({ mkDerivation, base, base-compat, stm }:
mkDerivation {
pname = "monad-var";
- version = "0.2.1.0";
- sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
+ version = "0.2.2.0";
+ sha256 = "0idmp912pwlahl5rb9bfx8fr088h9im8pz32bjqm2141b9ci10h8";
libraryHaskellDepends = [ base base-compat stm ];
description = "Generic operations over variables";
license = lib.licenses.bsd3;
@@ -177741,8 +177760,6 @@ self: {
benchmarkHaskellDepends = [ base criterion semigroups ];
description = "Various extra monoid-related definitions and utilities";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"monoid-owns" = callPackage
@@ -177809,6 +177826,26 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "monoid-subclasses_1_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+ , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+ }:
+ mkDerivation {
+ pname = "monoid-subclasses";
+ version = "1.1";
+ sha256 = "1bv0ripdw53121aj39zalczkfwrajpzzd1i99jn49sr4bfwgy3p4";
+ libraryHaskellDepends = [
+ base bytestring containers primes text vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers primes QuickCheck quickcheck-instances
+ tasty tasty-quickcheck text vector
+ ];
+ description = "Subclasses of Monoid";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"monoid-transformer" = callPackage
({ mkDerivation, base, semigroups }:
mkDerivation {
@@ -177967,22 +178004,18 @@ self: {
}) {};
"months" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base-compat, cassava
- , deepseq, hashable, http-api-data, intervals, lens, lucid
- , QuickCheck, swagger2, text, time-compat
+ ({ mkDerivation, aeson, attoparsec, base, base-compat, deepseq
+ , hashable, intervals, QuickCheck, text, time-compat
}:
mkDerivation {
pname = "months";
- version = "0.1";
- sha256 = "000fqmd5j3pxmfa5bpyk5fd0hbn9iq3g5v1slk4hrjdjm8k19wa0";
- revision = "4";
- editedCabalFile = "0rww4x5c4a9n1yrs6ll1irwn1c1fm8s9k1zri3n2n1d6x75brny5";
+ version = "0.2";
+ sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija";
libraryHaskellDepends = [
- aeson attoparsec base base-compat cassava deepseq hashable
- http-api-data intervals lens lucid QuickCheck swagger2 text
- time-compat
+ aeson attoparsec base base-compat deepseq hashable intervals
+ QuickCheck text time-compat
];
- description = "Month, YearMonth, Quarter, YearQuarter types";
+ description = "MonthName";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -179729,8 +179762,8 @@ self: {
}:
mkDerivation {
pname = "mu-graphql";
- version = "0.5.0.1";
- sha256 = "1mcm8db1q0sjzxyjhxd140l966vq6yh8hj1p2xx8yzqmagsfv7kx";
+ version = "0.5.0.2";
+ sha256 = "0kr8gqi34zgg8vj5x0c0mx3xjkhjr4ynparplysga7qzzj58a7f3";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -185922,8 +185955,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export";
- version = "1.7.3";
- sha256 = "18pdvmyhqil98d5mzh8a4r5i3pc4vyj13jcrjjw4q73prcj4mg6p";
+ version = "1.7.4";
+ sha256 = "11qmyj0cdmj9il2w5b25k45q59f1paia5yc98z999lj1fw7x27w6";
libraryHaskellDepends = [
async base binary bytestring deepseq monad-loops template-haskell
unix
@@ -186457,8 +186490,8 @@ self: {
}:
mkDerivation {
pname = "nix-tree";
- version = "0.1.5";
- sha256 = "1iymfgffafqh57m0b8mrsrcd8m6x3wycwm2lly0bz1q4z784k66v";
+ version = "0.1.6";
+ sha256 = "0v8ll12z073g1c9zrgniljvrvniv1nf8p2ak6f24sixnhr8f2hhl";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -187197,6 +187230,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "nonempty-zipper" = callPackage
+ ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }:
+ mkDerivation {
+ pname = "nonempty-zipper";
+ version = "1.0.0.0";
+ sha256 = "0qqdrp1rr1qmgxxzwn21gy1gc9mwdhliyp72d74bndqr3yki46fm";
+ libraryHaskellDepends = [ base comonad deepseq safe ];
+ testHaskellDepends = [ base comonad deepseq doctest Glob safe ];
+ description = "A non-empty comonadic list zipper";
+ license = lib.licenses.mit;
+ }) {};
+
"nonemptymap" = callPackage
({ mkDerivation, base, containers, semigroupoids }:
mkDerivation {
@@ -187681,20 +187726,6 @@ self: {
}) {};
"nri-env-parser" = callPackage
- ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text
- }:
- mkDerivation {
- pname = "nri-env-parser";
- version = "0.1.0.4";
- sha256 = "01s2346rdccnqrymxb947kx68jqdyh29v3s2mq3c707pvmxlhw4y";
- libraryHaskellDepends = [
- base modern-uri network-uri nri-prelude text
- ];
- description = "Read environment variables as settings to build 12-factor apps";
- license = lib.licenses.bsd3;
- }) {};
-
- "nri-env-parser_0_1_0_5" = callPackage
({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text
}:
mkDerivation {
@@ -187706,7 +187737,6 @@ self: {
];
description = "Read environment variables as settings to build 12-factor apps";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"nri-observability" = callPackage
@@ -187734,32 +187764,6 @@ self: {
}) {};
"nri-prelude" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async
- , auto-update, base, bytestring, containers, directory, exceptions
- , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show
- , safe-exceptions, terminal-size, text, time, vector
- }:
- mkDerivation {
- pname = "nri-prelude";
- version = "0.4.0.0";
- sha256 = "032j7wy9wjjv0pbn1g16vdj15j03brkkwa3ssjv7g0v61hjaq4z7";
- libraryHaskellDepends = [
- aeson aeson-pretty ansi-terminal async auto-update base bytestring
- containers directory exceptions filepath ghc hedgehog junit-xml
- pretty-diff pretty-show safe-exceptions terminal-size text time
- vector
- ];
- testHaskellDepends = [
- aeson aeson-pretty ansi-terminal async auto-update base bytestring
- containers directory exceptions filepath ghc hedgehog junit-xml
- pretty-diff pretty-show safe-exceptions terminal-size text time
- vector
- ];
- description = "A Prelude inspired by the Elm programming language";
- license = lib.licenses.bsd3;
- }) {};
-
- "nri-prelude_0_5_0_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async
, auto-update, base, bytestring, containers, directory, exceptions
, filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show
@@ -187783,7 +187787,6 @@ self: {
];
description = "A Prelude inspired by the Elm programming language";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"nsis" = callPackage
@@ -189366,8 +189369,8 @@ self: {
}:
mkDerivation {
pname = "oeis2";
- version = "1.0.4";
- sha256 = "1parmfwdxrmvzz81dy8mb9ry4bbp1bvsqsr593zld7hnfx6cvlh9";
+ version = "1.0.5";
+ sha256 = "1incjy5si6lwsvh2hfdw61m3jq9qad06nrrylj5b8n5yj54wzna8";
libraryHaskellDepends = [
aeson base containers http-conduit lens lens-aeson text vector
];
@@ -189823,14 +189826,13 @@ self: {
}) {};
"one-line-aeson-text" = callPackage
- ({ mkDerivation, aeson, base, doctest, text, unordered-containers
- }:
+ ({ mkDerivation, aeson, base, text, unordered-containers }:
mkDerivation {
pname = "one-line-aeson-text";
- version = "0.1.0.0";
- sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn";
+ version = "0.1.0.2";
+ sha256 = "033dqj6qc0fjq9nq22mbdrhn8nllmx95x785dwv5l7yj7q1rm7q9";
libraryHaskellDepends = [ aeson base text unordered-containers ];
- testHaskellDepends = [ base doctest ];
+ testHaskellDepends = [ aeson base text ];
description = "Pretty-printing short Aeson values as text";
license = lib.licenses.asl20;
}) {};
@@ -190386,45 +190388,6 @@ self: {
}) {};
"openapi3" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
- , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
- , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
- , HUnit, insert-ordered-containers, lens, mtl, network, optics-core
- , optics-th, QuickCheck, quickcheck-instances, scientific
- , template-haskell, text, time, transformers, unordered-containers
- , utf8-string, uuid-types, vector
- }:
- mkDerivation {
- pname = "openapi3";
- version = "3.0.1.0";
- sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc";
- revision = "1";
- editedCabalFile = "017mikhl12iyrgn40mmis3m05bfjxmg9y09nsk7i8xfjzkqcnly0";
- isLibrary = true;
- isExecutable = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- aeson aeson-pretty base base-compat-batteries bytestring containers
- cookie generics-sop hashable http-media insert-ordered-containers
- lens mtl network optics-core optics-th QuickCheck scientific
- template-haskell text time transformers unordered-containers
- uuid-types vector
- ];
- executableHaskellDepends = [ aeson base lens text ];
- testHaskellDepends = [
- aeson base base-compat-batteries bytestring containers doctest Glob
- hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
- quickcheck-instances template-haskell text time
- unordered-containers utf8-string vector
- ];
- testToolDepends = [ hspec-discover ];
- description = "OpenAPI 3.0 data model";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "openapi3_3_0_2_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
, bytestring, Cabal, cabal-doctest, containers, cookie, doctest
, generics-sop, Glob, hashable, hspec, hspec-discover, http-media
@@ -192852,23 +192815,26 @@ self: {
"overloaded" = callPackage
({ mkDerivation, assoc, base, bin, boring, bytestring, constraints
, containers, fin, generic-lens-lite, ghc, hmatrix, HUnit, lens
- , optics-core, QuickCheck, ral, record-hasfield, singleton-bool
- , sop-core, split, syb, symbols, tasty, tasty-hunit
- , tasty-quickcheck, text, time, vec
+ , optics-core, profunctors, QuickCheck, ral, record-hasfield
+ , semigroupoids, singleton-bool, sop-core, split, splitmix, syb
+ , symbols, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , text, th-compat, time, vec
}:
mkDerivation {
pname = "overloaded";
- version = "0.2.1";
- sha256 = "1qa2xq2hf792ivi92mimznwj86x9y1dpwz7rwcz99zvfk7a3hsis";
+ version = "0.3";
+ sha256 = "151xnpk7l1jg63m4bwr91h3dh1xb0d4xinc4vn1jsbhr96p662ap";
libraryHaskellDepends = [
- assoc base bin bytestring containers fin ghc optics-core ral
- record-hasfield sop-core split syb symbols text time vec
+ assoc base bin bytestring containers fin ghc optics-core
+ profunctors ral record-hasfield semigroupoids sop-core split syb
+ symbols template-haskell text th-compat time vec
];
testHaskellDepends = [
assoc base bin boring bytestring constraints containers fin
generic-lens-lite hmatrix HUnit lens optics-core QuickCheck ral
- record-hasfield singleton-bool sop-core symbols tasty tasty-hunit
- tasty-quickcheck text time vec
+ record-hasfield singleton-bool sop-core splitmix symbols tasty
+ tasty-hunit tasty-quickcheck template-haskell text th-compat time
+ vec
];
doHaddock = false;
description = "Overloaded pragmas as a plugin";
@@ -193331,10 +193297,8 @@ self: {
({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
mkDerivation {
pname = "pagination";
- version = "0.2.1";
- sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48";
- revision = "2";
- editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2";
+ version = "0.2.2";
+ sha256 = "0k5rd55ssrk2f4vfzwnz09az6p1d6igbfmyyyjvnwwjrgcsmynig";
libraryHaskellDepends = [ base deepseq exceptions ];
testHaskellDepends = [ base exceptions hspec QuickCheck ];
description = "Framework-agnostic pagination boilerplate";
@@ -193565,6 +193529,65 @@ self: {
maintainers = with lib.maintainers; [ peti ];
}) {};
+ "pandoc_2_12" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+ , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+ , case-insensitive, citeproc, commonmark, commonmark-extensions
+ , commonmark-pandoc, connection, containers, data-default, deepseq
+ , Diff, directory, doclayout, doctemplates, emojis, exceptions
+ , executable-path, file-embed, filepath, Glob, haddock-library
+ , hslua, hslua-module-path, hslua-module-system, hslua-module-text
+ , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb
+ , jira-wiki-markup, JuicyPixels, mtl, network, network-uri
+ , pandoc-types, parsec, process, QuickCheck, random, safe
+ , scientific, SHA, skylighting, skylighting-core, split, syb
+ , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua
+ , tasty-quickcheck, temporary, texmath, text, text-conversions
+ , time, unicode-transforms, unix, unordered-containers, xml
+ , xml-conduit, zip-archive, zlib
+ }:
+ mkDerivation {
+ pname = "pandoc";
+ version = "2.12";
+ sha256 = "0z7j6hqfjis0a9bng7dlkwilksrambdcr72gj3aijv827hmz45sm";
+ configureFlags = [ "-fhttps" "-f-trypandoc" ];
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty attoparsec base base64-bytestring binary
+ blaze-html blaze-markup bytestring case-insensitive citeproc
+ commonmark commonmark-extensions commonmark-pandoc connection
+ containers data-default deepseq directory doclayout doctemplates
+ emojis exceptions file-embed filepath Glob haddock-library hslua
+ hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP
+ http-client http-client-tls http-types ipynb jira-wiki-markup
+ JuicyPixels mtl network network-uri pandoc-types parsec process
+ random safe scientific SHA skylighting skylighting-core split syb
+ tagsoup temporary texmath text text-conversions time
+ unicode-transforms unix unordered-containers xml xml-conduit
+ zip-archive zlib
+ ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [
+ base base64-bytestring bytestring containers Diff directory
+ doctemplates exceptions executable-path filepath Glob hslua mtl
+ pandoc-types process QuickCheck tasty tasty-golden tasty-hunit
+ tasty-lua tasty-quickcheck temporary text time xml zip-archive
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers mtl tasty tasty-bench text time
+ ];
+ postInstall = ''
+ mkdir -p $out/share/man/man1
+ mv "man/"*.1 $out/share/man/man1/
+ '';
+ description = "Conversion between markup formats";
+ license = lib.licenses.gpl2Plus;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = with lib.maintainers; [ peti ];
+ }) {};
+
"pandoc-citeproc" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -193626,8 +193649,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.9.1";
- sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx";
+ version = "0.3.10.0";
+ sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -193944,40 +193967,6 @@ self: {
}) {};
"pandoc-plot" = callPackage
- ({ mkDerivation, base, bytestring, containers, criterion
- , data-default, directory, filepath, githash, hashable, hspec
- , hspec-expectations, lifted-async, lifted-base, mtl
- , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup
- , tasty, tasty-hspec, tasty-hunit, template-haskell, text
- , typed-process, yaml
- }:
- mkDerivation {
- pname = "pandoc-plot";
- version = "1.0.2.1";
- sha256 = "0yi1dh6d1zxzrpmh32v0c7v921qjyxmmapzv56vh0ih8mi3ggbji";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring containers data-default directory filepath hashable
- lifted-async lifted-base mtl pandoc pandoc-types shakespeare
- tagsoup template-haskell text typed-process yaml
- ];
- executableHaskellDepends = [
- base containers directory filepath githash optparse-applicative
- pandoc pandoc-types template-haskell text typed-process
- ];
- testHaskellDepends = [
- base containers directory filepath hspec hspec-expectations
- pandoc-types tasty tasty-hspec tasty-hunit text
- ];
- benchmarkHaskellDepends = [
- base criterion pandoc-types template-haskell text
- ];
- description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
- license = lib.licenses.gpl2Plus;
- }) {};
-
- "pandoc-plot_1_1_0" = callPackage
({ mkDerivation, base, bytestring, containers, criterion
, data-default, directory, filepath, githash, hashable, hspec
, hspec-expectations, lifted-async, lifted-base, mtl
@@ -194009,7 +193998,6 @@ self: {
];
description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
license = lib.licenses.gpl2Plus;
- hydraPlatforms = lib.platforms.none;
}) {};
"pandoc-pyplot" = callPackage
@@ -194167,8 +194155,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.3.7";
- sha256 = "0laqf7mfzdpdbg583l3mr25qxdqryq1cd1141gl713d5m9s1b4fs";
+ version = "0.3.8";
+ sha256 = "093m8hds7x5i2kh478l7vcjjv60x68z96dzyxllaw9aijxrw9h3p";
description = "A box of patterns and paradigms";
license = lib.licenses.mit;
}) {};
@@ -195339,8 +195327,8 @@ self: {
pname = "parsec";
version = "3.1.14.0";
sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67";
- revision = "2";
- editedCabalFile = "1xyjd06nns0k65k4ig2azrijy43gnbvpcfwb3jpd8vmn2fnk0yib";
+ revision = "3";
+ editedCabalFile = "1qclpv599691710g321x1864js3gqyfv35xbh6kxlshjdrzcbmbj";
libraryHaskellDepends = [ base bytestring mtl text ];
testHaskellDepends = [
base HUnit mtl test-framework test-framework-hunit
@@ -196104,6 +196092,31 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "password_3_0_0_0" = callPackage
+ ({ mkDerivation, base, base-compat, base64, bytestring, Cabal
+ , cabal-doctest, cryptonite, doctest, memory, password-types
+ , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "password";
+ version = "3.0.0.0";
+ sha256 = "0x6f4zkqqsa6vi5dvy5sj0f7pqkqq9zw3ph9f0d8vl631zcs2inb";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base base64 bytestring cryptonite memory password-types
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring cryptonite doctest memory
+ password-types QuickCheck quickcheck-instances scrypt tasty
+ tasty-hunit tasty-quickcheck template-haskell text
+ ];
+ description = "Hashing and checking of passwords";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"password-instances" = callPackage
({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest
, doctest, http-api-data, password, persistent, QuickCheck
@@ -196127,6 +196140,49 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "password-instances_3_0_0_0" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest
+ , doctest, http-api-data, password, password-types, persistent
+ , QuickCheck, quickcheck-instances, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "password-instances";
+ version = "3.0.0.0";
+ sha256 = "08y42r165n3d7lry160rdmn8akhhfyx76fwjhsqb25zc5a9d5glj";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson base http-api-data password-types persistent text
+ ];
+ testHaskellDepends = [
+ aeson base base-compat doctest http-api-data password
+ password-types persistent QuickCheck quickcheck-instances tasty
+ tasty-hunit tasty-quickcheck template-haskell text
+ ];
+ description = "typeclass instances for password package";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "password-types" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, Cabal
+ , cabal-doctest, doctest, memory, QuickCheck, quickcheck-instances
+ , tasty, tasty-quickcheck, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "password-types";
+ version = "1.0.0.0";
+ sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base bytestring memory text ];
+ testHaskellDepends = [
+ base base-compat doctest QuickCheck quickcheck-instances tasty
+ tasty-quickcheck template-haskell text
+ ];
+ description = "Types for handling passwords";
+ license = lib.licenses.bsd3;
+ }) {};
+
"passwords" = callPackage
({ mkDerivation, base, containers, MonadRandom, random }:
mkDerivation {
@@ -196328,6 +196384,8 @@ self: {
pname = "path";
version = "0.8.0";
sha256 = "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4";
+ revision = "1";
+ editedCabalFile = "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja";
libraryHaskellDepends = [
aeson base deepseq exceptions filepath hashable template-haskell
text
@@ -198591,6 +198649,8 @@ self: {
pname = "persistent-mysql";
version = "2.10.3.1";
sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7";
+ revision = "1";
+ editedCabalFile = "1nd3l499kpv2rfhqqjw1b3qsn558rwz3794cy2x493l98rsspszp";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit containers monad-logger
mysql mysql-simple persistent resource-pool resourcet text
@@ -205659,8 +205719,8 @@ self: {
pname = "postgresql-simple-url";
version = "0.2.1.0";
sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk";
- revision = "3";
- editedCabalFile = "02l1g5jiw6idnnax7q2lzayjycgi029pv41njdmwdch57k59vai5";
+ revision = "4";
+ editedCabalFile = "092gkvwzdf0nmm6q6lgjb81j8vpn5d3pybavs39ya2v92mbhrpmm";
libraryHaskellDepends = [
base network-uri postgresql-simple split
];
@@ -208443,8 +208503,8 @@ self: {
({ mkDerivation, base, directory, mmsyn3, process, sublists }:
mkDerivation {
pname = "process-sequential";
- version = "0.1.0.0";
- sha256 = "11s6ki1cgqav8i06np63cj2l6z1wdszjrq2rslx1pk7af5dxz9r0";
+ version = "0.1.1.0";
+ sha256 = "19dv9sk1hk4ny0zh8amr9bddmjxc94r8h3cims9ylhrrb34zz90f";
libraryHaskellDepends = [ base directory mmsyn3 process sublists ];
description = "A test suite for the complex multi files multi level processment";
license = lib.licenses.mit;
@@ -210196,17 +210256,18 @@ self: {
}) {};
"proton" = callPackage
- ({ mkDerivation, adjunctions, base, bifunctors, comonad
- , compactable, containers, contravariant, distributive, linear, mtl
- , profunctors, tagged
+ ({ mkDerivation, adjunctions, async, base, bifunctors, comonad
+ , compactable, containers, contravariant, distributive, folds
+ , linear, mtl, profunctors, tagged, transformers
}:
mkDerivation {
pname = "proton";
- version = "0.0.1";
- sha256 = "0l3176d1vjvknns2dx7qnwi7n45mc6v4qx9iv3z4488msjfqx6gf";
+ version = "0.0.3";
+ sha256 = "0w68v8sglyg99jni1p1cz6x87cm6x1ayll08wlijaiwpqc2pma2n";
libraryHaskellDepends = [
- adjunctions base bifunctors comonad compactable containers
- contravariant distributive linear mtl profunctors tagged
+ adjunctions async base bifunctors comonad compactable containers
+ contravariant distributive folds linear mtl profunctors tagged
+ transformers
];
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -210336,6 +210397,36 @@ self: {
broken = true;
}) {};
+ "prune-juice" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, Cabal
+ , cabal-install-parsers, containers, directory, file-embed
+ , file-path-th, filepath, hspec, megaparsec, monad-logger, mtl
+ , optparse-applicative, process, text, yaml
+ }:
+ mkDerivation {
+ pname = "prune-juice";
+ version = "0.6";
+ sha256 = "0g7gn0158hkr5b27iqlzmhnarb05y5id92qk2jl6azqnzrb2p5j7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring Cabal cabal-install-parsers containers
+ directory filepath megaparsec monad-logger mtl process text yaml
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring Cabal cabal-install-parsers containers
+ directory filepath megaparsec monad-logger mtl optparse-applicative
+ process text yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring Cabal cabal-install-parsers containers
+ directory file-embed file-path-th filepath hspec megaparsec
+ monad-logger mtl process text yaml
+ ];
+ description = "Prune unused Haskell dependencies";
+ license = lib.licenses.mit;
+ }) {};
+
"psc-ide" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, edit-distance, either, filepath, fsnotify, hspec, http-client
@@ -211499,27 +211590,6 @@ self: {
}) {};
"pusher-http-haskell" = callPackage
- ({ mkDerivation, aeson, base, base16-bytestring, bytestring
- , cryptonite, hashable, hspec, http-client, http-client-tls
- , http-types, memory, QuickCheck, text, time, unordered-containers
- }:
- mkDerivation {
- pname = "pusher-http-haskell";
- version = "2.0.0.3";
- sha256 = "0h53y0jxk1nyqwyr4f0nry0gl64s1w8ay15fips4drql37apbq1v";
- libraryHaskellDepends = [
- aeson base base16-bytestring bytestring cryptonite hashable
- http-client http-client-tls http-types memory text time
- unordered-containers
- ];
- testHaskellDepends = [
- aeson base bytestring hspec QuickCheck text unordered-containers
- ];
- description = "Haskell client library for the Pusher Channels HTTP API";
- license = lib.licenses.mit;
- }) {};
-
- "pusher-http-haskell_2_1_0_0" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, cryptonite, hashable, hspec, http-client, http-client-tls
, http-types, memory, QuickCheck, text, time, unordered-containers
@@ -211538,7 +211608,6 @@ self: {
];
description = "Haskell client library for the Pusher Channels HTTP API";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"pusher-ws" = callPackage
@@ -214932,8 +215001,8 @@ self: {
pname = "range-set-list";
version = "0.1.3.1";
sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j";
- revision = "1";
- editedCabalFile = "0ma1gxmk2in2fj4rxhwshy2zq690ylw1zz0c9cnyin8mxkp96inc";
+ revision = "2";
+ editedCabalFile = "08b5zlc2q3nyxxjzzigjbjygvd2001i2w3vslacib3kxm4569n8v";
libraryHaskellDepends = [ base containers deepseq hashable ];
testHaskellDepends = [
base containers deepseq hashable tasty tasty-quickcheck
@@ -215339,8 +215408,8 @@ self: {
pname = "rasterific-svg";
version = "0.3.3.2";
sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2";
- revision = "1";
- editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv";
+ revision = "2";
+ editedCabalFile = "1938sp9m0yi7ypxk74bzrbkp9b4yk6hsaqhlhbraf9yb7w61228v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -216637,8 +216706,8 @@ self: {
}:
mkDerivation {
pname = "reanimate";
- version = "1.1.3.3";
- sha256 = "1d348fpfzfqi3vm8qzdxbbdrx62awxx0hrnj3vw1szp41an6ya30";
+ version = "1.1.4.0";
+ sha256 = "0gz651ipn5w6w7adxkvkcgi6nb1d2vs72l8glz5jdll44mchdk55";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal array attoparsec base base64-bytestring
@@ -216851,23 +216920,6 @@ self: {
}) {};
"record-dot-preprocessor" = callPackage
- ({ mkDerivation, base, extra, filepath, ghc, record-hasfield
- , uniplate
- }:
- mkDerivation {
- pname = "record-dot-preprocessor";
- version = "0.2.9";
- sha256 = "02g36p14waf66lwwy2s4jy19pmkxv46kqfkkipy7qix3vaffbzir";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base extra ghc uniplate ];
- executableHaskellDepends = [ base extra ];
- testHaskellDepends = [ base extra filepath record-hasfield ];
- description = "Preprocessor to allow record.field syntax";
- license = lib.licenses.bsd3;
- }) {};
-
- "record-dot-preprocessor_0_2_10" = callPackage
({ mkDerivation, base, extra, filepath, ghc, record-hasfield
, uniplate
}:
@@ -216882,7 +216934,6 @@ self: {
testHaskellDepends = [ base extra filepath record-hasfield ];
description = "Preprocessor to allow record.field syntax";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"record-encode" = callPackage
@@ -217049,6 +217100,26 @@ self: {
broken = true;
}) {};
+ "recover-rtti" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, ghc-heap
+ , ghc-prim, mtl, QuickCheck, sop-core, stm, tasty, tasty-quickcheck
+ , text, vector
+ }:
+ mkDerivation {
+ pname = "recover-rtti";
+ version = "0.1.0.0";
+ sha256 = "19bf4279nfq8sv20v56sah30mv2g10zy2yxcylhc33w85d9jkisl";
+ libraryHaskellDepends = [
+ aeson base bytestring containers ghc-heap mtl sop-core stm text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers ghc-heap ghc-prim mtl QuickCheck
+ sop-core stm tasty tasty-quickcheck text vector
+ ];
+ description = "Recover run-time type information from the GHC heap";
+ license = lib.licenses.bsd3;
+ }) {};
+
"recursion" = callPackage
({ mkDerivation, base, composition-prelude }:
mkDerivation {
@@ -218931,6 +219002,22 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "regex-pcre-builtin_0_95_2_3_8_43" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, regex-base
+ , text
+ }:
+ mkDerivation {
+ pname = "regex-pcre-builtin";
+ version = "0.95.2.3.8.43";
+ sha256 = "02c6vzxcy1zkqwy6w4dsc97xvvdwlh8xr7imrlx2qs2521rvswr7";
+ libraryHaskellDepends = [
+ array base bytestring containers regex-base text
+ ];
+ description = "PCRE Backend for \"Text.Regex\" (regex-base)";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"regex-pcre-text" = callPackage
({ mkDerivation, array, base, bytestring, regex-base
, regex-pcre-builtin, regex-tdfa-text, text
@@ -221081,8 +221168,8 @@ self: {
}:
mkDerivation {
pname = "rescue";
- version = "0.3.0";
- sha256 = "0lfvd5x845m2by8n67lgcybp22ppf7yxgglcqzwwfmmpa9qnchq2";
+ version = "0.4.0";
+ sha256 = "0hv2q8mkd94ksxgvijn83bkxf9lgnqn92g6k4ryl05z21sc8wl8d";
libraryHaskellDepends = [
base exceptions ghc mtl text transformers transformers-base
world-peace
@@ -222610,8 +222697,8 @@ self: {
}:
mkDerivation {
pname = "ridley";
- version = "0.3.1.4";
- sha256 = "120yqfrkp4ziz8yn6xgzzhdszrvq1dk1szzh3q2m8w36c0g2qdhy";
+ version = "0.3.2.1";
+ sha256 = "14k7cmbcwqxf4d7r6yz77wpj88q3v9vx90agx16wd8dk1zzmcbx5";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
async base containers ekg-core ekg-prometheus-adapter inline-c
@@ -222636,8 +222723,8 @@ self: {
}:
mkDerivation {
pname = "ridley-extras";
- version = "0.1.0.2";
- sha256 = "0ckc9amxp6picp1xmpxgplnxsn39p5h6j0y8h3mj5ik3720qn6c8";
+ version = "0.1.1.0";
+ sha256 = "1syqjc1002cxdk8bsa3k2c232dkmhlw9r4bi5h68a0ddvi86x0ha";
libraryHaskellDepends = [
base ekg-prometheus-adapter microlens mtl prometheus ridley shelly
text transformers
@@ -225275,6 +225362,17 @@ self: {
broken = true;
}) {};
+ "safe-coloured-text" = callPackage
+ ({ mkDerivation, base, bytestring, terminfo, text }:
+ mkDerivation {
+ pname = "safe-coloured-text";
+ version = "0.0.0.0";
+ sha256 = "0c07527g35gpxif8ia07x766pmzcf4m1cgjz9lkac973n12iwllx";
+ libraryHaskellDepends = [ base bytestring terminfo text ];
+ description = "Safely output coloured text";
+ license = lib.licenses.mit;
+ }) {};
+
"safe-decimal" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
, exceptions, hspec, hspec-discover, QuickCheck, scientific
@@ -226609,30 +226707,30 @@ self: {
"sbv" = callPackage
({ mkDerivation, array, async, base, bench-show, bytestring
- , containers, crackNum, deepseq, directory, doctest, filepath
- , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random
- , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+ , containers, deepseq, directory, doctest, filepath, gauge, Glob
+ , hlint, libBF, mtl, pretty, process, QuickCheck, random, silently
+ , syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
, template-haskell, text, time, transformers, uniplate, z3
}:
mkDerivation {
pname = "sbv";
- version = "8.10";
- sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji";
+ version = "8.12";
+ sha256 = "0qr9z5vm4py072a23nc263ma7k5hg6n9xy2pq9pra8z16sq4bnb3";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- array async base containers crackNum deepseq directory filepath mtl
+ array async base containers deepseq directory filepath libBF mtl
pretty process QuickCheck random syb template-haskell text time
transformers uniplate
];
testHaskellDepends = [
- base bytestring containers crackNum directory doctest filepath Glob
- hlint mtl QuickCheck random tasty tasty-golden tasty-hunit
+ base bytestring containers directory doctest filepath Glob hlint
+ mtl QuickCheck random tasty tasty-golden tasty-hunit
tasty-quickcheck
];
testSystemDepends = [ z3 ];
benchmarkHaskellDepends = [
- base bench-show containers crackNum deepseq directory filepath
- gauge mtl process random silently syb text time
+ base bench-show containers deepseq directory filepath gauge mtl
+ process random silently syb text time
];
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
license = lib.licenses.bsd3;
@@ -230088,8 +230186,8 @@ self: {
}:
mkDerivation {
pname = "sequence-formats";
- version = "1.6.0";
- sha256 = "1vy2wwzpnqd2c0ma3jm46gx3w3al0j61ncr22bcahsb1nrgmg0dq";
+ version = "1.6.1";
+ sha256 = "0r2p8aap9z82yhw6gagl1h7s8v05zf6w82qzhqr6p1msv183fm2a";
libraryHaskellDepends = [
attoparsec base bytestring containers errors exceptions foldl
lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
@@ -232819,13 +232917,15 @@ self: {
}) {};
"servant-to-elm" = callPackage
- ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm
- , http-types, servant, servant-multipart, text
+ ({ mkDerivation, aeson, base, bound, bytestring, directory
+ , elm-syntax, filepath, generics-sop, haskell-to-elm, hspec
+ , http-types, prettyprinter, process, servant, servant-multipart
+ , temporary, text, unordered-containers
}:
mkDerivation {
pname = "servant-to-elm";
- version = "0.4.1.0";
- sha256 = "0kxkyijkxvpb5jv815i9s6pg7rnq437jj7hrwr0xprxd709mc648";
+ version = "0.4.2.0";
+ sha256 = "1hbz6c9233wgpgmgnplg9qv5hrniynkn5n4zsmkyansw07gmaw05";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -232833,8 +232933,9 @@ self: {
servant-multipart text
];
testHaskellDepends = [
- aeson base bound elm-syntax haskell-to-elm http-types servant
- servant-multipart text
+ aeson base bound bytestring directory elm-syntax filepath
+ generics-sop haskell-to-elm hspec http-types prettyprinter process
+ servant servant-multipart temporary text unordered-containers
];
description = "Automatically generate Elm clients for Servant APIs";
license = lib.licenses.bsd3;
@@ -234155,6 +234256,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "shake-bench" = callPackage
+ ({ mkDerivation, aeson, base, Chart, Chart-diagrams, diagrams
+ , diagrams-svg, directory, extra, filepath, shake, text
+ }:
+ mkDerivation {
+ pname = "shake-bench";
+ version = "0.1.0.0";
+ sha256 = "09lgmiw77nr3xycxksvzmcw1c2j66h51d5vxpm0lngv1dnsrad64";
+ libraryHaskellDepends = [
+ aeson base Chart Chart-diagrams diagrams diagrams-svg directory
+ extra filepath shake text
+ ];
+ description = "Build rules for historical benchmarking";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"shake-bindist" = callPackage
({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake
, zlib, zstd
@@ -235517,6 +235636,8 @@ self: {
pname = "shower";
version = "0.2.0.2";
sha256 = "0flad49vvqww2pbf6j8557szffd7wb3z375avhvzwqyklimwipgn";
+ revision = "1";
+ editedCabalFile = "0d5vfb65lq6f36lagsf89dj45gs68dyv6cc6lqxz0c23bv91qarc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base megaparsec pretty ];
@@ -237516,8 +237637,6 @@ self: {
];
description = "Sized functors, for size-based enumerations";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"sized" = callPackage
@@ -243880,42 +243999,6 @@ self: {
}) {};
"stache" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, criterion
- , deepseq, directory, file-embed, filepath, gitrev, hspec
- , hspec-discover, hspec-megaparsec, megaparsec, mtl
- , optparse-applicative, template-haskell, text
- , unordered-containers, vector, yaml
- }:
- mkDerivation {
- pname = "stache";
- version = "2.2.0";
- sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g";
- revision = "3";
- editedCabalFile = "1wjdn7qsrfnz2cqwx2pggi8ak3pj01zsmax14gvb8xsq4w9crdvx";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base bytestring containers deepseq directory filepath
- megaparsec mtl template-haskell text unordered-containers vector
- ];
- executableHaskellDepends = [
- aeson base filepath gitrev optparse-applicative text
- unordered-containers yaml
- ];
- testHaskellDepends = [
- aeson base bytestring containers file-embed hspec hspec-megaparsec
- megaparsec template-haskell text yaml
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [
- aeson base criterion deepseq megaparsec text
- ];
- description = "Mustache templates for Haskell";
- license = lib.licenses.bsd3;
- }) {};
-
- "stache_2_2_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, deepseq, directory, file-embed, filepath, gitrev, hspec
, hspec-discover, hspec-megaparsec, megaparsec, mtl
@@ -243947,7 +244030,6 @@ self: {
];
description = "Mustache templates for Haskell";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"stack" = callPackage
@@ -244368,6 +244450,8 @@ self: {
pname = "stack2cabal";
version = "1.0.12";
sha256 = "0424qz4fy8218a0zr8pw5kbaldrb3wddvsb87sjqbb4q5qcm7rj7";
+ revision = "1";
+ editedCabalFile = "12i5fnjf393jnfqq1qchfd0bpa0isj4j0bzs14wp80s7sh8f10kz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -245186,8 +245270,6 @@ self: {
];
description = "Simple State-like monad transformer with saveable and restorable state";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"statethread" = callPackage
@@ -248181,8 +248263,6 @@ self: {
];
description = "A library for generating random string from a regular experession";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"string-similarity" = callPackage
@@ -248380,8 +248460,8 @@ self: {
({ mkDerivation, base, bytestring, text }:
mkDerivation {
pname = "stripe-concepts";
- version = "1.0.2.4";
- sha256 = "0n4q3hsgqrqypmkkim8mcksdlljgldr908wqxlcz6k1wsv9klyc6";
+ version = "1.0.2.6";
+ sha256 = "0vz8kiwg9q27jhr6gfvhqy9gykrl3zgy3m2ldk1np4v7y4fg7906";
libraryHaskellDepends = [ base bytestring text ];
description = "Types for the Stripe API";
license = lib.licenses.mit;
@@ -248422,8 +248502,8 @@ self: {
}:
mkDerivation {
pname = "stripe-hs";
- version = "0.2.1.0";
- sha256 = "1f8snldj183yz20f50kkwg6kqcr5zigp3n9k32hxa6dah8xvvnh1";
+ version = "0.3.0.0";
+ sha256 = "0hcni1fqvw2p7jyvl5nmaxp5dhp52dqyp4x3wk8i2j3ix4zjn6xi";
libraryHaskellDepends = [
aeson base bytestring casing cpphs cryptonite http-client
http-types memory safe servant servant-client stripe-servant text
@@ -248488,8 +248568,8 @@ self: {
}:
mkDerivation {
pname = "stripe-scotty";
- version = "1.0.0.6";
- sha256 = "1x7dsk2m66ka8qd76mj5aww52rjs0b49vx1lws5bl2xl0asyb03v";
+ version = "1.0.0.8";
+ sha256 = "1r91lf3yjivfcxdnqy1ayfzs2ckszyx8x6f6fn8rjiz0gfv1v6hn";
libraryHaskellDepends = [
aeson base bytestring http-types scotty stripe-concepts
stripe-signature text unordered-containers
@@ -248506,8 +248586,8 @@ self: {
}:
mkDerivation {
pname = "stripe-servant";
- version = "0.2.1.0";
- sha256 = "0vvzf4wh2d9bv5af2al2hdgvy5ds7v7p8w14l018cn3f3iynwh3f";
+ version = "0.3.0.0";
+ sha256 = "0zk9pbf498liq9sxqsb0hfk6w3jv03m4amlqqxr4dh3l98i03cli";
libraryHaskellDepends = [
aeson base casing http-api-data servant text time
unordered-containers vector
@@ -248522,8 +248602,8 @@ self: {
}:
mkDerivation {
pname = "stripe-signature";
- version = "1.0.0.6";
- sha256 = "0lp3fli9g5yvlxy8f0md2d3wv6z45mw0929b8c0y2xkcsdjvpp5l";
+ version = "1.0.0.8";
+ sha256 = "0cybjsvzknsldqhf7fjd4ar2qjyym43x2ymmgw01f9a1ixyaxgmn";
libraryHaskellDepends = [
base base16-bytestring bytestring cryptonite memory stripe-concepts
text
@@ -248556,8 +248636,8 @@ self: {
}:
mkDerivation {
pname = "stripe-wreq";
- version = "1.0.1.6";
- sha256 = "1lwwyzj4gi6rav8al3mkld4vq8rdvi4ir1y51nywflkcfiqjjjsx";
+ version = "1.0.1.8";
+ sha256 = "1km0h94d1clgba0yy520yx54axdkf4xl5p5hnmn8ghg40r0pax73";
libraryHaskellDepends = [
aeson base bytestring lens stripe-concepts text
unordered-containers wreq
@@ -248723,10 +248803,8 @@ self: {
}:
mkDerivation {
pname = "structured";
- version = "0.1";
- sha256 = "0xm0m7jxwrbz8jgcn2dl5vhlz0gcg7wxcbbgaqidm2msmnc6fqww";
- revision = "2";
- editedCabalFile = "0l9ls0r1v5bjcznjd0jcpml8vpr4iq8shp4dm4jkv96i3x277gdv";
+ version = "0.1.0.1";
+ sha256 = "1ai760kzx0y901zwimsgiwbms88cyhg9mblhpqr0813dxqy31d5f";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
hashable scientific tagged text time-compat transformers
@@ -249009,8 +249087,8 @@ self: {
pname = "stylist";
version = "2.4.0.0";
sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96";
- revision = "1";
- editedCabalFile = "18amb2sbp4qh2lszc21vpvnyqsbsy7s9396ivkcw7dmg7hljvk9a";
+ revision = "2";
+ editedCabalFile = "104rdqv33v54sj6yf8438sk7d0x0964b3gr1cj42qlxa8wl2idx0";
libraryHaskellDepends = [
async base css-syntax hashable network-uri regex-tdfa text
unordered-containers
@@ -250086,8 +250164,6 @@ self: {
];
description = "DSL for building SVG";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"svg-builder-fork" = callPackage
@@ -250634,28 +250710,135 @@ self: {
"sydtest" = callPackage
({ mkDerivation, async, base, bytestring, containers, Diff, dlist
, envparse, MonadRandom, mtl, optparse-applicative, path, path-io
- , pretty-show, QuickCheck, quickcheck-io, rainbow, random-shuffle
- , safe, split, stm, sydtest-discover, text, yaml
+ , pretty-show, QuickCheck, quickcheck-io, random-shuffle, safe
+ , safe-coloured-text, split, stm, sydtest-discover, text, yaml
, yamlparse-applicative
}:
mkDerivation {
pname = "sydtest";
- version = "0.0.0.0";
- sha256 = "0ii5fmhksfhl7a6a8bkqih4y20q8964879x3fb5nzv6dah5qq7x5";
+ version = "0.1.0.0";
+ sha256 = "1r5p9vai0krzcnwxyicw9b00vzdqdm8zpj70y8snn4mdxxvhvyvq";
libraryHaskellDepends = [
async base bytestring containers Diff dlist envparse MonadRandom
mtl optparse-applicative path path-io pretty-show QuickCheck
- quickcheck-io rainbow random-shuffle safe split text yaml
- yamlparse-applicative
+ quickcheck-io random-shuffle safe safe-coloured-text split text
+ yaml yamlparse-applicative
];
testHaskellDepends = [
- base bytestring path path-io QuickCheck rainbow stm text
+ base bytestring path path-io QuickCheck safe-coloured-text stm text
];
testToolDepends = [ sydtest-discover ];
- description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features";
+ description = "A modern testing framework for Haskell with good defaults and advanced testing features";
license = "unknown";
hydraPlatforms = lib.platforms.none;
- }) {sydtest-discover = null;};
+ }) {};
+
+ "sydtest-discover" = callPackage
+ ({ mkDerivation, base, filepath, optparse-applicative, path
+ , path-io
+ }:
+ mkDerivation {
+ pname = "sydtest-discover";
+ version = "0.0.0.0";
+ sha256 = "1kyjcvi9paax0hi05d2qab8pdkvvabq8s0gl772qiq8rhmrmazsx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base filepath optparse-applicative path path-io
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Automatic test suite discovery for sydtest";
+ license = "unknown";
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "sydtest-persistent-sqlite" = callPackage
+ ({ mkDerivation, base, monad-logger, mtl, persistent
+ , persistent-sqlite, persistent-template, sydtest, sydtest-discover
+ }:
+ mkDerivation {
+ pname = "sydtest-persistent-sqlite";
+ version = "0.0.0.0";
+ sha256 = "0p9xy2pdjnzd61dadvrzrnnxxz04xm0ypn2h1ssmrilfglic80iz";
+ libraryHaskellDepends = [
+ base monad-logger mtl persistent persistent-sqlite
+ persistent-template sydtest
+ ];
+ testHaskellDepends = [
+ base persistent persistent-sqlite persistent-template sydtest
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "A persistent-sqlite companion library for sydtest";
+ license = "unknown";
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "sydtest-servant" = callPackage
+ ({ mkDerivation, base, http-client, servant, servant-client
+ , servant-server, stm, sydtest, sydtest-discover, sydtest-wai
+ }:
+ mkDerivation {
+ pname = "sydtest-servant";
+ version = "0.0.0.0";
+ sha256 = "147v5s10qvpp67aq7c240rsc4f356hvznc5gb538slh03d5vas4j";
+ libraryHaskellDepends = [
+ base http-client servant servant-client servant-server sydtest
+ sydtest-wai
+ ];
+ testHaskellDepends = [
+ base servant servant-client servant-server stm sydtest
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "A servant companion library for sydtest";
+ license = "unknown";
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "sydtest-wai" = callPackage
+ ({ mkDerivation, base, http-client, http-types, stm, sydtest
+ , sydtest-discover, wai, warp
+ }:
+ mkDerivation {
+ pname = "sydtest-wai";
+ version = "0.0.0.0";
+ sha256 = "01fqys32zj1rg9ciq04l7d4av3i1ynw3yinkgc84c3ia330i98ws";
+ libraryHaskellDepends = [ base http-client sydtest wai warp ];
+ testHaskellDepends = [
+ base http-client http-types stm sydtest wai
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "A wai companion library for sydtest";
+ license = "unknown";
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "sydtest-yesod" = callPackage
+ ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+ , conduit, containers, cookie, exceptions, http-client, http-types
+ , monad-logger, mtl, persistent, persistent-sqlite
+ , persistent-template, pretty-show, QuickCheck, resourcet, sydtest
+ , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text
+ , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test
+ }:
+ mkDerivation {
+ pname = "sydtest-yesod";
+ version = "0.0.0.0";
+ sha256 = "0mknn114q495f1bh829fi6c9gag58048c0m06yw0bkl0ikz32k67";
+ libraryHaskellDepends = [
+ base blaze-builder bytestring case-insensitive containers cookie
+ exceptions http-client http-types mtl pretty-show sydtest
+ sydtest-wai text time wai xml-conduit yesod-core yesod-test
+ ];
+ testHaskellDepends = [
+ base bytestring conduit cookie http-client http-types monad-logger
+ mtl persistent persistent-sqlite persistent-template QuickCheck
+ resourcet sydtest sydtest-persistent-sqlite text yesod yesod-form
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "A yesod companion library for sydtest";
+ license = "unknown";
+ hydraPlatforms = lib.platforms.none;
+ }) {};
"syfco" = callPackage
({ mkDerivation, array, base, containers, convertible, directory
@@ -256711,8 +256894,6 @@ self: {
];
description = "Functional Enumeration of Algebraic Types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"testing-type-modifiers" = callPackage
@@ -258101,6 +258282,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "th-compat_0_1_2" = callPackage
+ ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "th-compat";
+ version = "0.1.2";
+ sha256 = "009qc0yy5iq61kgnp9n6vdlqh8zmk4bjawcvpigccgfyk40mvi1b";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [
+ base base-compat hspec mtl template-haskell
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Backward- (and forward-)compatible Quote and Code types";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"th-constraint-compat" = callPackage
({ mkDerivation, base, containers, template-haskell }:
mkDerivation {
@@ -258208,6 +258407,21 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "th-expand-syns_0_4_7_0" = callPackage
+ ({ mkDerivation, base, containers, syb, template-haskell }:
+ mkDerivation {
+ pname = "th-expand-syns";
+ version = "0.4.7.0";
+ sha256 = "1gmb89pgy3i0jpd760xmzx254xpg8pczfa8glgw9z1wak09kwv54";
+ revision = "1";
+ editedCabalFile = "0zh77kg86qmr285sn0xhhi2hbn8b9dx2pgmf2fipij8zj32k9ny4";
+ libraryHaskellDepends = [ base containers syb template-haskell ];
+ testHaskellDepends = [ base template-haskell ];
+ description = "Expands type synonyms in Template Haskell ASTs";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"th-extras" = callPackage
({ mkDerivation, base, syb, template-haskell }:
mkDerivation {
@@ -267482,6 +267696,8 @@ self: {
pname = "ucl";
version = "0.2.0.0";
sha256 = "1ccf9zavmsk0msq4gz6alv5z32qwnap8a4zvajmqps69bh66b9wv";
+ revision = "1";
+ editedCabalFile = "1gyhy1311wqj5s10pgkpc0vsmvcqja23p4nqn3nv0mbc9fajal2n";
libraryHaskellDepends = [ base bytestring containers text time ];
libraryPkgconfigDepends = [ libucl ];
testHaskellDepends = [ base containers ];
@@ -271845,24 +272061,6 @@ self: {
}) {};
"validation" = callPackage
- ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
- , semigroupoids, semigroups
- }:
- mkDerivation {
- pname = "validation";
- version = "1.1";
- sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5";
- revision = "1";
- editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp";
- libraryHaskellDepends = [
- base bifunctors deepseq lens semigroupoids semigroups
- ];
- testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
- description = "A data-type like Either but with an accumulating Applicative";
- license = lib.licenses.bsd3;
- }) {};
-
- "validation_1_1_1" = callPackage
({ mkDerivation, assoc, base, bifunctors, deepseq, hedgehog, HUnit
, lens, semigroupoids, semigroups
}:
@@ -271876,7 +272074,6 @@ self: {
testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
description = "A data-type like Either but with an accumulating Applicative";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"validation-selective" = callPackage
@@ -272017,6 +272214,17 @@ self: {
license = lib.licenses.mit;
}) {};
+ "validity-persistent" = callPackage
+ ({ mkDerivation, base, hspec, persistent, validity }:
+ mkDerivation {
+ pname = "validity-persistent";
+ version = "0.0.0.0";
+ sha256 = "02kyiwnj53kk11p0178m98gbfs7508lpk0bi4yd1svpj3vryhf6c";
+ libraryHaskellDepends = [ base hspec persistent validity ];
+ description = "Validity instances for persistent-related types";
+ license = lib.licenses.mit;
+ }) {};
+
"validity-primitive" = callPackage
({ mkDerivation, base, primitive, validity }:
mkDerivation {
@@ -278088,6 +278296,27 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x-gtk3;};
+ "webmention" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, either
+ , exceptions, hspec, http-client, http-client-tls, http-types
+ , modern-uri, tagsoup, text
+ }:
+ mkDerivation {
+ pname = "webmention";
+ version = "0.1.0.0";
+ sha256 = "12lm7w0isb1dfs28r6yr8pz5czpmw5p6krdbz0rpp4hr487sz9pb";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive either exceptions hspec
+ http-client http-client-tls http-types modern-uri tagsoup text
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive either exceptions hspec
+ http-client http-client-tls http-types modern-uri tagsoup text
+ ];
+ description = "Types and functions for working with Webmentions";
+ license = lib.licenses.bsd3;
+ }) {};
+
"webp" = callPackage
({ mkDerivation, base, bytestring, c2hs, JuicyPixels, libwebp
, tasty, tasty-hunit, vector
@@ -282016,8 +282245,8 @@ self: {
pname = "xml-conduit-stylist";
version = "2.3.0.0";
sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w";
- revision = "1";
- editedCabalFile = "0ydqjrk5q3zzgrwk9cqcjlk3vafzcnxjvb7p74ywm5wfnhmfvmyn";
+ revision = "2";
+ editedCabalFile = "16hky6q4v5zmxyarj464i5hlq7s4c9b3vb7skxn2yi66vfy03a32";
libraryHaskellDepends = [
base containers css-syntax network-uri stylist text
unordered-containers xml-conduit
@@ -284158,26 +284387,18 @@ self: {
"yamlparse-applicative" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
- , genvalidity-aeson, genvalidity-containers, genvalidity-hspec
- , genvalidity-scientific, genvalidity-text
- , genvalidity-unordered-containers, hspec, optparse-applicative
- , path, path-io, prettyprinter, QuickCheck, scientific, text
- , unordered-containers, validity, validity-text, vector, yaml
+ , optparse-applicative, path, path-io, prettyprinter
+ , safe-coloured-text, scientific, text, unordered-containers
+ , validity, validity-text, vector, yaml
}:
mkDerivation {
pname = "yamlparse-applicative";
- version = "0.1.0.2";
- sha256 = "1bzf3kbhccxzg88amyk3ys3bwfi99fhmfa843sxn53nrbgphdw09";
+ version = "0.1.0.3";
+ sha256 = "14fp7qyfh9ax2cqp5amvj2hi8fl9imdq25j8bx5mil8f2jxqr6bi";
libraryHaskellDepends = [
aeson base bytestring containers optparse-applicative path path-io
- prettyprinter scientific text unordered-containers validity
- validity-text vector yaml
- ];
- testHaskellDepends = [
- aeson base containers genvalidity-aeson genvalidity-containers
- genvalidity-hspec genvalidity-scientific genvalidity-text
- genvalidity-unordered-containers hspec QuickCheck scientific text
- unordered-containers
+ prettyprinter safe-coloured-text scientific text
+ unordered-containers validity validity-text vector yaml
];
description = "Declaritive configuration parsing with free docs";
license = lib.licenses.mit;
@@ -285247,30 +285468,6 @@ self: {
}) {};
"yesod-auth-oauth2" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cryptonite, errors
- , hoauth2, hspec, http-client, http-conduit, http-types, memory
- , microlens, safe-exceptions, text, uri-bytestring, yesod-auth
- , yesod-core
- }:
- mkDerivation {
- pname = "yesod-auth-oauth2";
- version = "0.6.1.7";
- sha256 = "11z4zgzj9j15agnqj9dpfavmi2ns9d6aa4inazk1kig1wai2inp1";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring cryptonite errors hoauth2 http-client
- http-conduit http-types memory microlens safe-exceptions text
- uri-bytestring yesod-auth yesod-core
- ];
- testHaskellDepends = [ base hspec uri-bytestring ];
- description = "OAuth 2.0 authentication plugins";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "yesod-auth-oauth2_0_6_2_3" = callPackage
({ mkDerivation, aeson, base, bytestring, cryptonite, errors
, hoauth2, hspec, http-client, http-conduit, http-types, memory
, microlens, safe-exceptions, text, uri-bytestring, yesod-auth
@@ -286063,8 +286260,8 @@ self: {
}:
mkDerivation {
pname = "yesod-markdown";
- version = "0.12.6.5";
- sha256 = "1bs0npryigf7k8gj48i8r8snylc49qdca96610msi6df843c6s6g";
+ version = "0.12.6.6";
+ sha256 = "1myjm5fjcqkzh90bz14mn5rrhy41wfg0i76dihhbkhx7g15z4nwz";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring directory pandoc persistent
shakespeare text xss-sanitize yesod-core yesod-form
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 4d66478f338..86123d8a70f 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -28,4 +28,8 @@ self: super: {
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
# cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
+
+ # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
+ # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
+ hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {};
}
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index fa428b98335..7f248c8d430 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "evcxr";
- version = "0.7.0";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "v${version}";
- sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg=";
+ sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4=";
};
- cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU=";
+ cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4=";
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 7fe50a124eb..be1a1a15c84 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -23,7 +23,7 @@ jruby = stdenv.mkDerivation rec {
for i in $out/bin/jruby{,.bash}; do
wrapProgram $i \
- --set JAVA_HOME ${jre}
+ --set JAVA_HOME ${jre.home}
done
ln -s $out/bin/jruby $out/bin/ruby
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index 5e600a92fb7..a0e23614ebc 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mujs";
- version = "1.0.7";
+ version = "1.0.9";
src = fetchurl {
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
- sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2";
+ sha256 = "sha256-zKjWafQtO2OEPelF370s5KkArbT+gQv3lQQpYdGw6HY=";
};
buildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d53edaad03e..b13c50f18d2 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -51,7 +51,7 @@ let
# - If you run:
# ruby -e "puts RbConfig::CONFIG['configure_args']"
# - In:
- # $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
+ # $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
# Or (usually):
# $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
# - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
@@ -177,7 +177,7 @@ let
$out/lib/libruby*
${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \
- $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
+ $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
''
}
# Bundler tries to create this directory
@@ -189,7 +189,7 @@ let
addRubyLibPath() {
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
- addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system}
+ addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system}
}
addEnvHooks "$hostOffset" addGemPath
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index 527545e683f..97af236af04 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,14 +1,21 @@
-{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, mpir
+, gmp
+, mpfr
+, flint
+}:
stdenv.mkDerivation rec {
pname = "arb";
- version = "2.17.0";
+ version = "2.19.0";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = pname;
rev = version;
- sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
+ sha256 = "sha256-J/LQVZ8gmssazE7ru89EtvW6cVjaLEHgUHuwjW1nuOE=";
};
buildInputs = [ mpir gmp mpfr flint ];
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 36c946e06f7..13a33f68d25 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchurl
, autoreconfHook
-, docbook_xml_dtd_412
, docbook_xml_dtd_45
, docbook-xsl-nons
, which
@@ -53,14 +52,14 @@
stdenv.mkDerivation rec {
pname = "flatpak";
- version = "1.10.1";
+ version = "1.10.2";
# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
+ sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ=";
};
patches = [
@@ -105,9 +104,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
libxml2
- # Remove 4.1.2 again once the following is merged
- # https://github.com/flatpak/flatpak/pull/4102
- docbook_xml_dtd_412
docbook_xml_dtd_45
docbook-xsl-nons
which
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 01c6ef002e5..e9d389bfc1f 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
- version = "21.1.1";
+ version = "21.1.2";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
- sha256 = "1cgmpy2wqhv8zljz73wm4rggpk9w1prpmab5qphfp7ljajfv7k8r";
+ sha256 = "17g9xilcrpmkn6higgpvd9bly1h61xxyp1kx9zwl6rgzs2pryby2";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 2cd7da0784a..fdaace2dc4f 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libgdata";
- version = "0.18.0";
+ version = "0.18.1";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA=";
+ sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc=";
};
patches = [
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 1dec830566f..2208606a813 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
- version = "3.16.1";
+ version = "3.17.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5";
+ sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k=";
};
outputs = [ "out" "dev" "man" "info" "doc" ];
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 33c1cecfbc8..c62aa77c61a 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -20,7 +20,7 @@ let
"-DLWS_WITH_PLUGINS=ON"
"-DLWS_WITH_IPV6=ON"
"-DLWS_WITH_SOCKS5=ON"
- ];
+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
@@ -35,6 +35,7 @@ let
# Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
# is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
license = with licenses; [ mit publicDomain bsd3 asl20 ];
+ maintainers = with maintainers; [ mindavi ];
platforms = platforms.all;
};
};
diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix
index 0ec814b7164..38e938080ba 100644
--- a/pkgs/development/libraries/mauikit/default.nix
+++ b/pkgs/development/libraries/mauikit/default.nix
@@ -37,6 +37,6 @@ mkDerivation rec {
description = "Free and modular front-end framework for developing fast and compelling user experiences";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ dotlambda ];
- broken = lib.versionOlder qtbase.version "5.14.0";
+ broken = versionOlder qtbase.version "5.14.0";
};
}
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 802685970ac..46b2748cad9 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -18,7 +18,7 @@
assert !cudaSupport || cudatoolkit != null;
let
- version = "4.0.5";
+ version = "4.1.0";
cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit";
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
- sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5";
+ sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index 38c9444d0d3..c00d579702c 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -4,18 +4,18 @@
stdenv.mkDerivation rec {
pname = "rankwidth";
- version = "0.7";
+ version = "0.9";
src = fetchurl {
url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
- sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
+ sha256 = "sha256-weA1Bv4lzfy0KMBR/Fay0q/7Wwb7o/LOdWYxRmvvtEE=";
};
configureFlags = [
"--enable-executable=no" # no igraph dependency
];
- # check phase is empty for now (as of version 0.7)
+ # check phase is empty for now (as of version 0.9)
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch
new file mode 100644
index 00000000000..cbcf18b4cdb
--- /dev/null
+++ b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch
@@ -0,0 +1,39 @@
+commit 433a8b99da9d71e96434bd421c2468cbda29d37c
+Author: Mauricio Collares
+Date: Tue Mar 2 22:07:11 2021 -0300
+
+ trim logfile information from pari 2.13 output
+
+ Pari (since commit 609fb01faf827d91dfa9136849a647a3bbfe8036) prints
+ extra logfile information such as
+
+ [logfile is "/tmp/nix-shell.2BquN9/home/.sympow/datafiles/P02HM.txt"]
+
+ which messes up sympow's parsing. This commit reuses the same trimming
+ mechanism already in sympow to trim this new message.
+
+diff --git a/Configure b/Configure
+index 1ef9756..776bec2 100755
+--- a/Configure
++++ b/Configure
+@@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE
+ echo " \$(MKDIR) -p datafiles" >> $FILE
+ echo " \$(TOUCH) datafiles/param_data" >> $FILE
+ echo " \$(SH) armd.sh" >> $FILE
+-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE
++echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE
+ echo "sympow.1: sympow" >> $FILE
+ echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE
+ echo "clean:" >> $FILE
+diff --git a/generate.c b/generate.c
+index dbb811f..783320c 100644
+--- a/generate.c
++++ b/generate.c
+@@ -148,6 +148,7 @@ static void trimit(char *A)
+ " -e '"
+ "/^\?/d" ";"
+ "/^(/d" ";"
++ "/logfile /d" ";"
+ "/Warning:/d" ";"
+ "/^About to find TOO_BIG/d" ";"
+ "/^Now working backwards/d" ";"
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index 3c31ed8a361..c31c705d39d 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl";
};
+ patches = [ ./clean-extra-logfile-output-from-pari.patch ];
+
postUnpack = ''
patchShebangs .
'';
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 8bb7522b197..9ab269aaacf 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,24 +1,49 @@
-{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
-, gobject-introspection, vala, glibcLocales }:
+{ lib
+, stdenv
+, fetchurl
+, dbus-glib
+, glib
+, python3
+, pkg-config
+, libxslt
+, gobject-introspection
+, vala
+, glibcLocales
+}:
stdenv.mkDerivation rec {
- name = "telepathy-glib-0.24.1";
+ pname = "telepathy-glib";
+ version = "0.24.2";
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
- sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
+ url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
+ sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A=";
};
+ nativeBuildInputs = [
+ pkg-config
+ libxslt
+ gobject-introspection
+ vala
+ ];
+
+ buildInputs = [
+ glibcLocales
+ python3
+ ];
+
+ propagatedBuildInputs = [
+ dbus-glib
+ glib
+ ];
+
configureFlags = [
"--enable-vala-bindings"
];
- LC_ALL = "en_US.UTF-8";
- propagatedBuildInputs = [ dbus-glib glib ];
- nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
- buildInputs = [ glibcLocales python2 ];
+ LC_ALL = "en_US.UTF-8";
enableParallelBuilding = true;
@@ -26,8 +51,6 @@ stdenv.mkDerivation rec {
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
'';
- passthru.python = python2;
-
meta = with lib; {
homepage = "https://telepathy.freedesktop.org";
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
index d9d74081735..84d50faf54e 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "tepl";
- version = "5.0.0";
+ version = "5.0.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6";
+ sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 6e5b1d83de5..30e807cde05 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -4,23 +4,20 @@
, xorgproto, gst_all_1, setfile
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? libGLSupported
-, libGLU ? null, libGL ? null
+, libGLU, libGL
, compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true
-, withWebKit ? false, webkitgtk ? null
-, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
+, withWebKit ? false, webkitgtk
+, AGL, Carbon, Cocoa, Kernel, QTKit
}:
with lib;
-assert withMesa -> libGLU != null && libGL != null;
-assert withWebKit -> webkitgtk != null;
-
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2.";
stdenv.mkDerivation rec {
- version = "3.0.5";
pname = "wxwidgets";
+ version = "3.0.5";
src = fetchFromGitHub {
owner = "wxWidgets";
@@ -29,16 +26,16 @@ stdenv.mkDerivation rec {
sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7";
};
+ nativeBuildInputs = [ pkg-config ];
+
buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
- ] ++ optionals withGtk2 [ gtk2 ]
+ ] ++ optional withGtk2 gtk2
++ optional (!withGtk2) gtk3
++ optional withMesa libGLU
++ optional withWebKit webkitgtk
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
- nativeBuildInputs = [ pkg-config ];
-
propagatedBuildInputs = optional stdenv.isDarwin AGL;
patches = [
diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
new file mode 100644
index 00000000000..7f49430c15c
--- /dev/null
+++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck
+, transformers, transformers-compat
+}:
+mkDerivation {
+ pname = "hercules-ci-optparse-applicative";
+ version = "0.16.1.0";
+ src = fetchgit {
+ url = "https://github.com/hercules-ci/optparse-applicative.git";
+ sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48";
+ rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8";
+ fetchSubmodules = true;
+ };
+ libraryHaskellDepends = [
+ ansi-wl-pprint base process transformers transformers-compat
+ ];
+ testHaskellDepends = [ base QuickCheck ];
+ homepage = "https://github.com/hercules-ci/optparse-applicative";
+ description = "Utilities and combinators for parsing command line options (fork)";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ roberth ];
+}
diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 9c5e10d3a48..6f4522ebf1c 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -1,8 +1,8 @@
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.2)
- activesupport (5.2.4.4)
+ CFPropertyList (3.0.3)
+ activesupport (5.2.4.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -14,10 +14,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
- cocoapods (1.10.0)
+ cocoapods (1.10.1)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.10.0)
+ cocoapods-core (= 1.10.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -32,7 +32,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
- cocoapods-core (1.10.0)
+ cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
@@ -52,19 +52,19 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.1.7)
+ concurrent-ruby (1.1.8)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
- ffi (1.13.1)
+ ffi (1.15.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (1.8.5)
+ i18n (1.8.9)
concurrent-ruby (~> 1.0)
- json (2.3.1)
- minitest (5.14.2)
+ json (2.5.1)
+ minitest (5.14.4)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
@@ -74,7 +74,7 @@ GEM
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
- tzinfo (1.2.7)
+ tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index d4de7cd698d..cf718b02c08 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -1,8 +1,8 @@
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.2)
- activesupport (5.2.4.4)
+ CFPropertyList (3.0.3)
+ activesupport (5.2.4.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -14,10 +14,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
- cocoapods (1.10.0)
+ cocoapods (1.10.1)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.10.0)
+ cocoapods-core (= 1.10.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -32,7 +32,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
- cocoapods-core (1.10.0)
+ cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
@@ -52,19 +52,19 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.1.7)
+ concurrent-ruby (1.1.8)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
- ffi (1.13.1)
+ ffi (1.15.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (1.8.5)
+ i18n (1.8.9)
concurrent-ruby (~> 1.0)
- json (2.3.1)
- minitest (5.14.2)
+ json (2.5.1)
+ minitest (5.14.4)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
@@ -74,7 +74,7 @@ GEM
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
- tzinfo (1.2.7)
+ tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 195f0901a19..9c18d393bcb 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
+ sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
type = "gem";
};
- version = "5.2.4.4";
+ version = "5.2.4.5";
};
addressable = {
dependencies = ["public_suffix"];
@@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf";
+ sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.3";
};
claide = {
groups = ["default"];
@@ -68,10 +68,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j";
+ sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a";
type = "gem";
};
- version = "1.10.0";
+ version = "1.10.1";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -79,10 +79,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4";
+ sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83";
type = "gem";
};
- version = "1.10.0";
+ version = "1.10.1";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -161,10 +161,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.8";
};
escape = {
groups = ["default"];
@@ -192,10 +192,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
+ sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
type = "gem";
};
- version = "1.13.1";
+ version = "1.15.0";
};
fourflusher = {
groups = ["default"];
@@ -243,30 +243,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+ sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
- version = "1.8.5";
+ version = "1.8.9";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
- version = "2.3.1";
+ version = "2.5.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+ sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
- version = "5.14.2";
+ version = "5.14.4";
};
molinillo = {
groups = ["default"];
@@ -355,10 +355,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem";
};
- version = "1.2.7";
+ version = "1.2.9";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 732d2a2cdd8..90c1687aeab 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
+ sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
type = "gem";
};
- version = "5.2.4.4";
+ version = "5.2.4.5";
};
addressable = {
dependencies = ["public_suffix"];
@@ -45,10 +45,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf";
+ sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.3";
};
claide = {
groups = ["default"];
@@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j";
+ sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a";
type = "gem";
};
- version = "1.10.0";
+ version = "1.10.1";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -77,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4";
+ sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83";
type = "gem";
};
- version = "1.10.0";
+ version = "1.10.1";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -153,10 +153,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.8";
};
escape = {
source = {
@@ -182,10 +182,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
+ sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
type = "gem";
};
- version = "1.13.1";
+ version = "1.15.0";
};
fourflusher = {
groups = ["default"];
@@ -229,30 +229,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+ sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
- version = "1.8.5";
+ version = "1.8.9";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
- version = "2.3.1";
+ version = "2.5.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+ sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
- version = "5.14.2";
+ version = "5.14.4";
};
molinillo = {
source = {
@@ -333,10 +333,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem";
};
- version = "1.2.7";
+ version = "1.2.9";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
new file mode 100644
index 00000000000..b4ddb4dd5e4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitHub
+, buildDunePackage
+, bigarray-compat
+, containers
+, cppo
+, ctypes
+, integers
+, num
+, ppxlib
+, re
+}:
+
+buildDunePackage rec {
+ pname = "ppx_cstubs";
+ version = "0.6.1.1";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "fdopen";
+ repo = "ppx_cstubs";
+ rev = version;
+ sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh";
+ };
+
+ buildInputs = [
+ bigarray-compat
+ containers
+ cppo
+ ctypes
+ integers
+ num
+ ppxlib
+ re
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/fdopen/ppx_cstubs";
+ description = "Preprocessor for easier stub generation with ocaml-ctypes";
+ license = licenses.mit;
+ maintainers = [ maintainers.osener ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 910e5390096..7d415bd894e 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,15 +1,28 @@
-{ lib, fetchurl, buildDunePackage
-, cppo, ppxlib, ppx_derivers, result, ounit, ocaml-migrate-parsetree
+{ lib
+, fetchurl
+, buildDunePackage
+, cppo
+, ppxlib
+, ppx_derivers
+, result
+, ounit
+, ocaml-migrate-parsetree
+, ocaml-migrate-parsetree-2-1
}:
let params =
- if lib.versionAtLeast ppxlib.version "0.15"
- then {
+ if lib.versionAtLeast ppxlib.version "0.20" then {
+ version = "5.2.1";
+ sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9";
+ useOMP2 = true;
+ } else if lib.versionAtLeast ppxlib.version "0.15" then {
version = "5.1";
sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh";
+ useOMP2 = false;
} else {
version = "5.0";
sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3";
+ useOMP2 = false;
}
; in
@@ -25,7 +38,13 @@ buildDunePackage rec {
};
buildInputs = [ ppxlib cppo ];
- propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers result ];
+ propagatedBuildInputs = [
+ (if params.useOMP2
+ then ocaml-migrate-parsetree-2-1
+ else ocaml-migrate-parsetree)
+ ppx_derivers
+ result
+ ];
doCheck = true;
checkInputs = [ ounit ];
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 03085a13cdf..11b608e6ef5 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -25,6 +25,10 @@ let param = {
sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
min_version = "4.07";
};
+ "0.22.0" = {
+ sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q";
+ min_version = "4.07";
+ };
}."${version}"; in
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index bddf2a2448f..eed6b158d4a 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -1,31 +1,26 @@
-{ lib, stdenv, fetchurl
-, ocaml, findlib, pkg-config, perl
+{ lib, stdenv, fetchFromGitHub
+, ocaml, findlib, pkg-config
, gmp
}:
-let source =
- if lib.versionAtLeast ocaml.version "4.02"
- then {
- version = "1.11";
- url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz";
- sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr";
- } else {
- version = "1.3";
- url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz";
- sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
- };
-in
+if !lib.versionAtLeast ocaml.version "4.04"
+then throw "zarith is not available for OCaml ${ocaml.version}"
+else
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-zarith-${version}";
- inherit (source) version;
- src = fetchurl { inherit (source) url sha256; };
+ pname = "ocaml${ocaml.version}-zarith";
+ version = "1.12";
+ src = fetchFromGitHub {
+ owner = "ocaml";
+ repo = "Zarith";
+ rev = "release-${version}";
+ sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9";
+ };
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ocaml findlib perl ];
+ buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ gmp ];
- patchPhase = "patchShebangs ./z_pp.pl";
dontAddPrefix = true;
configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];
diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix
index b8147f8d281..ecea6c0f62e 100644
--- a/pkgs/development/octave-modules/sparsersb/default.nix
+++ b/pkgs/development/octave-modules/sparsersb/default.nix
@@ -13,7 +13,7 @@ buildOctavePackage rec {
sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw";
};
- buildInputs = [
+ propagatedBuildInputs = [
librsb
];
@@ -22,7 +22,5 @@ buildOctavePackage rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ KarlJoad ];
description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
- # Mark this way until KarlJoad builds librsb specifically for this package.
- broken = true;
};
}
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index a142c695121..9f1ce65db0a 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
- version = "2.18.2";
+ version = "2.18.3";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "sha256-451be1O/y92ib5hZNVbf8iCkD+e9DoK47Z7IkMnwuo0=";
+ sha256 = "sha256-Bdk1+X+SKcVS/zxEqlgnR3zjq/l0ht7icE4sQ1hjn8g=";
};
phases = [ "installPhase" ];
diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 5a7a856f3ae..0e536d57132 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
- version = "0.12.79";
+ version = "0.12.81";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "sha256-H6JmjdJtcCrNvad0ZbJ73OdRXimeTIJMVPuk8K6X6v8=";
+ sha256 = "sha256-mdqVrTrxWE2AuLVqgumA7V+JjzGW9ukkFM7klJSLeDE=";
};
phases = [ "installPhase" ];
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 32a9dda6c87..507147dc8d6 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -1,8 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
-, setuptools_scm
-, pytest
+, setuptools-scm
+, pytestCheckHook
, pytestcov
, sqlalchemy
, tornado
@@ -29,11 +29,11 @@ buildPythonPackage rec {
};
buildInputs = [
- setuptools_scm
+ setuptools-scm
];
checkInputs = [
- pytest
+ pytestCheckHook
pytestcov
sqlalchemy
tornado
@@ -51,18 +51,11 @@ buildPythonPackage rec {
setuptools
] ++ lib.optional (!isPy3k) futures;
- checkPhase = ''
- py.test
- '';
-
pythonImportsCheck = [ "apscheduler" ];
- # Somehow it cannot find pytestcov
- doCheck = false;
-
meta = with lib; {
description = "A Python library that lets you schedule your Python code to be executed";
- homepage = "https://pypi.python.org/pypi/APScheduler/";
+ homepage = "https://github.com/agronholm/apscheduler";
license = licenses.mit;
};
}
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index 054cce0ce52..4faedcada3b 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ec981b4f07f7582fc564aba8b57763a549392e9ef8b6a338e9da54cdd229cf95";
+ sha256 = "540a2da5fb3ada1f0abf6968e0fa01ca7de6cd517f3be5c52d03a4fc8d54d75e";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index 7bbfc623d35..890f44b4ad3 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, isPy27
-, fetchFromGitHub
+, fetchPypi
, agate
, sqlalchemy
, crate
@@ -15,11 +15,9 @@ buildPythonPackage rec {
disabled = isPy27;
- src = fetchFromGitHub {
- owner = "wireservice";
- repo = "agate-sql";
- rev = version;
- sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde";
};
propagatedBuildInputs = [ agate sqlalchemy ];
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 4006a034d48..19c1921f7c7 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -48,5 +48,7 @@ buildPythonPackage rec {
homepage = "https://github.com/spacetelescope/asdf";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
+ # many ValueError in tests
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index fcbeb1f1f4d..86840257725 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ase";
- version = "3.20.1";
+ version = "3.21.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca";
+ sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b";
};
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 2f368b82649..c7528dace27 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iotcentral";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a";
+ sha256 = "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix
index 17f996bfd70..1854bd4f71b 100644
--- a/pkgs/development/python-modules/bip_utils/default.nix
+++ b/pkgs/development/python-modules/bip_utils/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bip_utils";
- version = "1.6.0";
+ version = "1.7.0";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "ebellocchia";
repo = pname;
rev = "v${version}";
- sha256 = "0zbjrgl4dd65r3liyp8syxr106z1wn7ngfcm5dlfcxqwj8zkf56m";
+ sha256 = "1dj0c9sj0c4dkdf7rbz3s1z5kfzw22hpncm4bnwqigjzi6nrk81z";
};
propagatedBuildInputs = [ ecdsa pysha3 ];
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 32b3bfc4b83..b8d184a0581 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.22"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.17.25"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E=";
+ sha256 = "sha256-Jz6WriuVpgNqTDVH52onCxerdhzHYFOCPJ42HSaCE+8=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 29f00d87ad3..d6069e14a9b 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.22"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.25"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws=";
+ sha256 = "sha256-uAtO/l+vsp8ko2V9H3eqFwUlyHa1/ZOE1eWFnQQFIG4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 58b8c267306..5e8e8d985aa 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w=";
};
- buildInputs = [ pytest-runner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index f41aa6985da..7e3e3206757 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage rec {
license = licenses.lgpl3;
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
maintainers = with maintainers; [ mredaelli ];
+ # following tests fail: test_eccentric_globe and test_ellipse_globe
+ broken = true;
};
-
}
diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix
index 3226e3854c7..b26689cf38c 100644
--- a/pkgs/development/python-modules/clifford/default.nix
+++ b/pkgs/development/python-modules/clifford/default.nix
@@ -63,5 +63,7 @@ buildPythonPackage rec {
homepage = "https://clifford.readthedocs.io";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
+ # many TypeError's in tests
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/construct/2.10.54.nix b/pkgs/development/python-modules/construct/2.10.54.nix
new file mode 100644
index 00000000000..6bb279490ab
--- /dev/null
+++ b/pkgs/development/python-modules/construct/2.10.54.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel_yaml
+}:
+
+buildPythonPackage rec {
+ pname = "construct";
+ version = "2.10.54";
+
+ # no tests in PyPI tarball
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48";
+ };
+
+ checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel_yaml ];
+
+ disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
+
+ pytestFlagsArray = [ "--benchmark-disable" ];
+
+ meta = with lib; {
+ description = "Powerful declarative parser (and builder) for binary data";
+ homepage = "https://construct.readthedocs.org/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/convertdate/2.2.x.nix b/pkgs/development/python-modules/convertdate/2.2.x.nix
new file mode 100644
index 00000000000..d67f4c5a344
--- /dev/null
+++ b/pkgs/development/python-modules/convertdate/2.2.x.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pymeeus
+, pytz
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "convertdate";
+ version = "2.2.2";
+
+ # Tests are not available in the PyPI tarball so use GitHub instead.
+ src = fetchFromGitHub {
+ owner = "fitnr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5";
+ };
+
+ propagatedBuildInputs = [
+ pymeeus
+ pytz
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/fitnr/convertdate";
+ description = "Utils for converting between date formats and calculating holidays";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index f285a74e544..0dee95541b0 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
+, isPy27
, fetchFromGitHub
, pymeeus
, pytz
@@ -10,6 +11,8 @@ buildPythonPackage rec {
pname = "convertdate";
version = "2.3.0";
+ disabled = isPy27;
+
# Tests are not available in the PyPI tarball so use GitHub instead.
src = fetchFromGitHub {
owner = "fitnr";
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index a12fbf48c82..4ea08c8a7b0 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,22 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, mock }:
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, mock
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "cssutils";
- version = "1.0.2";
+ version = "2.0.0";
+
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf";
+ sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c";
};
- buildInputs = [ mock ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
- # couple of failing tests
- doCheck = false;
+ disabledTests = [
+ "test_parseUrl" # accesses network
+ ];
+
+ pythonImportsCheck = [ "cssutils" ];
meta = with lib; {
- description = "A Python package to parse and build CSS";
- homepage = "http://cthedot.de/cssutils/";
+ description = "A CSS Cascading Style Sheets library for Python";
+ homepage = "https://github.com/jaraco/cssutils";
+ changelog = "https://github.com/jaraco/cssutils/blob/v${version}/CHANGES.rst";
license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 736afab4257..201a8c42d68 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -1,4 +1,5 @@
{ lib
+, fetchpatch
, fetchPypi
, buildPythonPackage
, cython
@@ -16,6 +17,16 @@ buildPythonPackage rec {
sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1";
};
+ patches = [
+ # fixes intermittent crashes in Sage tests (including in interfaces/singular.py)
+ # will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127
+ (fetchpatch {
+ name = "fix-verify_exc_value.patch";
+ url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch";
+ sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs=";
+ })
+ ];
+
# explicit check:
# build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
hardeningDisable = [
diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index 8a3174fff3d..7719842fbad 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -29,5 +29,6 @@ buildPythonPackage rec {
description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/dateparser/0.x.nix b/pkgs/development/python-modules/dateparser/0.x.nix
new file mode 100644
index 00000000000..49e2d1f2796
--- /dev/null
+++ b/pkgs/development/python-modules/dateparser/0.x.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, parameterized
+, pytestCheckHook
+, dateutil
+, pytz
+, regex
+, tzlocal
+, convertdate
+, umalqurra
+, jdatetime
+, ruamel_yaml
+}:
+
+buildPythonPackage rec {
+ pname = "dateparser";
+ version = "0.7.6";
+
+ src = fetchFromGitHub {
+ owner = "scrapinghub";
+ repo = "dateparser";
+ rev = "v${version}";
+ sha256 = "0j3sm4hlx7z0ci5fnjq5n9i02vvlfz0wxa889ydryfknjhy5apqw";
+ };
+
+ checkInputs = [
+ mock
+ parameterized
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [ "tests" ];
+
+ disabledTestPaths = [
+ "tests/test_dateparser_data_integrity.py" # ImportError: No module named ruamel.yaml
+ ];
+
+ propagatedBuildInputs = [
+ # install_requires
+ dateutil pytz regex tzlocal
+ # extra_requires
+ convertdate umalqurra jdatetime ruamel_yaml
+ ];
+
+ pythonImportsCheck = [ "dateparser" ];
+
+ meta = with lib; {
+ description = "Date parsing library designed to parse dates from HTML pages";
+ homepage = "https://github.com/scrapinghub/dateparser";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix
index 0d81110dee8..c29737595af 100644
--- a/pkgs/development/python-modules/deepmerge/default.nix
+++ b/pkgs/development/python-modules/deepmerge/default.nix
@@ -1,22 +1,30 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, vcver }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, setuptools-scm
+, vcver
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "deepmerge";
- version = "0.1.1";
+ version = "0.2.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f";
+ sha256 = "082bvlk65pkf9qzkzzl8fq7s6zfz1b2v5pcb0ikwg1nx0xspggaz";
};
- propagatedBuildInputs = [
+ nativeBuildInputs = [
+ setuptools-scm
vcver
];
- # depends on https://pypi.org/project/uranium/
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
pythonImportsCheck = [ "deepmerge" ];
diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 36025e85bf8..100c7ee6fc1 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "defcon";
- version = "0.8.0";
+ version = "0.8.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "028j7i39m75fnbyc6jsvwwiz31vq4slxwf47y6yszy1qn61xkcna";
+ sha256 = "1sj9yhwkyvzchglpy07pkx5362mwlap581ibv150b5l9s5mxn2j1";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 455eeebddde..9bd72965cf8 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "django-extensions";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "hZ6GS2VkXH8KfKZuL1rR6JS/nDkx8SfKuUx5XrvTbec=";
+ sha256 = "0ss5x3d21c3g8i1s79l4akazlf116yp4y50gx4vrk1dxh3jb29zj";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix
index 9fd36fab294..f8468209bb4 100644
--- a/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "flowlogs_reader";
- version = "2.3.0";
+ version = "2.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef";
+ sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4";
};
propagatedBuildInputs = [ botocore boto3 docutils ];
diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index fb38954629b..60783d3ded7 100644
--- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Stackdriver Monitoring API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-monitoring";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 0370f80b4a4..beaf1e4f903 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "3.6.0";
+ version = "3.7.0";
pname = "gspread";
src = fetchPypi {
inherit pname version;
- sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c";
+ sha256 = "4bda4ab8c5edb9e41cf4ae40d4d5fb30447522b4e43608e05c01351ab1b96912";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index e5149f6025a..c8149a5fed8 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -7,7 +7,7 @@
, decorator
, nose
, krb5Full
-, darwin
+, GSS
, parameterized
, shouldbe
, cython
@@ -44,7 +44,7 @@ buildPythonPackage rec {
];
buildInputs = lib.optionals stdenv.isDarwin [
- darwin.apple_sdk.frameworks.GSS
+ GSS
];
checkInputs = [
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 8f9d69a8941..192589cdc8f 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "hcloud";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "11sdyays90lmkbdxhllc8ccx0xhrafb7dknqgjlrfpzq04v67vyy";
+ sha256 = "1yq7g9hk6b95nqd0f7kvh9r8ij8k9hs6gmjif83qip98xvkdwf0b";
};
propagatedBuildInputs = [ future requests python-dateutil ];
diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix
index f1b0d13e56e..cc953aa696e 100644
--- a/pkgs/development/python-modules/hdmedians/default.nix
+++ b/pkgs/development/python-modules/hdmedians/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "0.14.1";
+ version = "0.14.2";
pname = "hdmedians";
src = fetchPypi {
inherit pname version;
- sha256 = "ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871";
+ sha256 = "b47aecb16771e1ba0736557255d80ae0240b09156bff434321de559b359ac2d6";
};
# nose was specified in setup.py as a build dependency...
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index e1318b51aef..61c9e85ced2 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.14.3";
+ version = "1.14.4";
disabled = isPy27;
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jc";
rev = "v${version}";
- sha256 = "sha256-6ofw74onFECJYYSuZlOVcNVAVuJaJKV4pkaJ4cTrvPk=";
+ sha256 = "sha256-RJiJByORpdMWZkA7q7A+WoV4S/UcOP/VZ5TVxFMLYSg=";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index 00f8634e47d..fd8c4da6381 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, pythonOlder
, hypothesis
-, doCheck ? true
, dataclasses
, hypothesmith
, pytestCheckHook
@@ -29,12 +28,13 @@ buildPythonPackage rec {
disabled = pythonOlder "3.6";
- propagatedBuildInputs = [ hypothesis typing-inspect pyyaml ]
+ propagatedBuildInputs = [ hypothesis typing-extensions typing-inspect pyyaml ]
++ lib.optional (pythonOlder "3.7") dataclasses;
checkInputs = [ black hypothesmith isort pytestCheckHook ];
- inherit doCheck;
+ # can't run tests due to circular dependency on hypothesmith -> licst
+ doCheck = false;
preCheck = ''
python -m libcst.codegen.generate visitors
@@ -44,8 +44,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "libcst" ];
meta = with lib; {
- description =
- "A Concrete Syntax Tree (CST) parser and serializer library for Python.";
+ description = "A Concrete Syntax Tree (CST) parser and serializer library for Python.";
homepage = "https://github.com/Instagram/libcst";
license = with licenses; [ mit asl20 psfl ];
maintainers = with maintainers; [ ruuda SuperSandro2000 ];
diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index 031f7b04021..e646ee71ec4 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, cython
, pytestrunner
, pytest
, hypothesis
@@ -20,7 +21,11 @@ buildPythonPackage rec {
--replace "hypothesis==" "hypothesis>="
'';
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ cython pytestrunner ];
+
+ preBuild = ''
+ ./update_cpp.sh
+ '';
checkInputs = [ pytest hypothesis ];
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 058133665f4..6e8fd896d91 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }:
+{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
buildPythonPackage rec {
pname = "mpi4py";
@@ -9,6 +9,12 @@ buildPythonPackage rec {
sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
};
+ patches = [ (fetchpatch {
+ name = "disable-broken-test"; # upstream patch
+ url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch";
+ sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx";
+ })];
+
passthru = {
inherit mpi;
};
diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index c79b11252be..0d2da52f015 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, isPyPy
, substituteAll
-, graphvizPkg
+, graphvizPkgs
, graphviz
, mock
}:
@@ -23,7 +23,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./hardcode-graphviz-path.patch;
- graphviz = graphvizPkg;
+ graphviz = graphvizPkgs;
})
];
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index f11cf1c0984..e2496d6097d 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "4.13.0";
+ version = "4.14.3";
src = fetchPypi {
inherit pname version;
- sha256 = "20df14f7883807f57d96ac245841e086a1799f2c2778462a7f3bca704e369c66";
+ sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix
index 88fb6e3abf9..1b5af02dca0 100644
--- a/pkgs/development/python-modules/pre-commit/default.nix
+++ b/pkgs/development/python-modules/pre-commit/default.nix
@@ -2,7 +2,6 @@
, aspy-yaml
, cached-property
, cfgv
-, futures
, identify
, importlib-metadata
, importlib-resources
@@ -16,13 +15,13 @@
buildPythonPackage rec {
pname = "pre-commit";
- version = "2.7.1";
+ version = "2.11.0";
disabled = isPy27;
src = fetchPypi {
inherit version;
pname = "pre_commit";
- sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5";
+ sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06";
};
patches = [
diff --git a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
index c1bead48b34..6d274aae3c0 100644
--- a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
+++ b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
@@ -12,15 +12,15 @@ index 26f4919..4885ec1 100644
if version != C.DEFAULT:
cmd.extend(['-n', version])
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
-index e17376e..0c1d2ab 100644
+index 43b7280..f0f2338 100644
--- a/pre_commit/languages/python.py
+++ b/pre_commit/languages/python.py
-@@ -204,7 +204,7 @@ def install_environment(
+@@ -192,7 +192,7 @@ def install_environment(
+ additional_dependencies: Sequence[str],
) -> None:
envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
+- venv_cmd = [sys.executable, '-mvirtualenv', envdir]
++ venv_cmd = ['@virtualenv@/bin/virtualenv', envdir]
python = norm_version(version)
-- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python)
-+ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python)
- install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies)
-
- with clean_path_on_failure(envdir):
+ if python is not None:
+ venv_cmd.extend(('-p', python))
diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
index 6b4bdb59f1e..39fab3e7bf8 100644
--- a/pkgs/development/python-modules/pystray/default.nix
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "pystray";
- version = "0.16.0";
+ version = "0.17.2";
src = fetchFromGitHub {
owner = "moses-palmer";
repo = "pystray";
rev = "v${version}";
- sha256 = "0q5yqfm5mzffx9vnp9xcnclgjzgs0b7f50i9xmxn1m1iha1zawh1";
+ sha256 = "sha256-/dU+jwe/3qhypq7e5tawhJKzSryW7EIbmrpP+VLDvHA=";
};
propagatedBuildInputs = [ pillow xlib six ];
diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix
index 0044a13d2c9..e2353c4840b 100644
--- a/pkgs/development/python-modules/pytest-sanic/default.nix
+++ b/pkgs/development/python-modules/pytest-sanic/default.nix
@@ -1,28 +1,41 @@
{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, aiohttp
, async_generator
+, buildPythonPackage
+, doCheck ? true
+, fetchFromGitHub
+, httpx
+, pytest
+, pytestCheckHook
+, sanic
+, websockets
}:
buildPythonPackage rec {
pname = "pytest-sanic";
- version = "1.6.2";
+ version = "1.7.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209";
+ src = fetchFromGitHub {
+ owner = "yunstanford";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi";
};
propagatedBuildInputs = [
- pytest
- aiohttp
async_generator
+ httpx
+ pytest
+ websockets
];
- # circular dependency on sanic
- doCheck = false;
+ checkInputs = [
+ sanic
+ pytestCheckHook
+ ];
+
+ inherit doCheck;
+
+ pythonImportsCheck = [ "pytest_sanic" ];
meta = with lib; {
description = "A pytest plugin for Sanic";
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 98efb169df7..22a87b386e1 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
- cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null,
+ cudaSupport ? false, cudatoolkit, cudnn, nccl, magma,
mklDnnSupport ? true, useSystemNccl ? true,
MPISupport ? false, mpi,
buildDocs ? false,
@@ -30,8 +30,6 @@
isPy3k, pythonOlder }:
# assert that everything needed for cuda is present and that the correct cuda versions are used
-assert !cudaSupport || cudatoolkit != null;
-assert cudnn == null || cudatoolkit != null;
assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
in majorIs == "9" || majorIs == "10" || majorIs == "11");
@@ -297,12 +295,13 @@ in buildPythonPackage rec {
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib
'';
-
- meta = {
+ meta = with lib; {
description = "Open source, prototype-to-production deep learning platform";
homepage = "https://pytorch.org/";
- license = lib.licenses.bsd3;
- platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
- maintainers = with lib.maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
+ license = licenses.bsd3;
+ platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
+ maintainers = with maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
+ # error: use of undeclared identifier 'noU'; did you mean 'no'?
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index f503b0b8556..e5faa440ad8 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, doCheck ? true
, aiofiles, httptools, httpx, multidict, ujson, uvloop, websockets
, pytestCheckHook, beautifulsoup4, gunicorn, httpcore, uvicorn
, pytest-asyncio, pytest-benchmark, pytest-dependency, pytest-sanic, pytest-sugar, pytestcov
@@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6";
};
- patchPhase = ''
+ postPatch = ''
substituteInPlace setup.py \
--replace '"multidict==5.0.0"' '"multidict"' \
--replace '"httpx==0.15.4"' '"httpx"' \
@@ -30,14 +30,19 @@ buildPythonPackage rec {
pytest-asyncio pytest-benchmark pytest-dependency pytest-sanic pytest-sugar pytestcov
];
+ inherit doCheck;
+
disabledTests = [
"test_gunicorn" # No "examples" directory in pypi distribution.
"test_logo" # Fails to filter out "DEBUG asyncio:selector_events.py:59 Using selector: EpollSelector"
"test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution.
+ "test_reloader_live" # OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 42104)
];
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [ "sanic" ];
+
meta = with lib; {
description = "A microframework based on uvloop, httptools, and learnings of flask";
homepage = "http://github.com/channelcat/sanic/";
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 9cbbf8c2dda..0679b25ad41 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -33,6 +33,12 @@ buildPythonPackage rec {
sha256 = "ad62bfd31e677d39984449d9c68e233da2776b80894a988a2421aad412e4c44f";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \
+ --replace 'pytz<2021.0' 'pytz'
+ '';
+
propagatedBuildInputs = [
azure-storage-blob
asn1crypto
@@ -55,11 +61,6 @@ buildPythonPackage rec {
urllib3
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL',"
- '';
-
# tests require encrypted secrets, see
# https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters
doCheck = false;
diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index bccca3ee6b6..9ec17443dd8 100644
--- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
@@ -27,5 +27,6 @@ buildPythonPackage rec {
description = "Snowflake SQLAlchemy Dialect";
homepage = "https://www.snowflake.net/";
license = licenses.asl20;
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix
index ec9dbd947c0..1532fca78c4 100644
--- a/pkgs/development/python-modules/update-dotdee/default.nix
+++ b/pkgs/development/python-modules/update-dotdee/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "update-dotdee";
- version = "5.0";
+ version = "6.0";
src = fetchFromGitHub {
owner = "xolox";
repo = "python-update-dotdee";
rev = version;
- sha256 = "1h3m593nwzx6vwa24k0wizb7la49yhqxwn73ipclxgxxi4dfdj01";
+ sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
};
propagatedBuildInputs = [ executor naturalsort ];
diff --git a/pkgs/development/python-modules/vcrpy/3.nix b/pkgs/development/python-modules/vcrpy/3.nix
new file mode 100644
index 00000000000..ddd4015aad1
--- /dev/null
+++ b/pkgs/development/python-modules/vcrpy/3.nix
@@ -0,0 +1,48 @@
+{ buildPythonPackage
+, lib
+, six
+, fetchPypi
+, pyyaml
+, mock
+, contextlib2
+, wrapt
+, pytest
+, pytest-httpbin
+, yarl
+, pythonOlder
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+ pname = "vcrpy";
+ version = "3.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc";
+ };
+
+ checkInputs = [
+ pytest
+ pytest-httpbin
+ ];
+
+ propagatedBuildInputs = [
+ pyyaml
+ wrapt
+ six
+ ]
+ ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ]
+ ++ lib.optionals (pythonAtLeast "3.4") [ yarl ];
+
+ checkPhase = ''
+ py.test --ignore=tests/integration -k "not TestVCRConnection"
+ '';
+
+ meta = with lib; {
+ description = "Automatically mock your HTTP interactions to simplify and speed up testing";
+ homepage = "https://github.com/kevin1024/vcrpy";
+ license = licenses.mit;
+ };
+}
+
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index e67bbc59e93..7766e75ba05 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -1,5 +1,6 @@
{ buildPythonPackage
, lib
+, isPy27
, six
, fetchPypi
, pyyaml
@@ -17,6 +18,8 @@ buildPythonPackage rec {
pname = "vcrpy";
version = "4.1.1";
+ disabled = isPy27;
+
src = fetchPypi {
inherit pname version;
sha256 = "57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599";
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 31f41c50097..ef80dedeb98 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv
+{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, fetchpatch
, argh
, pathtools
, pyyaml
-, pkgs
, pytest-cov
, pytestCheckHook
+, CoreServices
}:
buildPythonPackage rec {
@@ -27,8 +28,7 @@ buildPythonPackage rec {
})
];
- buildInputs = lib.optionals stdenv.isDarwin
- [ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
propagatedBuildInputs = [
argh
@@ -48,6 +48,7 @@ buildPythonPackage rec {
homepage = "https://github.com/gorakhargosh/watchdog";
license = licenses.asl20;
maintainers = with maintainers; [ goibhniu ];
+ # error: use of undeclared identifier 'kFSEventStreamEventFlagItemCloned'
+ broken = stdenv.isDarwin;
};
-
}
diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix
index 138933ebb57..dea2fd895f1 100644
--- a/pkgs/development/tools/analysis/nix-linter/default.nix
+++ b/pkgs/development/tools/analysis/nix-linter/default.nix
@@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
-, fetchpatch
, fixplate
, tasty
, tasty-hunit
@@ -37,13 +36,10 @@ mkDerivation rec {
executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
testHaskellDepends = [ tasty tasty-hunit tasty-th ];
- patches = [
- # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
- (fetchpatch {
- url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch";
- sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j";
- })
- ];
+ # Relax upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
+ postPatch = ''
+ substituteInPlace nix-linter.cabal --replace "hnix >=0.8 && < 0.11" "hnix >=0.8"
+ '';
description = "Linter for Nix(pkgs), based on hnix";
homepage = "https://github.com/Synthetica9/nix-linter";
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index 5b5a06828a7..e7b0c1d105b 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = [ maintainers.babariviere ];
+ # ld: symbol(s) not found for architecture x86_64
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix
new file mode 100644
index 00000000000..dfca0c4d388
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/hci/default.nix
@@ -0,0 +1,23 @@
+{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
+let
+ inherit (haskell.lib) overrideCabal addBuildDepends;
+ inherit (lib) makeBinPath;
+ bundledBins = lib.optional stdenv.isLinux runc;
+
+ pkg =
+ # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
+ overrideCabal
+ (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ])
+ (o: {
+ postInstall = ''
+ ${o.postInstall or ""}
+ mkdir -p $out/libexec
+ mv $out/bin/hci $out/libexec
+ makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins}
+ '';
+ });
+in pkg // {
+ meta = pkg.meta // {
+ position = toString ./default.nix + ":1";
+ };
+ }
diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
index c8316f4bb57..ccb8b4eba65 100644
--- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
@@ -1,7 +1,9 @@
-{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }:
+{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
let
inherit (haskell.lib) overrideCabal addBuildDepends;
inherit (lib) makeBinPath;
+ bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
+
pkg =
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
overrideCabal
@@ -11,7 +13,7 @@ let
${o.postInstall or ""}
mkdir -p $out/libexec
mv $out/bin/hercules-ci-agent $out/libexec
- makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]}
+ makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins}
'';
});
in pkg // {
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 6f11ee9e877..9807866f1bd 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
- version = "2.263.4";
+ version = "2.277.1";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
- sha256 = "1disj0a0qh7gzjqm6bjb7dx0v74k74hkyvxpg12ahdj2g04p8jhx";
+ sha256 = "0lficvngxzl7q088n3ssnnhjicd0xxr0k3n0inz7pvjj27dl35rr";
};
buildCommand = ''
diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix
index 6b7b13437cc..f6465d53cae 100644
--- a/pkgs/development/tools/glpaper/default.nix
+++ b/pkgs/development/tools/glpaper/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
+{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
, libX11, libGL }:
-stdenv.mkDerivation {
- name = "glpaper";
+stdenv.mkDerivation rec {
+ pname = "glpaper";
version = "unstable-2020-10-11";
- src = fetchhg {
- url = "https://hg.sr.ht/~scoopta/glpaper";
+ src = fetchFromSourcehut {
+ owner = "~scoopta";
+ repo = pname;
+ vc = "hg";
rev = "9e7ec7cd270af330039c395345c7d23c04682267";
sha256 = "sha256-yBHRg6eg+PK/ixuM0MBty3RJY9qcemr3Dt+8SAitqnk=";
};
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 3e6ef4d4d34..2ad3bcbf9a7 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "hcloud";
- version = "1.20.0";
+ version = "1.21.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
- sha256 = "0sjshcppcfdfz29nsrzvrciypcb4r7fbl2sqhlkcq948b7k3jk8b";
+ sha256 = "sha256-zXlsvuc778z1sxnv02mFJXQzkEEft0BdubWecvcytYg=";
};
nativeBuildInputs = [ installShellFiles ];
- vendorSha256 = "0q6jm2ghwrbjxn76i8wz72xjdmwfvl5dn8n4zilyjjx9vvllwdjw";
+ vendorSha256 = "sha256-QdTD6xeVNswaaMms82rFYb5jLDhxL+wQgaLVXqROSFs=";
doCheck = false;
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index c22f839321c..e8e84a7f51d 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
- version = "0.1.15085";
+ version = "0.1.15108";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KcC9KfAeUM3pMSNThL+w/kzpQYzcMYV6YoNEN4q6duA=";
+ sha256 = "sha256-r0GSv9JaQQkVLYDh51Rz6OIDTqV75RIT+NIWAFXWcV8=";
};
vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index c253bda36b8..c557f9600c3 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -5,7 +5,7 @@
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
, migration ? false, patches ? []
-, tests ? {}
+, tests ? {}, mdbook
}:
with stdenv;
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config mdbook ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 1636ad6dd71..a49f2231312 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -2,16 +2,13 @@
{
hydra-unstable = callPackage ./common.nix {
- version = "2020-10-20";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
- rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c";
- sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj";
+ rev = "930f05c38eeac63ad6c3e3250de2667e2df2e96e";
+ sha256 = "06s2lg119p96i1j4rdbg3z097n25bgvq8ljdn4vcwcw3yz0lnswm";
};
- patches = [
- ./hydra-nix-receiveContents.patch
- ];
nix = nixFlakes;
tests = {
diff --git a/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
deleted file mode 100644
index 61957e2190c..00000000000
--- a/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Update for https://github.com/NixOS/nix/commit/faa31f40
-
---- a/src/hydra-queue-runner/nar-extractor.cc
-+++ b/src/hydra-queue-runner/nar-extractor.cc
-@@ -48,9 +48,9 @@
-- void receiveContents(unsigned char * data, size_t len) override
-+ void receiveContents(std::string_view data) override
- {
- assert(expectedSize);
- assert(curMember);
- assert(hashSink);
-- *curMember->fileSize += len;
-- (*hashSink)(data, len);
-+ *curMember->fileSize += data.size();
-+ (*hashSink)(data);
- if (curMember->contents) {
-- curMember->contents->append((char *) data, len);
-+ curMember->contents->append(data);
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 8e1c032cdaf..fd995216281 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.32.12";
+ version = "0.32.14";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-AaoLT5M1ut2Hlgw91On8AHRN/rrufbAp4I7bcCeG3cA=";
+ sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
- cargoSha256 = "sha256-r64Y8TxYmzxuZOTncHUYm+KmKlbK+KnHCHyNups5kRw=";
+ cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index f867fd836a3..f43a0a369d6 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
@@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
- nativeBuildInputs = [ perl ]
- ++ lib.optionals stdenv.isLinux [ pkg-config ];
+ nativeBuildInputs = [ pkg-config ];
- buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+ buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
+ OPENSSL_NO_VENDOR = 1;
+
# tries to use "/homeless-shelter" and fails
doCheck = false;
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index dae3243e1e7..2d04fc51c81 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
- version = "6.5.0";
+ version = "6.6.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
- sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o=";
+ sha256 = "13zw9gyaqna9d82mwrglab4dfx5y9faqf36d6xplq0z6vnzig1rg";
};
# don't remove runtime deps
diff --git a/pkgs/games/among-sus/default.nix b/pkgs/games/among-sus/default.nix
index 1ec0a42ea18..454c7d181f9 100644
--- a/pkgs/games/among-sus/default.nix
+++ b/pkgs/games/among-sus/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchgit, port ? "1234" }:
+{ lib, stdenv, fetchFromSourcehut, port ? "1234" }:
stdenv.mkDerivation {
pname = "among-sus-unstable";
version = "2020-10-29";
- src = fetchgit {
- url = "https://git.sr.ht/~martijnbraam/among-sus";
+ src = fetchFromSourcehut {
+ owner = "~martijnbraam";
+ repo = "among-sus";
rev = "1f4c8d800d025d36ac66826937161be3252fbc57";
sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh";
};
diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix
index dcb72d53b32..7112c6bf49c 100644
--- a/pkgs/games/eidolon/default.nix
+++ b/pkgs/games/eidolon/default.nix
@@ -1,11 +1,12 @@
-{ lib, fetchgit, rustPlatform, pkg-config, openssl }:
+{ lib, fetchFromSourcehut, rustPlatform, pkg-config, openssl }:
rustPlatform.buildRustPackage rec {
pname = "eidolon";
version = "1.4.6";
- src = fetchgit {
- url = "https://git.sr.ht/~nicohman/eidolon";
+ src = fetchFromSourcehut {
+ owner = "~nicohman";
+ repo = pname;
rev = version;
sha256 = "1yn3k569pxzw43mmsk97088xpkdc714rks3ncchbb6ccx25kgxrr";
};
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index 21aa2f6d200..b38069355ee 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,56 +2,56 @@
"x86_64-linux": {
"alpha": {
"experimental": {
+ "name": "factorio_alpha_x64-1.1.27.tar.xz",
+ "needsAuth": true,
+ "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln",
+ "tarDirectory": "x64",
+ "url": "https://factorio.com/get-download/1.1.27/alpha/linux64",
+ "version": "1.1.27"
+ },
+ "stable": {
"name": "factorio_alpha_x64-1.1.26.tar.xz",
"needsAuth": true,
"sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/alpha/linux64",
"version": "1.1.26"
- },
- "stable": {
- "name": "factorio_alpha_x64-1.1.25.tar.xz",
- "needsAuth": true,
- "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi",
- "tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.25/alpha/linux64",
- "version": "1.1.25"
}
},
"demo": {
"experimental": {
+ "name": "factorio_demo_x64-1.1.27.tar.xz",
+ "needsAuth": false,
+ "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z",
+ "tarDirectory": "x64",
+ "url": "https://factorio.com/get-download/1.1.27/demo/linux64",
+ "version": "1.1.27"
+ },
+ "stable": {
"name": "factorio_demo_x64-1.1.26.tar.xz",
"needsAuth": false,
"sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/demo/linux64",
"version": "1.1.26"
- },
- "stable": {
- "name": "factorio_demo_x64-1.1.25.tar.xz",
- "needsAuth": false,
- "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj",
- "tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.25/demo/linux64",
- "version": "1.1.25"
}
},
"headless": {
"experimental": {
+ "name": "factorio_headless_x64-1.1.27.tar.xz",
+ "needsAuth": false,
+ "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w",
+ "tarDirectory": "x64",
+ "url": "https://factorio.com/get-download/1.1.27/headless/linux64",
+ "version": "1.1.27"
+ },
+ "stable": {
"name": "factorio_headless_x64-1.1.26.tar.xz",
"needsAuth": false,
"sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/headless/linux64",
"version": "1.1.26"
- },
- "stable": {
- "name": "factorio_headless_x64-1.1.25.tar.xz",
- "needsAuth": false,
- "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1",
- "tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.25/headless/linux64",
- "version": "1.1.25"
}
}
}
diff --git a/pkgs/games/maelstrom/default.nix b/pkgs/games/maelstrom/default.nix
new file mode 100644
index 00000000000..5f78e34edac
--- /dev/null
+++ b/pkgs/games/maelstrom/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_net }:
+
+stdenv.mkDerivation rec {
+ pname = "maelstrom";
+ version = "3.0.7";
+
+ src = fetchurl {
+ url = "http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${version}.tar.gz";
+ sha256 = "0dm0m5wd7amrsa8wnrblkv34sq4v4lglc2wfx8klfkdhyhi06s4k";
+ };
+
+ # this fixes a typedef compilation error with gcc-3.x
+ patches = [ ./fix-compilation.patch ];
+
+ buildInputs = [ SDL2 SDL2_net ];
+
+ postInstall = ''
+ mkdir -p $out/bin
+ ln -s $out/games/Maelstrom/Maelstrom $out/bin/maelstrom
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "maelstrom";
+ exec = "maelstrom";
+ desktopName = "Maelstrom";
+ genericName = "Maelstrom";
+ comment = "An arcade-style game resembling Asteroids";
+ categories = "Game;";
+ })
+ ];
+
+ meta = with lib; {
+ description = "An arcade-style game resembling Asteroids";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ tmountain ];
+ };
+}
diff --git a/pkgs/games/maelstrom/fix-compilation.patch b/pkgs/games/maelstrom/fix-compilation.patch
new file mode 100644
index 00000000000..3fa8980c5ee
--- /dev/null
+++ b/pkgs/games/maelstrom/fix-compilation.patch
@@ -0,0 +1,42 @@
+diff -Naur Maelstrom-3.0.7/buttonlist.h Maelstrom-3.0.7-patched/buttonlist.h
+--- Maelstrom-3.0.7/buttonlist.h 2000-01-25 11:41:32.000000000 -0500
++++ Maelstrom-3.0.7-patched/buttonlist.h 2021-02-22 08:34:01.000000000 -0500
+@@ -16,7 +16,7 @@
+
+ void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height,
+ void (*callback)(void)) {
+- struct button *belem;
++ button *belem;
+
+ for ( belem=&button_list; belem->next; belem=belem->next );
+ belem->next = new button;
+@@ -30,7 +30,7 @@
+ }
+
+ void Activate_Button(Uint16 x, Uint16 y) {
+- struct button *belem;
++ button *belem;
+
+ for ( belem=button_list.next; belem; belem=belem->next ) {
+ if ( (x >= belem->x1) && (x <= belem->x2) &&
+@@ -42,7 +42,7 @@
+ }
+
+ void Delete_Buttons(void) {
+- struct button *belem, *btemp;
++ button *belem, *btemp;
+
+ for ( belem=button_list.next; belem; ) {
+ btemp = belem;
+diff -Naur Maelstrom-3.0.7/main.cpp Maelstrom-3.0.7-patched/main.cpp
+--- Maelstrom-3.0.7/main.cpp 2021-02-04 11:50:27.000000000 -0500
++++ Maelstrom-3.0.7-patched/main.cpp 2021-02-22 08:34:34.000000000 -0500
+@@ -153,7 +153,7 @@
+ error("or\n");
+ error("Usage: %s \n\n", progname);
+ error("Where can be any of:\n\n"
+-" -fullscreen # Run Maelstrom in full-screen mode\n"
++" -windowed # Run Maelstrom in windowed mode\n"
+ " -gamma [0-8] # Set the gamma correction\n"
+ " -volume [0-8] # Set the sound volume\n"
+ " -netscores # Use the world-wide network score server\n"
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
deleted file mode 100644
index 68f48a2db64..00000000000
--- a/pkgs/misc/lilypond/unstable.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }:
-
-let
-
- version = "2.19.83";
-
-in
-
-lilypond.overrideAttrs (oldAttrs: {
- inherit version;
-
- src = fetchgit {
- url = "https://git.savannah.gnu.org/r/lilypond.git";
- rev = "release/${version}-1";
- sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0";
- };
-
- meta = oldAttrs.meta // {
- broken = stdenv.isDarwin;
- };
-})
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 333830f0143..8cb02185f17 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -1,7 +1,6 @@
{ lib
, fetchFromGitHub
, pkgs
-, reattach-to-user-namespace
, stdenv
}:
@@ -10,10 +9,10 @@ let
addRtp = path: rtpFilePath: attrs: derivation:
derivation // { rtp = "${derivation}/${path}/${rtpFilePath}"; } // {
- overrideAttrs = f: mkDerivation (attrs // f attrs);
+ overrideAttrs = f: mkTmuxPlugin (attrs // f attrs);
};
- mkDerivation = a@{
+ mkTmuxPlugin = a@{
pluginName,
rtpFilePath ? (builtins.replaceStrings ["-"] ["_"] pluginName) + ".tmux",
namePrefix ? "tmuxplugin-",
@@ -50,10 +49,7 @@ let
}));
in rec {
-
- inherit mkDerivation;
-
- battery = mkDerivation {
+ battery = mkTmuxPlugin {
pluginName = "battery";
version = "unstable-2019-07-04";
src = fetchFromGitHub {
@@ -64,7 +60,7 @@ in rec {
};
};
- continuum = mkDerivation {
+ continuum = mkTmuxPlugin {
pluginName = "continuum";
version = "unstable-2020-10-16";
src = fetchFromGitHub {
@@ -94,7 +90,7 @@ in rec {
};
};
- copycat = mkDerivation {
+ copycat = mkTmuxPlugin {
pluginName = "copycat";
version = "unstable-2020-01-09";
src = fetchFromGitHub {
@@ -105,7 +101,7 @@ in rec {
};
};
- cpu = mkDerivation {
+ cpu = mkTmuxPlugin {
pluginName = "cpu";
version = "unstable-2020-07-25";
src = fetchFromGitHub {
@@ -116,7 +112,7 @@ in rec {
};
};
- ctrlw = mkDerivation rec {
+ ctrlw = mkTmuxPlugin rec {
pluginName = "ctrlw";
version = "0.1.1";
src = fetchFromGitHub {
@@ -127,7 +123,7 @@ in rec {
};
};
- dracula = mkDerivation rec {
+ dracula = mkTmuxPlugin rec {
pluginName = "dracula";
version = "unstable-2021-02-18";
src = fetchFromGitHub {
@@ -145,7 +141,7 @@ in rec {
};
};
- fingers = mkDerivation rec {
+ fingers = mkTmuxPlugin rec {
pluginName = "fingers";
rtpFilePath = "tmux-fingers.tmux";
version = "1.0.1";
@@ -159,7 +155,7 @@ in rec {
dependencies = [ pkgs.gawk ];
};
- fpp = mkDerivation {
+ fpp = mkTmuxPlugin {
pluginName = "fpp";
version = "unstable-2016-03-08";
src = fetchFromGitHub {
@@ -174,7 +170,7 @@ in rec {
dependencies = [ pkgs.fpp ];
};
- fzf-tmux-url = mkDerivation {
+ fzf-tmux-url = mkTmuxPlugin {
pluginName = "fzf-tmux-url";
rtpFilePath = "fzf-url.tmux";
version = "unstable-2019-12-02";
@@ -186,7 +182,7 @@ in rec {
};
};
- gruvbox = mkDerivation {
+ gruvbox = mkTmuxPlugin {
pluginName = "gruvbox";
rtpFilePath = "gruvbox-tpm.tmux";
version = "unstable-2019-05-05";
@@ -198,7 +194,7 @@ in rec {
};
};
- jump = mkDerivation {
+ jump = mkTmuxPlugin {
pluginName = "jump";
version = "2020-06-26";
rtpFilePath = "tmux-jump.tmux";
@@ -222,7 +218,7 @@ in rec {
};
};
- logging = mkDerivation {
+ logging = mkTmuxPlugin {
pluginName = "logging";
version = "unstable-2019-04-19";
src = fetchFromGitHub {
@@ -233,7 +229,7 @@ in rec {
};
};
- net-speed = mkDerivation {
+ net-speed = mkTmuxPlugin {
pluginName = "net-speed";
version = "unstable-2018-12-02";
src = fetchFromGitHub {
@@ -244,7 +240,7 @@ in rec {
};
};
- nord = mkDerivation rec {
+ nord = mkTmuxPlugin rec {
pluginName = "nord";
version = "0.3.0";
src = pkgs.fetchFromGitHub {
@@ -255,7 +251,7 @@ in rec {
};
};
- maildir-counter = mkDerivation {
+ maildir-counter = mkTmuxPlugin {
pluginName = "maildir-counter";
version = "unstable-2016-11-25";
src = fetchFromGitHub {
@@ -266,7 +262,7 @@ in rec {
};
};
- online-status = mkDerivation {
+ online-status = mkTmuxPlugin {
pluginName = "online-status";
version = "unstable-2018-11-30";
src = fetchFromGitHub {
@@ -277,7 +273,7 @@ in rec {
};
};
- open = mkDerivation {
+ open = mkTmuxPlugin {
pluginName = "open";
version = "unstable-2019-12-02";
src = fetchFromGitHub {
@@ -288,7 +284,7 @@ in rec {
};
};
- onedark-theme = mkDerivation {
+ onedark-theme = mkTmuxPlugin {
pluginName = "onedark-theme";
rtpFilePath = "tmux-onedark-theme.tmux";
version = "unstable-2020-06-07";
@@ -300,7 +296,7 @@ in rec {
};
};
- pain-control = mkDerivation {
+ pain-control = mkTmuxPlugin {
pluginName = "pain-control";
version = "unstable-2020-02-18";
src = fetchFromGitHub {
@@ -311,7 +307,7 @@ in rec {
};
};
- plumb = mkDerivation rec {
+ plumb = mkTmuxPlugin rec {
pluginName = "plumb";
version = "0.1.1";
src = fetchFromGitHub {
@@ -325,7 +321,7 @@ in rec {
'';
};
- power-theme = mkDerivation {
+ power-theme = mkTmuxPlugin {
pluginName = "power";
rtpFilePath = "tmux-power.tmux";
version = "unstable-2020-11-18";
@@ -337,7 +333,7 @@ in rec {
};
};
- prefix-highlight = mkDerivation {
+ prefix-highlight = mkTmuxPlugin {
pluginName = "prefix-highlight";
version = "unstable-2020-03-26";
src = fetchFromGitHub {
@@ -348,7 +344,7 @@ in rec {
};
};
- resurrect = mkDerivation {
+ resurrect = mkTmuxPlugin {
pluginName = "resurrect";
version = "unstable-2020-09-18";
src = fetchFromGitHub {
@@ -385,7 +381,7 @@ in rec {
};
};
- sensible = mkDerivation {
+ sensible = mkTmuxPlugin {
pluginName = "sensible";
version = "unstable-2017-09-05";
src = fetchFromGitHub {
@@ -394,12 +390,12 @@ in rec {
rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5";
sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx";
};
- postInstall = lib.optionalString pkgs.stdenv.isDarwin ''
- sed -e 's:reattach-to-user-namespace:${reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
'';
};
- sessionist = mkDerivation {
+ sessionist = mkTmuxPlugin {
pluginName = "sessionist";
version = "unstable-2017-12-03";
src = fetchFromGitHub {
@@ -410,7 +406,7 @@ in rec {
};
};
- sidebar = mkDerivation {
+ sidebar = mkTmuxPlugin {
pluginName = "sidebar";
version = "unstable-2018-11-30";
src = fetchFromGitHub {
@@ -421,7 +417,7 @@ in rec {
};
};
- sysstat = mkDerivation {
+ sysstat = mkTmuxPlugin {
pluginName = "sysstat";
version = "unstable-2017-12-12";
src = fetchFromGitHub {
@@ -432,7 +428,7 @@ in rec {
};
};
- tilish = mkDerivation {
+ tilish = mkTmuxPlugin {
pluginName = "tilish";
version = "2020-08-12";
src = fetchFromGitHub {
@@ -451,7 +447,7 @@ in rec {
};
};
- tmux-colors-solarized = mkDerivation {
+ tmux-colors-solarized = mkTmuxPlugin {
pluginName = "tmuxcolors";
version = "unstable-2019-07-14";
src = fetchFromGitHub {
@@ -462,7 +458,7 @@ in rec {
};
};
- tmux-fzf = mkDerivation {
+ tmux-fzf = mkTmuxPlugin {
pluginName = "tmux-fzf";
rtpFilePath = "main.tmux";
version = "unstable-2020-12-07";
@@ -498,7 +494,7 @@ in rec {
};
};
- urlview = mkDerivation {
+ urlview = mkTmuxPlugin {
pluginName = "urlview";
version = "unstable-2016-01-06";
src = fetchFromGitHub {
@@ -513,7 +509,7 @@ in rec {
dependencies = [ pkgs.urlview ];
};
- vim-tmux-focus-events = mkDerivation {
+ vim-tmux-focus-events = mkTmuxPlugin {
pluginName = "vim-tmux-focus-events";
version = "unstable-2020-10-05";
src = fetchFromGitHub {
@@ -532,7 +528,7 @@ in rec {
};
};
- vim-tmux-navigator = mkDerivation {
+ vim-tmux-navigator = mkTmuxPlugin {
pluginName = "vim-tmux-navigator";
rtpFilePath = "vim-tmux-navigator.tmux";
version = "unstable-2019-12-10";
@@ -544,7 +540,7 @@ in rec {
};
};
- yank = mkDerivation {
+ yank = mkTmuxPlugin {
pluginName = "yank";
version = "unstable-2019-12-02";
src = fetchFromGitHub {
@@ -554,5 +550,4 @@ in rec {
sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4";
};
};
-
}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8ac029250ec..da4f37d28a0 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 = "2021-03-04";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "8c5081f6316183c97298ec4a819fd94c2a2a9516";
- sha256 = "1k1d19w9avvxk6ccgdj2sricr3c3crvlwdfj0g7ybgh8nyn2isvs";
+ rev = "c21d6afd2fb799013e3894d393bf976d9da31e65";
+ sha256 = "1f4s6zq0270mpczwz7chi763rxnm2qk3gjfylwmr8r2ny6f5is1w";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -209,12 +209,12 @@ let
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2021-02-05";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "691155697a809af8797c1b935aa4e73187516d42";
- sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg";
+ rev = "2bb1fcd8828df1de5c79821b6b01ba929af355f0";
+ sha256 = "0xlzq51izzbhsl3jlqj3f719ixcqi7r7y8m8n6291yp1xpmidfwm";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -257,12 +257,12 @@ let
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-02-18";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "42d7112d78839ef9bd2b283ec0d9d82134e94b4f";
- sha256 = "0i2vx60h27sal1crl8di4rq6dp4c8zjarknjl9z09l1s798l5i62";
+ rev = "85432f426b7473bb7a4de9f698f91848737b0fd8";
+ sha256 = "16ql06swg4flr933bp2qm8g5iy2sjgh650k18pzghc0qc9k517xd";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "4608bbe255e66f463cf08de888e470cb00966f8d";
- sha256 = "06rkj244frd2a7w0x0dp4nnzn8sdnbyww1jwn9xlypfcn67gg0nn";
+ rev = "36bc8699c7fe94d8c184bc2d17382752557bd22e";
+ sha256 = "0swcw4cfhshfb6rmq93r5lmr338gn0ci7wmhabvmpxzhwwm28xvr";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -509,12 +509,12 @@ let
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "9454f352914475f3595efad08bb1524cf8812853";
- sha256 = "0j3h8jyn2gbyyk7vpbjprg4kpk77j85npb0m090z0iqhlvcdrhh1";
+ rev = "946e8393cd9189f97a50084c2a040966dce0f0cb";
+ sha256 = "0d74lk85hkjb0w4fzvsp4gljl224ci749g2l25a1kd6kihyf7f82";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-03-03";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "71b5766a7cc28daef89fac7db99340cd532035b3";
- sha256 = "035fhkf6n4iyi01jc84a8bsaapz5dd3m49cbilxag2wr85gc4b9p";
+ rev = "ab4f3f5797754334def047466a998b92f3076db9";
+ sha256 = "1wr0v1kgv9km5rfc9g49897043gk3hraf07z8i937144z34qasf1";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-03-04";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "5e78fa379d6c1a604834e89eff31c9a28123c6d9";
- sha256 = "1phkq68hv6pi1z637in8hl5m5xzaw7ybmqyvljy8rly89w9gis5w";
+ rev = "3b61d0755a4523a131096c97fb016b102e7b1672";
+ sha256 = "1df1zq117vf6w7d9y0l9cdicsw1qw3d497xnckk3c0r0kv8w6hkc";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -846,24 +846,24 @@ let
dart-vim-plugin = buildVimPluginFrom2Nix {
pname = "dart-vim-plugin";
- version = "2020-11-10";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "dart-lang";
repo = "dart-vim-plugin";
- rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d";
- sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf";
+ rev = "a2821046c45d25258aeddd4d64d607070b93dd88";
+ sha256 = "0wpsv0qz5dyp484ilvlkmd8jlb6b9s0p96lsw103jpj1dlf2n7la";
};
meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
};
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-03-03";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "dbcee4399394e56e4bbae5039af78408b2a35334";
- sha256 = "1p6ckanaqxgag1l1kmpiwq2fxygfp6rghbf4a3mx5ldh17lhnii8";
+ rev = "6849ecf77a6075e55946c642f07a562fcdcdd579";
+ sha256 = "0pyvscibc7ydn294kffwp80gfwk5rk4v63haih79c7acq52xmm0l";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -882,24 +882,24 @@ let
defx-icons = buildVimPluginFrom2Nix {
pname = "defx-icons";
- version = "2020-08-09";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "defx-icons";
- rev = "3259550f918b2cfb9794b62e7bb94b863f75f489";
- sha256 = "1a65p99f9f1idzkxl4fd1klxidf40lvs79bym1fydv1zw34x8qzv";
+ rev = "563bc2d07d6c369a293ea8cb2fad8afd38bf4a02";
+ sha256 = "0gp65vf7lb00k4pk9iyr2zm6q3lfz16ad70hh3ldnj2azdfz539m";
};
meta.homepage = "https://github.com/kristijanhusak/defx-icons/";
};
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-02-28";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "f4e082b3e4a62ca2cd5dfe041288f4acf3b2031f";
- sha256 = "1lm4x0skg9mm776bm7s34sjmxjjvcsy7gjn95qhplg7r6799xsn0";
+ rev = "fc76104d2b7204c016bd8e1750a06150800c4735";
+ sha256 = "1ch1g39r2iyd8ma11kfi6fqy0cp0ybqv0laqs1pxphlw2z575jrj";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -1184,12 +1184,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "a4683be7c58c346458e2cdb1f8b244e14fe35a8e";
- sha256 = "0ph4mj4s2gklr8rz8ny80i91r7fcivh9kb5q0y20c19mmyjsvifm";
+ rev = "aa32b3d2e8f4240c7908f098f89359d20063c691";
+ sha256 = "1048kb3sxmsbd9xk4s1nxvhgkrfixvpragbj6sm00sy4hx5qfq4j";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1256,12 +1256,12 @@ let
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
- version = "2021-03-05";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "32f0a489d1f47405f3327d0686f8d96da216cead";
- sha256 = "1czs335wdjs8vfx3ydy92m145wibp6jy47fia5p5mhrp6zncibqq";
+ rev = "561c21a96249e7411b409817c00d472a26337b8d";
+ sha256 = "0nb1s9c6av6jkvc3gc239llzsa34n50nfqf6swvvbazn7j29sz7c";
};
meta.homepage = "https://github.com/dracula/vim/";
};
@@ -1315,6 +1315,18 @@ let
meta.homepage = "https://github.com/dmix/elvish.vim/";
};
+ embark-vim = buildVimPluginFrom2Nix {
+ pname = "embark-vim";
+ version = "2021-02-23";
+ src = fetchFromGitHub {
+ owner = "embark-theme";
+ repo = "vim";
+ rev = "d9ea898794c486e2517823f24b9577ce4c488364";
+ sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
+ };
+ meta.homepage = "https://github.com/embark-theme/vim/";
+ };
+
emmet-vim = buildVimPluginFrom2Nix {
pname = "emmet-vim";
version = "2020-10-21";
@@ -1523,24 +1535,24 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2021-02-02";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "02a192ea0bed22a015e005b281e55e0da2a8e496";
- sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv";
+ rev = "711fb41e39e2ad3abec1ec9720782acbac6fb6b4";
+ sha256 = "1jfjj20arsikk8alaa7jrp7aakkpakpnjbkk4ri0s95f8ix09wcm";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "dd1cd3098f95423fa744be5d65b61132caae51b5";
- sha256 = "12k25aq9giivfh2nw086ha8jq77bd5d5v9mmqsxjb15bp6b2mbc5";
+ rev = "a6c2cbc2218cb2e59fd3353fb827da82b84a248a";
+ sha256 = "1vj4f61x5p1zg8cr4a7a90xij810v6zkbzdwpkbksfmyrxfkvqs8";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1619,12 +1631,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-03-04";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "d54291e425d324db56a4b0990c73a0facb9ae877";
- sha256 = "1zwnsblklw9a9khr6xpwsfn115synrzg1b92pvzsh5p53ydaqaj2";
+ rev = "6f282d9e99e04780d645e0133c4376486bd16c23";
+ sha256 = "0jy682lmafxpippsrd63r46dda5a96vrd1filj1b5xqniqwk4mrz";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1787,12 +1799,12 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-03-03";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "114354c337dc0f492b014853f8972fa42ca4c379";
- sha256 = "0laxlhzv70zln8wsxdcgimbc3zg4dpyixik7qa44lw4g8szmpyxc";
+ rev = "b3224bc6231a6a3543390cdfab4e4226dbfe40a7";
+ sha256 = "165csrpk2mq685i13kyf7w935al1qwgqd2myyn2gnznbfpbnlcw1";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -1895,12 +1907,12 @@ let
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
- version = "2021-01-22";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "207e001be64b39b72f8661e4a723d5bab698b5cd";
- sha256 = "0vnnfm319y3n0vvwbwls40fb6s73rqc8yyi31g0f0hdwd6ahsafm";
+ rev = "47691a67b690ad6ebd9df67574691822d226a5b6";
+ sha256 = "0lkw6mslkd0gax0s280icpa5saq3320kkkmjih04mmnnf1vnwq6a";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2052,12 +2064,12 @@ let
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
- version = "2021-02-17";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
- rev = "7f967873c8a3e566bdf10715569319a632f3de93";
- sha256 = "1db6i2w93pfgw1nkhgw9m75crbx62rh5cvw7pbjs69xmbfd2zlld";
+ rev = "4188c157147fa1f3104edac7f52b41c8f18c6d8b";
+ sha256 = "18kb56lwn3xl0xq4h34hr3z3ja1phbjpaxk6281d38wkj8randk8";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@@ -2184,24 +2196,24 @@ let
lh-brackets = buildVimPluginFrom2Nix {
pname = "lh-brackets";
- version = "2021-01-15";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-brackets";
- rev = "7e0e38857de5558de04c251cf6ddc350724562d9";
- sha256 = "105dgm80946jvx9qxs10vscgrplwpg89nwd6cmpm47wzj8999r8b";
+ rev = "73efae0e97b8c661bf36d3637c3ba1ee02b4fe07";
+ sha256 = "122jhh3vkapxz42sa6l9sdxcdl4fzq4xfrjmaak815nvf3bg249a";
};
meta.homepage = "https://github.com/LucHermitte/lh-brackets/";
};
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2021-02-23";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "7afb5525addfab7c177c2912a7aa98053c79e495";
- sha256 = "18jwc65q0k1q7nd2w31gi476cg4h7bfrr7z39is3s3qw0z2nprp9";
+ rev = "0618a099fa7895c5d25b80cc1bea948ebdc64a96";
+ sha256 = "1k2kz3475f15n1y7dkac45fw4mbr33fgbf2j7vmlshb4796j5fw3";
};
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
};
@@ -2304,24 +2316,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "afbe401bf8e8b02e4b61459d012bf2c1c70b7cf0";
- sha256 = "03hbh3y5ya0v2qgc5mhs0v7vwn2z56c8srg3arfqaphhr18da7s7";
+ rev = "80c29017e9897280273473956009cc641a0b3709";
+ sha256 = "1n08g56qiqq150hkihbwdnij5p1gipfddxh49vh8gs6jq7xk2vc5";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-03-02";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "9c9212c5b63675b43459e29858d3e0a64bce9507";
- sha256 = "07nz7wj8vr9dckbfx3dymjv9yq1q3wyy7mcj8lvlg1d9g28snnd1";
+ rev = "332f488e2499d0f7a09276adcdd50995b348f7de";
+ sha256 = "184csjlaizgd1fi7f3w6j67qvy1cg9sqiy5zjd1qy010bfl1cl46";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2748,12 +2760,12 @@ let
neosnippet-snippets = buildVimPluginFrom2Nix {
pname = "neosnippet-snippets";
- version = "2021-01-20";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet-snippets";
- rev = "b10b14873fc0fd46a7daab251e83eaad6c17e1e3";
- sha256 = "1y5bp92dvz356nzl14bcqhdvfwc59ckc45nw0m4lh43q2h0lvdg1";
+ rev = "97ce53528ded53cc2355acb64d285a6291cca099";
+ sha256 = "0kms714cgryajrjmw0fpxv8k5xdrs6jz68jqd5hj4cs8rj72vpjk";
};
meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
};
@@ -2928,12 +2940,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-02-26";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "536f99f6c5aa27f3362be6c7bc61e5251c9bdbcc";
- sha256 = "1n0xrzvplsrrc17jyqnyapwx2vj7b39d2ma0pd40qjf97rsvv4a4";
+ rev = "497d8f8ddc4e7ed339c8afbbfe80fb6a57743297";
+ sha256 = "012vnr7s7y3vv3n3fk10yxm7khwxnn7mjrkiixhrjq3lp4cai7xi";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -2950,16 +2962,28 @@ let
meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/";
};
- nvim-autopairs= buildVimPluginFrom2Nix {
+ nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-02-25";
+ version = "2021-02-08";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
};
- meta.homepage = "https://github.com/windwp/nvim-autopairs";
+ meta.homepage = "https://github.com/windwp/nvim-autopairs/";
+ };
+
+ nvim-bqf = buildVimPluginFrom2Nix {
+ pname = "nvim-bqf";
+ version = "2021-03-08";
+ src = fetchFromGitHub {
+ owner = "kevinhwang91";
+ repo = "nvim-bqf";
+ rev = "0e772b3ffb16ad1b712fe72c95b3b2bddc2c7ade";
+ sha256 = "051nly6h78cmx79nppxi86jchdjn90l3q96fx4g99pkgivsbswad";
+ };
+ meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-cm-racer = buildVimPluginFrom2Nix {
@@ -2974,26 +2998,14 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
- nvim-bqf = buildVimPluginFrom2Nix {
- pname = "nvim-bqf";
- version = "2021-02-25";
- src = fetchFromGitHub {
- owner = "kevinhwang91";
- repo = "nvim-bqf";
- rev = "4a424267e110e9637b84096a7080aa280c56be31";
- sha256 = "034x827nka73znvnbm5slnypw1az9s7xlrpkv5ia6hi7pcapjyfn";
- };
- meta.homepage = "https://github.com/kevinhwang91/nvim-bqf";
- };
-
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-03-05";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "c2dcc0d7469da71728a5443c053cd51a32c600fa";
- sha256 = "049ngs57xn19yv6p0xbz69riykxdv9mas5aj8ivdph67kwi5c7ym";
+ rev = "25170751944b64bb7b65af1e35772361485bc936";
+ sha256 = "0vaw5g4iflc0k1xy51rhgn1kb4qzxdd92r5nhnwvbc3fr6xkn464";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3036,24 +3048,24 @@ let
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2021-02-25";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "5a95e50556deebf45d771abc58c7cd440fd6390a";
- sha256 = "187yxnjxb9pp98yzvkpssmdcfqwvggzg5fpc20jwa7fvq8cdl0a0";
+ rev = "07aa4b435a832b122154a157ab6892ac4efb81fb";
+ sha256 = "05cgypswm7qdl26jd6nfqahk2bmqvp482k9zjbk0an12kbzlsrz0";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2021-03-03";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "5567fddecd08115857ef9fa49d1341ea6acf8620";
- sha256 = "02wgywj3sm4pc65qchdv3b217wrrrg11l5k60vrilqdk2spc4xvp";
+ rev = "5f189ece5e071f4133ce756bec0ab7da1f6eece6";
+ sha256 = "1s59fr7ppw37c98skrlbbcw583dhrqwjwd2nwjhmhhc884r88d5x";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@@ -3084,12 +3096,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-03-02";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "58e7ee50b847956e31b4e293efc24fe86eb1e193";
- sha256 = "063vgba5bqgji416bmp4vzy4pfsmvn3gjflinkyv05vcs76vy82w";
+ rev = "8ff60d5e91fe2a4c1dedc6685ef7722e8e7bce78";
+ sha256 = "1gaw6pcvgw31dkdpni708l3kcyw3fv3fk05fn3cgs0sdn4xzmnkj";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -3108,12 +3120,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "100a8bbfa621db3d373dc41b6f593719b53f860c";
- sha256 = "1p781j10mhyv8vgi9chkv36kxhy09hpnlk0iam915fhpm050q887";
+ rev = "11a581d1860a7ad2b6c1ee1e0ebbb000e81b9950";
+ sha256 = "0khbp05sgz07sazgkmv4pwrnnisswkagx4gwkw9slawm4qb1k93j";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3132,24 +3144,24 @@ let
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
- version = "2021-03-03";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-peekup";
- rev = "4da5cd216643ec15164237cdbab4884604053b46";
- sha256 = "0q5j3d4bdapb9m5h5ijkxh05q4fsc2inbskq2rhmannlq94myljb";
+ rev = "b88638d1067364965c214860cc2e5048caa617f7";
+ sha256 = "17hc37f7gm1wbrj6mzq3walb1a5km901viq0nx8n93r957sj98dd";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-03-05";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "33e5262777b26e1e81a887d1a85fb0d2037c8249";
- sha256 = "0agk44v8l91cmaczrraylkb8k69s1c05cz0yj9ipn06l0dmj2rlh";
+ rev = "16c7c64872d4e6634cd5cf2d7db63474b2e8beda";
+ sha256 = "15ig6x9xdl4gz9yvnhhxic106h03xxm95sd6kgmjpdpvibnv448n";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3168,36 +3180,36 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-02-26";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "1984c125100247f79e1aaa4de335032ea6092d63";
- sha256 = "081vcbasmhki7hshfaimbv1wgim15h6vagcxc4fkjgbmpl621s49";
+ rev = "31ef294d05e1feeb5eb9e8ff3895d09cc93d95e4";
+ sha256 = "0vcgvwcibqq5j59nw09z2mc0gb79nyhiwnxny81h0m56mn2v9a6r";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-03-04";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "2f60b43c0f003f549f845ac1578878c69514929b";
- sha256 = "1q7q5rd7cyjk7s83w5vnfin76dv52ggjn3q2ja15zayi758bg78k";
+ rev = "3b8c2ea492917fcb3c0e88ad6682dbd355cc0644";
+ sha256 = "083ysgl1xwlfm2ri54m4qr17rvm6a5al95ybzzff6av699v632rb";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2021-02-16";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
- rev = "0dda360a8f841550ca565564c5a409746353e94e";
- sha256 = "058hfybqhcwvmhjm7k9iww2baz2fpww7nq6m9xngj3wdwfkylcfy";
+ rev = "ff4955b250eebc320d32d6459297117004c68d3e";
+ sha256 = "0qmhk6mdx00cf0vnz57n512ddifh08js7paxg9qsha374xqwq715";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
@@ -3360,12 +3372,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-03-04";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "3c7bdd7afb0a0149fdf3e77ec8d6dd93b3159d52";
- sha256 = "1dxx0mjyms5h2a5g6abbmjvq00sn25q1xw4r4fa7l8sifsa9i7r4";
+ rev = "6a169bec7d15d24c1d680fb75aa24a2921829442";
+ sha256 = "01z192y61vls455hjp6im87mzbngyhpn78mpf80c445anpwpb0xf";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3456,12 +3468,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "41b4f834c4cc22ff283f381fd3fe3e00ead3099d";
- sha256 = "0vd4haaj2agsy3592j6kp72azpjj3lm51gahq2s7d4a63cr93xl8";
+ rev = "8f2babdd1bb76c2df0a1ef307bb9fe8477d13727";
+ sha256 = "14c57pxhq4da8svi11rbzsg3rygcnly7cwjzzhpg2a9id1xxsppq";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3493,12 +3505,12 @@ let
popup-nvim = buildVimPluginFrom2Nix {
pname = "popup-nvim";
- version = "2020-12-12";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "popup.nvim";
- rev = "6f8f4cf35278956de1095b0d10701c6b579a2a57";
- sha256 = "0mvcms1ica4kpl5na0cppk0advyq96707zj394wvlnnq18dnsj4z";
+ rev = "bc98ca6df9179452c368f0d7bac821a8fd4c01ac";
+ sha256 = "0j1gkaba6z5vb922j47i7sq0d1zwkr5581w0nxd8c31klghg3kyn";
};
meta.homepage = "https://github.com/nvim-lua/popup.nvim/";
};
@@ -4239,12 +4251,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "6e941e0ecec1ab6a1b4ce40c693ef1272c505abb";
- sha256 = "1dd7al3zh02fdjsnvxcbqxw9q27x57fl5krcdwn5yifadwmbrdml";
+ rev = "add7ee394350f268684cff03d844f32f255fec47";
+ sha256 = "0rfrgfx9xm02cy4dy40n4j90561ymw1pyqzzw4fawpajm3hmxcfv";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4359,7 +4371,7 @@ let
};
tremor-vim = buildVimPluginFrom2Nix {
- pname = "tremor-nvim";
+ pname = "tremor-vim";
version = "2020-11-19";
src = fetchFromGitHub {
owner = "tremor-rs";
@@ -4367,7 +4379,7 @@ let
rev = "17e53c33f3b0e825330580034ca60172b8ddaadc";
sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki";
};
- meta.homepage = "https://github.com/tremor-rs/tremor-vim";
+ meta.homepage = "https://github.com/tremor-rs/tremor-vim/";
};
tslime-vim = buildVimPluginFrom2Nix {
@@ -4502,18 +4514,6 @@ let
meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
};
- embark-vim = buildVimPluginFrom2Nix {
- pname = "embark-vim";
- version = "2021-02-23";
- src = fetchFromGitHub {
- owner = "embark-theme";
- repo = "vim";
- rev = "d9ea898794c486e2517823f24b9577ce4c488364";
- sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
- };
- meta.homepage = "https://github.com/embark-theme/vim/";
- };
-
vim-abolish = buildVimPluginFrom2Nix {
pname = "vim-abolish";
version = "2020-10-30";
@@ -4768,12 +4768,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-03-02";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "df956aa08b8bdb176d7127cc4940aea123ec4ffc";
- sha256 = "1wk9df1c80198xpp6zd2yxh3j216w573lv5ssfq6ck26jy7p4q44";
+ rev = "09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783";
+ sha256 = "0hi4yvd5b8il63a42kk10hxc8ixb1khf8h8q601qipkvgla8mpiy";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -4924,12 +4924,12 @@ let
vim-beancount = buildVimPluginFrom2Nix {
pname = "vim-beancount";
- version = "2020-08-06";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "nathangrigg";
repo = "vim-beancount";
- rev = "6d762beaa526d4e56280619aa62b1013b50457b7";
- sha256 = "0r4ziynmil432k1xjglqjx0bh5069aav3k9r58ksqg716w4zvzys";
+ rev = "30b55500094325af9e9498b72e75c8c1090df436";
+ sha256 = "0bh7q7s3zb2yrnck3zx1cx0kv8lm8zp4p5fwj6kv35y27v109pfm";
};
meta.homepage = "https://github.com/nathangrigg/vim-beancount/";
};
@@ -5044,12 +5044,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-03-05";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "791e2e7cffc6db2858dc6099af109e3b6e9d7f19";
- sha256 = "1d5z4s3llkz324ij9cz7sxhzn0a5bjgdvxg0wnd8v9d1vc7hjpp3";
+ rev = "c558950fa5e1aaa9fe4652b37380fffb762fdd09";
+ sha256 = "0z0k1596a2wj1ynr4jbh0s53drrkmx1r4ff0ji7scx1jihxpfjqp";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5284,12 +5284,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-02-26";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "28c3b294c9f1d88078eeebfa62a8533e6ea97f87";
- sha256 = "0myj7ng62sjxhrq0lfk142dzr637rfl0ll6khrd0a3hrwxjjnb2x";
+ rev = "c1f00249cb47dae2457ae8b748284620b622e642";
+ sha256 = "0s4srsnxqw0g5k75cqcy709x7jqipsfsvhsic2cj0b0y8m49wqzz";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5500,12 +5500,12 @@ let
vim-endwise = buildVimPluginFrom2Nix {
pname = "vim-endwise";
- version = "2020-04-19";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-endwise";
- rev = "97180a73ad26e1dcc1eebe8de201f7189eb08344";
- sha256 = "1f9nwp9qiip4alkpacwaq2nzsrx80a4cdwyrvajs6lrk48dv4hbw";
+ rev = "4289889a2622f9bc7c594a6dd79763781f63dfb5";
+ sha256 = "0sixr3rpcgqbaiyk7w6ghcrvllh35cb3gq9isdlwkww3dz4jyyxc";
};
meta.homepage = "https://github.com/tpope/vim-endwise/";
};
@@ -5680,12 +5680,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-03-05";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "a4c834bc8ed2e7e2ef3f02de2d3055007e464956";
- sha256 = "0lhfdnsqys0091k85nkd1g68xgv09m6jymv8ikax0xfar1zmymx3";
+ rev = "7b0eb92e72a6d6aef3c31faa868e2d2a4af81951";
+ sha256 = "08sf9idvrjqf6bvi5p98w8fj2r7c1czkvsyfjch77bwr20gdf2wy";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5728,12 +5728,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "9cba97f4db4e0af4275f802c2de977f553d26ec6";
- sha256 = "182z25fv3lqhsh926p24fq1lwldbdq8bqbmivpv4ylq2c5b6xisz";
+ rev = "753318ef83b685f32c6bda5ae5b65b7b239a29a7";
+ sha256 = "0g3l1hb4nqwaz5hhagr6hy4nwv1n1qcwbak27s5sx9fbnsp6npaa";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5848,12 +5848,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-02-20";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "755b498c7604e7aee4d001d2a78c2d1e079eb8d5";
- sha256 = "048xqia30alvcshvmbqlqvvslk19zvqmsdy50ww8rzz9yzhff5bw";
+ rev = "95c79dcdcbc7e8e9165fa7f4a6bf17c08a6bab05";
+ sha256 = "0110jifwa485l42cjjf3bbrwiahwm1ddijh4jlybchghrx2b64r2";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -6233,12 +6233,12 @@ let
vim-javascript = buildVimPluginFrom2Nix {
pname = "vim-javascript";
- version = "2020-05-11";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "pangloss";
repo = "vim-javascript";
- rev = "3c90d0cc37bb8b78422f647e62587f498a5dd7bd";
- sha256 = "16s3s883azfmwkr6hhnh8m7ibk6jm3vnvpmsagangxn0mz6ky533";
+ rev = "c7593e69bf64c3157b50cd0aea257c5abb8ae6a0";
+ sha256 = "11792qbl0080s8kxprfzc0xnb3abw1zsvb4vq2fc61q50afn775j";
};
meta.homepage = "https://github.com/pangloss/vim-javascript/";
};
@@ -6426,12 +6426,12 @@ let
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
- version = "2021-03-05";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
- rev = "0dc9c746ef2459964bab31ccca4225320fe0d687";
- sha256 = "1fkbi0yw62ga0fmyi40gz173ydydlp0xkbxl0c8l40d68yx0ckvh";
+ rev = "96ec5f9a14211c3b1b2e4632c07df3a5fb68ef3b";
+ sha256 = "0kawxaxahg7sdpkyp65k7gy6hqbfcs1hy8w8rzvi2h9kw4y8xkr7";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@@ -6510,12 +6510,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-03-03";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "fea03524cb89385dc8997867a8588135bbd454ca";
- sha256 = "1p8ahb8wl6prs7jdbjchk9w3h3yfz9mnklr4k5j360nwdj7mvbm8";
+ rev = "eb237a2cedf2c69a44543d2ffaee25470c53e29b";
+ sha256 = "1aldjq32cpbd2gkxqvf6gqskyr4br9835vsap4sgjc2fgigmiyla";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -6991,12 +6991,12 @@ let
vim-pandoc-syntax = buildVimPluginFrom2Nix {
pname = "vim-pandoc-syntax";
- version = "2021-03-02";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-syntax";
- rev = "76812f583d7fbec2ef0257424ec1f43fd32473fb";
- sha256 = "0dfhn03nirz2iccpsi9g3rdw3vg1pm0hv75swv5dwhshjzw8rw70";
+ rev = "aba6b5596cf0e879a83a2aa5edc93e5e5753bea8";
+ sha256 = "0hgzmfcyl3qhdmyyxdaynlm7psk164v8xg5j1kvdaxxgj4lwbnig";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
};
@@ -7447,12 +7447,12 @@ let
vim-scriptease = buildVimPluginFrom2Nix {
pname = "vim-scriptease";
- version = "2020-01-05";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-scriptease";
- rev = "86f49aca266e4b17420bcadd29009997d15668d8";
- sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c";
+ rev = "9450c4ea654649b6199750edc9f3f84637268d7b";
+ sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg";
};
meta.homepage = "https://github.com/tpope/vim-scriptease/";
};
@@ -7471,12 +7471,12 @@ let
vim-sexp = buildVimPluginFrom2Nix {
pname = "vim-sexp";
- version = "2017-05-15";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "guns";
repo = "vim-sexp";
- rev = "12292941903d9ac8151513189d2007e1ccfc95f0";
- sha256 = "1mfqbmrbqgnsc34pmcsrc0c5zvgxhhnw4hx4g5wbssfk1ddyx6y0";
+ rev = "14464d4580af43424ed8f2614d94e62bfa40bb4d";
+ sha256 = "139krxpjhbyypbl6v2jik1rms2fxl3dkqrl4rb7sms6c3p5764qx";
};
meta.homepage = "https://github.com/guns/vim-sexp/";
};
@@ -7519,12 +7519,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
- version = "2021-01-28";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
- rev = "b2a0450e23c63b75bbeabf4f0c28f9b4b2480689";
- sha256 = "0fj9dwvkpg69v6ps56hrm0k2y4f9rvnj7hwic6ysxfx96wngfzcm";
+ rev = "2542b6459085f3d1e361e8b5bf406dec6448487e";
+ sha256 = "1m7m1fwn4bpbqfji7fvvgx00fxz1hy5nvfajbpj4vpgaxzqwsf8k";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@@ -7627,12 +7627,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-02-25";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "24a9bf959211bb0ba9ada17d6425ff167adf7bd9";
- sha256 = "0jwjhpw1g0hy935vzslbhcw9n5sfbpcc7hs1bvvvir05619hr21y";
+ rev = "d30f65105e1f73c63c92c22c4afbad51539f5744";
+ sha256 = "05qbrdipxpzj7v0n4q3bj8p2sgl28jm952hy7gs76ma3p3g7mnrq";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7651,12 +7651,12 @@ let
vim-sort-motion = buildVimPluginFrom2Nix {
pname = "vim-sort-motion";
- version = "2018-07-15";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "christoomey";
repo = "vim-sort-motion";
- rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5";
- sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb";
+ rev = "c8782be8f7da414c6442b3ba4b6abb0345d392d9";
+ sha256 = "1vq2jrn75g3gd8vfgbnkn0w2qc4gbnrn2lg0wmzsvvxdvj8m9lii";
};
meta.homepage = "https://github.com/christoomey/vim-sort-motion/";
};
@@ -7831,12 +7831,12 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
- version = "2020-12-10";
+ version = "2021-03-07";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
- rev = "aa7877acb5dd81bed70c1188667b76cfde5b67bf";
- sha256 = "0ibks0ykybiardppad9psjh2qmh29s9mbjf2d4jg8hbx59kvj32g";
+ rev = "e62cac4d3186209a510f51becd768ee414b2be76";
+ sha256 = "1c93kvlrgzp5fw5rgv053sin0f2f2chydxbvrkprpz71qmxqmq05";
};
meta.homepage = "https://github.com/hashivim/vim-terraform/";
};
@@ -8024,12 +8024,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-03-04";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "e47a0cc3eaedb4072c564d616001dc61ae403ab6";
- sha256 = "1kjp6rx7k1svr90s56z8xqs4j1hii7y48acmdcl6lmhyxp5jindk";
+ rev = "3f6ed5af76d45cf3d0e7f87cd927866f3640aa22";
+ sha256 = "04m652dfwgr52ic2f206s0mq8z10dnaxb90xcywrfjgkdcjd6d10";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8445,24 +8445,24 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-03-05";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "f64e85873dbe654937a9ce50c987440c5a53975b";
- sha256 = "1nnj5qgb9hnkrp7hj0hiiacckak97mrygsv4j44rxqgdibwszi9h";
+ rev = "3af88f325e4784bd209df490dbf648a942326d57";
+ sha256 = "0zqp4zvl8xqa0lsj6lwc4wlg0n3wknhfn1g1j2gbncgyiw38ax2l";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
vimux = buildVimPluginFrom2Nix {
pname = "vimux";
- version = "2021-02-23";
+ version = "2021-03-09";
src = fetchFromGitHub {
owner = "preservim";
repo = "vimux";
- rev = "5b1791673c1a089a78be16187f7532f95e50580b";
- sha256 = "17m7hh02q9myfpa8z1scnakcl25fasnns1gxgfpx544rky5pd3mc";
+ rev = "29d46f6bc158c28b85ae540dc29459ff41211233";
+ sha256 = "1yd9pmyzqyk7mcsa9gkvsz6i9g6zkm63mm9h26713simy1idl536";
};
meta.homepage = "https://github.com/preservim/vimux/";
};
@@ -8493,12 +8493,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2021-02-26";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "9c97b935cb941a9fddcbbdc0eaf3e5e190f4847e";
- sha256 = "10jsqi5jipvaa8dbckrjacqz32iy0i9mx1a4m3jk3gainx9a9xmq";
+ rev = "954754c830d2ca7da3157cdea029c8d50021d0bc";
+ sha256 = "1cw79hzkisii0g2n457wbzha65wbpp00x3yrb8rb3d5299bz0z72";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -8675,24 +8675,24 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-03-05";
+ version = "2021-03-06";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "18d39cb21e00e0cd6b24a39f0c012c288d624246";
- sha256 = "12m0i9ma0lmy5vmc9b7ksijnn8lr5a4jkwgnfch496cyakpipvd9";
+ rev = "a9b4a655b61aeb02229d54ff7cd22395a02a9ee7";
+ sha256 = "1dxr4p1ikmqacjb0x9p0ndlcdg812yzqmk56c79dgllf0cr0l7hg";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2021-02-23";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "fcafb4b64ffe6d308f5e312ddd1672e69e09fb1c";
- sha256 = "0bsz046sbf5g6lkgcjyllc8knbiqdcglpkf1wbzn7zi7whdhjxdx";
+ rev = "ead21935391bb1f3906c7358af7ebe5572592cfd";
+ sha256 = "1qcd7w5hadf6h4lxrvj8xjl729csy0bc0dch39xy4j6iph9w8jpq";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 90dce90b072..1ee91987486 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -91,9 +91,11 @@ self: super: {
# plugin, since part of the fzf vim plugin is included in the main fzf
# program.
fzfWrapper = buildVimPluginFrom2Nix {
+ inherit (fzf) src version;
pname = "fzf";
- version = fzf.version;
- src = fzf.src;
+ postInstall = ''
+ ln -s ${fzf}/bin/fzf $target/bin/fzf
+ '';
};
skim = buildVimPluginFrom2Nix {
@@ -729,7 +731,7 @@ self: super: {
libiconv
];
- cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi";
+ cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
};
in
''
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a1d970c26a1..2076e24423d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -627,7 +627,7 @@ tpope/vim-tbone
tpope/vim-unimpaired
tpope/vim-vinegar
travitch/hasksyn
-tremor-rs/tremor-vim
+tremor-rs/tremor-vim@main
triglav/vim-visual-increment
troydm/zoomwintab.vim
twerth/ir_black
diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix
index 39dd6f90b80..7e7d0c618b7 100644
--- a/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
- version = "2.7.0";
+ version = "2.8.1";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
- sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp";
+ sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s";
};
patches = [ ./fix-terraform-ls.patch ];
diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
index 3d5cc51fe2a..9c076d06df4 100644
--- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
@@ -1,18 +1,17 @@
diff --git a/out/extension.js b/out/extension.js
-index 375048c..fa5eff0 100644
+index 4a2c6a9..158fe28 100644
--- a/out/extension.js
+++ b/out/extension.js
-@@ -209,20 +209,7 @@ function pathToBinary() {
+@@ -215,19 +215,7 @@ function pathToBinary() {
if (!_pathToBinaryPromise) {
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path
- const installDir = `${extensionPath}/lsp`;
-- const installer = new languageServerInstaller_1.LanguageServerInstaller();
+- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter);
- try {
- yield installer.install(installDir);
- }
- catch (err) {
-- vscode.window.showErrorMessage(err);
- reporter.sendTelemetryException(err);
- throw err;
- }
@@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644
- command = `${installDir}/terraform-ls`;
+ command = 'TERRAFORM-LS-PATH';
}
- _pathToBinaryPromise = Promise.resolve(command);
- }
+ else {
+ reporter.sendTelemetryEvent('usePathToBinary');
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
index b69849d8245..f19f5a0275b 100644
--- a/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.darwin;
- maintainers = with maintainers; [ yurrriq ];
+ maintainers = with maintainers; [];
};
}
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5e749ed3fcf..4fef56077c0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -772,6 +772,8 @@ let
MLX4_EN_VXLAN = whenOlder "4.8" yes;
MLX5_CORE_EN = option yes;
+ NVME_MULTIPATH = whenAtLeast "4.15" yes;
+
PSI = whenAtLeast "4.20" yes;
MODVERSIONS = whenOlder "4.9" yes;
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 344a866dfe1..c7d9376f1b9 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -13,14 +13,14 @@
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.21-hardened1.patch",
- "sha256": "1c0sdbw8vwrxq2bdhv1xnmp43x1cc3nwd0l77bw3wiq3x76d8sfp",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.21-hardened1/linux-hardened-5.10.21-hardened1.patch"
+ "name": "linux-hardened-5.10.22-hardened1.patch",
+ "sha256": "0ja7pcc999p6vy16gn4syb4vq7rlqckfrf5z2b4a7rzdzxcm6ji8",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.22-hardened1/linux-hardened-5.10.22-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.103-hardened1.patch",
- "sha256": "1ci0zml2g1q1438c7wkq6xn9kk39jsms8pj81chcyxwz67h7xvbc",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.103-hardened1/linux-hardened-5.4.103-hardened1.patch"
+ "name": "linux-hardened-5.4.104-hardened1.patch",
+ "sha256": "0dk0s23vr9vdh8aa7g3f6ygvqry4rw057i18sfnfsr18r7xslhna",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.104-hardened1/linux-hardened-5.4.104-hardened1.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index a0d77336bf4..bdecf6a9bb4 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.21";
+ version = "5.10.22";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy";
+ sha256 = "1pv3661d1gvkdl2jg6wx95lr5lcp6q77jrmx0m4a6z6n6asicnr4";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index f161acca9ea..16ac3baa65e 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.103";
+ version = "5.4.104";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "12wy2w7yc6fcn61xm6l7a86rfwwcchfq89lpznm2v3dmy5y3mqw4";
+ sha256 = "1p8459plp3a6xw7cib34p7bddjs0dlv2m34dy4z6bbsvgfg51m74";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 4fb6c3e916d..0f017bb4b24 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.10.17-rt32"; # updated by ./update-rt.sh
+ version = "5.10.21-rt34"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8";
+ sha256 = "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "1mffl1pvi7ijc3xws32bk8grs27ka2bd9bwl6h99vjn3dnkmkrfr";
+ sha256 = "12c2qpifcgij7hilhd7xrnqaz04gqf41m93pmlm8cv4nxz58cy36";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
index e56d2319a96..d9ebedf6801 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.11.2-rt9"; # updated by ./update-rt.sh
+ version = "5.11.4-rt11"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh";
+ sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "0707rjai04x12llvs004800pkb0axf0d1sssahf3xhgrbalg94y1";
+ sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 6c4cd171025..122848a4e6c 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation {
rm -r "$sourceRoot/debug" "$sourceRoot/release"
'';
+ postPatch = ''
+ substituteInPlace Makefile.am --replace '-Werror' ""
+ '';
+
nativeBuildInputs = [
autoreconfHook
];
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 4bd50653d52..935db27044f 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -1,21 +1,29 @@
-{ lib, stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
+{ lib, stdenv, fetchurl, jdk8_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
majorVersion ? "1.0" }:
let
+ jre8 = jdk8_headless;
+ jre11 = jdk11_headless;
versionMap = {
"2.4" = {
kafkaVersion = "2.4.1";
scalaVersion = "2.12";
sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1";
+ jre = jre8;
};
"2.5" = {
- kafkaVersion = "2.5.0";
+ kafkaVersion = "2.5.1";
+ scalaVersion = "2.12";
+ sha256 = "1wn4iszrm2rvsfyyr515zx79k5m86davjkcwcwpxcgc4k3q0z7lv";
+ jre = jre8;
+ };
+ "2.6" = {
+ kafkaVersion = "2.6.1";
scalaVersion = "2.13";
- sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi";
+ sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y";
+ jre = jre11;
};
};
-
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
in
with versionMap.${majorVersion};
@@ -63,5 +71,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.ragge ];
platforms = platforms.unix;
};
-
+ passthru = { inherit jre; };
}
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index c95de149b5a..c5d1f6c058f 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.17.617";
+ version = "0.17.668";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "sha256-rNCtoiv48fzKH5CAzTZJjAjv6Z37BfVVNqsfpRVfY1M=";
+ sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index a4c47948a64..6b67ef939dc 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,34 +18,36 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.6.4";
+ version = "10.7.0";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz";
- sha256 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo=";
+ sha256 = "sha256-63T1EBjtTWxg41W5gBDYCthgnokZ/e/B1s6BmymO32w=";
};
- nativeBuildInputs = [ unzip ];
- buildInputs = [
+ nativeBuildInputs = [
+ unzip
makeWrapper
];
propagatedBuildInputs = [
- dotnetCorePackages.aspnetcore_3_1
+ dotnetCorePackages.aspnetcore_5_0
sqlite
];
preferLocalBuild = true;
installPhase = ''
+ runHook preInstall
install -dm 755 "$out/opt/jellyfin"
cp -r * "$out/opt/jellyfin"
- makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \
+ makeWrapper "${dotnetCorePackages.aspnetcore_5_0}/bin/dotnet" $out/bin/jellyfin \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
sqlite fontconfig freetype stdenv.cc.cc.lib
]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \
--add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
+ runHook postInstall
'';
passthru.tests = {
@@ -55,7 +57,8 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "The Free Software Media System";
homepage = "https://jellyfin.org/";
- license = licenses.gpl2;
+ # https://github.com/jellyfin/jellyfin/issues/610#issuecomment-537625510
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ nyanloutre minijackson purcell ];
};
}
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 044e9fa050a..0758a863fce 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio";
- version = "2021-03-01T04-20-55Z";
+ version = "2021-03-10T05-11-33Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-VTmnpZzidongzv6BzPY01qggai0w+ztGL3grDv6VGD4=";
+ sha256 = "sha256-YwlVZE7TO9qr/8lwLXdZqjxy4NGxTkmLyKFDVlTZPqQ=";
};
- vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg=";
+ vendorSha256 = "sha256-E+j+ysBKKSyTITmJwHieBcpXdF3+rtt4YS7OVPMC6vI=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
new file mode 100644
index 00000000000..3aa1e18a9f1
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
@@ -0,0 +1,36 @@
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
+
+buildGoModule rec {
+ pname = "artifactory_exporter";
+ version = "1.9.0";
+ rev = "v${version}";
+
+ src = fetchFromGitHub {
+ owner = "peimanja";
+ repo = pname;
+ rev = rev;
+ sha256 = "1zmkajg48i40jm624p2h03bwg7w28682yfcgk42ig3d50p8xwqc3";
+ };
+
+ vendorSha256 = "1594bpfwhbjgayf4aacs7rfjxm4cnqz8iak8kpm1xzsm1cx1il17";
+
+ subPackages = [ "." ];
+
+ buildFlagsArray = ''
+ -ldflags=
+ -s -w
+ -X github.com/prometheus/common/version.Version=${version}
+ -X github.com/prometheus/common/version.Revision=${rev}
+ -X github.com/prometheus/common/version.Branch=master
+ -X github.com/prometheus/common/version.BuildDate=19700101-00:00:00
+ '';
+
+ passthru.tests = { inherit (nixosTests.prometheus-exporters) artifactory; };
+
+ meta = with lib; {
+ description = "JFrog Artifactory Prometheus Exporter";
+ homepage = "https://github.com/peimanja/artifactory_exporter";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ lbpdt ];
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
new file mode 100644
index 00000000000..9d99685b569
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, lib, python3, nixosTests }:
+
+stdenv.mkDerivation rec {
+ pname = "knot-exporter";
+ version = "unstable-2020-01-30";
+
+ src = fetchFromGitHub {
+ owner = "ghedo";
+ repo = "knot_exporter";
+ rev = "21dd46b401e0c1aea0b173e19462cdf89e1f444e";
+ sha256 = "sha256-4au4lpaq3jcqC2JXdCcf8h+YN8Nmm4eE0kZwA+1rWlc=";
+ };
+
+ dontBuild = true;
+
+ nativeBuildInputs = [ python3.pkgs.wrapPython ];
+ buildInputs = [ python3 ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm0755 knot_exporter $out/bin/knot_exporter
+ patchShebangs $out/bin
+ buildPythonPath ${python3.pkgs.prometheus_client}
+ patchPythonScript $out/bin/knot_exporter
+
+ runHook postInstall
+ '';
+
+ passthru.tests = { inherit (nixosTests.prometheus-exporters) knot; };
+
+ meta = with lib; {
+ homepage = "https://github.com/ghedo/knot_exporter";
+ description = " Prometheus exporter for Knot DNS";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ ma27 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix
index 965b33aa337..98ad9cd6226 100644
--- a/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "promscale";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
- sha256 = "sha256-rXOAAd08NTWFRGnJoAY9xllw6dAA7Xu3qcImIVq9ewE=";
+ sha256 = "sha256-f/fpCyAw9BQ6ccEZm/xsTCjINjFtX3Q6SmPuJNVSJVI=";
};
vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU=";
diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
new file mode 100644
index 00000000000..96029c99d8c
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
+
+buildGoModule rec {
+ pname = "systemd_exporter";
+ version = "0.4.0";
+
+ vendorSha256 = "sha256-bYoB0r+d0j3esi/kK2a7/Duup9cf4M3WJjiBNs2+bj8=";
+
+ src = fetchFromGitHub {
+ owner = "povilasv";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-JDfRHczFnTP9sxA7polUE9qzJhSPIiAU58GBNDYkX4c=";
+ };
+
+ passthru.tests = { inherit (nixosTests.prometheus-exporters) systemd; };
+
+ meta = with lib; {
+ description = "Exporter for systemd unit metrics";
+ homepage = "https://github.com/povilasv/systemd_exporter";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ chkno ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index ce57219468f..7d9009f8c65 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
- version = "0.23.9";
+ version = "0.24.1";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
- sha256 = "sha256-fVU3eOhog34fLnfNQ6mWB7yUEkinm74SgpxYXB9MV/g=";
+ sha256 = "sha256-z2F6ru2LNATiI4rSImbvwgxqKxuj8kwzjhwSbsPDBEs=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
- vendorSha256 = "sha256-Poumvh7DccY8qCZ5ehFFaqEsL945BxNXFfevJvRawUA=";
+ vendorSha256 = "sha256-JO2hGrKbt+5Eh7v7LCZrPBK84Q9gjquchlZ5MfMY3uY=";
doCheck = false;
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index 8f922baea66..8e9e06d7ef0 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql_check";
- version = "1.15.3";
+ version = "1.16.0";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TbQanXNdomEjp11izowy4763NsQWUe5rLxoEmuHKFn0=";
+ sha256 = "sha256-ZZvRrt2JaAWruAT4FXB6ChS0jLKpUEDCF2UmAAH4BRQ=";
};
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index ceb9cc9d8af..65107191938 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "repmgr";
- version = "5.1.0";
+ version = "5.2.1";
src = fetchFromGitHub {
owner = "2ndQuadrant";
repo = "repmgr";
rev = "v${version}";
- sha256 = "1igcy98ggwyx8zg4g4kz7xb32b7vc3h668r5wbfk4w49x9v97f4m";
+ sha256 = "sha256-hIhVjSSJAgH/eXiuz0xlTFgp9q+Y41ICeCrRFGss3mk=";
};
nativeBuildInputs = [ flex ];
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index 59da5a80a37..5c980f7e401 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "squid";
- version = "4.13";
+ version = "4.14";
src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
- sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8";
+ sha256 = "sha256-8Ql9qmQ0iXwVm8EAl4tRNHwDOQQWEIRdCvoSgVFyn/w=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index d0c674c1512..d4f9beecfb7 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -11,16 +11,16 @@ buildGoModule rec {
version = "2.0.30";
src = fetchFromGitHub {
- owner = "trezor";
- repo = "trezord-go";
- rev = "v${version}";
+ owner = "trezor";
+ repo = "trezord-go";
+ rev = "v${version}";
sha256 = "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr";
};
vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";
propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ]
- ++ lib.optionals stdenv.isDarwin [ AppKit ];
+ ++ lib.optionals stdenv.isDarwin [ AppKit ];
meta = with lib; {
description = "Trezor Communication Daemon aka Trezor Bridge";
diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index af565e6292d..4cc51baacea 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
let
- version = "3.10.1";
+ version = "3.10.2";
stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
- sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8=";
+ sha256 = "sha256-s20GtwqV1BAVr2q+DxG6hqKnDqM0dVm6TbokmPC8Hrs=";
};
phpConfig = writeText "config.php" ''
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 5b0ba490bf5..3b570c89ae4 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.27.1";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-Ms3ofPU7pd1qOxTJ7jImT2DawTcFLeI7Fi+xihsWhKY=";
+ sha256 = "sha256-8mS4Yvzyka85ZkV2LT68h4EGmumQtYpOxCIDRqa3fk0=";
};
- cargoSha256 = "sha256-cJ+P/AaptZGOyjIu+66M1/rMYpVPFZGQDPeakUws3CQ=";
+ cargoSha256 = "sha256-jbziXOrmHkZPp3YkPJypNj7l62Q6nKyamBBYjlfYiVE=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6960b3212ba..1c191b567d7 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
homepage = "https://ohmyz.sh/";
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ scolobb nequissimus ];
+ maintainers = with maintainers; [ nequissimus ];
};
}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 3e5c46709ac..a7b91a82a9d 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -322,7 +322,7 @@ in rec {
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
- libssh2 nghttp2 libkrb5 ninja;
+ libssh2 nghttp2 libkrb5 ninja brotli;
llvmPackages_7 = super.llvmPackages_7 // (let
tools = super.llvmPackages_7.tools.extend (_: _: {
@@ -359,7 +359,7 @@ in rec {
[ bootstrapTools ] ++
(with pkgs; [
xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt
- llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
]) ++
(with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
@@ -411,7 +411,7 @@ in rec {
[ bootstrapTools ] ++
(with pkgs; [
xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt
- llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
]) ++
(with pkgs.darwin; [ dyld ICU Libsystem locale ]);
@@ -533,7 +533,7 @@ in rec {
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
binutils.bintools darwin.binutils darwin.binutils.bintools
- curl.out openssl.out libssh2.out nghttp2.lib libkrb5
+ curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5
cc.expand-response-params libxml2.out
]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools ICU libiconv locale libtapi
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index ce3dbcc74be..c5e792d6bcd 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.22"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.19.25"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-yu2IltNbOLB44M+0u5lTjHHllDndBHp4rNfMwFOKMgw=";
+ sha256 = "sha256-YL5MnlN+DODGgpi2qtpr6wwC0nuebl/VoBzXRk4l4R8=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index df4211ad039..3937a6d65e9 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,16 +2,13 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2021.02.21";
+ version = "2021.03.10";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- sha256 = "10fa2g8vsz0y7kb0wxnz857r2gd9b0b278j0a5ipjaa7cjd0gi1b";
+ sha256 = "1g4a5b17jbra1c59fpsv1d1jrdsjwg5mw54qilrm12nw7yh9lihf";
};
- # There is also a file called "makefile" which seems to be preferred by the standard build phase
- makefile = "Makefile";
-
meta = with lib; {
homepage = "http://abc.sourceforge.net/abcMIDI/";
downloadPage = "https://ifdo.ca/~seymour/runabc/top.html";
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 61340938f51..a3eedf3ea47 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -21,6 +21,7 @@
, enableKodiupdate ? true
, enableLastfm ? true
, enableLoadext ? true
+, enableLyrics ? true
, enableMpd ? true
, enablePlaylist ? true
, enableReplaygain ? true
@@ -59,6 +60,7 @@ let
lastgenre = enableLastfm;
lastimport = enableLastfm;
loadext = enableLoadext;
+ lyrics = enableLyrics;
mpdstats = enableMpd;
mpdupdate = enableMpd;
playlist = enablePlaylist;
@@ -73,7 +75,7 @@ let
pluginsWithoutDeps = [
"bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart"
"export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy"
- "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics"
+ "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs"
"mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play"
"plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
"types" "unimported" "zero"
@@ -130,6 +132,8 @@ in pythonPackages.buildPythonApplication rec {
] ++ lib.optional enableAbsubmit essentia-extractor
++ lib.optional enableAcoustid pythonPackages.pyacoustid
++ lib.optional enableBeatport pythonPackages.requests_oauthlib
+ ++ lib.optional enableConvert ffmpeg
+ ++ lib.optional enableDiscogs pythonPackages.discogs_client
++ lib.optional (enableFetchart
|| enableDeezer
|| enableEmbyupdate
@@ -139,10 +143,9 @@ in pythonPackages.buildPythonApplication rec {
|| enableSubsonicplaylist
|| enableSubsonicupdate
|| enableAcousticbrainz) pythonPackages.requests
- ++ lib.optional enableConvert ffmpeg
- ++ lib.optional enableDiscogs pythonPackages.discogs_client
++ lib.optional enableKeyfinder keyfinder-cli
++ lib.optional enableLastfm pythonPackages.pylast
+ ++ lib.optional enableLyrics pythonPackages.beautifulsoup4
++ lib.optional enableMpd pythonPackages.mpd2
++ lib.optional enableSonosUpdate pythonPackages.soco
++ lib.optional enableThumbnails pythonPackages.pyxdg
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix
index 034e73207e3..d2a14aae330 100644
--- a/pkgs/tools/audio/yabridge/default.nix
+++ b/pkgs/tools/audio/yabridge/default.nix
@@ -56,14 +56,14 @@ let
};
in stdenv.mkDerivation rec {
pname = "yabridge";
- version = "3.0.1";
+ version = "3.0.2";
- # NOTE: Also update yabridgectl's cargoSha256 when this is updated
+ # NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
rev = version;
- hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0=";
+ hash = "sha256-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI=";
};
# Unpack subproject sources
diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix
index 6a77b502aee..5c7f3a628f5 100644
--- a/pkgs/tools/audio/yabridgectl/default.nix
+++ b/pkgs/tools/audio/yabridgectl/default.nix
@@ -6,12 +6,12 @@ rustPlatform.buildRustPackage rec {
src = yabridge.src;
sourceRoot = "source/tools/yabridgectl";
- cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc=";
+ cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0=";
patches = [
# By default, yabridgectl locates libyabridge.so by using
- # hard-coded distro-specific lib paths. This patch replaces those
- # hard coded paths with lib paths from NIX_PROFILE.
+ # hard coded distro specific lib paths. This patch replaces those
+ # hard coded paths with lib paths from NIX_PROFILES.
./libyabridge-from-nix-profiles.patch
];
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index d753e7c5204..cb40e72c30b 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -2,29 +2,28 @@
stdenv.mkDerivation rec {
pname = "mtd-utils";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd";
+ sha256 = "sha256-itTF80cW1AZGqihySi9WFtMlpvEZJU+RTiaXbx926dY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka;
buildInputs = [ acl libuuid lzo zlib zstd ];
- configureFlags = [
- (lib.enableFeature doCheck "unit-tests")
- (lib.enableFeature doCheck "tests")
+ configureFlags = with lib; [
+ (enableFeature doCheck "unit-tests")
+ (enableFeature doCheck "tests")
];
- enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
- meta = {
+ meta = with lib; {
description = "Tools for MTD filesystems";
- license = lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
homepage = "http://www.linux-mtd.infradead.org/";
- maintainers = with lib.maintainers; [ viric ];
- platforms = with lib.platforms; linux;
+ maintainers = with maintainers; [ viric superherointj ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index e109b12f287..b3d412b8fda 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -11,14 +11,17 @@ mkDerivation rec {
sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
};
- preConfigure = ''
- substituteInPlace CMakeLists.txt \
- --replace "#find_package(Serialport REQUIRED)" "find_package(Qt5SerialPort REQUIRED)"
- '';
-
buildInputs = [ qtbase qtserialport ];
nativeBuildInputs = [ cmake ];
+ postInstall = ''
+ cd ..
+ mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps,man/man1}
+ cp cutecom.desktop "$out/share/applications"
+ cp images/cutecom.svg "$out/share/icons/hicolor/scalable/apps"
+ cp cutecom.1 "$out/share/man/man1"
+ '';
+
meta = with lib; {
description = "A graphical serial terminal";
homepage = "https://gitlab.com/cutecom/cutecom/";
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 963063710a3..2350fd6afe4 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "fselect";
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-vVIanMkc0sPzu0L48oOh8wEEUOckR/AYkz81u4OR+fE=";
nativeBuildInputs = [ installShellFiles ];
+ buildInputs = lib.optional stdenv.isDarwin libiconv;
postInstall = ''
installManPage docs/fselect.1
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index f3dd909d22b..b164c8c0ae0 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "0.158.0";
+ version = "0.159.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ewwJHn55zzry2hhMNuRUlGwC995r0ooPJGqKYaCh4WE=";
+ sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ=";
};
- vendorSha256 = "sha256-awgkYMidTDcUjQt7hA5cSiwSAsNo5iUqKcG4+2lCXIM=";
+ vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk=";
buildFlagsArray = [
"-ldflags="
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index a7055437939..9635b6b4238 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -12,10 +12,10 @@
let
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
- version = "1.3";
- gitRev = "a26745e404c3a201fe98af4c000bb27f910542b1";
- sha256 = "0gfkqvla2cphyhnl5xw19yf1v4pvwsvphr019y5r914cwqwnkb92";
- cargoSha256 = "1a1alhpivlmxy8iv0ki7s0b8hf3hadashf81rzn207wn3yihsnaf";
+ version = "1.3.1";
+ gitRev = "df83b9b175fecc8ec8b02096c5cfe2db3d00b92e";
+ sha256 = "1df6p0b482vhymw3z7gimc441jr7aix9lhdbcm5wjvw9f276016f";
+ cargoSha256 = "1f9b2h3zakw7qmlnc4rqhxnw80sl5h4mj8cghr82iacxwqz499ql";
in (rustPlatform.buildRustPackage rec {
pname = "lorri";
diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix
index 970a5bc8265..27e228f0f20 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/pkgs/tools/misc/pgcenter/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgcenter";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "lesovsky";
repo = "pgcenter";
rev = "v${version}";
- sha256 = "sha256-W/UUc0qwOvLSXYWepkCydst113BqR9EsZK0Es+6HSt8=";
+ sha256 = "sha256-ow26wuM7nw/WbeaPVcNm5iYUYLydeujhw+7BcTirPcA=";
};
vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU=";
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index eb267e6007a..ea49038724b 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2021.1";
+ version = "1.2021.2";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ=";
+ sha256 = "sha256-06PrqYf1Cc4FZPr0K2xUc83t+/qGbwMXe/BOV81Fuxc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix
new file mode 100644
index 00000000000..b1e75f36b54
--- /dev/null
+++ b/pkgs/tools/misc/tfk8s/default.nix
@@ -0,0 +1,38 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "tfk8s";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "jrhouston";
+ repo = "tfk8s";
+ rev = version;
+ sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw=";
+ };
+
+ vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4=";
+ runVend = true;
+
+ buildFlagsArray = [
+ "-ldflags="
+ "-s"
+ "-w"
+ "-X main.toolVersion=${version}"
+ "-X main.builtBy=nixpkgs"
+ ];
+
+ meta = with lib; {
+ description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format.";
+ license = licenses.mit;
+ longDescription = ''
+ tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider.
+ If you want to copy examples from the Kubernetes documentation or migrate existing YAML manifests and use them with Terraform without having to convert YAML to HCL by hand, this tool is for you.
+ Features:
+ * Convert a YAML file containing multiple manifests.
+ * Strip out server side fields when piping kubectl get $R -o yaml | tfk8s --strip
+ '';
+ homepage = "https://github.com/jrhouston/tfk8s/";
+ maintainers = with maintainers; [ superherointj ];
+ };
+}
diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix
index 0db042120ca..fb1268acc6f 100644
--- a/pkgs/tools/misc/tremor-rs/default.nix
+++ b/pkgs/tools/misc/tremor-rs/default.nix
@@ -33,8 +33,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--all" ];
meta = with lib; {
- description =
- "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";
+ description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";
homepage = "https://www.tremor.rs/";
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 2091a4aa549..ede7dce2724 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clash";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "Dreamacro";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-T6oBdhBX850GXb19MTOFVo9LRfOgCyMW3GIljMMeGmg=";
+ sha256 = "sha256-ObnlcKTuO/yFNMXLwGvRTLnz18bNquq6dye2qpL7+VM=";
};
- vendorSha256 = "sha256-HqlHUVWwvO15nitpwIh/u0GfF8wqJqkviyxOp7QHYz8=";
+ vendorSha256 = "sha256-6ZQMDXc2NFs6l/DWPPCFJ+c40764hXzFTdi1Pxk1fnU=";
doCheck = false;
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 79f78c8fff4..b2710a2c33a 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "8.6.8";
+ version = "8.6.10";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ierNKZ14F3EKtQRdOd7D4jhaA7M6zwnFVSk6aUh4VPc=";
+ sha256 = "sha256-/JS173hIW3doDCP/5v8dUSEW44pyq6VdF17Za6JWtys=";
};
- vendorSha256 = "sha256-F/Vxl9Z5LgAmnRt/FOdW9eVN7IVb1ZEKiYOSpT9+L0E=";
+ vendorSha256 = "sha256-5UaOFTm72RG/xsShliU32Vp6qNANDyAotbaRYyan87U=";
doCheck = false;
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 53104ef1a47..8cf669494d1 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
- version = "0.35.2";
+ version = "0.35.5";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XOTHvI80WMn5j52+N/bR/NfaPX9v6cRB2VCVWJ6fJw8=";
+ sha256 = "sha256-DScN/swigecdhucxhfP1mNr2mDX6HbY2dktkN8BxBjI=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix
index 329302ae35d..33ea36da38a 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/pkgs/tools/networking/gping/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "gping";
- version = "1.2.0-post";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "orf";
repo = "gping";
rev = "v${version}";
- sha256 = "0h4cd36lrhr64p3m2l7yvkq22h8fzzm3g61m39d303s1viibm6dg";
+ sha256 = "sha256-lApm1JLXNjDKLj6zj25OaZDVp7lLW3qyrDsvJrudl8I=";
};
- cargoSha256 = "0aadalgs5p7wqbbkidm49ccfl716xairb4pirrgm3749zdg55bi9";
+ cargoSha256 = "sha256-2PxhtAqROgufVGGH7VtEJJU6Sa2OrGbbMVRUWYbAD0Q=";
meta = with lib; {
description = "Ping, but with a graph";
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index a6c50e46205..bdec1b2b4ac 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
- version = "2021-02-19T05-34-40Z";
+ version = "2021-03-10T05-59-20Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4=";
+ sha256 = "sha256-IoCM2FA6oNiNT6zWspMEqgq4hZ8tAQVEAqouRlBe/ts=";
};
- vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U=";
+ vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo=";
doCheck = false;
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index ddd196ebe56..de8b9a0a4f1 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config bison flex check ];
buildInputs = [ libdaemon ];
+ # Needed for cross-compilation
+ makeFlags = [
+ "AR=${stdenv.cc.targetPrefix}ar"
+ ];
+
meta = with lib; {
homepage = "http://www.litech.org/radvd/";
description = "IPv6 Router Advertisement Daemon";
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 3427cd186c3..efdd16e630b 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
configureFlags = [
(lib.withFeatureAs (openssl != null) "ssl" "openssl")
+ ] ++ lib.optionals stdenv.isDarwin [
+ # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
+ "--without-included-regex"
];
doCheck = false;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 9ab08007ec7..d39af405da5 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -13,7 +13,7 @@ common =
, bash, coreutils, gzip, gnutar
, pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex
- , jq, libarchive
+ , jq, libarchive, libcpuid
, lowdown, mdbook
# Used by tests
, gmock
@@ -56,6 +56,7 @@ common =
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock lowdown ]
+ ++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS
((aws-sdk-cpp.override {
@@ -212,28 +213,15 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20201205_a5d85d0";
+ suffix = "pre20210308_1c0e3e4";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "a5d85d07faa94cf3518e98273be4bee3d495f06a";
- sha256 = "0g9jjhh0vs4hjrff5yx88x6sh7rk87ngvni3gnyxajqia957dipg";
+ rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
+ sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
};
- patches = [
- (fetchpatch { # Fix build on gcc10
- url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch";
- sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y=";
- })
- # Fix the ETag bug. PR merged. Remove when updating to >= 20210125
- # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
- (fetchpatch {
- url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch";
- sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
- })
- ];
-
inherit storeDir stateDir confDir boehmgc;
});
diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock
index f130b57912b..c0610480c72 100644
--- a/pkgs/tools/security/bundler-audit/Gemfile.lock
+++ b/pkgs/tools/security/bundler-audit/Gemfile.lock
@@ -1,10 +1,10 @@
GEM
remote: https://rubygems.org/
specs:
- bundler-audit (0.7.0.1)
+ bundler-audit (0.8.0)
bundler (>= 1.2.0, < 3)
- thor (>= 0.18, < 2)
- thor (1.0.1)
+ thor (~> 1.0)
+ thor (1.1.0)
PLATFORMS
ruby
diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix
index c543920549f..ff4d6da8069 100644
--- a/pkgs/tools/security/bundler-audit/gemset.nix
+++ b/pkgs/tools/security/bundler-audit/gemset.nix
@@ -5,19 +5,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j";
+ sha256 = "00l8rs7cna0j3yh4s9sza0r88x7kjc7j4gp9yl378422k7i0r73v";
type = "gem";
};
- version = "0.7.0.1";
+ version = "0.8.0";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
+ sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
type = "gem";
};
- version = "1.0.1";
+ version = "1.1.0";
};
}
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index 66d4c23defb..9e34b07121f 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gitleaks";
- version = "7.2.2";
+ version = "7.3.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-G/7Ezyfp9vkG1QHTG9Xg6mZ3qhQpx952i7rsSr3fFwY=";
+ sha256 = "sha256-IJaumIFuIhrvXZ45uz8RUxAuprnWdv2lNzxNUascvVc=";
};
- vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
+ vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}")
diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix
index 20e28fa1253..9478844055e 100644
--- a/pkgs/tools/security/hcxtools/default.nix
+++ b/pkgs/tools/security/hcxtools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxtools";
- version = "6.1.5";
+ version = "6.1.6";
src = fetchFromGitHub {
owner = "ZerBea";
repo = pname;
rev = version;
- sha256 = "1xvr89r6287788bx5qbw9sr8jvmajps0rpc7fvh9bfzb6zw2rq6w";
+ sha256 = "sha256-x6sVFjM2GMGqpoAW7CtCLUoEAYLgulaUKXequQ7DmGQ=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 047c072c389..cb6ee5aefe0 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.33"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.34"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index a58e933d3c3..17d21d96423 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: 76926232b9c92df4832d986513fe89b8c1d53f1f
- ref: refs/tags/6.0.33
+ revision: 010e4d5a643a857e09bafbcf79b541e607de3c4c
+ ref: refs/tags/6.0.34
specs:
- metasploit-framework (6.0.33)
+ metasploit-framework (6.0.34)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -12,7 +12,6 @@ GIT
aws-sdk-s3
bcrypt
bcrypt_pbkdf
- bit-struct
bson
concurrent-ruby (= 1.0.5)
dnsruby
@@ -31,7 +30,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
- metasploit-payloads (= 2.0.34)
+ metasploit-payloads (= 2.0.37)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.6)
mqtt
@@ -124,22 +123,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
- aws-partitions (1.431.1)
- aws-sdk-core (3.112.1)
+ aws-partitions (1.432.0)
+ aws-sdk-core (3.113.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.226.0)
+ aws-sdk-ec2 (1.227.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.48.0)
+ aws-sdk-iam (1.49.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kms (1.42.0)
+ aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.89.0)
+ aws-sdk-s3 (1.91.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -148,7 +147,6 @@ GEM
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
bindata (2.4.8)
- bit-struct (0.16)
bson (4.12.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
@@ -168,7 +166,7 @@ GEM
eventmachine (>= 1.0.0.beta.4)
erubi (1.10.0)
eventmachine (1.2.7)
- faker (2.16.0)
+ faker (2.17.0)
i18n (>= 1.6, < 2)
faraday (1.3.0)
faraday-net_http (~> 1.0)
@@ -214,7 +212,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
- metasploit-payloads (2.0.34)
+ metasploit-payloads (2.0.37)
metasploit_data_models (4.1.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -240,7 +238,7 @@ GEM
network_interface (0.0.2)
nexpose (7.2.1)
nio4r (2.5.7)
- nokogiri (1.11.1)
+ nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
@@ -325,7 +323,7 @@ GEM
metasm
rex-core
rex-text
- rex-socket (0.1.25)
+ rex-socket (0.1.26)
rex-core
rex-sslscan (0.1.6)
rex-core
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 0887f84410e..b5fb78fd1f3 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.0.33";
+ version = "6.0.34";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-hIAXqohZyBJfVj4BxxYVpERZDU6sd6EnVgVax7MXQ7Q=";
+ sha256 = "sha256-sKt1hN7thNhA+bjeFF3gxJs/82EPXPiM81zcMpDRDyg=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index c66c4c5880b..edd4d305fd8 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,60 +114,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08574xgyq39z07xhbgc12882v38lgkmj0jpznpcivjca1v7dk53l";
+ sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg";
type = "gem";
};
- version = "1.431.1";
+ version = "1.432.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9";
+ sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z";
type = "gem";
};
- version = "3.112.1";
+ version = "3.113.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xa39m2lsdq4i0n9r2bz19nv43pjkrs54dnas7q78gl3c467wqj9";
+ sha256 = "0lhpwxad3yc5c3a8jmp116qx5jmym0ykpv39iwdq5km4h3as6h2d";
type = "gem";
};
- version = "1.226.0";
+ version = "1.227.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02xsqb66r7a53a9nnwrhpvd5s9n7wdrvd51c56gs1hlb38j45y0j";
+ sha256 = "1c7vnkwh6z7nxgpmdw8hy70wxiimszyp644vmj8p1pr7ybz6sv9l";
type = "gem";
};
- version = "1.48.0";
+ version = "1.49.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i";
+ sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh";
type = "gem";
};
- version = "1.42.0";
+ version = "1.43.0";
};
aws-sdk-s3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mznxmpsjqf3gmb6nxkmj2niswy4vvs4ykabf5z9cvamhbvvjhbv";
+ sha256 = "0vs3zg9d3lzi7rwys4qv62mcmga39s4rg4rmb0dalqknz6lqzhrq";
type = "gem";
};
- version = "1.89.0";
+ version = "1.91.0";
};
aws-sigv4 = {
groups = ["default"];
@@ -209,16 +209,6 @@
};
version = "2.4.8";
};
- bit-struct = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1w7x1fh4a6inpb46imhdf4xrq0z4d6zdpg7sdf8n98pif2hx50sx";
- type = "gem";
- };
- version = "0.16";
- };
bson = {
groups = ["default"];
platforms = [];
@@ -344,10 +334,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jc6wffxnl7rbhg4hpj572f38fkxgrkgvv5imgzamrdmw55h206b";
+ sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6";
type = "gem";
};
- version = "2.16.0";
+ version = "2.17.0";
};
faraday = {
groups = ["default"];
@@ -524,12 +514,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "76926232b9c92df4832d986513fe89b8c1d53f1f";
- sha256 = "1d232yrwfnh5aqks2xxc9q6mji542lbcf09yargi5j2ri2m1g044";
+ rev = "010e4d5a643a857e09bafbcf79b541e607de3c4c";
+ sha256 = "0a0gs6835p2wyf6ghp0gc7rkz6y4w1fi9pmqz50di17dvs27baxh";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.0.33";
+ version = "6.0.34";
};
metasploit-model = {
groups = ["default"];
@@ -546,10 +536,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n0npcd6im6h225pd3abcydsxg9n3hmarmdssy66x4g8wpiifbrp";
+ sha256 = "1mf1c50j2gszxspnn9f2d356z8aaiv9s9x8lpdi05cf6syvhsa2k";
type = "gem";
};
- version = "2.0.34";
+ version = "2.0.37";
};
metasploit_data_models = {
groups = ["default"];
@@ -706,10 +696,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
+ sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
type = "gem";
};
- version = "1.11.1";
+ version = "1.11.2";
};
octokit = {
groups = ["default"];
@@ -1076,10 +1066,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg";
+ sha256 = "0mgk44f55w2g536nkxbg62qq5cfr05qxldglfr3yf94qkkanl2gg";
type = "gem";
};
- version = "0.1.25";
+ version = "0.1.26";
};
rex-sslscan = {
groups = ["default"];
diff --git a/pkgs/tools/security/rbw/bump-security-framework-crate.patch b/pkgs/tools/security/rbw/bump-security-framework-crate.patch
new file mode 100644
index 00000000000..9074dd925b8
--- /dev/null
+++ b/pkgs/tools/security/rbw/bump-security-framework-crate.patch
@@ -0,0 +1,19 @@
+Bump security-framework from 2.1.1 to 2.1.2
+
+security-framework=2.1.1 doesn't build on Darwin 10.12.
+https://github.com/kornelski/rust-security-framework/issues/124
+
+--- i/Cargo.lock
++++ w/Cargo.lock
+@@ -1361,9 +1361,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+ [[package]]
+ name = "security-framework"
+-version = "2.1.1"
++version = "2.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
++checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
+ dependencies = [
+ "bitflags",
+ "core-foundation",
diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix
index 17c29c27cb1..c1f99719d76 100644
--- a/pkgs/tools/security/rbw/default.nix
+++ b/pkgs/tools/security/rbw/default.nix
@@ -2,11 +2,11 @@
, stdenv
, rustPlatform
, fetchCrate
-, pinentry
, openssl
, pkg-config
, makeWrapper
, Security
+, libiconv
# rbw-fzf
, withFzf ? false, fzf, perl
@@ -20,27 +20,26 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
- version = "1.0.0"; # do not upgrate 1.1.0 yet, because it doesn't build on Darwin
+ version = "1.1.2";
src = fetchCrate {
inherit version;
crateName = pname;
- sha256 = "0yqn65izcwbh7g085hwq4wrg9y9jlz1xbrq69b6ypqxi9abqnp6q";
+ sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx";
};
- cargoSha256 = "0x00clixdbpqif2wzhj3f4k9kpza623xs8a05wq4g15227kz7mlm";
+ cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b";
+
+ cargoPatches = [ ./bump-security-framework-crate.patch ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
- buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
- postPatch = ''
- substituteInPlace src/pinentry.rs \
- --replace 'Command::new("pinentry")' 'Command::new("${pinentry}/${pinentry.binaryPath or "bin/pinentry"}")'
- '' + lib.optionalString withFzf ''
+ postPatch = lib.optionalString withFzf ''
patchShebangs bin/rbw-fzf
substituteInPlace bin/rbw-fzf \
--replace fzf ${fzf}/bin/fzf \
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 7ea7430e95d..8ee30317bef 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "2.1";
+ version = "2.2";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb";
+ sha256 = "sha256-YxQBKXjYITVy8c6DJ3GwDR0ESgzghqJCcj1GEv8Lp2Q=";
};
buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];
diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix
index c6f4d5dc585..46ba57cea14 100644
--- a/pkgs/tools/system/gdu/default.nix
+++ b/pkgs/tools/system/gdu/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
- version = "4.7.0";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HIVLerSx0XLMvRRJUUGT1M50DbSsFNutOSM5HTTV9mc=";
+ sha256 = "sha256-3u3tsUwxj7lzqoydycIoYSd7ifb9pLlehDA3NwvzPOo=";
};
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
diff --git a/pkgs/tools/text/fst/0001-cargo-lockfile.patch b/pkgs/tools/text/fst/0001-cargo-lockfile.patch
new file mode 100644
index 00000000000..c8c56ffdb62
--- /dev/null
+++ b/pkgs/tools/text/fst/0001-cargo-lockfile.patch
@@ -0,0 +1,935 @@
+From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001
+From: "Robert T. McGibbon"
+Date: Fri, 5 Mar 2021 16:59:41 -0500
+Subject: [PATCH 1/1] Create cargo lock file for 0.4.5
+
+---
+ Cargo.lock | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 916 insertions(+)
+ create mode 100644 Cargo.lock
+
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..136677d
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,916 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "anyhow"
++version = "1.0.38"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++dependencies = [
++ "hermit-abi",
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "bit-set"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
++dependencies = [
++ "bit-vec",
++]
++
++[[package]]
++name = "bit-vec"
++version = "0.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "bstr"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
++dependencies = [
++ "lazy_static",
++ "memchr",
++ "regex-automata",
++ "serde",
++]
++
++[[package]]
++name = "bumpalo"
++version = "3.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
++
++[[package]]
++name = "byteorder"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
++
++[[package]]
++name = "cast"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
++dependencies = [
++ "rustc_version",
++]
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "clap"
++version = "2.33.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
++dependencies = [
++ "bitflags",
++ "textwrap",
++ "unicode-width",
++]
++
++[[package]]
++name = "criterion"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
++dependencies = [
++ "atty",
++ "cast",
++ "clap",
++ "criterion-plot",
++ "csv",
++ "itertools 0.10.0",
++ "lazy_static",
++ "num-traits",
++ "oorandom",
++ "plotters",
++ "rayon",
++ "regex",
++ "serde",
++ "serde_cbor",
++ "serde_derive",
++ "serde_json",
++ "tinytemplate",
++ "walkdir",
++]
++
++[[package]]
++name = "criterion-plot"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
++dependencies = [
++ "cast",
++ "itertools 0.9.0",
++]
++
++[[package]]
++name = "crossbeam-channel"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
++dependencies = [
++ "crossbeam-utils 0.7.2",
++ "maybe-uninit",
++]
++
++[[package]]
++name = "crossbeam-channel"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-utils 0.8.3",
++]
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-epoch",
++ "crossbeam-utils 0.8.3",
++]
++
++[[package]]
++name = "crossbeam-epoch"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-utils 0.8.3",
++ "lazy_static",
++ "memoffset",
++ "scopeguard",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++dependencies = [
++ "autocfg",
++ "cfg-if 0.1.10",
++ "lazy_static",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
++dependencies = [
++ "autocfg",
++ "cfg-if 1.0.0",
++ "lazy_static",
++]
++
++[[package]]
++name = "csv"
++version = "1.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
++dependencies = [
++ "bstr",
++ "csv-core",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "csv-core"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "doc-comment"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
++
++[[package]]
++name = "either"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++
++[[package]]
++name = "fnv"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
++
++[[package]]
++name = "fst"
++version = "0.4.5"
++dependencies = [
++ "doc-comment",
++ "fnv",
++ "memmap",
++ "quickcheck",
++ "rand 0.7.3",
++ "utf8-ranges",
++]
++
++[[package]]
++name = "fst"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f"
++dependencies = [
++ "utf8-ranges",
++]
++
++[[package]]
++name = "fst-bench"
++version = "0.0.1"
++dependencies = [
++ "criterion",
++ "fnv",
++ "fst 0.4.5",
++]
++
++[[package]]
++name = "fst-bin"
++version = "0.4.1"
++dependencies = [
++ "anyhow",
++ "bit-set",
++ "bstr",
++ "clap",
++ "crossbeam-channel 0.4.4",
++ "csv",
++ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memmap",
++ "num_cpus",
++ "regex-automata",
++ "serde",
++ "tempfile",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.10.2+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "half"
++version = "1.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "itertools"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "itertools"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++
++[[package]]
++name = "js-sys"
++version = "0.3.48"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
++dependencies = [
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.88"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
++
++[[package]]
++name = "log"
++version = "0.4.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++
++[[package]]
++name = "memchr"
++version = "2.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
++
++[[package]]
++name = "memmap"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
++dependencies = [
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "memoffset"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "oorandom"
++version = "11.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
++
++[[package]]
++name = "plotters"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
++dependencies = [
++ "num-traits",
++ "plotters-backend",
++ "plotters-svg",
++ "wasm-bindgen",
++ "web-sys",
++]
++
++[[package]]
++name = "plotters-backend"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
++
++[[package]]
++name = "plotters-svg"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
++dependencies = [
++ "plotters-backend",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "quickcheck"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
++dependencies = [
++ "rand 0.7.3",
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom 0.1.16",
++ "libc",
++ "rand_chacha 0.2.2",
++ "rand_core 0.5.1",
++ "rand_hc 0.2.0",
++]
++
++[[package]]
++name = "rand"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
++dependencies = [
++ "libc",
++ "rand_chacha 0.3.0",
++ "rand_core 0.6.2",
++ "rand_hc 0.3.0",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.6.2",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom 0.1.16",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
++dependencies = [
++ "getrandom 0.2.2",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++dependencies = [
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
++dependencies = [
++ "rand_core 0.6.2",
++]
++
++[[package]]
++name = "rayon"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
++dependencies = [
++ "autocfg",
++ "crossbeam-deque",
++ "either",
++ "rayon-core",
++]
++
++[[package]]
++name = "rayon-core"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
++dependencies = [
++ "crossbeam-channel 0.5.0",
++ "crossbeam-deque",
++ "crossbeam-utils 0.8.3",
++ "lazy_static",
++ "num_cpus",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "regex"
++version = "1.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
++dependencies = [
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-automata"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
++dependencies = [
++ "byteorder",
++ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++dependencies = [
++ "semver",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++
++[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++dependencies = [
++ "semver-parser",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++
++[[package]]
++name = "serde"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_cbor"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
++dependencies = [
++ "half",
++ "serde",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.64"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
++dependencies = [
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.61"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "rand 0.8.3",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "tinytemplate"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
++dependencies = [
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
++
++[[package]]
++name = "walkdir"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
++dependencies = [
++ "same-file",
++ "winapi",
++ "winapi-util",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.10.2+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
++dependencies = [
++ "cfg-if 1.0.0",
++ "wasm-bindgen-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
++dependencies = [
++ "bumpalo",
++ "lazy_static",
++ "log",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
++
++[[package]]
++name = "web-sys"
++version = "0.3.48"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b"
++dependencies = [
++ "js-sys",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+--
+2.29.2
+
diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix
new file mode 100644
index 00000000000..738fd69dc64
--- /dev/null
+++ b/pkgs/tools/text/fst/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, libiconv
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "fst";
+ version = "0.4.5";
+
+ src = fetchFromGitHub {
+ owner = "BurntSushi";
+ repo = pname;
+ rev = version;
+ sha256 = "01qdj7zzgwb1zqcznfmnks3dnl6hnf8ib0sm0sgimsbcvajmhab3";
+ };
+
+ cargoPatches = [
+ # Add Cargo.lock lockfile, which upstream does not include
+ ./0001-cargo-lockfile.patch
+ ];
+
+ cargoBuildFlags = [ "--workspace" ];
+ cargoSha256 = "0svn2gzipslz939396rcydqx3i1x07l7acas7fhql12n59n2yrxw";
+
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ csv="$(mktemp)"
+ fst="$(mktemp)"
+ printf "abc,1\nabcd,1" > "$csv"
+ $out/bin/fst map "$csv" "$fst" --force
+ $out/bin/fst fuzzy "$fst" 'abc'
+ $out/bin/fst --help > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "Represent large sets and maps compactly with finite state transducers";
+ homepage = "https://github.com/BurntSushi/fst";
+ license = with licenses; [ unlicense /* or */ mit ];
+ maintainers = with maintainers; [ rmcgibbo ];
+ };
+}
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 85600ff54cf..c6ab5ff9c73 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -32,6 +32,6 @@ buildGoModule rec {
You can feed it standard input, any number of files or any number of directories to recurse into.
'';
license = licenses.bsd3;
- maintainers = with maintainers; [ zowoq ];
+ maintainers = with maintainers; [ zowoq SuperSandro2000 ];
};
}
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index 989f49b6d9a..dbd4fed1474 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2, libxslt, texlive
+{ lib, stdenv, fetchurl, python3, libxslt, texlive
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
@@ -21,14 +21,15 @@ assert enableAllFeatures ->
ghostscript != null;
stdenv.mkDerivation rec {
- name = "dblatex-0.3.11";
+ pname = "dblatex";
+ version = "0.3.12";
src = fetchurl {
- url = "mirror://sourceforge/dblatex/${name}.tar.bz2";
- sha256 = "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv";
+ url = "mirror://sourceforge/dblatex/${pname}3-${version}.tar.bz2";
+ sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n";
};
- buildInputs = [ python2 libxslt tex ]
+ buildInputs = [ python3 libxslt tex ]
++ lib.optionals enableAllFeatures [ imagemagick transfig ];
# TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
@@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
- ${python2.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
+ ${python3.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
'';
passthru = { inherit tex; };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f2e4f419cef..03f78cabdbb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -262,7 +262,6 @@ mapAliases ({
google-gflags = gflags; # added 2019-07-25
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07
- google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07
googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
@@ -358,6 +357,7 @@ mapAliases ({
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
+ lilypond-unstable = lilypond; # added 2021-03-11
links = links2; # added 2016-01-31
linux_rpi0 = linux_rpi1;
linuxPackages_rpi0 = linuxPackages_rpi1;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22e4806349c..0b9ea75eeca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -482,6 +482,8 @@ in
fetchFromSavannah = callPackage ../build-support/fetchsavannah {};
+ fetchFromSourcehut = callPackage ../build-support/fetchsourcehut { };
+
fetchFromGitLab = callPackage ../build-support/fetchgitlab {};
fetchFromGitiles = callPackage ../build-support/fetchgitiles {};
@@ -509,6 +511,8 @@ in
madonctl = callPackage ../applications/misc/madonctl { };
+ maelstrom = callPackage ../games/maelstrom { };
+
copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh;
makeDesktopItem = callPackage ../build-support/make-desktopitem { };
@@ -751,6 +755,8 @@ in
metapixel = callPackage ../tools/graphics/metapixel { };
+ tfk8s = callPackage ../tools/misc/tfk8s { };
+
xtrt = callPackage ../tools/archivers/xtrt { };
yabridge = callPackage ../tools/audio/yabridge {
@@ -2351,6 +2357,8 @@ in
fsmon = callPackage ../tools/misc/fsmon { };
+ fst = callPackage ../tools/text/fst { };
+
fsql = callPackage ../tools/misc/fsql { };
fop = callPackage ../tools/typesetting/fop {
@@ -10822,7 +10830,7 @@ in
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
opa = callPackage ../development/compilers/opa {
- ocamlPackages = ocaml-ng.ocamlPackages_4_03;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_04;
};
opaline = callPackage ../development/tools/ocaml/opaline { };
@@ -11865,9 +11873,10 @@ in
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
- apacheKafka = apacheKafka_2_5;
+ apacheKafka = apacheKafka_2_6;
apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };
+ apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; };
kt = callPackage ../tools/misc/kt {};
@@ -13477,6 +13486,8 @@ in
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
+ hci = callPackage ../development/tools/continuous-integration/hci { };
+
niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv);
ormolu = haskellPackages.ormolu.bin;
@@ -18578,6 +18589,7 @@ in
};
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
+ prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { };
prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { };
@@ -18593,6 +18605,7 @@ in
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { };
+ prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };
prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { };
prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };
prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
@@ -18615,6 +18628,7 @@ in
prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { };
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
+ prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { };
prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
@@ -22861,6 +22875,10 @@ in
google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
+ google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
+ inherit (gnome2) GConf;
+ };
+
gosmore = callPackage ../applications/misc/gosmore { };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
@@ -29136,8 +29154,6 @@ in
lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
- lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
-
lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f31125ef82f..3c8c500d8b5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1001,6 +1001,10 @@ let
ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { };
+ ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs {
+ ppxlib = ppxlib.override { version = "0.22.0"; };
+ };
+
ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {};
ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {};
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index 6278a7042e1..115b38095ed 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -179,11 +179,7 @@ makeScope newScope (self:
sockets = callPackage ../development/octave-modules/sockets { };
- sparsersb = callPackage ../development/octave-modules/sparsersb {
- librsb = null;
- # TODO: Package the librsb library to build this package.
- # http://librsb.sourceforge.net/
- };
+ sparsersb = callPackage ../development/octave-modules/sparsersb { };
stk = callPackage ../development/octave-modules/stk { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ccdc34a574..3db1b1ff38a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -388,15 +388,21 @@ in {
ansiwrap = callPackage ../development/python-modules/ansiwrap { };
- antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; };
+ antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime {
+ inherit (pkgs) antlr4;
+ };
- antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; };
+ antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
+ inherit (pkgs) antlr4;
+ };
anyio = callPackage ../development/python-modules/anyio { };
anyjson = callPackage ../development/python-modules/anyjson { };
- anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; };
+ anytree = callPackage ../development/python-modules/anytree {
+ inherit (pkgs) graphviz;
+ };
apache-airflow = callPackage ../development/python-modules/apache-airflow { };
@@ -434,9 +440,13 @@ in {
area = callPackage ../development/python-modules/area { };
- arelle = callPackage ../development/python-modules/arelle { gui = true; };
+ arelle = callPackage ../development/python-modules/arelle {
+ gui = true;
+ };
- arelle-headless = callPackage ../development/python-modules/arelle { gui = false; };
+ arelle-headless = callPackage ../development/python-modules/arelle {
+ gui = false;
+ };
aresponses = callPackage ../development/python-modules/aresponses { };
@@ -448,7 +458,7 @@ in {
args = callPackage ../development/python-modules/args { };
- aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; };
+ aria2p = callPackage ../development/python-modules/aria2p { };
arrayqueues = callPackage ../development/python-modules/arrayqueues { };
@@ -562,7 +572,9 @@ in {
audiotools = callPackage ../development/python-modules/audiotools { };
- augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; };
+ augeas = callPackage ../development/python-modules/augeas {
+ inherit (pkgs) augeas;
+ };
auroranoaa = callPackage ../development/python-modules/auroranoaa { };
@@ -734,8 +746,7 @@ in {
azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { };
- azure-mgmt-iothubprovisioningservices =
- callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { };
+ azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { };
azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { };
@@ -877,8 +888,7 @@ in {
backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { };
- backports_ssl_match_hostname =
- if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { };
+ backports_ssl_match_hostname = callPackage ../development/python-modules/backports_ssl_match_hostname { };
backports_tempfile = callPackage ../development/python-modules/backports_tempfile { };
@@ -890,7 +900,9 @@ in {
bandit = callPackage ../development/python-modules/bandit { };
- bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; };
+ bap = callPackage ../development/python-modules/bap {
+ inherit (pkgs.ocaml-ng.ocamlPackages) bap;
+ };
baron = callPackage ../development/python-modules/baron { };
@@ -902,11 +914,11 @@ in {
basemap = callPackage ../development/python-modules/basemap { };
- bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; };
+ bash_kernel = callPackage ../development/python-modules/bash_kernel { };
bashlex = callPackage ../development/python-modules/bashlex { };
- basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; };
+ basiciw = callPackage ../development/python-modules/basiciw { };
batchgenerators = callPackage ../development/python-modules/batchgenerators { };
@@ -1124,8 +1136,7 @@ in {
buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
- buildbot-full = self.buildbot.withPlugins
- (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]);
+ buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]);
buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { };
@@ -1139,7 +1150,7 @@ in {
bunch = callPackage ../development/python-modules/bunch { };
- bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; };
+ bx-python = callPackage ../development/python-modules/bx-python { };
bwapy = callPackage ../development/python-modules/bwapy { };
@@ -1186,7 +1197,9 @@ in {
canopen = callPackage ../development/python-modules/canopen { };
- capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; };
+ capstone = callPackage ../development/python-modules/capstone {
+ inherit (pkgs) capstone;
+ };
capturer = callPackage ../development/python-modules/capturer { };
@@ -1266,7 +1279,9 @@ in {
chai = callPackage ../development/python-modules/chai { };
- chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; };
+ chainer = callPackage ../development/python-modules/chainer {
+ cudaSupport = pkgs.config.cudaSupport or false;
+ };
chainmap = callPackage ../development/python-modules/chainmap { };
@@ -1468,7 +1483,10 @@ in {
constantly = callPackage ../development/python-modules/constantly { };
- construct = callPackage ../development/python-modules/construct { };
+ construct = if isPy27 then
+ callPackage ../development/python-modules/construct/2.10.54.nix { }
+ else
+ callPackage ../development/python-modules/construct { };
consul = callPackage ../development/python-modules/consul { };
@@ -1478,7 +1496,10 @@ in {
contextvars = callPackage ../development/python-modules/contextvars { };
- convertdate = callPackage ../development/python-modules/convertdate { };
+ convertdate = if isPy27 then
+ callPackage ../development/python-modules/convertdate/2.2.x.nix { }
+ else
+ callPackage ../development/python-modules/convertdate { };
cookiecutter = callPackage ../development/python-modules/cookiecutter { };
@@ -1624,9 +1645,7 @@ in {
dask-gateway = callPackage ../development/python-modules/dask-gateway { };
- dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server {
- inherit (pkgs) go;
- };
+ dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { };
dask-glm = callPackage ../development/python-modules/dask-glm { };
@@ -1644,9 +1663,7 @@ in {
databricks-cli = callPackage ../development/python-modules/databricks-cli { };
- databricks-connect = callPackage ../development/python-modules/databricks-connect {
- inherit (pkgs) jdk;
- };
+ databricks-connect = callPackage ../development/python-modules/databricks-connect { };
dataclasses = callPackage ../development/python-modules/dataclasses { };
@@ -1668,11 +1685,12 @@ in {
datashape = callPackage ../development/python-modules/datashape { };
- datatable = callPackage ../development/python-modules/datatable {
- inherit (pkgs.llvmPackages) libcxx;
- };
+ datatable = callPackage ../development/python-modules/datatable { };
- dateparser = callPackage ../development/python-modules/dateparser { };
+ dateparser = if isPy27 then
+ callPackage ../development/python-modules/dateparser/0.x.nix { }
+ else
+ callPackage ../development/python-modules/dateparser { };
datrie = callPackage ../development/python-modules/datrie { };
@@ -2022,9 +2040,7 @@ in {
ds-store = callPackage ../development/python-modules/ds-store { };
- ds4drv = callPackage ../development/python-modules/ds4drv {
- inherit (pkgs) bluez;
- };
+ ds4drv = callPackage ../development/python-modules/ds4drv { };
dtopt = callPackage ../development/python-modules/dtopt { };
@@ -2053,10 +2069,7 @@ in {
EasyProcess = callPackage ../development/python-modules/easyprocess { };
- easysnmp = callPackage ../development/python-modules/easysnmp {
- openssl = pkgs.openssl;
- net-snmp = pkgs.net-snmp;
- };
+ easysnmp = callPackage ../development/python-modules/easysnmp { };
easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
@@ -2091,7 +2104,7 @@ in {
elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { };
- elasticsearchdsl = self.elasticsearch-dsl; # alias
+ elasticsearchdsl = self.elasticsearch-dsl;
elementpath = callPackage ../development/python-modules/elementpath { };
@@ -2307,9 +2320,7 @@ in {
fints = callPackage ../development/python-modules/fints { };
- fiona = callPackage ../development/python-modules/fiona {
- gdal_2 = pkgs.gdal_2;
- };
+ fiona = callPackage ../development/python-modules/fiona { };
fipy = callPackage ../development/python-modules/fipy { };
@@ -2816,6 +2827,7 @@ in {
gorilla = callPackage ../development/python-modules/gorilla { };
gpapi = callPackage ../development/python-modules/gpapi { };
+
gplaycli = callPackage ../development/python-modules/gplaycli { };
gpgme = toPythonModule (pkgs.gpgme.override {
@@ -2825,7 +2837,9 @@ in {
gphoto2 = callPackage ../development/python-modules/gphoto2 { };
- gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; };
+ gprof2dot = callPackage ../development/python-modules/gprof2dot {
+ inherit (pkgs) graphviz;
+ };
gps3 = callPackage ../development/python-modules/gps3 { };
@@ -2867,7 +2881,9 @@ in {
graphtage = callPackage ../development/python-modules/graphtage { };
- graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; };
+ graphviz = callPackage ../development/python-modules/graphviz {
+ inherit (pkgs) graphviz;
+ };
grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
@@ -2905,7 +2921,10 @@ in {
gspread = callPackage ../development/python-modules/gspread { };
- gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; };
+ gssapi = callPackage ../development/python-modules/gssapi {
+ inherit (pkgs) krb5Full;
+ inherit (pkgs.darwin.apple_sdk.frameworks) GSS;
+ };
gst-python = callPackage ../development/python-modules/gst-python {
inherit (pkgs) meson;
@@ -2932,7 +2951,9 @@ in {
guppy3 = callPackage ../development/python-modules/guppy3 { };
gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then
- callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; }
+ callPackage ../development/python-modules/gurobipy/darwin.nix {
+ inherit (pkgs.darwin) cctools insert_dylib;
+ }
else if stdenv.hostPlatform.system == "x86_64-linux" then
callPackage ../development/python-modules/gurobipy/linux.nix { }
else
@@ -2955,13 +2976,17 @@ in {
h2 = callPackage ../development/python-modules/h2 { };
- h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; };
+ h3 = callPackage ../development/python-modules/h3 {
+ inherit (pkgs) h3;
+ };
h5netcdf = callPackage ../development/python-modules/h5netcdf { };
- h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; };
+ h5py = callPackage ../development/python-modules/h5py { };
- h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; };
+ h5py-mpi = self.h5py.override {
+ hdf5 = pkgs.hdf5-mpi;
+ };
habanero = callPackage ../development/python-modules/habanero { };
@@ -2999,7 +3024,9 @@ in {
helper = callPackage ../development/python-modules/helper { };
- hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; });
+ hepmc3 = toPythonModule (pkgs.hepmc3.override {
+ inherit python;
+ });
hetzner = callPackage ../development/python-modules/hetzner { };
@@ -3015,7 +3042,9 @@ in {
hickle = callPackage ../development/python-modules/hickle { };
- hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; };
+ hidapi = callPackage ../development/python-modules/hidapi {
+ inherit (pkgs) udev libusb1;
+ };
hieroglyph = callPackage ../development/python-modules/hieroglyph { };
@@ -3043,7 +3072,9 @@ in {
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
- hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; });
+ hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue {
+ inherit python;
+ });
hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };
@@ -3135,16 +3166,14 @@ in {
hyperopt = callPackage ../development/python-modules/hyperopt { };
- hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix
- { }; # File name is called 2.nix because this one will need to remain for Python 2.
+ # File name is called 2.nix because this one will need to remain for Python 2.
+ hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { };
hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4;
- hypothesmith = callPackage ../development/python-modules/hypothesmith {
- libcst = self.libcst.override { doCheck = false; };
- };
+ hypothesmith = callPackage ../development/python-modules/hypothesmith { };
hyppo = callPackage ../development/python-modules/hyppo { };
@@ -3425,13 +3454,17 @@ in {
josepy = callPackage ../development/python-modules/josepy { };
- journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; };
+ journalwatch = callPackage ../tools/system/journalwatch {
+ inherit (self) systemd pytest;
+ };
jpylyzer = callPackage ../development/python-modules/jpylyzer { };
JPype1 = callPackage ../development/python-modules/JPype1 { };
- jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; };
+ jq = callPackage ../development/python-modules/jq {
+ inherit (pkgs) jq;
+ };
jsbeautifier = callPackage ../development/python-modules/jsbeautifier { };
@@ -3515,8 +3548,7 @@ in {
jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };
- jupyterhub-systemdspawner =
- callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; };
+ jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { };
jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { };
@@ -3530,7 +3562,9 @@ in {
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
- jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; };
+ jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
+ pkgs-docker = pkgs.docker;
+ };
jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { };
@@ -3540,7 +3574,9 @@ in {
jwcrypto = callPackage ../development/python-modules/jwcrypto { };
- k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; };
+ k5test = callPackage ../development/python-modules/k5test {
+ inherit (pkgs) krb5Full findutils which;
+ };
kaa-base = callPackage ../development/python-modules/kaa-base { };
@@ -3574,7 +3610,9 @@ in {
keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { };
- kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; };
+ kerberos = callPackage ../development/python-modules/kerberos {
+ inherit (pkgs) kerberos;
+ };
keyring = if isPy3k then
callPackage ../development/python-modules/keyring { }
@@ -3585,9 +3623,13 @@ in {
keystone-engine = callPackage ../development/python-modules/keystone-engine { };
- keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; };
+ keyutils = callPackage ../development/python-modules/keyutils {
+ inherit (pkgs) keyutils;
+ };
- kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src);
+ kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override {
+ python3 = python;
+ }).src);
kinparse = callPackage ../development/python-modules/kinparse { };
@@ -3631,7 +3673,7 @@ in {
labgrid = callPackage ../development/python-modules/labgrid { };
- lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; };
+ lammps-cython = callPackage ../development/python-modules/lammps-cython { };
langcodes = callPackage ../development/python-modules/langcodes { };
@@ -3697,11 +3739,17 @@ in {
libais = callPackage ../development/python-modules/libais { };
- libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; };
+ libarchive-c = callPackage ../development/python-modules/libarchive-c {
+ inherit (pkgs) libarchive;
+ };
- libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
+ libarcus = callPackage ../development/python-modules/libarcus {
+ inherit (pkgs) protobuf;
+ };
- libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; };
+ libasyncns = callPackage ../development/python-modules/libasyncns {
+ inherit (pkgs) libasyncns;
+ };
libcloud = if isPy27 then
callPackage ../development/python-modules/libcloud/2.nix { }
@@ -3749,7 +3797,9 @@ in {
libmr = callPackage ../development/python-modules/libmr { };
- libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; };
+ libnacl = callPackage ../development/python-modules/libnacl {
+ inherit (pkgs) libsodium;
+ };
libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override {
pythonSupport = true;
@@ -3779,7 +3829,9 @@ in {
librouteros = callPackage ../development/python-modules/librouteros { };
- libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; });
+ libsass = (callPackage ../development/python-modules/libsass {
+ inherit (pkgs) libsass;
+ });
libsavitar = callPackage ../development/python-modules/libsavitar { };
@@ -3869,7 +3921,9 @@ in {
liquidctl = callPackage ../development/python-modules/liquidctl { };
- lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; }));
+ lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override {
+ python3 = python;
+ }));
littleutils = callPackage ../development/python-modules/littleutils { };
@@ -3941,7 +3995,9 @@ in {
lxc = callPackage ../development/python-modules/lxc { };
- lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; };
+ lxml = callPackage ../development/python-modules/lxml {
+ inherit (pkgs) libxml2 libxslt zlib;
+ };
lyricwikia = callPackage ../development/python-modules/lyricwikia { };
@@ -4009,7 +4065,9 @@ in {
manuel = callPackage ../development/python-modules/manuel { };
- manticore = callPackage ../development/python-modules/manticore { inherit (pkgs) z3; };
+ manticore = callPackage ../development/python-modules/manticore {
+ inherit (pkgs) z3;
+ };
mapbox = callPackage ../development/python-modules/mapbox { };
@@ -4019,7 +4077,9 @@ in {
marionette-harness = callPackage ../development/python-modules/marionette-harness { };
- marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; };
+ marisa = callPackage ../development/python-modules/marisa {
+ inherit (pkgs) marisa;
+ };
marisa-trie = callPackage ../development/python-modules/marisa-trie { };
@@ -4109,7 +4169,9 @@ in {
memory_profiler = callPackage ../development/python-modules/memory_profiler { };
- mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; }));
+ mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override {
+ python3Packages = self;
+ }));
mergedeep = callPackage ../development/python-modules/mergedeep { };
@@ -4152,7 +4214,9 @@ in {
minimock = callPackage ../development/python-modules/minimock { };
- mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py;
+ mininet-python = (toPythonModule (pkgs.mininet.override {
+ inherit python;
+ })).py;
minio = callPackage ../development/python-modules/minio { };
@@ -4207,8 +4271,8 @@ in {
mohawk = callPackage ../development/python-modules/mohawk { };
- moinmoin = callPackage ../development/python-modules/moinmoin
- { }; # Needed here because moinmoin is loaded as a Python library.
+ # Needed here because moinmoin is loaded as a Python library.
+ moinmoin = callPackage ../development/python-modules/moinmoin { };
mongodict = callPackage ../development/python-modules/mongodict { };
@@ -4276,13 +4340,15 @@ in {
mpd = callPackage ../development/python-modules/mpd { };
- mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.mpi; };
+ mpi4py = callPackage ../development/python-modules/mpi4py { };
mplleaflet = callPackage ../development/python-modules/mplleaflet { };
mpmath = callPackage ../development/python-modules/mpmath { };
- mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; };
+ mpv = callPackage ../development/python-modules/mpv {
+ inherit (pkgs) mpv;
+ };
mpyq = callPackage ../development/python-modules/mpyq { };
@@ -4385,7 +4451,9 @@ in {
nanoleaf = callPackage ../development/python-modules/nanoleaf { };
- nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; };
+ nanomsg-python = callPackage ../development/python-modules/nanomsg-python {
+ inherit (pkgs) nanomsg;
+ };
nanotime = callPackage ../development/python-modules/nanotime { };
@@ -4475,16 +4543,20 @@ in {
nipy = callPackage ../development/python-modules/nipy { };
- nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; };
+ nipype = callPackage ../development/python-modules/nipype {
+ inherit (pkgs) which;
+ };
nitime = callPackage ../development/python-modules/nitime { };
nitpick = callPackage ../applications/version-management/nitpick { };
- nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; };
+ nix-kernel = callPackage ../development/python-modules/nix-kernel {
+ inherit (pkgs) nix;
+ };
- nixpart0 = callPackage ../tools/filesystems/nixpart/0.4
- { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart.
+ # This is used for NixOps to make sure we won't break it with the next major version of nixpart.
+ nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { };
nixpart = callPackage ../tools/filesystems/nixpart { };
@@ -4557,8 +4629,13 @@ in {
notify-py = callPackage ../development/python-modules/notify-py { };
- notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; };
- notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; };
+ notmuch = callPackage ../development/python-modules/notmuch {
+ inherit (pkgs) notmuch;
+ };
+
+ notmuch2 = callPackage ../development/python-modules/notmuch/2.nix {
+ inherit (pkgs) notmuch;
+ };
nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
@@ -4578,7 +4655,7 @@ in {
numba = callPackage ../development/python-modules/numba { };
- numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; };
+ numcodecs = callPackage ../development/python-modules/numcodecs { };
numericalunits = callPackage ../development/python-modules/numericalunits { };
@@ -4620,7 +4697,10 @@ in {
obfsproxy = callPackage ../development/python-modules/obfsproxy { };
- objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; };
+ objgraph = callPackage ../development/python-modules/objgraph {
+ # requires both the graphviz package and python package
+ graphvizPkgs = pkgs.graphviz;
+ };
od = callPackage ../development/python-modules/od { };
@@ -4892,7 +4972,9 @@ in {
pefile = callPackage ../development/python-modules/pefile { };
- pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; };
+ pelican = callPackage ../development/python-modules/pelican {
+ inherit (pkgs) glibcLocales git;
+ };
pendulum = callPackage ../development/python-modules/pendulum { };
@@ -4925,6 +5007,7 @@ in {
pexpect = callPackage ../development/python-modules/pexpect { };
pg8000 = callPackage ../development/python-modules/pg8000 { };
+
pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { };
pgcli = callPackage ../development/tools/database/pgcli { };
@@ -5001,7 +5084,7 @@ in {
pip-tools = callPackage ../development/python-modules/pip-tools {
git = pkgs.gitMinimal;
- glibcLocales = pkgs.glibcLocales;
+ inherit (pkgs) glibcLocales;
};
pipx = callPackage ../development/python-modules/pipx { };
@@ -5183,6 +5266,7 @@ in {
prison = callPackage ../development/python-modules/prison { };
privacyidea = callPackage ../development/python-modules/privacyidea { };
+
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
proboscis = callPackage ../development/python-modules/proboscis { };
@@ -5222,9 +5306,9 @@ in {
protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
- doCheck =
- !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
- protobuf = pkgs.protobuf;
+ # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
+ doCheck = !isPy3k;
+ inherit (pkgs) protobuf;
};
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
@@ -5249,7 +5333,7 @@ in {
ptest = callPackage ../development/python-modules/ptest { };
- ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; };
+ ptpython = callPackage ../development/python-modules/ptpython { };
ptyprocess = callPackage ../development/python-modules/ptyprocess { };
@@ -5289,7 +5373,9 @@ in {
Pweave = callPackage ../development/python-modules/pweave { };
- pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; };
+ pwntools = callPackage ../development/python-modules/pwntools {
+ debugger = pkgs.gdb;
+ };
pxml = callPackage ../development/python-modules/pxml { };
@@ -5500,7 +5586,9 @@ in {
pydocumentdb = callPackage ../development/python-modules/pydocumentdb { };
- pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; };
+ pydot = callPackage ../development/python-modules/pydot {
+ inherit (pkgs) graphviz;
+ };
pydrive = callPackage ../development/python-modules/pydrive { };
@@ -5522,7 +5610,9 @@ in {
pyemd = callPackage ../development/python-modules/pyemd { };
- pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; };
+ pyenchant = callPackage ../development/python-modules/pyenchant {
+ inherit (pkgs) enchant2;
+ };
pyepsg = callPackage ../development/python-modules/pyepsg { };
@@ -5624,9 +5714,13 @@ in {
pygobject2 = callPackage ../development/python-modules/pygobject { };
pygobject3 = if isPy3k then
- callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson; }
+ callPackage ../development/python-modules/pygobject/3.nix {
+ inherit (pkgs) meson;
+ }
else
- callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson; };
+ callPackage ../development/python-modules/pygobject/3.36.nix {
+ inherit (pkgs) meson;
+ };
pygogo = callPackage ../development/python-modules/pygogo { };
@@ -5634,7 +5728,7 @@ in {
pygraphviz = callPackage ../development/python-modules/pygraphviz {
inherit (pkgs) graphviz;
- }; # not the python package
+ };
pygreat = callPackage ../development/python-modules/pygreat { };
@@ -5695,7 +5789,9 @@ in {
pykdl = callPackage ../development/python-modules/pykdl { };
- pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; };
+ pykdtree = callPackage ../development/python-modules/pykdtree {
+ inherit (pkgs.llvmPackages) openmp;
+ };
pykeepass = callPackage ../development/python-modules/pykeepass { };
@@ -5730,7 +5826,9 @@ in {
pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
- pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; };
+ pylibftdi = callPackage ../development/python-modules/pylibftdi {
+ inherit (pkgs) libusb1;
+ };
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
@@ -5975,20 +6073,28 @@ in {
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { };
- pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; };
+ pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
+ pythonPackages = self;
+ };
- pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; };
+ pyqt5_with_qtmultimedia = self.pyqt5.override {
+ withMultimedia = true;
+ };
/*
`pyqt5_with_qtwebkit` should not be used by python libraries in
pkgs/development/python-modules/*. Putting this attribute in
`propagatedBuildInputs` may cause collisions.
*/
- pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };
+ pyqt5_with_qtwebkit = self.pyqt5.override {
+ withWebKit = true;
+ };
pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
- pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; };
+ pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine {
+ pythonPackages = self;
+ };
pyquery = callPackage ../development/python-modules/pyquery { };
@@ -6067,11 +6173,15 @@ in {
pysam = callPackage ../development/python-modules/pysam { };
- pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; };
+ pysaml2 = callPackage ../development/python-modules/pysaml2 {
+ inherit (pkgs) xmlsec;
+ };
pysc2 = callPackage ../development/python-modules/pysc2 { };
- pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; };
+ pyscard = callPackage ../development/python-modules/pyscard {
+ inherit (pkgs.darwin.apple_sdk.frameworks) PCSC;
+ };
pyschedule = callPackage ../development/python-modules/pyschedule { };
@@ -6099,14 +6209,21 @@ in {
pyshp = callPackage ../development/python-modules/pyshp { };
- pyside2-tools =
- toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; });
+ pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools {
+ inherit (pkgs) cmake qt5;
+ });
- pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; });
+ pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 {
+ inherit (pkgs) cmake ninja qt5;
+ });
- pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; };
+ pyside = callPackage ../development/python-modules/pyside {
+ inherit (pkgs) mesa;
+ };
- pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; };
+ pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix {
+ inherit (pkgs) libxml2 libxslt;
+ };
pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
@@ -6114,7 +6231,9 @@ in {
pysingleton = callPackage ../development/python-modules/pysingleton { };
- pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; };
+ pyslurm = callPackage ../development/python-modules/pyslurm {
+ inherit (pkgs) slurm;
+ };
pysma = callPackage ../development/python-modules/pysma { };
@@ -6180,7 +6299,9 @@ in {
pystache = callPackage ../development/python-modules/pystache { };
- pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; };
+ pystemd = callPackage ../development/python-modules/pystemd {
+ inherit (pkgs) systemd;
+ };
PyStemmer = callPackage ../development/python-modules/pystemmer { };
@@ -6218,18 +6339,27 @@ in {
pytest = if isPy3k then self.pytest_6 else self.pytest_4;
pytest_4 = callPackage
- ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle
- hypothesis = self.hypothesis.override { doCheck = false; };
+ ../development/python-modules/pytest/4.nix {
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override {
+ doCheck = false;
+ };
};
pytest_5 = callPackage
- ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle
- hypothesis = self.hypothesis.override { doCheck = false; };
+ ../development/python-modules/pytest/5.nix {
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override {
+ doCheck = false;
+ };
};
pytest_6 =
- callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle
- hypothesis = self.hypothesis.override { doCheck = false; };
+ callPackage ../development/python-modules/pytest {
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override {
+ doCheck = false;
+ };
};
pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {
@@ -6374,7 +6504,9 @@ in {
pytest-runner = self.pytestrunner; # added 2021-01-04
pytestrunner = callPackage ../development/python-modules/pytestrunner { };
- pytest-sanic = callPackage ../development/python-modules/pytest-sanic { };
+ pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
+ sanic = self.sanic.override { doCheck = false; };
+ };
pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };
@@ -6528,7 +6660,9 @@ in {
python-lzf = callPackage ../development/python-modules/python-lzf { };
- python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; };
+ python-lzo = callPackage ../development/python-modules/python-lzo {
+ inherit (pkgs) lzo;
+ };
python_magic = callPackage ../development/python-modules/python-magic { };
@@ -6612,7 +6746,9 @@ in {
inherit (pkgs) snap7;
};
- python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; };
+ python-snappy = callPackage ../development/python-modules/python-snappy {
+ inherit (pkgs) snappy;
+ };
python-socketio = callPackage ../development/python-modules/python-socketio { };
@@ -6670,7 +6806,9 @@ in {
pytools = callPackage ../development/python-modules/pytools { };
- pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; };
+ pytorch = callPackage ../development/python-modules/pytorch {
+ cudaSupport = pkgs.config.cudaSupport or false;
+ };
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };
@@ -6678,9 +6816,13 @@ in {
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
- pytorchWithCuda = self.pytorch.override { cudaSupport = true; };
+ pytorchWithCuda = self.pytorch.override {
+ cudaSupport = true;
+ };
- pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; };
+ pytorchWithoutCuda = self.pytorch.override {
+ cudaSupport = false;
+ };
pytrafikverket = callPackage ../development/python-modules/pytrafikverket { };
@@ -6707,7 +6849,9 @@ in {
});
};
- pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; };
+ pyudev = callPackage ../development/python-modules/pyudev {
+ inherit (pkgs) systemd;
+ };
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
@@ -6717,7 +6861,9 @@ in {
pyupgrade = callPackage ../development/python-modules/pyupgrade { };
- pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; };
+ pyusb = callPackage ../development/python-modules/pyusb {
+ inherit (pkgs) libusb1;
+ };
pyutil = callPackage ../development/python-modules/pyutil { };
@@ -6761,8 +6907,9 @@ in {
pywavelets = callPackage ../development/python-modules/pywavelets { };
- # We need "normal" libxml2 and not the python package by the same name.
- pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
+ pywbem = callPackage ../development/python-modules/pywbem {
+ inherit (pkgs) libxml2;
+ };
PyWebDAV = callPackage ../development/python-modules/pywebdav { };
@@ -6843,7 +6990,9 @@ in {
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { };
- qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; };
+ qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
+ pythonPackages = self;
+ };
qscintilla = self.qscintilla-qt4;
@@ -6859,8 +7008,8 @@ in {
quandl = callPackage ../development/python-modules/quandl { };
- Quandl =
- callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3
+ # TODO: rename this
+ Quandl = callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3
quantities = callPackage ../development/python-modules/quantities { };
@@ -6890,9 +7039,13 @@ in {
random2 = callPackage ../development/python-modules/random2 { };
- rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; };
+ rarfile = callPackage ../development/python-modules/rarfile {
+ inherit (pkgs) libarchive;
+ };
- rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet
+ rasterio = callPackage ../development/python-modules/rasterio {
+ gdal = pkgs.gdal_2;
+ };
ratelimit = callPackage ../development/python-modules/ratelimit { };
@@ -7042,7 +7195,9 @@ in {
rising = callPackage ../development/python-modules/rising { };
- rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; }));
+ rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override {
+ python3 = python;
+ }));
rjsmin = callPackage ../development/python-modules/rjsmin { };
@@ -7104,7 +7259,9 @@ in {
rply = callPackage ../development/python-modules/rply { };
- rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; }));
+ rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override {
+ inherit python;
+ }));
rpmfluff = callPackage ../development/python-modules/rpmfluff { };
@@ -7124,7 +7281,9 @@ in {
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
- Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; };
+ Rtree = callPackage ../development/python-modules/Rtree {
+ inherit (pkgs) libspatialindex;
+ };
rtslib = callPackage ../development/python-modules/rtslib { };
@@ -7294,7 +7453,9 @@ in {
seccomp = callPackage ../development/python-modules/seccomp { };
- secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; };
+ secp256k1 = callPackage ../development/python-modules/secp256k1 {
+ inherit (pkgs) secp256k1;
+ };
secretstorage = if isPy3k then
callPackage ../development/python-modules/secretstorage { }
@@ -7323,7 +7484,9 @@ in {
sendgrid = callPackage ../development/python-modules/sendgrid { };
- sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; };
+ sentencepiece = callPackage ../development/python-modules/sentencepiece {
+ inherit (pkgs) sentencepiece;
+ };
sentinel = callPackage ../development/python-modules/sentinel { };
@@ -7385,8 +7548,9 @@ in {
shellingham = callPackage ../development/python-modules/shellingham { };
- shiboken2 =
- toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; });
+ shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 {
+ inherit (pkgs) cmake llvmPackages qt5;
+ });
shippai = callPackage ../development/python-modules/shippai { };
@@ -7476,7 +7640,9 @@ in {
slither-analyzer = callPackage ../development/python-modules/slither-analyzer { };
- slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; };
+ slixmpp = callPackage ../development/python-modules/slixmpp {
+ inherit (pkgs) gnupg;
+ };
slob = callPackage ../development/python-modules/slob { };
@@ -7500,7 +7666,9 @@ in {
smpplib = callPackage ../development/python-modules/smpplib { };
- snack = toPythonModule (pkgs.newt.override { inherit (self) python; });
+ snack = toPythonModule (pkgs.newt.override {
+ inherit (self) python;
+ });
snakebite = callPackage ../development/python-modules/snakebite { };
@@ -7619,8 +7787,9 @@ in {
sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };
- sphinxcontrib_plantuml =
- callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; };
+ sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml {
+ inherit (pkgs) plantuml;
+ };
sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { };
@@ -7663,9 +7832,11 @@ in {
spotipy = callPackage ../development/python-modules/spotipy { };
spyder = callPackage ../development/python-modules/spyder { };
+
spyder_3 = callPackage ../development/python-modules/spyder/3.nix { };
spyder-kernels = callPackage ../development/python-modules/spyder-kernels { };
+
spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { };
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
@@ -7687,6 +7858,7 @@ in {
sqlitedict = callPackage ../development/python-modules/sqlitedict { };
sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { };
+
sqlite-utils = callPackage ../development/python-modules/sqlite-utils { };
sqlmap = callPackage ../development/python-modules/sqlmap { };
@@ -7787,7 +7959,9 @@ in {
subprocess32 = callPackage ../development/python-modules/subprocess32 { };
- subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; };
+ subunit = callPackage ../development/python-modules/subunit {
+ inherit (pkgs) subunit cppunit check;
+ };
suds = callPackage ../development/python-modules/suds { };
@@ -7838,16 +8012,18 @@ in {
else
callPackage ../development/python-modules/sympy/1_5.nix { };
- systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; };
+ systemd = callPackage ../development/python-modules/systemd {
+ inherit (pkgs) systemd;
+ };
sysv_ipc = callPackage ../development/python-modules/sysv_ipc { };
tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
tables = if isPy3k then
- callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }
+ callPackage ../development/python-modules/tables { }
else
- callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; };
+ callPackage ../development/python-modules/tables/3.5.nix { };
tablib = callPackage ../development/python-modules/tablib { };
@@ -7926,9 +8102,13 @@ in {
tensorflow-tensorboard = self.tensorflow-tensorboard_2;
- tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; };
+ tensorflowWithCuda = self.tensorflow.override {
+ cudaSupport = true;
+ };
- tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; };
+ tensorflowWithoutCuda = self.tensorflow.override {
+ cudaSupport = false;
+ };
tensorly = callPackage ../development/python-modules/tensorly { };
@@ -8013,14 +8193,16 @@ in {
thumborPexif = callPackage ../development/python-modules/thumborpexif { };
tkinter = let
- py = python.override{x11Support=true;};
+ py = python.override { x11Support=true; };
in callPackage ../development/python-modules/tkinter { py = py; };
tidylib = callPackage ../development/python-modules/pytidylib { };
tifffile = callPackage ../development/python-modules/tifffile { };
- tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; };
+ tiledb = callPackage ../development/python-modules/tiledb {
+ inherit (pkgs) tiledb;
+ };
tilestache = callPackage ../development/python-modules/tilestache { };
@@ -8098,7 +8280,9 @@ in {
# Used by streamlit, graphite_beacon, 2021-01-29
tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
- towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; };
+ towncrier = callPackage ../development/python-modules/towncrier {
+ inherit (pkgs) git;
+ };
tox = callPackage ../development/python-modules/tox { };
@@ -8253,7 +8437,9 @@ in {
uarray = callPackage ../development/python-modules/uarray { };
- ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; };
+ ueberzug = callPackage ../development/python-modules/ueberzug {
+ inherit (pkgs.xorg) libX11 libXext;
+ };
ufonormalizer = callPackage ../development/python-modules/ufonormalizer { };
@@ -8376,7 +8562,10 @@ in {
varint = callPackage ../development/python-modules/varint { };
- vcrpy = callPackage ../development/python-modules/vcrpy { };
+ vcrpy = if isPy27 then
+ callPackage ../development/python-modules/vcrpy/3.nix { }
+ else
+ callPackage ../development/python-modules/vcrpy { };
vcver = callPackage ../development/python-modules/vcver { };
@@ -8492,7 +8681,9 @@ in {
wasmer = callPackage ../development/python-modules/wasmer { };
- watchdog = callPackage ../development/python-modules/watchdog { };
+ watchdog = callPackage ../development/python-modules/watchdog {
+ inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
+ };
waterfurnace = callPackage ../development/python-modules/waterfurnace { };
@@ -8640,7 +8831,9 @@ in {
x256 = callPackage ../development/python-modules/x256 { };
- xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; };
+ xapian = callPackage ../development/python-modules/xapian {
+ inherit (pkgs) xapian;
+ };
xapp = callPackage ../development/python-modules/xapp {
inherit (pkgs) gtk3 gobject-introspection polkit;
@@ -8665,7 +8858,9 @@ in {
xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { });
- xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; };
+ xgboost = callPackage ../development/python-modules/xgboost {
+ inherit (pkgs) xgboost;
+ };
xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { };
@@ -8715,7 +8910,9 @@ in {
xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { };
- xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; };
+ xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper {
+ inherit (pkgs.xorg) xorgserver;
+ };
xxhash = callPackage ../development/python-modules/xxhash { };
@@ -8774,7 +8971,9 @@ in {
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
- z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python;
+ z3 = (toPythonModule (pkgs.z3.override {
+ inherit python;
+ })).python;
zake = callPackage ../development/python-modules/zake { };
@@ -8800,7 +8999,9 @@ in {
zeep = callPackage ../development/python-modules/zeep { };
- zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;
+ zeitgeist = (toPythonModule (pkgs.zeitgeist.override {
+ python3 = python;
+ })).py;
zerobin = callPackage ../development/python-modules/zerobin { };
@@ -8893,10 +9094,11 @@ in {
zstandard = callPackage ../development/python-modules/zstandard { };
- zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd; };
+ zstd = callPackage ../development/python-modules/zstd {
+ inherit (pkgs) zstd;
+ };
zulip = callPackage ../development/python-modules/zulip { };
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
-
}