diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 2d9338f2e89..83b7b159bd6 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
};
cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+ verifyCargoDeps = true;
meta = with stdenv.lib; {
description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -64,6 +65,9 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
added in `cargoPatches` will also be prepended to the patches in `patches` at
build-time.
+When `verifyCargoDeps` is set to `true`, the build will also verify that the
+`cargoSha256` is not out of date by comparing the `Cargo.lock` file in both the `cargoDeps` and `src`. Note that this option changes the value of `cargoSha256` since it also copies the `Cargo.lock` in it. To avoid breaking backward-compatibility this option is not enabled by default but hopefully will be in the future.
+
## Compiling Rust crates using Nix instead of Cargo
### Simple operation
diff --git a/lib/modules.nix b/lib/modules.nix
index c3c903c1dfa..71672c7d112 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -591,12 +591,16 @@ rec {
{ options, ... }:
{ options = setAttrByPath optionName (mkOption {
visible = false;
+ apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}";
});
- config.warnings =
- let opt = getAttrFromPath optionName options; in
- optional opt.isDefined ''
+ config.assertions =
+ let opt = getAttrFromPath optionName options; in [{
+ assertion = !opt.isDefined;
+ message = ''
The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.
- ${replacementInstructions}'';
+ ${replacementInstructions}
+ '';
+ }];
};
/* Return a module that causes a warning to be shown if the
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 8e02fcb5de0..58cff18e648 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -7,7 +7,7 @@ let
all = [
"aarch64-linux"
- "armv5tel-linux" "armv6l-linux" "armv7l-linux"
+ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux"
"mipsel-linux"
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 5748c09b564..818749442f9 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -14,7 +14,7 @@ let
in with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded);
- testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
testmips = mseteq mips [ "mipsel-linux" ];
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
@@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests {
testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];
- testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
+ testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6cb9d07fe93..b818c80e6e6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1655,6 +1655,12 @@
githubId = 1316469;
name = "Naomi Morse";
};
+ dkudriavtsev = {
+ email = "dkudriavtsev@gmail.com";
+ github = "dkudriavtsev";
+ githubId = 9790772;
+ name = "Dmitry Kudriavtsev";
+ };
dmalikov = {
email = "malikov.d.y@gmail.com";
github = "dmalikov";
@@ -2007,6 +2013,11 @@
githubId = 4828;
name = "Eric Merritt";
};
+ ericdallo = {
+ email = "ercdll1337@gmail.com";
+ github = "ericdallo";
+ name = "Eric Dallo";
+ };
ericsagnes = {
email = "eric.sagnes@gmail.com";
github = "ericsagnes";
@@ -2045,6 +2056,12 @@
github = "ertes";
name = "Ertugrul Söylemez";
};
+ esclear = {
+ email = "esclear@users.noreply.github.com";
+ github = "esclear";
+ githubId = 7432848;
+ name = "Daniel Albert";
+ };
Esteth = {
email = "adam.copp@gmail.com";
name = "Adam Copp";
@@ -2077,6 +2094,12 @@
githubId = 195032;
name = "Eric Evenchick";
};
+ evenbrenden = {
+ email = "evenbrenden@gmail.com";
+ github = "evenbrenden";
+ githubId = 2512008;
+ name = "Even Brenden";
+ };
exfalso = {
email = "0slemi0@gmail.com";
github = "exfalso";
@@ -2841,6 +2864,12 @@
githubId = 820715;
name = "Jake Logemann";
};
+ jakestanger = {
+ email = "mail@jstanger.dev";
+ github = "JakeStanger";
+ githubId = 5057870;
+ name = "Jake Stanger";
+ };
jakewaksbaum = {
email = "jake.waksbaum@gmail.com";
github = "jbaum98";
@@ -3132,6 +3161,11 @@
githubId = 392720;
name = "Jon Banafato";
};
+ jonathanmarler = {
+ email = "johnnymarler@gmail.com";
+ github = "marler8997";
+ name = "Jonathan Marler";
+ };
jonathanreeve = {
email = "jon.reeve@gmail.com";
github = "JonathanReeve";
@@ -3495,6 +3529,11 @@
githubId = 1362179;
name = "Kyle Lacy";
};
+ laikq = {
+ email = "gwen@quasebarth.de";
+ github = "laikq";
+ name = "Gwendolyn Quasebarth";
+ };
lasandell = {
email = "lasandell@gmail.com";
github = "lasandell";
@@ -5796,6 +5835,12 @@
githubId = 1151264;
name = "Sebastian Graf";
};
+ shahrukh330 = {
+ email = "shahrukh330@gmail.com";
+ github = "shahrukh330";
+ githubId = 1588288;
+ name = "Shahrukh Khan";
+ };
shanemikel = {
email = "shanemikel1@gmail.com";
github = "shanemikel";
@@ -5881,6 +5926,12 @@
fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";
}];
};
+ simonchatts = {
+ email = "code@chatts.net";
+ github = "simonchatts";
+ githubId = 11135311;
+ name = "Simon Chatterjee";
+ };
simonvandel = {
email = "simon.vandel@gmail.com";
github = "simonvandel";
@@ -7089,6 +7140,12 @@
githubId = 1866448;
name = "Eric Bailey";
};
+ yvt = {
+ email = "i@yvt.jp";
+ github = "yvt";
+ githubId = 5253988;
+ name = "yvt";
+ };
z77z = {
email = "maggesi@math.unifi.it";
github = "maggesi";
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e4dcc90cdd3..f42471c5969 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -513,6 +513,12 @@
must be owned by either root or the user specified in .
+
+
+ The Twitter client corebird has been dropped as it is discontinued and does not work against the new Twitter API.
+ Please use the fork cawbird instead which has been adapted to the API changes and is still maintained.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index c84bc8dbb37..6de0214b1fb 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -23,6 +23,11 @@
Support is planned until the end of October 2020, handing over to 20.09.
+
+
+ Postgresql for NixOS service now defaults to v11.
+
+
@@ -73,7 +78,7 @@
-
+ SD images are now compressed by default using bzip2.
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index 792d1dbb38f..4b663ebf85a 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -8,11 +8,6 @@ let
cfg = config.environment;
- pamProfiles =
- map
- (replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"])
- cfg.profiles;
-
in
{
@@ -75,13 +70,20 @@ in
let
suffixedVariables =
flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes:
- flip concatMap pamProfiles (profile:
+ flip concatMap cfg.profiles (profile:
map (suffix: "${profile}${suffix}") suffixes
)
);
+ # We're trying to use the same syntax for PAM variables and env variables.
+ # That means we need to map the env variables that people might use to their
+ # equivalent PAM variable.
+ # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have
+ # different syntax.
+ replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
+
pamVariable = n: v:
- ''${n} DEFAULT="${concatStringsSep ":" (toList v)}"'';
+ ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
pamVariables =
concatStringsSep "\n"
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index a2a8e8ef752..d510f3b2daf 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -98,6 +98,16 @@ in
populate the ./files/boot (/boot) directory.
'';
};
+
+ compressImage = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the SD image should be compressed using
+ bzip2.
+ '';
+ };
+
};
config = {
@@ -118,10 +128,12 @@ in
sdImage.storePaths = [ config.system.build.toplevel ];
- system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation {
+ system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
name = config.sdImage.imageName;
- nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ];
+ nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];
+
+ inherit (config.sdImage) compressImage;
buildCommand = ''
mkdir -p $out/nix-support $out/sd-image
@@ -168,6 +180,9 @@ in
# Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
+ if test -n "$compressImage"; then
+ bzip2 $img
+ fi
'';
}) {};
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a648eef46e5..e0197a0da3f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -299,10 +299,11 @@
./services/desktops/gnome3/chrome-gnome-shell.nix
./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/glib-networking.nix
+ ./services/desktops/gnome3/gnome-initial-setup.nix
./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix
- ./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-online-miners.nix
+ ./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-settings-daemon.nix
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/rygel.nix
@@ -503,6 +504,7 @@
./services/monitoring/das_watchdog.nix
./services/monitoring/datadog-agent.nix
./services/monitoring/dd-agent/dd-agent.nix
+ ./services/monitoring/do-agent.nix
./services/monitoring/fusion-inventory.nix
./services/monitoring/grafana.nix
./services/monitoring/grafana-reporter.nix
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 7bba4dacddc..3bedfe96a18 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -226,7 +226,8 @@ in
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
# systems!
- mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
+ mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
+ else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
new file mode 100644
index 00000000000..d715d52c2d0
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
@@ -0,0 +1,86 @@
+# GNOME Initial Setup.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ # GNOME initial setup's run is conditioned on whether
+ # the gnome-initial-setup-done file exists in XDG_CONFIG_HOME
+ # Because of this, every existing user will have initial setup
+ # running because they never ran it before.
+ #
+ # To prevent this we create the file if the users stateVersion
+ # is older than 20.03 (the release we added this module).
+
+ script = pkgs.writeScript "create-gis-stamp-files" ''
+ #!${pkgs.runtimeShell}
+ setup_done=$HOME/.config/gnome-initial-setup-done
+
+ echo "Creating g-i-s stamp file $setup_done ..."
+ cat - > $setup_done <<- EOF
+ yes
+ EOF
+ '';
+
+ createGisStampFilesAutostart = pkgs.writeTextFile rec {
+ name = "create-g-i-s-stamp-files";
+ destination = "/etc/xdg/autostart/${name}.desktop";
+ text = ''
+ [Desktop Entry]
+ Type=Application
+ Name=Create GNOME Initial Setup stamp files
+ Exec=${script}
+ StartupNotify=false
+ NoDisplay=true
+ OnlyShowIn=GNOME;
+ AutostartCondition=unless-exists gnome-initial-setup-done
+ X-GNOME-Autostart-Phase=EarlyInitialization
+ '';
+ };
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.gnome3.gnome-initial-setup = {
+
+ enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.gnome3.gnome-initial-setup.enable {
+
+ environment.systemPackages = [
+ pkgs.gnome3.gnome-initial-setup
+ ]
+ ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
+ ;
+
+ systemd.packages = [
+ pkgs.gnome3.gnome-initial-setup
+ ];
+
+ systemd.user.targets."gnome-session".wants = [
+ "gnome-initial-setup-copy-worker.service"
+ "gnome-initial-setup-first-login.service"
+ "gnome-welcome-tour.service"
+ ];
+
+ systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
+ "gnome-initial-setup.service"
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 3826f728afd..3263f695423 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -11,6 +11,7 @@ let
nixVersion = getVersion nix;
isNix20 = versionAtLeast nixVersion "2.0pre";
+ isNix23 = versionAtLeast nixVersion "2.3pre";
makeNixBuildUser = nr:
{ name = "nixbld${toString nr}";
@@ -63,7 +64,7 @@ let
builders =
''}
system-features = ${toString cfg.systemFeatures}
- ${optionalString (versionAtLeast nixVersion "2.3pre") ''
+ ${optionalString isNix23 ''
sandbox-fallback = false
''}
$extraOptions
@@ -74,7 +75,7 @@ let
'' else ''
echo "Checking that Nix can read nix.conf..."
ln -s $out ./nix.conf
- NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
+ NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null
'')
);
diff --git a/nixos/modules/services/monitoring/do-agent.nix b/nixos/modules/services/monitoring/do-agent.nix
new file mode 100644
index 00000000000..2d3fe2f7976
--- /dev/null
+++ b/nixos/modules/services/monitoring/do-agent.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.do-agent;
+in
+{
+ options.services.do-agent = {
+ enable = mkEnableOption "do-agent, the DigitalOcean droplet metrics agent";
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.do-agent ];
+
+ systemd.services.do-agent = {
+ description = "DigitalOcean Droplet Metrics Agent";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-online.target" ];
+ wants = [ "network-online.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog";
+ Restart = "always";
+ OOMScoreAdjust = -900;
+ SyslogIdentifier = "DigitalOceanAgent";
+ PrivateTmp = "yes";
+ ProtectSystem = "full";
+ ProtectHome = "yes";
+ NoNewPrivileges = "yes";
+ DynamicUser = "yes";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index 554377df37b..ba852fea433 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -49,6 +49,6 @@ in
(mkRemovedOptionModule [ "insecure" ] ''
This option was replaced by 'prometheus.exporters.nginx.sslVerify'.
'')
- ({ options.warnings = options.warnings; })
+ ({ options.warnings = options.warnings; options.assertions = options.assertions; })
];
}
diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix
index 5662ebc61d2..8ece1ca1901 100644
--- a/nixos/modules/services/security/fprintd.nix
+++ b/nixos/modules/services/security/fprintd.nix
@@ -50,13 +50,6 @@ in
systemd.packages = [ cfg.package ];
-
- # The upstream unit does not use StateDirectory, and will
- # fail if the directory it needs is not present. Should be
- # fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
- # is merged.
- systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";
-
};
}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 30c5250221c..304554e3684 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -155,10 +155,10 @@ in
environment.systemPackages = cfg.sessionPath;
- environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
+ environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
# Override GSettings schemas
- environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+ environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
# If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
@@ -229,6 +229,7 @@ in
services.colord.enable = mkDefault true;
services.gnome3.chrome-gnome-shell.enable = mkDefault true;
services.gnome3.glib-networking.enable = true;
+ services.gnome3.gnome-initial-setup.enable = mkDefault true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-user-share.enable = mkDefault true;
@@ -236,7 +237,23 @@ in
services.gvfs.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true;
- systemd.packages = [ pkgs.gnome3.vino ];
+
+ systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ];
+
+ # gnome-settings-daemon.nix is shared between several desktop
+ # environments (eg. mate and pantheon) so specify these gnome-shell specific
+ # service dependencies here instead.
+ systemd.user.targets."gnome-session-initialized".wants = [
+ "gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target"
+ "gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target"
+ "gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target"
+ "gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target"
+ "gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target"
+ ];
+
+ systemd.user.targets."gnome-session-x11-services".wants = [
+ "gsd-xsettings.target"
+ ];
services.avahi.enable = mkDefault true;
@@ -329,10 +346,10 @@ in
# Let nautilus find extensions
# TODO: Create nautilus-with-extensions package
- environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
+ environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
# Override default mimeapps for nautilus
- environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
+ environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
environment.pathsToLink = [
"/share/nautilus-python/extensions"
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c785396613..9f76bba9980 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -150,6 +150,11 @@ in
mkdir -p /run/gdm/.config/pulse
ln -sf ${pulseConfig} /run/gdm/.config/pulse/default.pa
chown -R gdm:gdm /run/gdm/.config
+ '' + optionalString config.services.gnome3.gnome-initial-setup.enable ''
+ # Create stamp file for gnome-initial-setup to prevent run.
+ cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
+ yes
+ EOF
'';
};
@@ -159,6 +164,10 @@ in
"rc-local.service"
"systemd-machined.service"
"systemd-user-sessions.service"
+ "getty@tty1.service"
+ ];
+ systemd.services.display-manager.conflicts = [
+ "getty@tty1.service"
];
systemd.services.display-manager.serviceConfig = {
diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix
index 95353e92098..5ac824c5e41 100644
--- a/nixos/modules/services/x11/hardware/cmt.nix
+++ b/nixos/modules/services/x11/hardware/cmt.nix
@@ -47,7 +47,12 @@ in {
assertions = [
{
assertion = !config.services.xserver.libinput.enable;
- message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver).";
+ message = ''
+ cmt and libinput are incompatible, meaning you cannot enable them both.
+ To use cmt you need to disable libinput with `services.xserver.libinput.enable = false`
+ If you haven't enabled it in configuration.nix, it's enabled by default on a
+ different xserver module.
+ '';
}
];
};
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 29310f6f24a..3038be6dbab 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -305,7 +305,7 @@ let
optional (defined ipv6Address && defined ipv6PrefixLength)
{ address = ipv6Address; prefixLength = ipv6PrefixLength; }))
- ({ options.warnings = options.warnings; })
+ ({ options.warnings = options.warnings; options.assertions = options.assertions; })
];
};
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index b8e8663e3ad..14c1cd44f5c 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -22,6 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
{
networking = {
dhcpcd.enable = false;
+ useNetworkd = true;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index f526d18befe..48ca98da8fa 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -73,4 +73,5 @@ in with pkgs; {
kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0;
kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
+ kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3;
}
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix
index 1eb8b416a9a..fb5fe47f4f2 100644
--- a/pkgs/applications/audio/parlatype/default.nix
+++ b/pkgs/applications/audio/parlatype/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "parlatype";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "gkarsay";
repo = pname;
rev = "v${version}";
- sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2";
+ sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix
new file mode 100644
index 00000000000..9def4a292f6
--- /dev/null
+++ b/pkgs/applications/audio/rofi-mpd/default.nix
@@ -0,0 +1,26 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "rofi-mpd";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "JakeStanger";
+ repo = "Rofi_MPD";
+ rev = "v${version}";
+ sha256 = "0pdra1idgas3yl9z9v7b002igwg2c1mv0yw2ffb8rsbx88x4gbai";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ mutagen mpd2 ];
+
+ # upstream doesn't contain a test suite
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A rofi menu for interacting with MPD written in Python";
+ homepage = "https://github.com/JakeStanger/Rofi_MPD";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jakestanger ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix
new file mode 100644
index 00000000000..ecdafdaeadd
--- /dev/null
+++ b/pkgs/applications/audio/sndpeek/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu
+, libXext, libXi }:
+
+stdenv.mkDerivation rec {
+ pname = "sndpeek";
+ version = "1.4";
+
+ src = fetchurl {
+ url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${version}.tgz";
+ sha256 = "2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf";
+ };
+ sourceRoot = "sndpeek-${version}/src/sndpeek";
+
+ # this patch adds -lpthread to the list of libraries, without it a
+ # symbol-not-found-error is thrown
+ patches = [ ./pthread.patch ];
+
+ buildInputs = [
+ freeglut
+ alsaLib
+ mesa
+ libGLU
+ libsndfile
+ libX11
+ libXmu
+ libXext
+ libXi
+ ];
+ buildFlags = "linux-alsa";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv sndpeek $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Real-time 3D animated audio display/playback";
+ longDescription = ''
+ sndpeek is just what it sounds (and looks) like:
+ * real-time 3D animated display/playback
+ * can use mic-input or wav/aiff/snd/raw/mat file (with playback)
+ * time-domain waveform
+ * FFT magnitude spectrum
+ * 3D waterfall plot
+ * lissajous! (interchannel correlation)
+ * rotatable and scalable display
+ * freeze frame! (for didactic purposes)
+ * real-time spectral feature extraction (centroid, rms, flux, rolloff)
+ * available on MacOS X, Linux, and Windows under GPL
+ * part of the sndtools distribution.
+ '';
+ homepage = https://soundlab.cs.princeton.edu/software/sndpeek/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.laikq ];
+ };
+}
diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/pkgs/applications/audio/sndpeek/pthread.patch
new file mode 100644
index 00000000000..b2f1d37da6b
--- /dev/null
+++ b/pkgs/applications/audio/sndpeek/pthread.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile.alsa b/makefile.alsa
+index 34fb848..cdaeaec 100644
+--- a/makefile.alsa
++++ b/makefile.alsa
+@@ -4,7 +4,7 @@ CPP=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+ CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
++LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -lpthread
+
+ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 7734a7f3067..443107ad9e4 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotifyd";
- version = "0.2.14";
+ version = "0.2.16";
src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
rev = "v${version}";
- sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz";
+ sha256 = "097hg18h7gya2w0wl5jkav79nb3qzcc4ycsryq7nhxa0h1agvinc";
};
- cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4";
+ cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm";
cargoBuildFlags = [
"--no-default-features"
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 234b98a893c..4322bbcbc43 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -1,6 +1,6 @@
{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig
, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
-, libzip, rtaudio, rtmidi, speex }:
+, libzip, rtaudio, rtmidi, speex, libsamplerate }:
let
glfw-git = glfw.overrideAttrs (oldAttrs: rec {
@@ -28,13 +28,13 @@ let
in
with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
- sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx";
+ sha256 = "172v66v2vb6l9dpsq6fb6xn035igwhpjci8w3kz2na3rvmz1bc5w";
fetchSubmodules = true;
};
@@ -58,7 +58,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ];
+ buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ];
buildFlags = "Rack";
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
index eca9c2f13c0..d310d57835e 100644
--- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
+++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
@@ -5,10 +5,9 @@ diff -ru a/Makefile b/Makefile
build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
LDFLAGS += -rdynamic \
-- dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \
-- -lpthread -lGL -ldl -lX11 -lasound -ljack \
-+ -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
-+ -lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \
+- dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \
++ -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \
+ -lpthread -lGL -ldl -lX11 -lasound -ljack \
$(shell pkg-config --libs gtk+-2.0)
TARGET := Rack
endif
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 5f347fe91e9..3754c9a087c 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "go-ethereum";
- version = "1.9.3";
+ version = "1.9.5";
goPackagePath = "github.com/ethereum/go-ethereum";
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg";
+ sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 5f54b84d4d4..f4ed3d777ca 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "jormungandr";
- version = "0.5.2";
+ version = "0.5.5";
src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
- sha256 = "0aixz007kc5gisc4hvix3ccmy0r459lczlwmnm2989jcxk3hki3q";
+ sha256 = "1fzhmkx60b5fnx4x81g5ls93iixd3126m4q1smrpq8ksidw5xifa";
fetchSubmodules = true;
};
- cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d";
+ cargoSha256 = "1hkbzxp6ic1655cq45zv6dcyrk9rbmvscdl8wm8fbidabz4x8vqd";
nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 88b35dd78a6..09cb3c329b9 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, appimageTools }:
+{ stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
let
pname = "ledger-live-desktop";
@@ -20,6 +20,8 @@ in appimageTools.wrapType2 rec {
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
+ ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png
+ install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png
substituteInPlace $out/share/applications/ledger-live-desktop.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index b4d95122ce0..6f9c7700ac3 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -1,4 +1,4 @@
-{ gcc8Stdenv
+{ stdenv
, ctags
, appstream-glib
, desktop-file-utils
@@ -22,6 +22,7 @@
, ninja
, ostree
, pcre
+, pcre2
, pkgconfig
, python3
, sysprof
@@ -32,20 +33,16 @@
, wrapGAppsHook
, dbus
, xvfb_run
+, glib
}:
-let
- # Does not build with GCC 7
- # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
- stdenv = gcc8Stdenv;
-in
stdenv.mkDerivation rec {
pname = "gnome-builder";
- version = "3.32.4";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr";
+ sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg";
};
nativeBuildInputs = [
@@ -80,6 +77,7 @@ stdenv.mkDerivation rec {
libxml2
ostree
pcre
+ pcre2
python3
sysprof
template-glib
@@ -98,6 +96,8 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/post_install.py
'';
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}"
"-Ddocs=true"
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
new file mode 100644
index 00000000000..764d7004940
--- /dev/null
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "gnvim-unwrapped";
+ version = "0.1.5";
+
+ src = fetchFromGitHub {
+ owner = "vhakulinen";
+ repo = "gnvim";
+ rev = version;
+ sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh";
+ };
+
+ cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2";
+
+ buildInputs = [ gtk webkitgtk ];
+
+ # The default build script tries to get the version through Git, so we
+ # replace it
+ prePatch = ''
+ cat << EOF > build.rs
+ use std::env;
+ use std::fs::File;
+ use std::io::Write;
+ use std::path::Path;
+
+ fn main() {
+ let out_dir = env::var("OUT_DIR").unwrap();
+ let dest_path = Path::new(&out_dir).join("gnvim_version.rs");
+ let mut f = File::create(&dest_path).unwrap();
+ f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
+ }
+ EOF
+ '';
+
+ installPhase = ''
+ make install PREFIX="${placeholder "out"}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GUI for neovim, without any web bloat";
+ homepage = "https://github.com/vhakulinen/gnvim";
+ license = licenses.mit;
+ maintainers = with maintainers; [ minijackson ];
+ inherit version;
+ };
+}
diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
new file mode 100644
index 00000000000..e16fe8a8adc
--- /dev/null
+++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
@@ -0,0 +1,41 @@
+{ stdenv, gnvim-unwrapped, neovim, makeWrapper }:
+
+stdenv.mkDerivation {
+ pname = "gnvim";
+ version = gnvim-unwrapped.version;
+ buildCommand = if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ cp -r ${gnvim-unwrapped}/bin/gnvim.app $out/Applications
+
+ chmod -R a+w "$out/Applications/gnvim.app/Contents/MacOS"
+ wrapProgram "$out/Applications/gnvim.app/Contents/MacOS/gnvim" \
+ --prefix PATH : "${neovim}/bin" \
+ --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
+ '' else ''
+ makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
+ --prefix PATH : "${neovim}/bin" \
+ --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
+
+ mkdir -p "$out/share"
+ ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"
+
+ # copy and fix .desktop file
+ cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
+ # Sed needs a writable directory to do inplace modifications
+ chmod u+rw "$out/share/applications"
+ for file in $out/share/applications/*.desktop; do
+ sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file"
+ done
+ '';
+
+ preferLocalBuild = true;
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ passthru.unwrapped = gnvim-unwrapped;
+
+ inherit (gnvim-unwrapped) meta;
+}
+
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 49ebe579ed4..49f41d5205b 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
- version = "1.9.5";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "119ri6lkzqapi5k0v818qkhg1916jj9s6bh72yqvc2wmyjnn2dbw";
+ sha256 = "1jmgnmpalnl3261wifk0mqa9viag6yvlrycgzqalmnrm1b20pyg4";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 654363d36f2..bd557f7b832 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.8-58";
- sha256 = "0yfw32nydwy7ag7ina1zc6yssa146x4v35hjv6v59bci9mmj9fb1";
+ version = "7.0.8-66";
+ sha256 = "0wih8ag5i6qg2zhbjrlcripb5ic5l6i1z04chnlgykb84n5pcirv";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index c7555b612f7..67be3ba6782 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
+, fetchpatch }:
let
version = "2.3.1";
@@ -14,6 +15,14 @@ in stdenv.mkDerivation {
sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
};
+ patches = [
+ # Remove useage of deprecrated G_PARAM_PRIVATE
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
+ sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
+ })
+ ];
+
nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
buildInputs = [ gtk3 hicolor-icon-theme ];
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index ea4cf986f39..0eb4f21e53c 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "gnome-photos";
- version = "3.32.1";
+ version = "3.34.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn";
+ sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m";
};
patches = [
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9f7fbc8421b..9910b7bbadf 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -53,6 +53,10 @@ mkDerivation rec {
# src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory
enableParallelBuilding = false; # true by default due to qmake
+ preBuild = ''
+ sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile
+ '';
+
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications
mv $out/bin/*.app $out/Applications
diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix
new file mode 100644
index 00000000000..f05c5fd210c
--- /dev/null
+++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, fetchFromGitLab
+, fetchpatch
+, appstream-glib
+, desktop-file-utils
+, fwupd
+, gettext
+, glib
+, gnome3
+, gtk3
+, libsoup
+, libxmlb
+, meson
+, ninja
+, pkgconfig
+, systemd
+, help2man
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-firmware-updater";
+ version = "3.34.0";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "hughsie";
+ repo = "gnome-firmware-updater";
+ rev = version;
+ sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l";
+ };
+
+ patches = [
+ # Fixes manual build
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
+ sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
+ sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1";
+ })
+ ];
+
+ nativeBuildInputs = [
+ appstream-glib # for ITS rules
+ desktop-file-utils
+ gettext
+ help2man
+ meson
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ fwupd
+ glib
+ gtk3
+ libsoup
+ libxmlb
+ systemd
+ ];
+
+ mesonFlags = [
+ "-Dconsolekit=false"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater";
+ description = "Tool for installing firmware on devices";
+ license = licenses.gpl2Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index eecf9bbd88f..7484998ab20 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -13,15 +13,16 @@
, libgtop
, libdazzle
, gnome3
+, tracker
}:
stdenv.mkDerivation rec {
pname = "gnome-usage";
- version = "3.32.0";
+ version = "3.33.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih";
+ sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4";
};
nativeBuildInputs = [
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
gtk3
libdazzle
libgtop
+ tracker
];
postPatch = ''
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 4b2ed9af24e..4a7cafb0b15 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
- version = "7.13";
+ version = "7.14";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw";
+ sha256 = "13lxjbc54mw2d5jn0q61wjzm0hk2f6vmbvw11n7z8p62n8q30nvb";
};
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 720445be9be..840f4c32e52 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "hugo";
- version = "0.58.0";
+ version = "0.58.3";
goPackagePath = "github.com/gohugoio/hugo";
src = fetchFromGitHub {
owner = "gohugoio";
- repo = "hugo";
+ repo = pname;
rev = "v${version}";
- sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d";
+ sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc";
};
- modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790";
+ modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx";
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
new file mode 100644
index 00000000000..a5196811a6a
--- /dev/null
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchzip }:
+
+let
+ arch = "amd64";
+in
+stdenv.mkDerivation rec {
+ pname = "jotta-cli";
+ version = "0.6.18626";
+ src =
+ fetchzip {
+ url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
+ sha256 = "0v9bw0f2mcvmzp7v8gs6q4p1q54rflqnbjv5sw7h1kyfwznmflzj";
+ stripRoot = false;
+ };
+
+ installPhase = ''
+ install -D usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
+ mkdir -p $out/share/bash-completion/completions
+ '';
+
+ postFixup = ''
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
+ $out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Jottacloud CLI";
+ homepage = https://www.jottacloud.com/;
+ downloadPage = https://repo.jotta.us/archives/linux/;
+ maintainers = with maintainers; [ evenbrenden ];
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index fb08eb2428e..37b93eecf39 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,6 +1,6 @@
{ stdenv, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook, gobject-introspection
-, intltool, yelp-tools, itstool, libxmlxx3
+, gettext, yelp-tools, itstool, libxmlxx3
, python, pygobject3, gtk3, gnome3, substituteAll
, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
@@ -9,13 +9,13 @@
buildPythonApplication rec {
pname = "orca";
- version = "3.32.0";
+ version = "3.34.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i";
+ sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p";
};
patches = [
@@ -30,7 +30,7 @@ buildPythonApplication rec {
nativeBuildInputs = [
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
- intltool yelp-tools itstool gobject-introspection
+ gettext yelp-tools itstool gobject-introspection
];
propagatedBuildInputs = [
@@ -44,11 +44,6 @@ buildPythonApplication rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
- # Run intltoolize to create po/Makefile.in.in
- preConfigure = ''
- intltoolize
- '';
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
new file mode 100644
index 00000000000..5ce7d06d727
--- /dev/null
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation,
+ qtsvg,
+ libxml2, postgresql }:
+
+mkDerivation rec {
+ pname = "pgmodeler";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ owner = "pgmodeler";
+ repo = "pgmodeler";
+ rev = "v${version}";
+ sha256 = "15isnbli9jj327r6sj7498nmhgf1mzdyhc1ih120ibw4900aajiv";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ pkgconfig qmake ];
+ qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ];
+
+ # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.
+ buildInputs = [ postgresql qtsvg ];
+
+ meta = with stdenv.lib; {
+ description = "A database modeling tool for PostgreSQL";
+ longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.'';
+ homepage = https://pgmodeler.io/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.esclear ];
+ platforms = platforms.linux;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 8fc890f4243..e928b0d597e 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qlcplus";
- version = "4.12.1";
+ version = "4.12.2";
src = fetchFromGitHub {
owner = "mcallegari";
repo = "qlcplus";
rev = "QLC+_${version}";
- sha256 = "1kz2zbz7blnm91dysn949bjsy4xqxg658k47p3gbl0pjl58c44hp";
+ sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3";
};
nativeBuildInputs = [ qmake pkgconfig ];
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 46a87938a81..d02296f0e16 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,6 +1,6 @@
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
-, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre
+, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ];
buildInputs =
- [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp
+ [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
utillinuxMinimal glib docbook_xsl xmlto libselinux
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
];
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 8510d501942..ede1995f927 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
+{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
stdenv.mkDerivation rec {
pname = "sakura";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ];
- buildInputs = [ makeWrapper gtk3 vte pcre glib ];
+ buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
# Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index ecaf9d5a34a..a3247b29fb8 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
+{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }:
stdenv.mkDerivation {
pname = "stupidterm";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ vte gtk ];
+ buildInputs = [ vte gtk pcre2 ];
src = fetchFromGitHub {
owner = "esmil";
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 6a9de364446..992c1f7e223 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,6 +1,40 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+let
+
+ # termite requires VTE with some internals exposed
+ # https://github.com/thestinger/vte-ng
+ vte-ng = vte.overrideAttrs (attrs: {
+ patches = attrs.patches or [] ++ [
+ (fetchpatch {
+ name = "0001-expose-functions-for-pausing-unpausing-output.patch";
+ url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
+ sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
+ })
+ (fetchpatch {
+ name = "0002-expose-function-for-setting-cursor-position.patch";
+ url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch";
+ sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89";
+ })
+ (fetchpatch {
+ name = "0003-add-function-for-setting-the-text-selections.patch";
+ url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch";
+ sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x";
+ })
+ (fetchpatch {
+ name = "0004-add-functions-to-get-set-block-selection-mode.patch";
+ url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
+ sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
+ })
+ (fetchpatch {
+ name = "0005-expose-function-for-getting-the-selected-text.patch";
+ url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
+ sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27";
+ })
+ ];
+ });
+
+in stdenv.mkDerivation rec {
pname = "termite";
version = "15";
@@ -24,7 +58,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
- buildInputs = [ vte-ng gtk3 ncurses ];
+ buildInputs = [ vte-ng gtk3 ncurses pcre2 ];
nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 87800cf90d6..791075e4dd9 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "urlscan";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "firecat53";
repo = pname;
rev = version;
- sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v";
+ sha256 = "11wkwjqsq848ks6m2jqsb8h0xnz75fb60bm0c4jkxys9wzy4chg5";
};
propagatedBuildInputs = [ python3Packages.urwid ];
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index e5b89ff43b5..6ff09a5b4b0 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "worker";
- version = "4.0.1";
+ version = "4.1.0";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
- sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh";
+ sha256 = "19v4g34sk4fkagk0s60rbixyrrgg22qy1xwffm8b5ffq36r7yfch";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 8a46336c9de..425c4a85888 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
- version = "3.0.0";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "1m0rsjb7y1j77mzg5cqb3fdvzgvjkrwgmkjn9nv1xl2757z8hcl4";
+ sha256 = "05z3hpz42609zsrqwd9sbxkgzm4f28ajhvgk69jvcfw7azg5jcfq";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 7d9ebca0086..5871d1a557b 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
- version = "3.0.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
- sha256 = "19rv5zmxwr3kmb2m3fas91aq1493cnkhvs88zcflnijr1ra218ks";
+ sha256 = "1qiwarf0bqc17w3r88ysxxpm71gm861zx1fnzp0xi4q3rbh3nfmd";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 60231350edb..83ba28bfce3 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "xterm-348";
+ name = "xterm-349";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
];
- sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb";
+ sha256 = "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir";
};
buildInputs =
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 7418640e072..b9231f8f093 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zola";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "getzola";
repo = pname;
rev = "v${version}";
- sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5";
+ sha256 = "0dbj2rkn4k5glnwdazsvjhah5pj9cbdb8hwlvm5q4njsmrgpyaw5";
};
- cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";
+ cargoSha256 = "0i0xqbpbv3md42d2853cfzkhfwlkvxahhz5dldla5x96rm1i2hr8";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index a0bc0c743e4..f87ba43f2bb 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,24 +1,52 @@
-{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
-, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking
+{ stdenv
+, fetchurl
+, cmake
+, ninja
+, pkgconfig
+, intltool
+, vala_0_44
+, wrapGAppsHook
+, gcr
+, libpeas
+, gtk3
+, webkitgtk
+, sqlite
+, gsettings-desktop-schemas
+, libsoup
+, glib-networking
+, json-glib
+, libarchive
}:
stdenv.mkDerivation rec {
pname = "midori";
- version = "7";
+ version = "9.0";
src = fetchurl {
- url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz";
- sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh";
+ url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz";
+ sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy";
};
nativeBuildInputs = [
- pkgconfig cmake ninja intltool vala wrapGAppsHook
+ cmake
+ intltool
+ ninja
+ pkgconfig
+ vala_0_44
+ wrapGAppsHook
];
buildInputs = [
- gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
- (libsoup.override { gnomeSupport = true; }) libpeas
+ (libsoup.override { gnomeSupport = true; })
+ gcr
glib-networking
+ gsettings-desktop-schemas
+ gtk3
+ libpeas
+ sqlite
+ webkitgtk
+ json-glib
+ libarchive
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix
new file mode 100644
index 00000000000..51657659b95
--- /dev/null
+++ b/pkgs/applications/networking/cawbird/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
+, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
+, glib-networking, python3, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.1";
+ pname = "cawbird";
+
+ src = fetchFromGitHub {
+ owner = "IBBoard";
+ repo = "cawbird";
+ rev = "v${version}";
+ sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1";
+ };
+
+ nativeBuildInputs = [
+ meson ninja vala pkgconfig wrapGAppsHook python3
+ gobject-introspection # for setup hook
+ ];
+
+ buildInputs = [
+ glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
+ ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
+
+ patches = [
+ # Fix build with vala 0.46
+ (fetchpatch {
+ url = "https://github.com/IBBoard/cawbird/commit/7b88f8856d108b9555ba7b855c7daed7b9e745ca.patch";
+ sha256 = "10kfdy91yas4xyz0hd057q6nsqfrkljcj7pql81xgm43qaff31y0";
+ })
+ ];
+
+ postPatch = ''
+ chmod +x data/meson_post_install.py # patchShebangs requires executable file
+ patchShebangs data/meson_post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Native GTK Twitter client for the Linux desktop";
+ longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
+ homepage = https://ibboard.co.uk/cawbird/;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 48d20ae3d58..0b4959d3b9b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -60,4 +60,9 @@ in rec {
version = "1.13.2";
sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
};
+
+ kops_1_14 = mkKops {
+ version = "1.14.0";
+ sha256 = "0zd2plsdn45wf73qspv9yaxa0crwfy5h6ws3lvw96vxvrkhl96l2";
+ };
}
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index c549efa7b40..7058c009f2d 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "kube3d";
version = "1.3.1";
+ k3sVersion = "0.9.1";
goPackagePath = "github.com/rancher/k3d";
@@ -13,13 +14,20 @@ buildGoPackage rec {
sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2";
};
- goDeps = ./deps.nix;
+ buildFlagsArray = ''
+ -ldflags=
+ -w -s
+ -X github.com/rancher/k3d/version.Version=${version}
+ -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion}
+ '';
+
+ modSha256 = "1qadf3gc2626l4jpad4lzi649nh8if9m6fgs2cf46r1nish16h95";
meta = with stdenv.lib; {
homepage = "https://github.com/rancher/k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ kuznero ];
+ maintainers = with maintainers; [ kuznero jlesquembre ];
};
}
diff --git a/pkgs/applications/networking/cluster/kube3d/deps.nix b/pkgs/applications/networking/cluster/kube3d/deps.nix
deleted file mode 100644
index 4fb2936a40b..00000000000
--- a/pkgs/applications/networking/cluster/kube3d/deps.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/Microsoft/go-winio";
- fetch = {
- type = "git";
- url = "https://github.com/Microsoft/go-winio";
- rev = "v0.4.12";
- sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.0";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
- };
- }
- {
- goPackagePath = "github.com/docker/distribution";
- fetch = {
- type = "git";
- url = "https://github.com/docker/distribution";
- rev = "v2.7.1";
- sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
- };
- }
- {
- goPackagePath = "github.com/docker/docker";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker";
- rev = "v1.13.1";
- sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
- };
- }
- {
- goPackagePath = "github.com/docker/go-connections";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-connections";
- rev = "v0.4.0";
- sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq";
- };
- }
- {
- goPackagePath = "github.com/docker/go-units";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-units";
- rev = "v0.3.3";
- sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "v0.0.4";
- sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "v1.1.0";
- sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
- };
- }
- {
- goPackagePath = "github.com/olekukonko/tablewriter";
- fetch = {
- type = "git";
- url = "https://github.com/olekukonko/tablewriter";
- rev = "v0.0.1";
- sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/go-digest";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/go-digest";
- rev = "v1.0.0-rc1";
- sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "v0.8.1";
- sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/stretchr/objx";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/objx";
- rev = "v0.1.0";
- sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.3.0";
- sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
- };
- }
- {
- goPackagePath = "github.com/urfave/cli";
- fetch = {
- type = "git";
- url = "https://github.com/urfave/cli";
- rev = "v1.20.0";
- sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "c2843e01d9a2";
- sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "b630fd6fe46b";
- sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "d0b11bdaac8a";
- sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
-]
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
deleted file mode 100644
index 73c0e234945..00000000000
--- a/pkgs/applications/networking/corebird/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
-, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
-, glib-networking, python3 }:
-
-stdenv.mkDerivation rec {
- version = "1.7.4";
- pname = "corebird";
-
- src = fetchFromGitHub {
- owner = "baedert";
- repo = "corebird";
- rev = version;
- sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
- };
-
- nativeBuildInputs = [
- meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
- gobject-introspection # for setup hook
- ];
-
- buildInputs = [
- glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
- ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
-
- postPatch = ''
- chmod +x data/meson_post_install.py # patchShebangs requires executable file
- patchShebangs data/meson_post_install.py
- '';
-
- meta = {
- description = "Native GTK Twitter client for the Linux desktop";
- longDescription = "Corebird is a modern, easy and fun Twitter client.";
- homepage = https://corebird.baedert.org/;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.jonafato ];
- };
-}
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 2535d0dc31d..9de87ee178d 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation {
- name = "esniper-2.35.0-15-g91d2665";
+ name = "esniper-2.35.0-18-g4a59da0";
src = fetchgit {
url = "https://git.code.sf.net/p/esniper/git";
- rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7";
- sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0";
+ rev = "4a59da032aa4536b9e5ea95633247650412511db";
+ sha256 = "0d3vazh5q7wymqahggbb2apl9hgrm037y4s3j91d24hjgk2pzzyd";
};
buildInputs = [ openssl curl ];
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index a8821213303..350e96a94a7 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
-, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
+, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}:
@@ -32,6 +32,14 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson_post_install.py
'';
+ patches = [
+ # Fixes build with libsecret
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch";
+ sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5";
+ })
+ ];
+
meta = with stdenv.lib; {
description = "A modern desktop application designed to complement existing web-based RSS accounts";
homepage = https://jangernert.github.io/FeedReader/;
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
deleted file mode 100644
index f90457ba937..00000000000
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl
-, geoip, gperftools, python, swig }:
-
-stdenv.mkDerivation rec {
- name = "bro-2.5.5";
-
- src = fetchurl {
- url = "https://www.bro.org/downloads/${name}.tar.gz";
- sha256 = "1kvkiq8jjsqryry9jd4vw45pbfb46jly988mq62mv4sd1fqsxwhq";
- };
-
- nativeBuildInputs = [ cmake flex bison file ];
- buildInputs = [ openssl libpcap perl zlib curl geoip gperftools python swig ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "Powerful network analysis framework much different from a typical IDS";
- homepage = https://www.bro.org/;
- license = licenses.bsd3;
- maintainers = with maintainers; [ pSub ];
- platforms = with platforms; linux;
- };
-}
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
new file mode 100644
index 00000000000..b087a6c3ae3
--- /dev/null
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
+, libmaxminddb, gperftools, python, swig, rocksdb }:
+
+stdenv.mkDerivation rec {
+ pname = "zeek";
+ version = "3.0.0";
+
+ src = fetchurl {
+ url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
+ sha256 = "16pz5fh0z1hmvhn8pxqmdm5a9d8mqrp4gxpxkaywnaqk2h598lmm";
+ };
+
+ nativeBuildInputs = [ cmake flex bison file ];
+ buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ];
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = [
+ "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
+ "-DENABLE_PERFTOOLS=true"
+ "-DINSTALL_AUX_TOOLS=true"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Powerful network analysis framework much different from a typical IDS";
+ homepage = "https://www.zeek.org";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ pSub marsam tobim ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index 310d419718f..8a15a3bdd85 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation {
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
};
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 5b3e09440a6..6180f531f47 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [ pidgin gmime libxml2 nss ];
enableParallelBuilding = true;
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index cfc38fb4ae7..d305fade038 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.4.0",
+ "version": "1.4.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 885e90a98c4..7b5bb1e04f3 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
let
executableName = "riot-desktop";
- version = "1.4.0";
+ version = "1.4.1";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
- sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa";
+ sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl";
};
in yarn2nix-moretea.mkYarnPackage rec {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index d0ee71b9969..1b9b34ed4aa 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "riot-web";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk";
+ sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq";
};
installPhase = let
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 26b858aa3b8..9319d8b0f5b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -8,7 +8,7 @@ with lib;
mkDerivation rec {
pname = "telegram-desktop";
- version = "1.8.8";
+ version = "1.8.9";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).
@@ -17,7 +17,7 @@ mkDerivation rec {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
- sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv";
+ sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 933badccf63..5a84f9be96d 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "3.0.291715.0908";
+ version = "3.0.301026.0930";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f";
+ sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar";
};
};
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 6addd66ac63..d1b950a7757 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -5,7 +5,7 @@
, static ? false # link statically
, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
-, qtbase, qtscript
+, mkDerivation, qtbase, qtscript
, phonon, libdbusmenu, qca-qt5
, withKDE ? true # enable KDE integration
@@ -20,6 +20,7 @@
}:
let
+ inherit (stdenv) lib;
buildClient = monolithic || client;
buildCore = monolithic || enableDaemon;
in
@@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only
let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
-in with stdenv; mkDerivation rec {
+in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
name = "quassel${tag}-${version}";
version = "0.13.1";
@@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec {
++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE";
- preFixup =
+ dontWrapQtApps = true;
+
+ postFixup =
lib.optionalString enableDaemon ''
- wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
+ wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' +
lib.optionalString buildClient ''
- wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
- --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
+ wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \
+ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 574c4895a64..cdf2769c27e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -52,6 +52,11 @@ in stdenv.mkDerivation rec {
patches = [
# Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch
+ (fetchpatch {
+ # https://phabricator.services.mozilla.com/D47796
+ url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff";
+ sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq";
+ })
]
++ lib.optional (lib.versionOlder version "69")
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 7907365a6a3..c674956066a 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
+{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "owncloud-client";
version = "2.5.4.11654";
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix
index 88f07f0a8a5..ce5a99b1e5f 100644
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "zeronet";
- version = "0.6.5";
+ version = "0.7.1";
format = "other";
src = fetchFromGitHub {
owner = "HelloZeroNet";
repo = "ZeroNet";
rev = "v${version}";
- sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a";
+ sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk";
};
- propagatedBuildInputs = with python2Packages; [ msgpack gevent ];
- buildPhase = "${python2Packages.python.interpreter} -O -m compileall .";
+ propagatedBuildInputs = with python3Packages; [
+ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client
+ gevent-websocket rencode bitcoinlib maxminddb pyopenssl
+ ];
+
+ buildPhase = ''
+ ${python3Packages.python.interpreter} -O -m compileall .
+ '';
installPhase = ''
mkdir -p $out/share
@@ -23,7 +29,7 @@ python2Packages.buildPythonApplication rec {
postFixup = ''
makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \
--set PYTHONPATH "$PYTHONPATH" \
- --set PATH ${python2Packages.python}/bin
+ --set PATH ${python3Packages.python}/bin
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 3b7db7075bb..d8dc33c944e 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
};
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl
( cd doc ; make );
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index aa965a0c868..ef1e07ca976 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib;
let
- version = "3.0.3";
+ version = "3.0.5";
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 = "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg";
+ sha256 = "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5";
};
cmakeFlags = [
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 5e9945492de..bc26541f4d7 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "rclone";
- version = "1.49.3";
+ version = "1.49.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa";
+ sha256 = "04fa85ch85dxm2nq7vqria34zn6fbgvky7p1i59j1wib753jpxyp";
};
goPackagePath = "github.com/rclone/rclone";
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index feee36b3d74..d8fbd4392bd 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -43,9 +43,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ dconf ];
- # glib-2.58 deprecrated g_type_class_add_private
- # Should probably be removed next version bump
- CXXFLAGS = [ "-Wno-deprecated-declarations" ];
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
patches = [ ./cmake_check_symbol_exists.patch ];
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 687b83948cd..f454d8830cb 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -45,6 +45,9 @@ in stdenv.mkDerivation {
python2.pkgs.pygtk
];
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
preConfigure = ''./autogen.sh'';
configureFlags = [
"--enable-python"
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index 16df0b294c1..7d79d79072a 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -4,12 +4,12 @@ with pythonPackages;
buildPythonApplication rec {
pname = "watson";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchPypi {
inherit version;
pname = "td-watson";
- sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
+ sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n";
};
checkPhase = ''
diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
new file mode 100644
index 00000000000..e8241ede96c
--- /dev/null
+++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, xen_4_10 }:
+
+stdenv.mkDerivation rec {
+ pname = "qubes-core-vchan-xen";
+ version = "4.1.2";
+
+ src = fetchFromGitHub {
+ owner = "QubesOS";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1wj4vv8nkzzig52r2nzkd4jy0cwznfkyddx379hfsdl4pzsp55mj";
+ };
+
+ buildInputs = [ xen_4_10 ];
+ buildPhase = ''
+ make all PREFIX=/
+ '';
+ installPhase = ''
+ make install DESTDIR=$out PREFIX=/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Libraries required for the higher-level Qubes daemons and tools";
+ homepage = "https://qubes-os.org";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ "0x4A6F" ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 4a185667944..a00ec6c47eb 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -5,7 +5,7 @@
} :
let
- version = "0.5.2";
+ version = "0.5.0";
in stdenv.mkDerivation {
pname = "qradiolink";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
owner = "kantooon";
repo = "qradiolink";
rev = version;
- sha256 = "0djhrr96b8sr2vi6hwbzgzlp9771622dp93f0rsphsyxlwbzsrgl";
+ sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
};
preBuild = ''
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 3d519255ab4..148ad35a1f0 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation {
- version = "18.12";
+ version = "19.08";
pname = "rtl_433";
src = fetchFromGitHub {
owner = "merbanan";
repo = "rtl_433";
- rev = "18.12";
- sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5";
+ rev = "19.08";
+ sha256 = "0cm82gm5c86qfl4dw37h8wyk77947k6fv2n1pn3xvk3wz2ygsdi6";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix
index 7b9cf0a4ee5..3434c0624ed 100644
--- a/pkgs/applications/radio/xlog/default.nix
+++ b/pkgs/applications/radio/xlog/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl";
};
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
buildInputs = [ glib pkgconfig gtk2 hamlib ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 2a57febe8f5..8fff296affa 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.20.5";
+ version = "2.20.8";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "107zlvp74ahpn652nfkipp80bbzf3fp812pi1ma42njk4wchah10";
+ sha256 = "01bibkwyp4xzwcpvkr3ab6z0syjmzj4zmyxl3bybmrp9irhjvydg";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 9a989919250..3ac4b24bf76 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "verilator";
- version = "4.016";
+ version = "4.018";
src = fetchurl {
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
- sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
+ sha256 = "0ih38dd8hiwgjyc6gclx8i9jlycgdlrxzz8bicm4a6yj4p0jxmcq";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
index 933344aa559..56f09279622 100644
--- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
+++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -1,8 +1,8 @@
diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
-index 0f2700168a..60f71357d2 100644
+index 73a078e619..059125c59f 100644
--- a/src/sage_setup/docbuild/__init__.py
+++ b/src/sage_setup/docbuild/__init__.py
-@@ -86,26 +86,6 @@ def builder_helper(type):
+@@ -86,27 +86,6 @@ def builder_helper(type):
"""
Returns a function which builds the documentation for
output type ``type``.
@@ -19,7 +19,8 @@ index 0f2700168a..60f71357d2 100644
- ....: raise BaseException("abort pool operation")
- sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException
-
-- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc
+- sage: from sage_setup.docbuild import builder_helper, build_ref_doc
+- sage: from sage_setup.docbuild import _build_many as build_many
- sage: helper = builder_helper("html")
- sage: try:
- ....: build_many(build_ref_doc, [("docname", "en", "html", {})])
@@ -29,7 +30,7 @@ index 0f2700168a..60f71357d2 100644
"""
def f(self, *args, **kwds):
output_dir = self._output_dir(type)
-@@ -127,10 +107,9 @@ def builder_helper(type):
+@@ -128,10 +107,9 @@ def builder_helper(type):
logger.debug(build_command)
# Run Sphinx with Sage's special logger
@@ -43,10 +44,10 @@ index 0f2700168a..60f71357d2 100644
if ABORT_ON_ERROR:
raise
diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
-index 9a2fba79bc..77c8ed3592 100644
+index fe7eba43b2..463790965c 100644
--- a/src/sage_setup/docbuild/sphinxbuild.py
+++ b/src/sage_setup/docbuild/sphinxbuild.py
-@@ -318,3 +318,8 @@ def runsphinx():
+@@ -321,3 +321,8 @@ def runsphinx():
sys.stderr = saved_stderr
sys.stdout.flush()
sys.stderr.flush()
diff --git a/pkgs/applications/science/math/sage/patches/threejs-offline.patch b/pkgs/applications/science/math/sage/patches/threejs-offline.patch
deleted file mode 100644
index 62b2f114bd6..00000000000
--- a/pkgs/applications/science/math/sage/patches/threejs-offline.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src
-index 91780d813c..254b850a24 100755
---- a/build/pkgs/threejs/spkg-src
-+++ b/build/pkgs/threejs/spkg-src
-@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE"
- echo "Downloading $URL3"
- curl -OL "$URL3"
-
-+# Set up directory structure
-+
-+mkdir build
-+mv three.min.js build
-+
-+mkdir -p examples/js/controls
-+mv OrbitControls.js examples/js/controls
-+
- # Package
--tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE'
--rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE'
-+tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE'
-+rm -rf 'build' 'examples' 'LICENSE'
-
- # Update package info
- echo "${GIT_VERSION}" > 'package-version.txt'
-diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py
-index 7c27d48a21..8bf4861a35 100644
---- a/src/sage/repl/rich_output/backend_ipython.py
-+++ b/src/sage/repl/rich_output/backend_ipython.py
-@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython):
- sage: backend.threejs_offline_scripts()
- '...
--
-+
-+
-
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 9351b90680d..dc9c9b5c874 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
# all get the same sources with the same patches applied.
stdenv.mkDerivation rec {
- version = "8.8";
+ version = "8.9";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
- sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";
+ sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a";
};
# Patches needed because of particularities of nix or the way this is packaged.
@@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/27660#ticket
./patches/do-not-test-find-library.patch
-
- # https://trac.sagemath.org/ticket/28007
- ./patches/threejs-offline.patch
-
# Parallelize docubuild using subprocesses, fixing an isolation issue. See
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
./patches/sphinx-docbuild-subprocesses.patch
@@ -97,14 +93,6 @@ stdenv.mkDerivation rec {
stripLen = 1;
})
- # https://trac.sagemath.org/ticket/26932
- (fetchSageDiff {
- name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";
- base = "8.8.beta4";
- rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
- sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
- })
-
# 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.
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 6eac84aaa86..69f7624078e 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -138,8 +138,8 @@ buildPythonPackage rec {
mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
mkdir -p "var/lib/sage/installed"
+ source build/bin/sage-dist-helpers
cd src
- source bin/sage-dist-helpers
${python.interpreter} -u setup.py --no-user-cfg build
'';
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index 11674f1951a..bce5795a9c7 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -5,13 +5,13 @@
pythonPackages.buildPythonApplication rec {
majorver = "1.4";
- minorver = "7";
+ minorver = "10";
version = "${majorver}.${minorver}";
pname = "catfish";
src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
- sha256 = "1s97jb1r07ff40jnz8zianpn1f0c67hssn8ywdi2g7njfb4amjj8";
+ sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
file
which
intltool
- gobject-introspection
+ gobject-introspection # for setup hook populating GI_TYPELIB_PATH
wrapGAppsHook
];
@@ -29,9 +29,11 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.pyxdg
pythonPackages.ptyprocess
pythonPackages.pycairo
+ gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
];
propagatedBuildInputs = [
+ pythonPackages.dbus-python
pythonPackages.pygobject3
pythonPackages.pexpect
xdg_utils
@@ -52,7 +54,7 @@ pythonPackages.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://docs.xfce.org/apps/catfish/start;
- description = "A handy file search tool";
+ description = "Handy file search tool";
longDescription = ''
Catfish is a handy file searching tool. The interface is
intentionally lightweight and simple, using only GTK 3.
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index ba0625c433d..5812ff8c1d1 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, python2Packages, git }:
+{ stdenv, fetchurl, pythonPackages, git }:
-python2Packages.buildPythonApplication rec {
- version = "1.4.2";
+pythonPackages.buildPythonApplication rec {
pname = "git-up";
+ version = "1.6.1";
- src = fetchurl {
- url = "mirror://pypi/g/git-up/${pname}-${version}.zip";
- sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
};
- buildInputs = [ git ] ++ (with python2Packages; [ nose ]);
- propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ];
+ # git should be on path for tool to work correctly
+ propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]);
+ checkInputs = [ git pythonPackages.nose ]; # git needs to be on path
# 1. git fails to run as it cannot detect the email address, so we set it
# 2. $HOME is by default not a valid dir, so we have to set that too
# https://github.com/NixOS/nixpkgs/issues/12591
@@ -22,7 +23,7 @@ python2Packages.buildPythonApplication rec {
'';
postInstall = ''
- rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests
+ rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests
'';
meta = with stdenv.lib; {
@@ -31,6 +32,5 @@ python2Packages.buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
- broken = true; # Incompatible with Git 2.15 object store.
};
}
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 0f2da545978..42887132f31 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "6.2.0";
+ version = "6.2.1";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
- sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k";
+ sha256 = "1l1w8gr4ss0g2k7bfslnc7df4ls1av59jjjc8mrx97wsndrm3vxg";
};
libPath = makeLibraryPath [
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 5e7cf9353b2..72aa59571bf 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -37,13 +37,13 @@ let
optional = stdenv.lib.optional;
in mkDerivation rec {
pname = "obs-studio";
- version = "23.2.1";
+ version = "24.0.1";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = version;
- sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
+ sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5";
};
nativeBuildInputs = [ cmake
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index e33610ac416..b5ffdb018ff 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- version = "1.1.1";
+ version = "1.2.0";
pname = "streamlink";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = version;
- sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33";
+ sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh";
};
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix
new file mode 100644
index 00000000000..430d7122179
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/utils.nix
@@ -0,0 +1,16 @@
+{ stdenv, qemu }:
+
+stdenv.mkDerivation rec {
+ name = "qemu-utils-${version}";
+ version = qemu.version;
+
+ buildInputs = [ qemu ];
+ unpackPhase = "true";
+
+ installPhase = ''
+ mkdir -p "$out/bin"
+ cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img"
+ cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io"
+ cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd"
+ '';
+}
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index d4318b715ba..a1a38484386 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -60,6 +60,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
# Remove all built in external workspaces, Bazel will recreate them when building
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
+ rm -rf $bazelOut/external/{rules_cc,\@rules_cc.marker}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
rm -rf $bazelOut/external/{local_*,\@local_*.marker}
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 4634d32f6ac..27601e481c6 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -13,6 +13,9 @@
, cargoUpdateHook ? ""
, cargoDepsHook ? ""
, cargoBuildFlags ? []
+, # Set to true to verify if the cargo dependencies are up to date.
+ # This will change the value of cargoSha256.
+ verifyCargoDeps ? false
, buildType ? "release"
, meta ? {}
@@ -26,6 +29,7 @@ let
cargoDeps = if cargoVendorDir == null
then fetchcargo {
inherit name src srcs sourceRoot cargoUpdateHook;
+ copyLockfile = verifyCargoDeps;
patches = cargoPatches;
sha256 = cargoSha256;
}
@@ -95,6 +99,21 @@ stdenv.mkDerivation (args // {
unset cargoDepsCopy
export RUST_LOG=${logLevel}
+ '' + stdenv.lib.optionalString verifyCargoDeps ''
+ if ! diff source/Cargo.lock $cargoDeps/Cargo.lock ; then
+ echo
+ echo "ERROR: cargoSha256 is out of date."
+ echo
+ echo "Cargo.lock is not the same in $cargoDeps."
+ echo
+ echo "To fix the issue:"
+ echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value'
+ echo "2. Build the derivation and wait it to fail with a hash mismatch"
+ echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field"
+ echo
+
+ exit 1
+ fi
'' + (args.postUnpack or "");
configurePhase = args.configurePhase or ''
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index bc80db0947b..a515ce9c6eb 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -17,7 +17,16 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
preferLocalBuild = true;
};
in
-{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
+{ name ? "cargo-deps"
+, src
+, srcs
+, patches
+, sourceRoot
+, sha256
+, cargoUpdateHook ? ""
+, # whenever to also include the Cargo.lock in the output
+ copyLockfile ? false
+}:
stdenv.mkDerivation {
name = "${name}-vendor";
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
@@ -37,6 +46,9 @@ stdenv.mkDerivation {
exit 1
fi
+ # Keep the original around for copyLockfile
+ cp Cargo.lock Cargo.lock.orig
+
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
CARGO_CONFIG=$(mktemp cargo-config.XXXX)
@@ -52,6 +64,10 @@ stdenv.mkDerivation {
if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then
install -D $CARGO_CONFIG $out/.cargo/config;
fi;
+
+ '' + stdenv.lib.optionalString copyLockfile ''
+ # add the Cargo.lock to allow hash invalidation
+ cp Cargo.lock.orig $out/Cargo.lock
'';
outputHashAlgo = "sha256";
diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/data/fonts/work-sans/default.nix
new file mode 100644
index 00000000000..16a0e9ac021
--- /dev/null
+++ b/pkgs/data/fonts/work-sans/default.nix
@@ -0,0 +1,29 @@
+{ lib, fetchFromGitHub }:
+
+let
+ version = "1.6";
+in fetchFromGitHub {
+ name = "work-sans-${version}";
+
+ owner = "weiweihuanghuang";
+ repo = "Work-Sans";
+ rev = "v${version}";
+
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype/ fonts/desktop/*.otf
+ install -m444 -Dt $out/share/fonts/truetype/ fonts/webfonts/ttf/*.ttf
+ install -m444 -Dt $out/share/fonts/woff/ fonts/webfonts/woff/*.woff
+ install -m444 -Dt $out/share/fonts/woff2/ fonts/webfonts/woff2/*.woff2
+ '';
+
+ sha256 = "01kjidk6zv80rqxapcdwhd9wxzrjfc6lj4gkf6dwa4sskw5x3b8a";
+
+ meta = with lib; {
+ description = "A grotesque sans";
+ homepage = "https://weiweihuanghuang.github.io/Work-Sans/";
+ license = licenses.ofl;
+ maintainers = [ maintainers.marsam ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index fb02309992b..726023caef5 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "19.02.22";
+ version = "19.05.07";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7";
+ sha256 = "04h7kp1895rkfaqrgzrpqjmqamkxv3dkmhslgm2cxsa6qc0wammg";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index cc917d95337..6ae27a11e3a 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "19.02.22";
+ version = "19.05.07";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw";
+ sha256 = "13wxy36qys439pv0xaynqvmjshnfrk9wa89iw878ibvfj506ji2s";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 671f03bd837..b227c9576fb 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
- version = "20190802";
+ version = "20190919";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
- sha256 = "1i6nh1vy2cjqh4fw1mzq5v4ah613ghf018g8w0npxhj9qi3pyjm5";
+ sha256 = "1pykrvh232b12wlhc56yd992vl4p3j2ap21mhhcwyxml06riwvki";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index b9de3743daf..b5882eb98d0 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
- version = "2019-09-23";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
- rev = "v${version}";
- sha256 = "0fx6ksv9yb16drhx1sn4nq6jha36gha3cxnr1fjhj8dgarjqrg9k";
+ rev = version;
+ sha256 = "1zp8s2hr33lpdyc4nihfmsc728672fa2dcji4xk6dv6b64cp1xyx";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 59789bd84bb..11032fba0e7 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
- libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
+ libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
pcre
vte
wnck
+ gnutls
+ pcre2
];
postPatch = ''
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 869f08154bb..61db4ca0571 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -39,7 +39,7 @@ let
deepin-turbo = callPackage ./deepin-turbo { };
deepin-wallpapers = callPackage ./deepin-wallpapers { };
deepin-wm = callPackage ./deepin-wm {
- vala = pkgs.vala_0_42;
+ vala = pkgs.vala_0_40;
};
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
dtkcore = callPackage ./dtkcore { };
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 1876cce6c8a..5e3763c9a6d 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -1,33 +1,94 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
-, fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
-, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
-, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
-, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
-, curl, libinput, systemd, mesa, writeText, gtk3
+{ stdenv, fetchurl, pkgconfig, SDL, SDL2, alsaLib, bullet, curl, dbus,
+ doxygen, expat, fontconfig, freetype, fribidi, ghostscript, giflib,
+ glib, gst_all_1, gtk3, harfbuzz, jbig2dec, libGL, libdrm, libinput,
+ libjpeg, libpng, libpulseaudio, libraw, librsvg, libsndfile,
+ libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, mesa,
+ openjpeg, openssl, poppler, python27Packages, systemd, udev,
+ utillinux, writeText, xineLib, xorg, zlib
}:
stdenv.mkDerivation rec {
pname = "efl";
- version = "1.22.3";
+ version = "1.22.5";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky";
+ sha256 = "1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59";
};
- nativeBuildInputs = [ pkgconfig gtk3 ];
+ nativeBuildInputs = [
+ gtk3
+ pkgconfig
+ ];
- buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa
- giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
- gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto
- xorg.libX11 udev systemd ];
+ buildInputs = [
+ SDL
+ fontconfig
+ freetype
+ giflib
+ glib
+ gst_all_1.gst-libav
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gstreamer
+ libGL
+ libpng
+ libpulseaudio
+ libsndfile
+ libtiff
+ lz4
+ mesa
+ openssl
+ systemd
+ udev
+ xorg.libX11
+ xorg.libXcursor
+ xorg.xorgproto
+ zlib
+ ];
- propagatedBuildInputs = [ libxkbcommon python27Packages.dbus-python dbus libjpeg xorg.libXcomposite
- xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
- bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
- xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
- harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
- libinput utillinux fribidi SDL2 ];
+ propagatedBuildInputs = [
+ SDL2
+ alsaLib
+ bullet
+ curl
+ dbus
+ dbus
+ doxygen
+ expat
+ fribidi
+ ghostscript
+ harfbuzz
+ jbig2dec
+ libdrm
+ libinput
+ libjpeg
+ libraw
+ librsvg
+ libspectre
+ libwebp
+ libxkbcommon
+ luajit
+ openjpeg
+ poppler
+ python27Packages.dbus-python
+ utillinux
+ xineLib
+ xorg.libXScrnSaver
+ xorg.libXcomposite
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXinerama
+ xorg.libXp
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libxcb
+ xorg.libxkbfile
+ xorg.xcbutilkeysyms
+ ];
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
configureFlags = [
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 9a70319952c..a2556492bb6 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -17,13 +17,13 @@
python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}";
- version = "3.32.3";
+ version = "3.34.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0ark4qkfvdggz2mbksq12iq55izdsjnkjqkvfnnkf4k5vfpa95y5";
+ sha256 = "1npl1pxqrij9dsmp70ralcfbjbw503jsz2pqm3qjwyba5cf6kcbm";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index b18e58f6f56..b3bb1e1093c 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -1,39 +1,41 @@
-{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
+{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
-, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
+, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
, libxslt, yelp-tools, gnome-common, gtk-doc
-, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
+, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2
+, meson, ninja, dbus, python3 }:
stdenv.mkDerivation rec {
pname = "cheese";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv";
+ sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni";
};
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
passthru = {
updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; };
};
nativeBuildInputs = [
- pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib
+ meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib
libxslt docbook_xml_dtd_43 docbook_xsl
- autoreconfHook gtk-doc yelp-tools gnome-common
+ gtk-doc yelp-tools gnome-common python3
];
buildInputs = [ gtk3 glib gnome-video-effects
gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
- libcanberra-gtk3 libgudev ];
+ libcanberra-gtk3 libgudev dbus ];
outputs = [ "out" "man" "devdoc" ];
- patches = [
- gtk-doc.respect_xml_catalog_files_var_patch
- ];
-
preFixup = ''
gappsWrapperArgs+=(
# Effects
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 2061fc26607..8085b2a824a 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -10,7 +10,7 @@
, gtk3
, glib
, libnotify
-, gtkspell3
+, gspell
, evolution-data-server
, adwaita-icon-theme
, gnome-desktop
@@ -38,15 +38,16 @@
, procps
, p11-kit
, openldap
+, spamassassin
}:
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.32.4";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh";
+ sha256 = "136jim297ac7ig0ax7ll6x4dc3vhd7l5prh3fvb4mmskv5klbl6r";
};
nativeBuildInputs = [
@@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gtk3
- gtkspell3
+ gspell
highlight
icu
libcanberra-gtk3
@@ -102,6 +103,10 @@ stdenv.mkDerivation rec {
"-DENABLE_LIBCRYPTUI=OFF"
"-DENABLE_PST_IMPORT=OFF"
"-DENABLE_YTNEF=OFF"
+ "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin"
+ "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"
+ "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter"
+ "-DWITH_OPENLDAP=${openldap}"
];
requiredSystemFeatures = [
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 267a7f2f7d2..36b89a31052 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "file-roller";
- version = "3.32.1";
+ version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw";
+ sha256 = "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6";
};
LANG = "en_US.UTF-8"; # postinstall.py
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 35d97a87a86..5115c2d8fb4 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "gedit";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
+ sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 25ee957224c..628442c3075 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gnome-books";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4";
+ sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 2f0a21896e9..ba0d0bd891b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -6,17 +6,15 @@
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
}:
-# TODO: ovirt (optional)
-
let
- version = "3.32.1";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
pname = "gnome-boxes";
inherit version;
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
+ sha256 = "07qjrb1qgfznvm0l2jm99d212dvw3iaw76czq5q1msnghpdw67qd";
};
doCheck = true;
@@ -40,10 +38,6 @@ in stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}")
'';
- mesonFlags = [
- "-Dovirt=false"
- ];
-
postPatch = ''
chmod +x build-aux/post_install.py # patchShebangs requires executable file
patchShebangs build-aux/post_install.py
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 03619f38c9b..ec09b856f30 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
let
pname = "gnome-calendar";
- version = "3.32.2";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k";
+ sha256 = "0gbiqsx3pny2blgfwazy82fbrnn17yilm3rvv1aq8k5w0xd9147b";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 38182f1f994..a99e775b26b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "gnome-clocks";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
+ sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 1301381e5aa..3a7e1473332 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "gnome-documents";
- version = "3.32.0";
+ version = "3.33.90";
src = fetchurl {
url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
+ sha256 = "0l9g10i380bnjp1y3pslsy8ph1hd5x1d57dadvq70p5ki4r3qjaw";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 655e9e9fe34..bb4e1820807 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnome-getting-started-docs";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq";
+ sha256 = "1nq3dvvjr6vzl87p0y2ggv8bxap3hdbwhbn9ycan4y5d4g5f437p";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 8681a3c866c..c80238740e5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
pname = "gnome-logs";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068";
+ sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m";
};
mesonFlags = [
- "-Dtests=true"
"-Dman=true"
];
nativeBuildInputs = [
python3
- meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
+ meson ninja pkgconfig wrapGAppsHook gettext itstool
libxml2 libxslt docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 6011092c0e0..fd659b3e405 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
let
pname = "gnome-maps";
- version = "3.32.2.1";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb";
+ sha256 = "0vsi21zzk5mvf6rv86r6ahzxd93ciyhjrdqsn3pncnk0yy67y2wr";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9b8c96729ad..204d0a8982e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
- version = "3.32.2";
+ version = "3.34.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk";
+ sha256 = "1a566ifx08clfm22qzdh1i6w8cr2kv7avqzkk6zgc5adba0vmzx4";
};
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 920343a6024..a6bc54fd86b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -5,14 +5,14 @@
, gnome3, libxml2, gsettings-desktop-schemas, tracker }:
let
- version = "3.32.2";
+ version = "3.34.0";
in stdenv.mkDerivation {
pname = "gnome-notes";
inherit version;
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
- sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2";
+ sha256 = "0wrnsspcg4s0vdfc23cc84xy02k3b19yim9s4k0vv23b69n37n1l";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index de5ab50d38f..3996a2e7564 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-sound-recorder";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0q83b6dabckmwj8mcw0wvhbxaszwdzzcf8ajx5bldll3lyl5yh2b";
+ sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index dbbbb43659b..f5c4eedc48d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
};
patches = [
- # fix build with e-d-s 3.32
+ # fix build with libecal 2.0
(fetchpatch {
- url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch;
- sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
+ name = "gnome-todo-eds-libecal-2.0.patch";
+ url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch";
+ sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq";
})
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 1e5a641f08f..c71baa146d1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-weather";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s";
+ sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4";
};
nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 7ac8b4dfe11..00000000000
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
-
-let
- pname = "nautilus-sendto";
- version = "3.8.6";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
-
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz";
- sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
- };
-
- nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
- buildInputs = [ glib ];
-
- passthru = {
- updateScript = gnome3.updateScript {
- packageName = pname;
- attrPath = "gnome3.${pname}";
- };
- };
-
- meta = with stdenv.lib; {
- description = "Integrates Evolution and Pidgin into the Nautilus file manager";
- maintainers = gnome3.maintainers;
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 51fea63b714..0202821f7d5 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
let
pname = "polari";
- version = "3.32.2";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp";
+ sha256 = "09g2ylx2fwm55h28w0c03fxkdvlwmr2yc033m93c4acz1h30rjns";
};
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index a1bcb406eb3..670cbabf362 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala, meson, ninja, libpwquality
+{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality
, pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, gpgme, python3, openldap, gcr
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x";
};
+ patches = [
+ # fix build with recent libsecret
+ # https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch;
+ sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj";
+ })
+ ];
+
doCheck = true;
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index a7f4a637b17..d2f161f23b4 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "adwaita-icon-theme";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
+ sha256 = "0zvwikj3a07i3g3rir4cc63b14822lrzzgprs1j2nmb3h8gykds0";
};
# For convenience, we can specify adwaita-icon-theme only in packages
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 4734a0e96b8..5817d8ff942 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -4,13 +4,13 @@
let
pname = "baobab";
- version = "3.32.0";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r";
+ sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index fa9bfa248d4..8681cd71429 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
let
pname = "dconf-editor";
- version = "3.32.0";
+ version = "3.34.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi";
+ sha256 = "0dgkgzrk4q8753j3lvz4ykyfs7pv1fvdmi516ryv3q20k24kxb9j";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 43f8dd08dbf..7ce498da9f3 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -6,20 +6,14 @@ let
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "0.32.0";
+ version = "0.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38";
+ sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll";
};
patches = [
- # Fix the build on Darwin
- # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
- sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
- })
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 8bb727a6fc5..fa4de8583da 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
let
pname = "eog";
- version = "3.32.2";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy";
+ sha256 = "1vjrlgc82ij8ijkgc1ssssig4bp23nd6a31wx44m7k1pwy64z594";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index c52162ce7f1..d583e8d1f87 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,32 +1,90 @@
-{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
-, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
-, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
-, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle
-, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
+{ stdenv
+, meson
+, ninja
+, gettext
+, fetchurl
+, pkgconfig
+, gtk3
+, glib
+, icu
+, wrapGAppsHook
+, gnome3
+, libxml2
+, libxslt
+, itstool
+, webkitgtk
+, libsoup
+, glib-networking
+, libsecret
+, gnome-desktop
+, libnotify
+, p11-kit
+, sqlite
+, gcr
+, isocodes
+, desktop-file-utils
+, python3
+, nettle
+, gdk-pixbuf
+, gst_all_1
+, json-glib
+, libdazzle
+, libhandy
+}:
stdenv.mkDerivation rec {
pname = "epiphany";
- version = "3.32.4";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
+ sha256 = "04wxnz8i0wbg21lqll2gqaa5j17f4vxqzgwgc7b0nylqi9pyd8bb";
};
# Tests need an X display
- mesonFlags = [ "-Dunit_tests=disabled" ];
+ mesonFlags = [
+ "-Dunit_tests=disabled"
+ ];
nativeBuildInputs = [
- meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
+ desktop-file-utils
+ gettext
+ itstool
+ libxslt
+ meson
+ ninja
+ pkgconfig
+ python3
+ wrapGAppsHook
];
buildInputs = [
- gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
- sqlite isocodes p11-kit icu libhandy
- gdk-pixbuf gnome3.adwaita-icon-theme gcr
- glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
- gst_all_1.gst-libav json-glib libdazzle nettle
+ gcr
+ gdk-pixbuf
+ glib
+ glib-networking
+ gnome-desktop
+ gnome3.adwaita-icon-theme
+ gst_all_1.gst-libav
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-ugly
+ gst_all_1.gstreamer
+ gtk3
+ icu
+ isocodes
+ json-glib
+ libdazzle
+ libhandy
+ libnotify
+ libsecret
+ libsoup
+ libxml2
+ nettle
+ p11-kit
+ sqlite
+ webkitgtk
];
postPatch = ''
@@ -36,7 +94,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
- packageName = "epiphany";
+ packageName = pname;
};
};
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 9313ca8990c..ee4e619332c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,6 +1,5 @@
-{ fetchFromGitLab
-, stdenv
-, fetchpatch
+{ stdenv
+, fetchFromGitLab
, meson
, ninja
, pkgconfig
@@ -34,6 +33,9 @@
, texlive
, t1lib
, gst_all_1
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
, supportMultimedia ? true # PDF multimedia
, libgxps
, supportXPS ? true # Open XML Paper Specification via libgxps
@@ -41,64 +43,62 @@
stdenv.mkDerivation rec {
pname = "evince";
- version = "3.32.0";
+ version = "3.34.0";
+ outputs = [ "out" "dev" "devdoc" ];
+
+ # meson.build not distributed
+ # See: https://gitlab.gnome.org/GNOME/evince/issues/1270
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
- sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r";
+ sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr";
};
-
- patches = [
- (fetchpatch {
- name = "CVE-2019-11459.patch";
- url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch";
- sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74";
- })
- ];
-
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
nativeBuildInputs = [
+ appstream
+ docbook-xsl-nons
+ docbook_xml_dtd_43
+ gettext
+ gobject-introspection
+ gtk-doc
+ itstool
meson
ninja
pkgconfig
- gobject-introspection
- gettext
- itstool
- yelp-tools
- appstream
- wrapGAppsHook
python3
+ wrapGAppsHook
+ yelp-tools
];
buildInputs = [
- glib
- gtk3
- pango
- atk
- gdk-pixbuf
- libxml2
- gsettings-desktop-schemas
- poppler
- ghostscriptX
- djvulibre
- libspectre
- libarchive
- libsecret
- librsvg
adwaita-icon-theme
- gspell
- gnome-desktop
+ atk
dbus # only needed to find the service directory
- texlive.bin.core # kpathsea for DVI support
+ djvulibre
+ gdk-pixbuf
+ ghostscriptX
+ glib
+ gnome-desktop
+ gsettings-desktop-schemas
+ gspell
+ gtk3
+ libarchive
+ librsvg
+ libsecret
+ libspectre
+ libxml2
+ pango
+ poppler
t1lib
+ texlive.bin.core # kpathsea for DVI support
] ++ stdenv.lib.optional supportXPS libgxps
++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
@@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dnautilus=false"
"-Dps=enabled"
- "-Dgtk_doc=false"
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 0048b02581a..63e1ec9ae29 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
- version = "3.32.4";
+ version = "3.34.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
+ sha256 = "1kw6wkrr33bxv95z06dr31qvmp7c7x88xkw27k3fq0df4jlb17gv";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index a4d2fd2be5a..8b9c3732454 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,15 +1,29 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
-, librsvg, coreutils, xwayland }:
+, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
+
+let
+
+ icon = fetchurl {
+ url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/4f041870efa1a6f0799ef4b32bb7be2cafee7a74/logo/nixos.svg";
+ sha256 = "0b0dj408c1wxmzy6k0pjwc4bzwq286f1334s3cqqwdwjshxskshk";
+ };
+
+ override = substituteAll {
+ src = ./org.gnome.login-screen.gschema.override;
+ inherit icon;
+ };
+
+in
stdenv.mkDerivation rec {
pname = "gdm";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
+ sha256 = "0pnh0nj4kk8n48kgj77bb5r4z5jnb7kxnvpnddk6b9n96g0qwklv";
};
# Only needed to make it build
@@ -22,7 +36,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--with-plymouth=yes"
"--enable-gdm-xsession"
- "--with-initial-vt=7"
+ # "--with-initial-vt=7"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev"
];
@@ -37,6 +51,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
patches = [
+ # See: https://gitlab.gnome.org/GNOME/gdm/issues/515
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch";
+ sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
+ })
+
+ # https://gitlab.gnome.org/GNOME/gdm/merge_requests/84
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch";
+ sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2";
+ })
+
# Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
@@ -65,6 +91,11 @@ stdenv.mkDerivation rec {
"dbusconfdir=$(out)/etc/dbus-1/system.d"
];
+ preInstall = ''
+ schema_dir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
+ install -D ${override} $schema_dir/org.gnome.login-screen.gschema.override
+ '';
+
passthru = {
updateScript = gnome3.updateScript {
packageName = "gdm";
diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
new file mode 100644
index 00000000000..8c17f494b0f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.login-screen]
+logo='@icon@'
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 303377b8631..a7b8e18d73a 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gjs";
- version = "1.56.2";
+ version = "1.58.0";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
+ sha256 = "1wvywpng27y0264pq9anxdi1xy280x6mcnbgiggn804pql4nml8y";
};
passthru = {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "installedTests" ];
nativeBuildInputs = [ pkgconfig makeWrapper ];
- buildInputs = [ libxml2 gobject-introspection gtk3 glib pango readline dbus ];
+ buildInputs = [ libxml2 gobject-introspection glib pango readline dbus ];
propagatedBuildInputs = [ spidermonkey_60 ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index e4c772cb1d4..4b91b3219be 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnome-backgrounds";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
+ sha256 = "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 817c8324c6b..b52161f90ae 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -6,14 +6,14 @@ let
pname = "gnome-bluetooth";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "3.32.1";
+ version = "3.34.0";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4";
+ sha256 = "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index df43371a497..f743e8fead6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -1,14 +1,14 @@
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
-, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
+, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }:
stdenv.mkDerivation rec {
pname = "gnome-calculator";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
+ sha256 = "0gzjdddby3pi22srlcw6q2dv9dxwak75jbplpvflhq4w82qx543b";
};
nativeBuildInputs = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libxml2 gtksourceview4 mpfr gmp
- gnome3.adwaita-icon-theme
+ gnome3.adwaita-icon-theme libgee
gsettings-desktop-schemas libsoup libmpc
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 75a15a41f97..01127853a86 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,14 +5,14 @@
, vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
let
- version = "3.32.1";
+ version = "3.34";
in stdenv.mkDerivation rec {
pname = "gnome-contacts";
inherit version;
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy";
+ sha256 = "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r";
};
propagatedUserEnvPkgs = [ evolution-data-server ];
@@ -33,15 +33,6 @@ in stdenv.mkDerivation rec {
];
patches = [
- # Fixes build with libhandy >= 0.0.10
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/c5eee38cd2556403a640a0a4c11d36cbf9a5a798.patch";
- sha256 = "0s2cl7z6b0x3ky4y28yyxc9x5zp4r3vqmvbhz5m2fm6830fyjg13";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/1f1500ca01098ffda6392f5ec9ce3a29a48a84b1.patch";
- sha256 = "082zaaj2l5cgr2qy145x8yknja87r0vpigrhidal40041kd5nldg";
- })
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 04730f2370f..b87980f6b65 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -67,11 +67,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
- version = "3.32.2";
+ version = "3.34.0.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs";
+ sha256 = "1jr3bbpycdzk26b83fsxw1my0aldi86v0733k42y4x45vacaanqa";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 9d798c2811b..cf76caf9f48 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
- version = "3.32.2";
+ version = "3.34.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
+ sha256 = "09i4nv3fn8vlx7f1rzqid9qgd3srlz3hfajnjwmnpmf1apk1wcwd";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index d6d9f927252..86739bb0f45 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -1,15 +1,15 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2, gsettings-desktop-schemas
-, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
+, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }:
stdenv.mkDerivation rec {
pname = "gnome-disk-utility";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg";
+ sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
- udisks2 gnome3.adwaita-icon-theme
+ udisks2 gnome3.adwaita-icon-theme systemd
gnome3.gnome-settings-daemon gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 976829acd4c..0589dfe7285 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-font-viewer";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
+ sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
new file mode 100644
index 00000000000..1ca3d696726
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -0,0 +1,115 @@
+{ stdenv
+, fetchurl
+, fetchpatch
+, substituteAll
+, gettext
+, meson
+, ninja
+, pkgconfig
+, wrapGAppsHook
+, gnome3
+, accountsservice
+, fontconfig
+, gdm
+, geoclue2
+, geocode-glib
+, glib
+, gnome-desktop
+, gnome-getting-started-docs
+, gnome-online-accounts
+, gtk3
+, libgweather
+, json-glib
+, krb5
+, libpwquality
+, librest
+, libsecret
+, networkmanager
+, pango
+, polkit
+, webkitgtk
+, systemd
+, networkmanagerapplet
+, tzdata
+, yelp
+, libgnomekbd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-initial-setup";
+ version = "3.34.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "19ly8xrj7vvjlhhbh6y2cm5l02qgq9wqfczrjdn0llkga9f8b8sc";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ meson
+ ninja
+ pkgconfig
+ systemd
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ accountsservice
+ fontconfig
+ gdm
+ geoclue2
+ geocode-glib
+ glib
+ gnome-desktop
+ gnome-getting-started-docs
+ gnome-online-accounts
+ gtk3
+ json-glib
+ krb5
+ libgweather
+ libpwquality
+ librest
+ libsecret
+ networkmanager
+ pango
+ polkit
+ webkitgtk
+ networkmanagerapplet
+ ];
+
+ patches = [
+ # Disable g-i-s service in GDM
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/commit/b67b5cc48c418415eb3233f78ab089bc447b1952.patch";
+ sha256 = "050zc6cnil71bf7ijav6w6bkr33lqwglipcg7anw9jcn7mcakhlq";
+ })
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit tzdata libgnomekbd;
+ yelp = "${yelp}/bin/yelp"; # gnome-welcome-tour
+ })
+ ];
+
+ mesonFlags = [
+ "-Dregion-page=true"
+ "-Dcheese=disabled"
+ "-Dsoftware-sources=disabled"
+ "-Dibus=disabled"
+ "-Dvendor-conf-file=${./vendor.conf}"
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "Simple, easy, and safe way to prepare a new system";
+ homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
new file mode 100644
index 00000000000..94e14f688b3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
@@ -0,0 +1,67 @@
+diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
+index c479296..3dd629c 100755
+--- a/data/gnome-welcome-tour
++++ b/data/gnome-welcome-tour
+@@ -3,7 +3,7 @@
+ cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
+
+ # Don't do anything if yelp isn't installed
+-yelp_path=$(which yelp 2>/dev/null)
++yelp_path=@yelp@
+ if test -z "${yelp_path}"; then
+ rm -f $cfgdir/run-welcome-tour
+ exit
+@@ -17,5 +17,5 @@ geometry=(1024, 709)
+ EOF
+ fi
+
+-yelp help:gnome-help/getting-started
++$yelp_path help:gnome-help/getting-started
+ rm -f $cfgdir/run-welcome-tour
+diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+index 1c34ef7..a1e7f93 100644
+--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
++++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label,
+ return TRUE;
+
+ if (variant[0])
+- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
+ else
+- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout);
++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout);
+ g_spawn_command_line_async (commandline, NULL);
+ g_free (commandline);
+
+@@ -829,7 +829,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
+ g_param_spec_string ("showing-extra", "", "", "",
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+- signals[CHANGED] =
++ signals[CHANGED] =
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
+index 93905b3..e7ee785 100644
+--- a/gnome-initial-setup/pages/timezone/tz.h
++++ b/gnome-initial-setup/pages/timezone/tz.h
+@@ -4,7 +4,7 @@
+ * Copyright (C) 2000-2001 Ximian, Inc.
+ *
+ * Authors: Hans Petter Jansson
+- *
++ *
+ * Largely based on Michael Fulbright's work on Anaconda.
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -28,7 +28,7 @@
+ #include
+
+ #ifndef __sun
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
+ #else
+ # define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
new file mode 100644
index 00000000000..a06b37e100e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
@@ -0,0 +1,5 @@
+# Disable pages not right for NixOS
+# For example user accounts should be preconfigured
+# and we can't modify system time with systemd.
+[pages]
+skip=account;software;password;timezone;
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 7817936bfda..fa960087f9b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-keyring";
- version = "3.31.91";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
+ sha256 = "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 93da1f8abec..b21e3f6f68a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-online-miners";
- version = "3.30.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
+ sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 33acfd245cf..bf57fb809c6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -4,13 +4,13 @@
let
pname = "gnome-screenshot";
- version = "3.32.0";
+ version = "3.33.90";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b";
+ sha256 = "0bki99lkp20jvp1yjymy8y56k378vivpvqvfwfx9dwl8r3qal7i2";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index f13ad9f47aa..9e86297e1ec 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,17 +1,28 @@
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
-, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }:
stdenv.mkDerivation rec {
pname = "gnome-session";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
+ sha256 = "0qkdwvj6w33h8csq9mhjbf10f0v5g0sgabyfg1bgp75z0br76si0";
};
patches = [
+ # Fix debug spam when using systemd session
+ # https://gitlab.gnome.org/GNOME/gnome-session/issues/31
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/adfdf7f64f08fc07325f9332e9eba46974cc30ee.patch";
+ sha256 = "0vjg77gpj3k63a5ffhsvv5m30lbj6cab35lhl4gpqxg4j2j3yy7y";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/b7b24627485c520f873db4e918e217a76ededd8c.patch";
+ sha256 = "1d8pw8q423wvv0cd32p0yf52vlfj7w1if2gljqvarcm2n1m0pdxj";
+ })
+
(substituteAll {
src = ./fix-paths.patch;
gsettings = "${glib.bin}/bin/gsettings";
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index b9f33ce73a8..aa8a42ceb21 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -27,6 +27,7 @@
, libwacom
, libxslt
, libxml2
+, modemmanager
, networkmanager
, gnome-desktop
, geocode-glib
@@ -35,15 +36,16 @@
, python3
, tzdata
, nss
+, gcr
}:
stdenv.mkDerivation rec {
pname = "gnome-settings-daemon";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks";
+ sha256 = "0dvkq6pwrvqsm30wa965q0wf15v7nmnv6xfb9sli2sc62yc9gr3w";
};
patches = [
@@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
gtk3
glib
gsettings-desktop-schemas
+ modemmanager
networkmanager
libnotify
libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
@@ -89,6 +92,7 @@ stdenv.mkDerivation rec {
systemd
libgudev
libwacom
+ gcr
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
index 272656fae78..2229302cab7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
@@ -13,14 +13,3 @@
typedef struct _TzDB TzDB;
typedef struct _TzLocation TzLocation;
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager,
- gboolean run_daemon = dwell_click_enabled || secondary_click_enabled;
-
- if (run_daemon || manager->priv->mousetweaks_daemon_running)
-- comm = g_strdup_printf ("mousetweaks %s",
-+ comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s",
- run_daemon ? "" : "-s");
- else
- return;
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 3d37040828c..dd88d4feea1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_60, glib
, gnome3, gnome-menus, substituteAll }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2";
+ sha256 = "1ayb48l2p3lji7b226027293jfclgcjmdb5dd6xfn67rhxm8zgzm";
};
passthru = {
updateScript = gnome3.updateScript {
- packageName = "gnome-shell-extensions";
- attrPath = "gnome3.gnome-shell-extensions";
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
};
};
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
];
doCheck = true;
- # 52 is required for tests
- # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build#L25
- checkInputs = [ spidermonkey_52 ];
+ # 60 is required for tests
+ # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23
+ checkInputs = [ spidermonkey_60 ];
nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index a1d8f2c599a..57fa9c967ca 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,10 +2,11 @@
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
+, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
-, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
+, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
+, gnome-autoar, asciidoc-full }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
@@ -14,21 +15,21 @@ let
in stdenv.mkDerivation rec {
pname = "gnome-shell";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
+ sha256 = "0vdx4mfj46cpvzn6mhxc1ivg138437f5m4n3k4vb54pk45w4s00x";
};
LANG = "en_US.UTF-8";
nativeBuildInputs = [
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
- sassc desktop-file-utils libxslt.bin python3
+ sassc desktop-file-utils libxslt.bin python3 asciidoc-full
];
buildInputs = [
- systemd caribou
+ systemd
gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
libcroco libsecret libsoup polkit gdk-pixbuf librsvg
clutter networkmanager libstartup_notification telepathy-glib
@@ -39,15 +40,11 @@ in stdenv.mkDerivation rec {
at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
gst_all_1.gst-plugins-good # recording
gobject-introspection
+ gnome-autoar
# not declared at build time, but typelib is needed at runtime
libgweather networkmanagerapplet
];
- propagatedUserEnvPkgs = [
- # Needed to support on-screen keyboard used with touch screen devices
- # see https://github.com/NixOS/nixpkgs/issues/25968
- caribou
- ];
patches = [
(fetchpatch {
@@ -58,6 +55,7 @@ in stdenv.mkDerivation rec {
(substituteAll {
src = ./fix-paths.patch;
inherit libgnomekbd unzip;
+ gsettings = "${glib.bin}/bin/gsettings";
})
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 3207af11088..7b93475619b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -11,12 +11,20 @@
null);
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
-@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button {
- let description = xkbLayout;
+@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button {
if (xkbVariant.length > 0)
- description = description + '\t' + xkbVariant;
+ description = `${description}\t${xkbVariant}`;
- Util.spawn(['gkbd-keyboard-display', '-l', description]);
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
}
});
+--- a/data/gnome-shell-disable-extensions.service
++++ b/data/gnome-shell-disable-extensions.service
+@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
+ [Service]
+ Type=simple
+ # Disable extensions
+-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
++ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
+ Restart=no
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 464a804da28..ba720c7fe74 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec {
pname = "gnome-software";
- version = "3.32.4";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4";
+ sha256 = "1mr03s6f38pbgvgpb1p91csqms369f1lzqyk5nfam5jqyl273nzk";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 36e43066b35..6dad5b2aa98 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
-, desktop-file-utils, itstool, wrapGAppsHook }:
+, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 }:
stdenv.mkDerivation rec {
pname = "gnome-terminal";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
+ sha256 = "0wcavripfsr691qkcjb71vccffz0wx2q5qh4clwnk1hi8j1hz9l5";
};
buildInputs = [
@@ -19,9 +19,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig intltool itstool which libxml2
- vala desktop-file-utils wrapGAppsHook
+ vala desktop-file-utils wrapGAppsHook pcre2
];
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
# Silly ./configure, it looks for dbus file from gnome-shell in the
# installation tree of the package it is configuring.
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 7915e71a73c..cb0c1494b94 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
- version = "3.32.3";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
+ sha256 = "1v94mz8zwzx67db2avbi9p2klw36cz45qr6fbskpvygz2pzhg6cg";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 2a425acb067..6207dd42a61 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,6 +1,9 @@
{ stdenv
, gettext
+, meson
+, ninja
, fetchurl
+, fetchpatch
, apacheHttpd
, nautilus
, pkgconfig
@@ -14,36 +17,55 @@
, mod_dnssd
, gnome3
, libcanberra-gtk3
+, python3
}:
stdenv.mkDerivation rec {
pname = "gnome-user-share";
- version = "3.32.0.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945";
+ sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x";
};
+ patches = [
+ # fix gio-unix-2.0 lookup
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch;
+ sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p";
+ })
+ ];
+
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
-i data/dav_user_2.4.conf
'';
- configureFlags = [
- "--with-httpd=${apacheHttpd.out}/bin/httpd"
- "--with-modules-path=${apacheHttpd.dev}/modules"
- "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
- "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
+ mesonFlags = [
+ "-Dhttpd=${apacheHttpd.out}/bin/httpd"
+ "-Dmodules_path=${apacheHttpd.dev}/modules"
+ "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user"
+ # In 3.34.0 it defaults to false but it is silently ignored and always installed.
+ # Let’s add it anyway in case they decide to make build respect the option in the future.
+ "-Dnautilus_extension=true"
];
nativeBuildInputs = [
pkgconfig
+ meson
+ ninja
gettext
itstool
libxml2
wrapGAppsHook
+ python3
];
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch b/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
new file mode 100644
index 00000000000..2df70ff9646
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
@@ -0,0 +1,25 @@
+From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
+From: worldofpeace
+Date: Mon, 16 Sep 2019 11:18:27 -0400
+Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 182f7f5f5..43060865b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -710,7 +710,7 @@ if have_profiler
+ 'backends/meta-profiler.h',
+ ]
+
+- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
++ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
+ sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
+
+ dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
+--
+2.22.1
+
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index eab0b131ea9..ce129f7537f 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -7,17 +7,19 @@
, xorgserver
, python3
, wrapGAppsHook
+, sysprof
+, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.32.2";
+ version = "3.34.0";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva";
+ sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss";
};
mesonFlags = [
@@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
# for cvt command
xorgserver
wrapGAppsHook
+ desktop-file-utils
];
buildInputs = [
@@ -47,21 +50,48 @@ stdenv.mkDerivation rec {
geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire xwayland
- gnome-settings-daemon
+ gnome-settings-daemon sysprof
];
patches = [
+ (fetchpatch {
+ name = "ensure-emit-x11-display-opened.patch";
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
+ sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
+ })
+ # fix animation related crashes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/805
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/63a0b702c94af013b94ad3f32a8c5ba86bf6dfba.patch";
+ sha256 = "13hvz3n275crvpankj1b47nds71c42nnbq1yx2xhhvk60qc72vh4";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/1e637bd7e1b2a4316d1cf6da80966d43819a10df.patch";
+ sha256 = "0jcx33j2sw7hva0gs0svqg69habxxmgdi0kcb07nqq2df6pb62qf";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/c9c53cb55fd6e782c50f36da1e2adbf28111a660.patch";
+ sha256 = "0iwjlbr8j0icigmilpghlkcyg4hll9dm0mcaj8lvi7qxrgjrmczr";
+ })
+ # Fix crash when pressing ctrl-super: https://gitlab.gnome.org/GNOME/mutter/issues/823
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/0706e021f5bd82cf4c9b2c0d2916d272f3cba406.patch";
+ sha256 = "0i4ixr419jggrd17gxxs45jnx131lnp8wkkhhygqsrpq8941sdw6";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/76f2579e442d8ad0a3b8b644daab7c72a585506b.patch";
+ sha256 = "0c3ls624k9f4mqrrbv8ng0slvm31l0li6ciqn04qd4yi18plnldy";
+ })
+ # Avoid crashing any apps on X11 when restarting: https://gitlab.gnome.org/GNOME/mutter/merge_requests/808
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/f352c3d79da99e961341c1d2b5dd334dcade0271.patch";
+ sha256 = "1drn8wjbkj903jxay5wxq163i9ahp558sjl2bc3fi1qs90xj6cn2";
+ })
+ # TODO: submit upstream
+ ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
(substituteAll {
src = ./fix-paths.patch;
inherit zenity;
})
- # Fix a segmentation fault in dri_flush_front_buffer() upon
- # suspend/resume. This change should be removed when Mutter
- # is updated to 3.34.
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
- sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
- })
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
deleted file mode 100644
index 37358c8432c..00000000000
--- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-+++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array,
- g_return_val_if_fail (script->s_infile != NULL, FALSE);
-
- add_args (array,
-- "bwrap",
-- "--ro-bind", "/usr", "/usr",
-- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
-+ "@bubblewrap_bin@",
-+ "--ro-bind", "@storeDir@", "@storeDir@",
-+ "--ro-bind", "/run/current-system", "/run/current-system",
- NULL);
-
- /* These directories might be symlinks into /usr/... */
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 14551fb7d0c..b68415b32a2 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,33 +1,77 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
-, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
-, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
-, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf
-, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gettext
+, libxml2
+, desktop-file-utils
+, python3
+, wrapGAppsHook
+, gtk3
+, gnome3
+, gnome-autoar
+, glib-networking
+, shared-mime-info
+, libnotify
+, libexif
+, libseccomp
+, exempi
+, librsvg
+, tracker
+, tracker-miners
+, gexiv2
+, libselinux
+, gdk-pixbuf
+, substituteAll
+, gnome-desktop
+, gst_all_1
+, gsettings-desktop-schemas
+, gobject-introspection
}:
-let
+stdenv.mkDerivation rec {
pname = "nautilus";
- version = "3.32.3";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.34.0";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1ncs5hmaxjb9p2yzj81m7dz2x27vzmvppir3058dk236jzn98r36";
};
nativeBuildInputs = [
- meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook
desktop-file-utils
+ gettext
+ gobject-introspection
+ libxml2
+ meson
+ ninja
+ pkgconfig
+ python3
+ wrapGAppsHook
];
buildInputs = [
- glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
- tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
- gnome3.adwaita-icon-theme gsettings-desktop-schemas
+ exempi
+ gexiv2
+ glib-networking
+ gnome-desktop
+ gnome3.adwaita-icon-theme
+ gsettings-desktop-schemas
+ gst_all_1.gst-plugins-base
+ gtk3
+ libexif
+ libnotify
+ libseccomp
+ libselinux
+ shared-mime-info
+ tracker
+ tracker-miners
];
- propagatedBuildInputs = [ gnome-autoar ];
+ propagatedBuildInputs = [
+ gnome-autoar
+ ];
preFixup = ''
gappsWrapperArgs+=(
@@ -44,13 +88,6 @@ in stdenv.mkDerivation rec {
patches = [
./extension_dir.patch
- # 3.30 now generates it's own thummbnails,
- # and no longer depends on `gnome-desktop`
- (substituteAll {
- src = ./bubblewrap-paths.patch;
- bubblewrap_bin = "${bubblewrap}/bin/bwrap";
- inherit (builtins) storeDir;
- })
];
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index de56b14d46f..89d756c559e 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
- version = "3.32.2.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
+ sha256 = "1fxqrwhpvm7y83zrn85wg2avwlcmkfjvv1gb6br6v58zi6fvny3k";
};
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 86675f21f06..fc4034acf66 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
-, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs
+, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs
, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
-, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
+, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }:
stdenv.mkDerivation rec {
pname = "sushi";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
+ sha256 = "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8";
};
nativeBuildInputs = [
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
glib gtk3 gnome3.evince icu harfbuzz
- clutter-gtk clutter-gst gjs gtksourceview gdk-pixbuf
- librsvg libmusicbrainz5 webkitgtk
+ clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf
+ librsvg libmusicbrainz5 webkitgtk epoxy
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index a5388f2eae1..379f154abec 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "totem";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
+ sha256 = "00fpm3609zckiqjrlg3r64vz2mqych44kdkljxbidb847vg6xm84";
};
doCheck = true;
@@ -31,14 +31,6 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
- mesonFlags = [
- "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
- # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
- # https://bugzilla.gnome.org/show_bug.cgi?id=784236
- # https://github.com/mesonbuild/meson/issues/1994
- "-Denable-vala=no"
- ];
-
checkInputs = [ xvfb_run ];
checkPhase = ''
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index fc5b0268df7..7cb63b8df79 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -1,23 +1,38 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, itstool, libxml2, libxslt, gnome3 }:
+{ stdenv
+, gettext
+, fetchurl
+, pkgconfig
+, itstool
+, libxml2
+, libxslt
+, gnome3
+}:
stdenv.mkDerivation rec {
pname = "yelp-xsl";
- version = "3.32.1";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
+ sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; };
- };
+ nativeBuildInputs = [
+ pkgconfig
+ gettext
+ itstool
+ libxml2
+ libxslt
+ ];
doCheck = true;
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool itstool libxml2 libxslt ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Yelp;
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 7e326dd1657..438c71c4ad3 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "yelp";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
+ sha256 = "0ifhgdxff2xx2damaj72gpjln5k36grg2chvi4335mv3b5y55mp3";
};
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 370733798af..017ced6c98b 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -79,6 +79,8 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnome-keyring = callPackage ./core/libgnome-keyring { };
+ gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
+
gnome-online-miners = callPackage ./core/gnome-online-miners { };
gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
@@ -215,8 +217,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-weather = callPackage ./apps/gnome-weather { };
- nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
polari = callPackage ./apps/polari { };
seahorse = callPackage ./apps/seahorse { };
@@ -338,7 +338,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
- clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
+ clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19
inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
@@ -356,4 +356,6 @@ lib.makeScope pkgs.newScope (self: with self; {
corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`";
optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`";
gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
+
+ nautilus-sendto = throw "deprecated 2019-09-17: abandoned";
})
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 573259b7e7d..4df3ed10a69 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "anjuta";
- version = "3.28.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
+ sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 23a58011e02..8d731d829b2 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "devhelp";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
+ sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 6f289fd74d9..910007bc05b 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-appindicator";
- version = "29";
+ version = "30";
src = fetchFromGitHub {
owner = "Ubuntu";
repo = "gnome-shell-extension-appindicator";
rev = "v${version}";
- sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i";
+ sha256 = "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8";
};
# This package has a Makefile, but it's used for building a zip for
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
index b38f0aeba91..cb1fa70d681 100644
--- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-arc-menu";
- version = "31";
+ version = "33.2";
src = fetchFromGitLab {
owner = "LinxGem33";
repo = "Arc-Menu";
- rev = "v${version}-stable";
- sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1";
+ rev = "v${version}-dev";
+ sha256 = "1dd9ysiyza6drwdv4qcxyijy7yijirjf2fd1aq5jv8s4bqajcqf4";
};
patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
glib gettext
];
- makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ];
+ makeFlags = [ "INSTALL_BASE=${placeholder "out"}/share/gnome-shell/extensions" ];
meta = with stdenv.lib; {
description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index 95a68505c7c..8cf9fb9f0e6 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, gettext, bash }:
+{ stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-caffeine";
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ eperuffo ];
homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
+ broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index 0faadbcd2b6..5277cb08cbb 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-clipboard-indicator";
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jonafato ];
platforms = platforms.linux;
homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator;
+ broken = versionAtLeast gnome3.gnome-shell.version "3.26";
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index e80149e5005..1f09afc52c4 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-dash-to-dock";
- version = "66";
+ version = "20190921";
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
- rev = "extensions.gnome.org-v" + version;
- sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh";
+ # rev = "extensions.gnome.org-v" + version;
+ rev = "d918d29a6afced8823dc954a4317988b79aad6b8";
+ sha256 = "1wlmbcn8zs8xiyxhgdcbnf2igjsjg0bkcsvjpy8fk13fxshxsqx6";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
new file mode 100644
index 00000000000..c0ecfc29e2c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, substituteAll, gnome3, vte }:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-shell-extension-drop-down-terminal";
+ version = "24";
+
+ src = fetchFromGitHub {
+ owner = "zzrough";
+ repo = "gs-extensions-drop-down-terminal";
+ rev = "v${version}";
+ sha256 = "1gda56xzwsa5pgmgpb7lhb3i3gqishvn84282inwvqm86afks73r";
+ };
+
+ uuid = "drop-down-terminal@gs-extensions.zzrough.org";
+
+ patches = [
+ (substituteAll {
+ src = ./fix_vte_and_gjs.patch;
+ inherit vte;
+ gjs = gnome3.gjs;
+ })
+ ];
+
+ installPhase = ''
+ mkdir -p $out/share/gnome-shell/extensions
+ cp -r ${uuid} $out/share/gnome-shell/extensions/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Configurable drop down terminal shell";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ ericdallo ];
+ homepage = https://github.com/zzrough/gs-extensions-drop-down-terminal;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
new file mode 100644
index 00000000000..3544c91ee89
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
@@ -0,0 +1,32 @@
+--- a/drop-down-terminal@gs-extensions.zzrough.org/extension.js
++++ b/drop-down-terminal@gs-extensions.zzrough.org/extension.js
+@@ -15,6 +15,8 @@
+
+ // Author: Stéphane Démurget
+
++imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0')
++
+ const Lang = imports.lang;
+ const Gettext = imports.gettext.domain("drop-down-terminal");
+ const Mainloop = imports.mainloop;
+@@ -653,7 +655,7 @@ const DropDownTerminalExtension = new Lang.Class({
+ this._killingChild = false;
+
+ // finds the forking arguments
+- let args = ["gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path];
++ let args = ["@gjs@/bin/gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path];
+
+ // forks the process
+ debug("forking '" + args.join(" ") + "'");
+--- a/drop-down-terminal@gs-extensions.zzrough.org/terminal.js
++++ b/drop-down-terminal@gs-extensions.zzrough.org/terminal.js
+@@ -14,6 +14,9 @@
+ // along with this program. If not, see .
+
+ // Author: Stéphane Démurget
++
++imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0')
++
+ const Lang = imports.lang;
+
+ const Pango = imports.gi.Pango;
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cef00513df1..cfd906a3d0c 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-gsconnect";
- version = "23";
+ version = "26";
src = fetchFromGitHub {
owner = "andyholmes";
repo = "gnome-shell-extension-gsconnect";
rev = "v${version}";
- sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid";
+ sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a";
};
patches = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
upower
gnome3.caribou
gnome3.gjs # for running daemon
- gnome3.evolution-data-server # folks.py requires org.gnome.Evolution.DefaultSources gsettings; TODO: hardcode the schema path to the library (similarly to https://github.com/NixOS/nixpkgs/issues/47226)
+ gnome3.evolution-data-server # for libebook-contacts typelib
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
index b32d0af3272..097cde829ea 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
@@ -29,16 +29,32 @@
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk;
---- a/src/service/__init__.js
-+++ b/src/service/__init__.js
-@@ -600,7 +600,9 @@
- /**
- * Convenience functions for saving/restoring window geometry
- */
--const _mutter = new Gio.Settings({schema_id: 'org.gnome.mutter'});
-+const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
-+const _schema = _schema_source.lookup('org.gnome.mutter', false);
-+const _mutter = new Gio.Settings({settings_schema: _schema});
+--- a/src/preferences/service.js
++++ b/src/preferences/service.js
+@@ -435,9 +435,9 @@ var Window = GObject.registerClass({
+
+ _restoreGeometry() {
+ if (this._mutterSettings === undefined) {
+- this._mutterSettings = new Gio.Settings({
+- schema_id: 'org.gnome.mutter'
+- });
++ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++ const _schema = _schema_source.lookup('org.gnome.mutter', false);
++ this._mutterSettings = new Gio.Settings({settings_schema: _schema});
+ }
+
+ // Restore geometry, even if we're going to maximize
+--- a/src/service/ui/messaging.js
++++ b/src/service/ui/messaging.js
+@@ -891,9 +891,9 @@ var Window = GObject.registerClass({
+ */
+ _restoreGeometry() {
+ if (this._mutterSettings === undefined) {
+- this._mutterSettings = new Gio.Settings({
+- schema_id: 'org.gnome.mutter'
+- });
++ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++ const _schema = _schema_source.lookup('org.gnome.mutter', false);
++ this._mutterSettings = new Gio.Settings({settings_schema: _schema});
+ }
- Gtk.Window.prototype.restore_geometry = function() {
- let [width, height] = this.settings.get_value('window-size').deep_unpack();
diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index 8214300a531..8bfd681625f 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jonafato ];
platforms = gnome3.gnome-shell.meta.platforms;
homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider;
+ broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
deleted file mode 100644
index 10175719e46..00000000000
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
-
-stdenv.mkDerivation {
- pname = "gnome-shell-extensions-mediaplayer";
- version = "unstable-2019-03-21";
-
- src = fetchFromGitHub {
- owner = "JasonLG1979";
- repo = "gnome-shell-extensions-mediaplayer";
- rev = "b382c98481fa421501684e2ff3eafc53971ef22b";
- sha256 = "01z2dml8dvl5sljw62g7x19mz02dz1g4gkmyp0h5bx49djcw1nnh";
- };
-
- nativeBuildInputs = [
- meson
- ninja
- python3
- ];
- buildInputs = [
- glib
- gettext
- ];
-
- postPatch = ''
- rm build
- chmod +x meson_post_install.py
- patchShebangs meson_post_install.py
- '';
-
- meta = with stdenv.lib; {
- description = "Control MPRIS Version 2 Capable Media Players";
- license = licenses.gpl2Plus;
- homepage = https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/;
- maintainers = with maintainers; [ tiramiseb ];
- };
-}
-
diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
index 6f1cc3df409..cffe96894cc 100644
--- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib }:
+{ stdenv, fetchFromGitHub, glib, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-pidgin-im-integration";
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
+ broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
index d9ea670db09..fbbd56f1c0f 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-remove-dropdown-arrows";
- version = "11";
+ version = "13";
src = fetchFromGitHub {
owner = "mpdeimos";
repo = "gnome-shell-remove-dropdown-arrows";
rev = "version/${version}";
- sha256 = "1g99r9bpjdhab3xj74wkl40gdnaf2w51kswcr8mi6bq72n4wjxwh";
+ sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk";
};
# This package has a Makefile, but it's used for publishing and linting, not
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index 33c127f449b..a5f94288ae5 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
- version = "unstable-2019-04-01";
+ version = "24";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
- rev = "37098909a50bafe2f2538819f988cb2327ed7c60";
- sha256 = "09sbby8zi9xn21lbdry57bp1vwgd5c73anvqpw9css3x2ryda5li";
+ rev = version;
+ sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x";
};
dontBuild = true;
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 13b2d6a1db4..921991a33ae 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ aneeshusa tiramiseb ];
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
+ broken = versionAtLeast gnome3.gnome-shell.version "3.32";
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index 90be6aed1d7..1e44cd4de5c 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
+{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-taskwhisperer";
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jonafato ];
homepage = https://github.com/cinatic/taskwhisperer;
+ broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesnt't support 3.34
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
index 293918bd2b1..22f857a7809 100644
--- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, glib, gnome3 }:
stdenv.mkDerivation rec {
- pname = "gnome-shell-extension-tilingnome";
- version = "unstable-2019-01-18";
+ pname = "gnome-shell-extension-tilingnome-unstable";
+ version = "unstable-2019-09-19";
src = fetchFromGitHub {
owner = "rliang";
- repo = pname;
- rev = "bd4fb8c19f7a6282b38724b30e62645143390226";
- sha256 = "1y4s4n88gdkpvgd3v3dg0181ccyhlixbvkx3bwyvdxyyyxbqibid";
+ repo = "gnome-shell-extension-tilingnome";
+ rev = "f401c20c9721d85e6b3e30d1e822a200db370407";
+ sha256 = "1hq9g9bxqpzqrdj9zm0irld8r6q4w1m4b00jya7wsny8rzb1s0y2";
};
nativeBuildInputs = [ glib ];
@@ -30,6 +30,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ benley ];
homepage = https://github.com/rliang/gnome-shell-extension-tilingnome;
platforms = gnome3.gnome-shell.meta.platforms;
- broken = lib.versionAtLeast gnome3.gnome-shell.version "3.31";
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
index f841ef2403d..04e98d51b0c 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-timepp";
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/zagortenay333/timepp__gnome;
license = licenses.gpl3;
maintainers = with maintainers; [ svsdep ];
+ broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113
};
}
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 3e274c35cdd..474c49fb584 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "aisleriot";
- version = "3.22.8";
+ version = "3.22.9";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815";
+ sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji";
};
configureFlags = [
diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix
index c9395166c52..ec9895b3bf5 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -3,13 +3,13 @@
let
pname = "atomix";
- version = "3.32.1";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "19wpm7mn6r7x6jz1r0kkqg3xa69iycvgb7g7i8wi0d3cx0rsgjkl";
+ sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 5b233c48385..356df76a061 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala
+, gettext, meson, gsound, librsvg, itstool, vala
, python3, ninja, desktop-file-utils }:
stdenv.mkDerivation rec {
pname = "four-in-a-row";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
+ sha256 = "1wf0545lhmqf2hfi7wc8bqs7b9g43rm0df0ssza6517xzc4lx7jl";
};
nativeBuildInputs = [
pkgconfig wrapGAppsHook gettext meson itstool vala
ninja python3 desktop-file-utils
];
- buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];
+ buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x build-aux/meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index d7001e1c527..72c4bdf1d29 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-chess";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
+ sha256 = "1n1vjg6xhwppmddrmqmkk6b3jkgphshp06rjbv5h3270k520a135";
};
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 904edd7e51a..137357e0a39 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -5,13 +5,13 @@
let
pname = "gnome-klotski";
- version = "3.32.0";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72";
+ sha256 = "0sbx0bzy32lh2c9jp8v7gz788wn9y1la8mr5a7gf7370szsl4d4f";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 9d173945cdd..aa7824a0317 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-mahjongg";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
+ sha256 = "0qyi3jkg112jysrsy5p330b7b92sl09mr8zsimq06q68kj1wzkz5";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 1ac7e51357e..8c620fdd0d1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-mines";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g";
+ sha256 = "1spxa6qr1y8s5rrsvpciywpvhk812ngn95s1apaxaigwy2g1iw54";
};
# gobject-introspection for finding vapi files
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 7b069922169..803661b0153 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -1,19 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool
-, libxml2, libgee, libgnome-games-support }:
+, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3
+, libxml2, libgee, libgnome-games-support, meson, ninja
+, desktop-file-utils, hicolor-icon-theme}:
stdenv.mkDerivation rec {
pname = "gnome-nibbles";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p";
+ sha256 = "0al0znl26y3xcdq6ilv78g54pz0fcw5lr9rhhf9g9rkyigd5056n";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
+ nativeBuildInputs = [
+ meson ninja vala python3
+ pkgconfig wrapGAppsHook gettext itstool libxml2
+ desktop-file-utils hicolor-icon-theme
+ ];
buildInputs = [
- gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme
+ gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme
libgee libgnome-games-support
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index cabedf74368..c8cc9f121f5 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support
+, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support
, libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }:
stdenv.mkDerivation rec {
pname = "gnome-robots";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
+ sha256 = "18vnx5096d3mc2i7w4ma9hflsqfnvahl29aifjnvhdm5ji8qi0mb";
};
passthru = {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
libxml2 wrapGAppsHook gettext itstool desktop-file-utils
];
buildInputs = [
- gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee adwaita-icon-theme
+ gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index a555ee31cf3..de00368df2e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-sudoku";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
+ sha256 = "1bwy9w4jkdlsc6iz7lwy0nm4vqa11kgcw24qf4w2g0qyldcvhc3y";
};
nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index b6c60362265..889991d210f 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, gettext, itstool, libxml2
+, librsvg, gsound, gettext, itstool, libxml2
, meson, ninja, vala, python3, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "gnome-taquin";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm";
+ sha256 = "0jhfryqim98m9i84k18r4xb83q2g2198mn4igmr05sr974f0j578";
};
passthru = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
gettext itstool libxml2 vala desktop-file-utils
];
buildInputs = [
- gtk3 librsvg libcanberra-gtk3
+ gtk3 librsvg gsound
gnome3.adwaita-icon-theme
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index 29141530211..774f066d06b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-tetravex";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
+ sha256 = "0wyhiiyi9zhvj250nwsc9h38dnhw3z8aml3yk6b7i1wfg7f54nwa";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 8e53a937a5e..cf83527432f 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "hitori";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "15s20db2fq4cy031sw20pmf53hxiak44fgyjy5njqnp2h2sg3806";
+ sha256 = "1612hq6d2mnggppy949dkb8lz9886n0rlg68z7qmjjizz1l41lb5";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 114551ed4ee..bee939fd129 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
-, itstool, libcanberra-gtk3, libxml2
+, itstool, gsound, libxml2
, meson, ninja, python3, vala, desktop-file-utils
}:
stdenv.mkDerivation rec {
pname = "iagno";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d";
+ sha256 = "15zan1h63hm9z0bf3y5h7rqd935jjw672qh88waqzwp6mlv1y321";
};
nativeBuildInputs = [
meson ninja python3 vala desktop-file-utils
pkgconfig wrapGAppsHook itstool libxml2
];
- buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg libcanberra-gtk3 ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg gsound ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 9c582f037a2..0a236d0425a 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "lightsoff";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f";
+ sha256 = "1yyq0962fv16rab3alq5saf4gpii9xvcfy5vbq85hhhgjpbqrfns";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 78ed0d9fa68..0f89d8c3a74 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -1,18 +1,16 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
-, librsvg, libcanberra-gtk3, libmanette
+, librsvg, gsound, libmanette
, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
, meson, ninja, python3, vala, desktop-file-utils
}:
-let
+stdenv.mkDerivation rec {
pname = "quadrapassel";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
- url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy";
+ url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1na5j1mf09rdj0kp7fwfdnc1p7mfclpv58is2cs2ldfik4y1p2if";
};
nativeBuildInputs = [
@@ -22,11 +20,9 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 gdk-pixbuf librsvg libmanette
- libcanberra-gtk3 clutter libxml2 clutter-gtk
+ gsound clutter libxml2 clutter-gtk
];
- enableParallelBuilding = true;
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index a944e0c568a..6de5eaa96c3 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -3,13 +3,13 @@
let
pname = "swell-foop";
- version = "3.32.0";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0jpci3c1wyzbvsq86j30rcl166skhi2wf12001amfgh0dmmwipci";
+ sha256 = "1vbclb1jcn2s9rb7whk02v6hfr6fnwx2ppa55bsa7595f3ki79v5";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 8babe77e412..870ff56e570 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,28 +1,30 @@
{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
-, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
+, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking }:
+, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking
+, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
stdenv.mkDerivation rec {
pname = "geary";
- version = "3.32.2";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0sg53zq81v28hdqiy5d048skwfgsa8ck0z7ywsagdh7iaqin68gq";
+ sha256 = "1cxpyjgfrai423vwqc6jv4aqadxkd3ghh2had71drilyywy5bx64";
};
nativeBuildInputs = [
desktop-file-utils gettext itstool libxml2 meson ninja
- pkgconfig vala wrapGAppsHook python3
+ pkgconfig vala wrapGAppsHook python3 appstream-glib
+ gobject-introspection
];
buildInputs = [
adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
- libgee libnotify libsecret sqlite webkitgtk glib-networking
- libunwind libunity folks
+ libgee libsecret sqlite webkitgtk glib-networking
+ libunwind libunity folks gspell libytnef libhandy
];
checkInputs = [ xvfb_run dbus ];
@@ -32,8 +34,8 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- chmod +x build-aux/post_install.py
- patchShebangs build-aux/post_install.py
+ chmod +x build-aux/post_install.py build-aux/git_version.py
+ patchShebangs build-aux/post_install.py build-aux/git_version.py
chmod +x desktop/geary-attach
'';
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index 25e1347f1c9..fff328c608d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -18,7 +18,6 @@
, adwaita-icon-theme
, libgweather
, gucharmap
-, gnome-settings-daemon
, tracker
, polkit
, gnome3
@@ -26,13 +25,13 @@
let
pname = "gnome-applets";
- version = "3.32.0";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1";
+ sha256 = "1mbhykqwzq18zpvfkdcdkbb4zhijmxqa2i6502an78yap87vq74i";
};
nativeBuildInputs = [
@@ -56,7 +55,6 @@ in stdenv.mkDerivation rec {
adwaita-icon-theme
libgweather
gucharmap
- gnome-settings-daemon
tracker
polkit
wirelesstools
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index c8d26988391..8ccf5107046 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -1,11 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, gnome3
-, gtk3, glib, gobject-introspection, libarchive
+{ stdenv
+, fetchurl
+, pkgconfig
+, gnome3
+, gtk3
+, glib
+, gobject-introspection
+, libarchive
+, vala
}:
stdenv.mkDerivation rec {
pname = "gnome-autoar";
version = "0.2.3";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
@@ -15,9 +24,20 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; };
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 glib ];
- propagatedBuildInputs = [ libarchive gobject-introspection ];
+ nativeBuildInputs = [
+ gobject-introspection
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ gtk3
+ ];
+
+ propagatedBuildInputs = [
+ libarchive
+ glib
+ ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index 3cade7ccdf8..e809cc7f44f 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -26,24 +26,20 @@
let
pname = "gnome-flashback";
- version = "3.32.0";
- requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
+ version = "3.34.0";
+ requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
gnome-flashback = stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62";
+ sha256 = "1ryr28psrjr3kp0in99a12y4vy6kvi2mvhp174dli2a56ds16mgj";
};
# make .desktop Execs absolute
postPatch = ''
patch -p0 < "$out/lib/ghcjs-${version}/ghc_libdir"
- '';
- passthru = {
- inherit bootPkgs;
- ghcVersion = ghc.version;
- isCross = true;
- isGhcjs = true;
- inherit nodejs ghcjsBoot;
- socket-io = pkgs.nodePackages."socket.io";
- haskellCompilerName = "ghcjs-${version}";
-
- # let us assume ghcjs is never actually cross compiled
- targetPrefix = "";
-
- enableShared = true;
-
- inherit stage1Packages;
- mkStage2 = stage2 {
- inherit ghcjsBoot;
- };
- };
-
- homepage = https://github.com/ghcjs/ghcjs;
- description = "A Haskell to JavaScript compiler that uses the GHC API";
- license = stdenv.lib.licenses.bsd3;
- platforms = ghc.meta.platforms;
- maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ];
- hydraPlatforms = if broken then [] else ghc.meta.platforms;
- inherit broken;
-})
diff --git a/pkgs/development/compilers/ghcjs/gen-stage2.rb b/pkgs/development/compilers/ghcjs/gen-stage2.rb
deleted file mode 100755
index 709e635db55..00000000000
--- a/pkgs/development/compilers/ghcjs/gen-stage2.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-
-# from boot.yaml in ghcjs/ghcjs
-stage2_packages = [
- "boot/async",
- "boot/aeson",
- "boot/attoparsec",
- "boot/case-insensitive",
- "boot/dlist",
- "boot/extensible-exceptions",
- "boot/hashable",
- "boot/mtl",
- "boot/old-time",
- "boot/parallel",
- "boot/scientific",
- "boot/stm",
- "boot/syb",
- "boot/text",
- "boot/unordered-containers",
- "boot/vector",
- "ghcjs/ghcjs-base",
- # not listed under stage2, but needed when "quick booting".
- "boot/cabal/Cabal"
-]
-
-nixpkgs = File.expand_path("../../../../..", __FILE__)
-boot = ARGV[0] || `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp
-
-out = "".dup
-out << "{ ghcjsBoot }: { callPackage }:\n"
-out << "\n"
-out << "{\n"
-
-stage2_packages.each do |package|
- name = Pathname.new(package).basename
- nix = `cabal2nix file://#{boot}/#{package} --jailbreak`
- nix.sub!(/src =.*?$/, "src = \"${ghcjsBoot}/#{package}\";")
- nix.sub!(" doCheck = false;\n", "")
- nix.sub!("libraryHaskellDepends", "doCheck = false;\n libraryHaskellDepends")
- # cabal2nix somehow generates the deps for 'text' as if it had selected flag
- # 'integer-simple' (despite not passing the flag within the generated
- # expression). We want integer-gmp instead.
- nix.gsub!(/integer-simple/, "integer-gmp")
- nix = nix.split("\n").join("\n ")
-
- out << " #{name} = callPackage\n"
- out << " (#{nix}) {};\n"
-end
-
-out << "}"
-
-puts out
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
deleted file mode 100644
index c00e13a9240..00000000000
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ runCommand, src }:
-
-# we remove the patches so ghcjs-boot doesn't try to apply them again.
-runCommand "${src.name}-patched" {} ''
- cp -r ${src} $out
- chmod -R +w $out
-
- # Make the patches be relative their corresponding package's directory.
- # See: https://github.com/ghcjs/ghcjs-boot/pull/12
- for patch in $out/patches/*.patch; do
- echo ">> fixing patch: $patch"
- sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
- done
-
- for package in $(cd $out/boot; echo *); do
- patch=$out/patches/$package.patch
- if [[ -e $patch ]]; then
- echo ">> patching package: $package"
- pushd $out/boot/$package
- patch -p1 < $patch
- rm $patch
- popd
- fi
- done
-''
diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 683f8d7ace0..0b28b61a27b 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "2018_02_15";
+ version = "2019_08_27";
in llvmPackages.stdenv.mkDerivation {
@@ -13,7 +13,7 @@ in llvmPackages.stdenv.mkDerivation {
owner = "halide";
repo = "Halide";
rev = "release_${version}";
- sha256 = "14lmpbxydx7ii0pxds6rgq5vw4i6yfjsq0bai1l5wwpv1rnwmbxd";
+ sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
};
patches = [ ./nix.patch ];
@@ -58,7 +58,7 @@ in llvmPackages.stdenv.mkDerivation {
description = "C++ based language for image processing and computational photography";
homepage = "https://halide-lang.org";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.ck3d ];
};
}
diff --git a/pkgs/development/compilers/halide/nix.patch b/pkgs/development/compilers/halide/nix.patch
index 2ab1e31adeb..fb9bbf1a4cf 100644
--- a/pkgs/development/compilers/halide/nix.patch
+++ b/pkgs/development/compilers/halide/nix.patch
@@ -1,11 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40a685b7e..c452efd09 100644
+index 4ba384324..7e23038f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -49,10 +49,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
+@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
-
+
-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
@@ -14,7 +14,7 @@ index 40a685b7e..c452efd09 100644
+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
-
+
# LLVM doesn't appear to expose --system-libs via its CMake interface,
# so we must shell out to llvm-config to find this info
diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
@@ -27,7 +27,7 @@ index 132c80e6a..36ce865f2 100644
set(OpenBLAS_EXTRA_LIBS)
- set(BLAS_VENDORS OpenBLAS ATLAS)
+ set(BLAS_VENDORS OpenBLAS)
-
+
# TODO
# there are more vendors we could add here that support the cblas interface
@@ -41,6 +41,7 @@ if (CBLAS_FOUND)
@@ -39,17 +39,18 @@ index 132c80e6a..36ce865f2 100644
endif()
endforeach()
diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt
-index 4b95eb3bb..1daa97437 100644
+index cc02eb0a4..c20419a0d 100644
--- a/apps/linear_algebra/tests/CMakeLists.txt
+++ b/apps/linear_algebra/tests/CMakeLists.txt
-@@ -19,6 +19,6 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
+@@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
target_link_libraries(test_halide_blas
PRIVATE
halide_blas
- cblas # XXX fragile
+ ${BLAS_LIBRARIES}
- Halide
+ ${HALIDE_COMPILER_LIB}
)
---
-2.15.0
+
+--
+2.23.0
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 0912435327c..5d7266f39ec 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
- cmakeFlags = [
+ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false || stdenv.isDarwin) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
- ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
- ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
+ ] ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch
++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
- '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include " ""
substituteInPlace lib/builtins/clear_cache.c \
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
# Hack around weird upsream RPATH bug
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
ln -s "$out/lib"/*/* "$out/lib"
- '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 936c877d58c..88788852862 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -7,11 +7,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
- cmakeFlags = [
+ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
- ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
@@ -37,7 +36,7 @@ stdenv.mkDerivation {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
+ ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) ./crtbegin-and-end.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
@@ -47,7 +46,7 @@ stdenv.mkDerivation {
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
- '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include " ""
substituteInPlace lib/builtins/clear_cache.c \
diff --git a/pkgs/development/compilers/llvm/9/bintools.nix b/pkgs/development/compilers/llvm/9/bintools.nix
new file mode 100644
index 00000000000..72a2a733193
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/bintools.nix
@@ -0,0 +1,19 @@
+{ runCommand, stdenv, llvm, lld, version }:
+
+let
+ prefix =
+ if stdenv.hostPlatform != stdenv.targetPlatform
+ then "${stdenv.targetPlatform.config}-"
+ else "";
+in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
+ mkdir -p $out/bin
+ for prog in ${lld}/bin/*; do
+ ln -s $prog $out/bin/${prefix}$(basename $prog)
+ done
+ for prog in ${llvm}/bin/*; do
+ ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||")
+ ln -sf $prog $out/bin/${prefix}$(basename $prog)
+ done
+ rm -f $out/bin/${prefix}cat
+ ln -s ${lld}/bin/lld $out/bin/${prefix}ld
+''
diff --git a/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch b/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
new file mode 100644
index 00000000000..a4a0f21b0fc
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/compiler-rt-baremetal.patch
@@ -0,0 +1,53 @@
+Index: lib/Driver/ToolChains/BareMetal.cpp
+===================================================================
+--- a/lib/Driver/ToolChains/BareMetal.cpp
++++ b/lib/Driver/ToolChains/BareMetal.cpp
+@@ -157,7 +157,7 @@
+ void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
+ ArgStringList &CmdArgs) const {
+ CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
+- getTriple().getArchName() + ".a"));
++ getTriple().getArchName()));
+ }
+
+ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+Index: test/Driver/baremetal.cpp
+===================================================================
+--- a/test/Driver/baremetal.cpp
++++ b/test/Driver/baremetal.cpp
+@@ -13,7 +13,7 @@
+ // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
+-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -35,7 +35,7 @@
+ // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -48,7 +48,7 @@
+ // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -61,7 +61,7 @@
+ // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
+-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
new file mode 100644
index 00000000000..df6b916e87f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -0,0 +1,120 @@
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+, enableManpages ? false
+, enablePolly ? false # TODO: get this info from llvm (passthru?)
+}:
+
+let
+ self = stdenv.mkDerivation ({
+ pname = "clang";
+ inherit version;
+
+ src = fetch "cfe" "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v";
+
+ unpackPhase = ''
+ unpackFile $src
+ mv cfe-${version}* clang
+ sourceRoot=$PWD/clang
+ unpackFile ${clang-tools-extra_src}
+ mv clang-tools-extra-* $sourceRoot/tools/extra
+ '';
+
+ nativeBuildInputs = [ cmake python ]
+ ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+ buildInputs = [ libxml2 llvm ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags = [
+ "-DCMAKE_CXX_FLAGS=-std=c++11"
+ "-DCLANGD_BUILD_XPC=OFF"
+ ] ++ stdenv.lib.optionals enableManpages [
+ "-DCLANG_INCLUDE_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ] ++ stdenv.lib.optionals enablePolly [
+ "-DWITH_POLLY=ON"
+ "-DLINK_POLLY_INTO_TOOLS=ON"
+ ];
+
+ patches = [
+ ./purity.patch
+ # https://reviews.llvm.org/D51899
+ ./compiler-rt-baremetal.patch
+ ];
+
+ postPatch = ''
+ sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+ lib/Driver/ToolChains/*.cpp
+
+ # Patch for standalone doc building
+ sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace tools/extra/clangd/CMakeLists.txt \
+ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
+ '';
+
+ outputs = [ "out" "lib" "python" ];
+
+ # Clang expects to find LLVMgold in its own prefix
+ postInstall = ''
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
+ ln -sv $out/bin/clang $out/bin/cpp
+
+ # Move libclang to 'lib' output
+ moveToOutput "lib/libclang.*" "$lib"
+ substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
+
+ mkdir -p $python/bin $python/share/clang/
+ mv $out/bin/{git-clang-format,scan-view} $python/bin
+ if [ -e $out/bin/set-xcode-analyzer ]; then
+ mv $out/bin/set-xcode-analyzer $python/bin
+ fi
+ mv $out/share/clang/*.py $python/share/clang
+ rm $out/bin/c-index-test
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ isClang = true;
+ inherit llvm;
+ } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) {
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+ };
+
+ meta = {
+ description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ platforms = stdenv.lib.platforms.all;
+ };
+ } // stdenv.lib.optionalAttrs enableManpages {
+ pname = "clang-manpages";
+
+ buildPhase = ''
+ make docs-clang-man
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/man/man1
+ # Manually install clang manpage
+ cp docs/man/*.1 $out/share/man/man1/
+ '';
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man page for Clang ${version}";
+ });
+in self
diff --git a/pkgs/development/compilers/llvm/9/clang/purity.patch b/pkgs/development/compilers/llvm/9/clang/purity.patch
new file mode 100644
index 00000000000..a6729a9b004
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+ if (!IsStatic) {
+ if (Args.hasArg(options::OPT_rdynamic))
+ CmdArgs.push_back("-export-dynamic");
+-
+- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {
+- const std::string Loader =
+- D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+- CmdArgs.push_back("-dynamic-linker");
+- CmdArgs.push_back(Args.MakeArgString(Loader));
+- }
+ }
+
+ CmdArgs.push_back("-o");
+--
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
new file mode 100644
index 00000000000..3cc12b94b20
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/compiler-rt-codesign.patch
@@ -0,0 +1,33 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake | 8 ------
+ test/asan/CMakeLists.txt | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+ set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+ set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+ endif()
+- if(APPLE)
+- # Ad-hoc sign the dylibs
+- add_custom_command(TARGET ${libname}
+- POST_BUILD
+- COMMAND codesign --sign - $
+- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+- )
+- endif()
+ endif()
+ install(TARGETS ${libname}
+ ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
new file mode 100644
index 00000000000..9a333ad7c11
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -0,0 +1,68 @@
+{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
+stdenv.mkDerivation rec {
+ pname = "compiler-rt";
+ inherit version;
+ src = fetch pname "03ni43lbkp63lr3p6sc94dphqmvnz5av5mml0xmk930xvnbcvr2n";
+
+ nativeBuildInputs = [ cmake python llvm ];
+ buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+ "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+ "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+ "-DCMAKE_C_FLAGS=-nodefaultlibs"
+ "-DCMAKE_CXX_COMPILER_WORKS=ON"
+ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+ "-DCOMPILER_RT_BUILD_XRAY=OFF"
+ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+ "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+ "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+ #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
+ "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
+ "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
+ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+ "-DCOMPILER_RT_BUILD_XRAY=OFF"
+ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+ "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [
+ "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+ "-DCOMPILER_RT_OS_DIR=baremetal"
+ ];
+
+ outputs = [ "out" "dev" ];
+
+ patches = [
+ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+ ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+
+ # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+ # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+ # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+ # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+ # a flag and turn the flag off during the stdenv build.
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace cmake/config-ix.cmake \
+ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+ substituteInPlace lib/builtins/int_util.c \
+ --replace "#include " ""
+ substituteInPlace lib/builtins/clear_cache.c \
+ --replace "#include " ""
+ substituteInPlace lib/builtins/cpu_model.c \
+ --replace "#include " ""
+ '';
+
+ # Hack around weird upsream RPATH bug
+ postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+ ln -s "$out/lib"/*/* "$out/lib"
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+ ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
+ ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
+ ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
+ ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
+ '';
+
+ enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
new file mode 100644
index 00000000000..1590d180c3f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -0,0 +1,197 @@
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
+}:
+
+let
+ release_version = "9.0.0";
+ version = release_version; # differentiating these is important for rc's
+
+ fetch = name: sha256: fetchurl {
+ url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
+ inherit sha256;
+ };
+
+ clang-tools-extra_src = fetch "clang-tools-extra" "045cldmcfd8s33wyjlviifgpnw52yqicd6v4ysvdg4i96p78c77a";
+
+ tools = stdenv.lib.makeExtensible (tools: let
+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+ mkExtraBuildCommands = cc: ''
+ rsrc="$out/resource-root"
+ mkdir "$rsrc"
+ ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+ ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+ echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) ''
+ echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+ '';
+ in {
+
+ llvm = callPackage ./llvm.nix { };
+ llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
+
+ clang-unwrapped = callPackage ./clang {
+ inherit clang-tools-extra_src;
+ };
+ clang-polly-unwrapped = callPackage ./clang {
+ inherit clang-tools-extra_src;
+ llvm = tools.llvm-polly;
+ enablePolly = true;
+ };
+
+ llvm-manpages = lowPrio (tools.llvm.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ clang-manpages = lowPrio (tools.clang-unwrapped.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ libclang = tools.clang-unwrapped.lib;
+
+ clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
+
+ libstdcxxClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ extraPackages = [
+ libstdcxxHook
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = mkExtraBuildCommands cc;
+ };
+
+ libcxxClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = targetLlvmLibraries.libcxx;
+ extraPackages = [
+ targetLlvmLibraries.libcxx
+ targetLlvmLibraries.libcxxabi
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = mkExtraBuildCommands cc;
+ };
+
+ lld = callPackage ./lld.nix {};
+
+ lldb = callPackage ./lldb.nix {};
+
+ # Below, is the LLVM bootstrapping logic. It handles building a
+ # fully LLVM toolchain from scratch. No GCC toolchain should be
+ # pulled in. As a consequence, it is very quick to build different
+ # targets provided by LLVM and we can also build for what GCC
+ # doesn’t support like LLVM. Probably we should move to some other
+ # file.
+
+ bintools = callPackage ./bintools.nix {};
+
+ lldClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = targetLlvmLibraries.libcxx;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ };
+ extraPackages = [
+ targetLlvmLibraries.libcxx
+ targetLlvmLibraries.libcxxabi
+ targetLlvmLibraries.compiler-rt
+ ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+ targetLlvmLibraries.libunwind
+ ];
+ extraBuildCommands = ''
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+ echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+ echo "-fno-exceptions" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoLibcxx = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ };
+ extraPackages = [
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = ''
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ echo "-nostdlib++" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoLibc = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ libc = null;
+ };
+ extraPackages = [
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = ''
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoCompilerRt = wrapCCWith {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ libc = null;
+ };
+ extraPackages = [ ];
+ extraBuildCommands = ''
+ echo "-nostartfiles" >> $out/nix-support/cc-cflags
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ '';
+ };
+
+ });
+
+ libraries = stdenv.lib.makeExtensible (libraries: let
+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+ in {
+
+ compiler-rt = callPackage ./compiler-rt.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
+ }));
+
+ stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+ libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
+
+ libcxx = callPackage ./libc++ ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ }));
+
+ libcxxabi = callPackage ./libc++abi.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ libunwind = libraries.libunwind;
+ }));
+
+ openmp = callPackage ./openmp.nix {};
+
+ libunwind = callPackage ./libunwind.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ }));
+
+ });
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch b/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
new file mode 100644
index 00000000000..e6c2f040684
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/fix-test-on-non-x86-like-others.patch
@@ -0,0 +1,23 @@
+Index: test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
+===================================================================
+diff --git a/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll b/llvm/trunk/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
+--- a/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll (revision 372333)
++++ b/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll (working copy)
+@@ -3,7 +3,7 @@
+
+ ; RUN: opt -module-summary %s -o %t.o
+ ; RUN: opt -module-summary %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2.o
+-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
++; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
+ ; RUN: --plugin-opt=save-temps \
+ ; RUN: %t.o %t2.o -o %t3.o
+ ; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s
+@@ -11,7 +11,7 @@
+ ; Now test when one module is a native object. In that case we must be
+ ; conservative and not auto hide.
+ ; RUN: llc %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2native.o -filetype=obj
+-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
++; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
+ ; RUN: --plugin-opt=save-temps \
+ ; RUN: %t.o %t2native.o -o %t3.o
+ ; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s --check-prefix=NOSUMMARY
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix
new file mode 100644
index 00000000000..daf8ed5a9ae
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -0,0 +1,55 @@
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
+
+ src = fetch "libcxx" "136j3v7il9aq8wyp48klx6sifnl5asj4lf5c8yx08cjx5fbn4h9w";
+
+ postUnpack = ''
+ unpackFile ${libcxxabi.src}
+ export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+ '';
+
+ patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+
+ preConfigure = ''
+ # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+ cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+ '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+ patchShebangs utils/cat_files.py
+ '';
+ nativeBuildInputs = [ cmake ]
+ ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python;
+
+ buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags = [
+ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+ "-DLIBCXX_LIBCPPABI_VERSION=2"
+ "-DLIBCXX_CXX_ABI=libcxxabi"
+ ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+ ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+ ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+ "-DLIBCXX_ENABLE_THREADS=OFF"
+ "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
+ "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
+ ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+
+ enableParallelBuilding = true;
+
+ linkCxxAbi = stdenv.isLinux;
+
+ setupHooks = [
+ ../../../../../build-support/setup-hooks/role.bash
+ ./setup-hook.sh
+ ];
+
+ meta = {
+ homepage = http://libcxx.llvm.org/;
+ description = "A new implementation of the C++ standard library, targeting C++11";
+ license = with stdenv.lib.licenses; [ ncsa mit ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
new file mode 100644
index 00000000000..6611259165a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
@@ -0,0 +1,6 @@
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+
+linkCxxAbi="@linkCxxAbi@"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix
new file mode 100644
index 00000000000..7afff991e75
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libc++abi.nix
@@ -0,0 +1,67 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+ pname = "libc++abi";
+ inherit version;
+
+ src = fetch "libcxxabi" "1s9haplqv8ashlsdx2psxiqxh50gqk2jp2vz5yn0djb56mw42l37";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+
+ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ "-DLLVM_ENABLE_LIBCXX=ON"
+ "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+ "-DLIBCXXABI_ENABLE_THREADS=OFF"
+ "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
+ ] ++ stdenv.lib.optionals (!enableShared) [
+ "-DLIBCXXABI_ENABLE_SHARED=OFF"
+ ];
+
+ patches = [ ./libcxxabi-no-threads.patch ];
+
+ postUnpack = ''
+ unpackFile ${libcxx.src}
+ unpackFile ${llvm.src}
+ cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export TRIPLE=x86_64-apple-darwin
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+ patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
+ '';
+
+ installPhase = if stdenv.isDarwin
+ then ''
+ for file in lib/*.dylib; do
+ # this should be done in CMake, but having trouble figuring out
+ # the magic combination of necessary CMake variables
+ # if you fancy a try, take a look at
+ # http://www.cmake.org/Wiki/CMake_RPATH_handling
+ install_name_tool -id $out/$file $file
+ done
+ make install
+ install -d 755 $out/include
+ install -m 644 ../include/*.h $out/include
+ ''
+ else ''
+ install -d -m 755 $out/include $out/lib
+ install -m 644 lib/libc++abi.a $out/lib
+ install -m 644 ../include/cxxabi.h $out/include
+ '' + stdenv.lib.optionalString enableShared ''
+ install -m 644 lib/libc++abi.so.1.0 $out/lib
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+ '';
+
+ meta = {
+ homepage = http://libcxxabi.llvm.org/;
+ description = "A new implementation of low level support for a standard C++ library";
+ license = with stdenv.lib.licenses; [ ncsa mit ];
+ maintainers = with stdenv.lib.maintainers; [ vlstill ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch b/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
new file mode 100644
index 00000000000..787f3e16500
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libcxxabi-no-threads.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4138acf..41b4763 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
+ " is also set to ON.")
+ endif()
+ add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
++ add_definitions(-D_LIBCPP_HAS_NO_THREADS)
+ endif()
+
+ if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
diff --git a/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
new file mode 100644
index 00000000000..4ebfe46aa81
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libcxxabi-wasm.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
+index 15497d405e0..33f7f18193a 100644
+--- a/cmake/modules/HandleLLVMOptions.cmake
++++ b/cmake/modules/HandleLLVMOptions.cmake
+@@ -127,7 +127,10 @@ else(WIN32)
+ set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
+ endif()
+ else(FUCHSIA OR UNIX)
+- MESSAGE(SEND_ERROR "Unable to determine platform")
++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")
++ else()
++ MESSAGE(SEND_ERROR "Unable to determine platform")
++ endif()
+ endif(FUCHSIA OR UNIX)
+ endif(WIN32)
+
diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix
new file mode 100644
index 00000000000..5eba9e03c78
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/libunwind.nix
@@ -0,0 +1,14 @@
+{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
+
+stdenv.mkDerivation rec {
+ pname = "libunwind";
+ inherit version;
+
+ src = fetch pname "1chd1nz4bscrs6qa7p8sqgk5df86ll0frv0f451vhks2w44qsslp";
+
+ nativeBuildInputs = [ cmake ];
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+}
diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix
new file mode 100644
index 00000000000..c5baef4357e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/lld.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetch
+, cmake
+, libxml2
+, llvm
+, version
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lld";
+ inherit version;
+
+ src = fetch pname "14cgd34gr826qpxzhrkbz6qgm8ymds0hrsiznwzp42ax4f5p9iii";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ llvm libxml2 ];
+
+ outputs = [ "out" "dev" ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ moveToOutput include "$dev"
+ moveToOutput lib "$dev"
+ '';
+
+ meta = {
+ description = "The LLVM Linker";
+ homepage = http://lld.llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/9/lldb-procfs.patch b/pkgs/development/compilers/llvm/9/lldb-procfs.patch
new file mode 100644
index 00000000000..b075dbaeee0
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/lldb-procfs.patch
@@ -0,0 +1,31 @@
+--- a/source/Plugins/Process/Linux/Procfs.h
++++ b/source/Plugins/Process/Linux/Procfs.h
+@@ -11,21 +11,12 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+
+ #include
++#include
+
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include
++#undef pt_regs
++#else
+ #include
+-#endif // __ANDROID__
++#endif
diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix
new file mode 100644
index 00000000000..ee281384c40
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/lldb.nix
@@ -0,0 +1,72 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python
+, version
+, darwin
+, lit
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lldb";
+ inherit version;
+
+ src = fetch pname "1507dl0xw03nppxpz2xsq4s30jdbkplx4w14za54ngqm3xm2yk0y";
+
+ patches = [ ./lldb-procfs.patch ];
+
+ nativeBuildInputs = [ cmake python which swig lit ];
+ buildInputs = [
+ ncurses
+ zlib
+ libedit
+ libxml2
+ llvm
+ ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [
+ darwin.libobjc
+ darwin.apple_sdk.libs.xpc
+ darwin.apple_sdk.frameworks.Foundation
+ darwin.bootstrap_cmds
+ darwin.apple_sdk.frameworks.Carbon
+ darwin.apple_sdk.frameworks.Cocoa
+ ];
+
+ CXXFLAGS = "-fno-rtti";
+ hardeningDisable = [ "format" ];
+
+ cmakeFlags = [
+ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+ "-DClang_DIR=${clang-unwrapped}/lib/cmake"
+ "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
+ ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ # man page
+ mkdir -p $out/share/man/man1
+ install ../docs/lldb.1 -t $out/share/man/man1/
+
+ # Editor support
+ # vscode:
+ install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
+ mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+ ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A next-generation high-performance debugger";
+ homepage = http://llvm.org/;
+ license = licenses.ncsa;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/9/llvm-outputs.patch b/pkgs/development/compilers/llvm/9/llvm-outputs.patch
new file mode 100644
index 00000000000..40096fa3497
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+ ActiveIncludeOption = "-I" + ActiveIncludeDir;
+ }
+
++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++ if (!IsInDevelopmentTree) {
++ bool WantShared = true;
++ for (int i = 1; i < argc; ++i) {
++ StringRef Arg = argv[i];
++ if (Arg == "--link-shared")
++ WantShared = true;
++ else if (Arg == "--link-static")
++ WantShared = false; // the last one wins
++ }
++
++ if (WantShared)
++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++ }
++
+ /// We only use `shared library` mode in cases where the static library form
+ /// of the components provided are not available; note however that this is
+ /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
new file mode 100644
index 00000000000..9bc7e1fc20b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -0,0 +1,182 @@
+{ stdenv
+, fetch
+, cmake
+, python
+, libffi
+, libbfd
+, libpfm
+, libxml2
+, ncurses
+, version
+, release_version
+, zlib
+, buildPackages
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, enablePFM ? !(stdenv.isDarwin
+ || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+)
+, enablePolly ? false
+}:
+
+let
+ inherit (stdenv.lib) optional optionals optionalString;
+
+ # Used when creating a version-suffixed symlink of libLLVM.dylib
+ shortVersion = with stdenv.lib;
+ concatStringsSep "." (take 1 (splitString "." release_version));
+
+in stdenv.mkDerivation (rec {
+ pname = "llvm";
+ inherit version;
+
+ src = fetch pname "117ymdz1by2nkfq1c2p9m4050dp848kbjbiv6nsfj8hzy9f5d86n";
+ polly_src = fetch "polly" "0cyl2gsibf1dhqvkyw1qb0f8q58ib6cihzyh4f9kj9g77ll95ym4";
+
+ unpackPhase = ''
+ unpackFile $src
+ mv llvm-${version}* llvm
+ sourceRoot=$PWD/llvm
+ '' + optionalString enablePolly ''
+ unpackFile $polly_src
+ mv polly-* $sourceRoot/tools/polly
+ '';
+
+ outputs = [ "out" "python" ]
+ ++ optional enableSharedLibraries "lib";
+
+ nativeBuildInputs = [ cmake python ]
+ ++ optionals enableManpages [ python.pkgs.sphinx python.pkgs.recommonmark ];
+
+ buildInputs = [ libxml2 libffi ]
+ ++ optional enablePFM libpfm; # exegesis
+
+ propagatedBuildInputs = [ ncurses zlib ];
+
+ postPatch = optionalString stdenv.isDarwin ''
+ substituteInPlace cmake/modules/AddLLVM.cmake \
+ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
+ --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
+ ''
+ # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ + optionalString (enableSharedLibraries) ''
+ substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+ patch -p1 < ./llvm-outputs.patch
+ '' + ''
+ # FileSystem permissions tests fail with various special bits
+ substituteInPlace unittests/Support/CMakeLists.txt \
+ --replace "Path.cpp" ""
+ rm unittests/Support/Path.cpp
+ '' + optionalString stdenv.hostPlatform.isMusl ''
+ patch -p1 -i ${../TLI-musl.patch}
+ substituteInPlace unittests/Support/CMakeLists.txt \
+ --replace "add_subdirectory(DynamicLibrary)" ""
+ rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+ # valgrind unhappy with musl or glibc, but fails w/musl only
+ rm test/CodeGen/AArch64/wineh4.mir
+ '' + ''
+ patchShebangs test/BugPoint/compile-custom.ll.py
+
+ # Fix test so that no extra locale files are needed
+ substituteInPlace test/tools/llvm-ar/mri-utf8.test \
+ --replace en_US.UTF-8 C.UTF-8
+
+ # Fix x86 gold test on non-x86 platforms
+ # (similar fix made to others in this directory previously, FWIW)
+ patch -p1 -i ${./fix-test-on-non-x86-like-others.patch}
+ '';
+
+ # hacky fix: created binaries need to be run before installation
+ preBuild = ''
+ mkdir -p $out/
+ ln -sv $PWD/lib $out
+ '';
+
+ cmakeFlags = with stdenv; [
+ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
+ "-DLLVM_BUILD_TESTS=ON"
+ "-DLLVM_ENABLE_FFI=ON"
+ "-DLLVM_ENABLE_RTTI=ON"
+ "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DLLVM_ENABLE_DUMP=ON"
+ ] ++ optionals enableSharedLibraries [
+ "-DLLVM_LINK_LLVM_DYLIB=ON"
+ ] ++ optionals enableManpages [
+ "-DLLVM_BUILD_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ] ++ optionals (!isDarwin) [
+ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+ ] ++ optionals (isDarwin) [
+ "-DLLVM_ENABLE_LIBCXX=ON"
+ "-DCAN_TARGET_i386=false"
+ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "-DCMAKE_CROSSCOMPILING=True"
+ "-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen"
+ ];
+
+ postBuild = ''
+ rm -fR $out
+ '';
+
+ preCheck = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+ '';
+
+ postInstall = ''
+ mkdir -p $python/share
+ mv $out/share/opt-viewer $python/share/opt-viewer
+ ''
+ + optionalString enableSharedLibraries ''
+ moveToOutput "lib/libLLVM-*" "$lib"
+ moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+ ''
+ + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ '';
+
+ doCheck = stdenv.isLinux && (!stdenv.isx86_32);
+
+ checkTarget = "check-all";
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Collection of modular and reusable compiler and toolchain technologies";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+ platforms = stdenv.lib.platforms.all;
+ };
+} // stdenv.lib.optionalAttrs enableManpages {
+ pname = "llvm-manpages";
+
+ buildPhase = ''
+ make docs-llvm-man
+ '';
+
+ propagatedBuildInputs = [];
+
+ installPhase = ''
+ make -C docs install
+ '';
+
+ postPatch = null;
+ postInstall = null;
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix
new file mode 100644
index 00000000000..a511aed2eb8
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/openmp.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetch
+, cmake
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation rec {
+ pname = "openmp";
+ inherit version;
+
+ src = fetch pname "0nrv9np134b7c483jnq786spy3hbpj11d7g21g67cqq66c8ynycr";
+
+ nativeBuildInputs = [ cmake perl ];
+ buildInputs = [ llvm ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Components required to build an executable OpenMP program";
+ homepage = http://openmp.llvm.org/;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..1f2ac97818e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/sanitizers-nongnu.patch
@@ -0,0 +1,412 @@
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc | 4 +-
+ lib/interception/interception_linux.cc | 2 +-
+ lib/interception/interception_linux.h | 2 +-
+ lib/msan/msan_linux.cc | 2 +-
+ lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
+ .../sanitizer_common_interceptors_ioctl.inc | 4 +-
+ .../sanitizer_common_syscalls.inc | 2 +-
+ lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
+ .../sanitizer_linux_libcdep.cc | 10 ++---
+ lib/sanitizer_common/sanitizer_platform.h | 6 +++
+ .../sanitizer_platform_interceptors.h | 4 +-
+ .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
+ lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
+ 13 files changed, 51 insertions(+), 34 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include
+ #endif
+
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+ UNIMPLEMENTED();
+ }
+
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 26bfcd8f6..529b234f7 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+ return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 942c25609..24a4d5080 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+ (::__interception::uptr) & WRAP(func))
+
+ // Android, Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+ (::__interception::real_##func = (func##_f)( \
+ unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 385a650c4..6e30a8ce9 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+
+ #include "msan.h"
+ #include "msan_report.h"
+diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
+index 6bfd5e5ee..048f6154f 100644
+--- a/lib/sanitizer_common/sanitizer_allocator.cc
++++ b/lib/sanitizer_common/sanitizer_allocator.cc
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
+
+ // ThreadSanitizer for Go uses libc malloc/free.
+ #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
+-# if SANITIZER_LINUX && !SANITIZER_ANDROID
++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ extern "C" void *__libc_malloc(uptr size);
+ # if !SANITIZER_GO
+ extern "C" void *__libc_memalign(uptr alignment, uptr size);
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 2d633c173..b6eb23116 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
+ _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ // Conflicting request ids.
+ // _(CDROMAUDIOBUFSIZ, NONE, 0);
+ // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
+ _(VT_WAITACTIVE, NONE, 0);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+ _(CYGETDEFTHRESH, WRITE, sizeof(int));
+ _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+ }
+ }
+
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+ void *old_rlim) {
+ if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
+index 96d6c1eff..9e2b7fb9d 100644
+--- a/lib/sanitizer_common/sanitizer_linux.cc
++++ b/lib/sanitizer_common/sanitizer_linux.cc
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
+ #endif
+ }
+
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ extern "C" {
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ }
+ #endif
+
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
+ !SANITIZER_OPENBSD
+ static void ReadNullSepFileToArray(const char *path, char ***arr,
+ int arr_size) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+ #elif SANITIZER_NETBSD
+ *argv = __ps_strings->ps_argvstr;
+ *envp = __ps_strings->ps_envstr;
++#elif SANITIZER_NONGNU
++ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
+ #else // SANITIZER_FREEBSD
+ #if !SANITIZER_GO
+ if (&__libc_stack_end) {
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 4962ff832..438f94dbe 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
+ }
+
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
+- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+
+ #ifdef __i386__
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
+ defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
+ defined(__arm__)) && \
+- SANITIZER_LINUX && !SANITIZER_ANDROID
++ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t thread_descriptor_size;
+
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+ *addr = ThreadSelf();
+ *size = GetTlsSize();
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+ *addr = 0;
+ *size = 0;
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+ *addr = 0;
+ *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
+- SANITIZER_OPENBSD || SANITIZER_SOLARIS
++ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ uptr addr, size;
+ GetTls(&addr, &size);
+ return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d81e25580..e10680ac8 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -208,6 +208,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index f95539a73..6c53b3415 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -39,7 +39,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -322,7 +322,7 @@
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL \
+ (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+ SANITIZER_WORDSIZE == 64)) // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 54da635d7..2f6ff69c3 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+
+ #include "sanitizer_platform.h"
+
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include
+-#include
++# if !SANITIZER_NONGNU
++# include
++# endif
+ #include
+-#include
+-#include
+-#include
+-#include
++#include
++#include
++#include
++#include
+ #if HAVE_RPC_XDR_H
+ # include
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -251,7 +256,7 @@ namespace __sanitizer {
+ unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // Use pre-computed size of struct ustat to avoid which
+ // has been removed from glibc 2.28.
+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ int glob_nomatch = GLOB_NOMATCH;
+ int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned struct_termios_sz = sizeof(struct termios);
+ unsigned struct_winsize_sz = sizeof(struct winsize);
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ unsigned struct_arpreq_sz = sizeof(struct arpreq);
+ unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+ unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+ unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+ unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+ unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+
+ CHECK_TYPE_SIZE(ether_addr);
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index de989b780..51a97b554 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -294,7 +294,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ int cnt = 0;
+ struct __res_state *statp = (struct __res_state*)state;
+ for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+--
+2.19.0
+
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 4228c368e56..129b8ca4dd8 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,15 +1,15 @@
# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-11_x, openssl, pcre, readline,
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim, openssl, pcre, readline,
boehmgc, sfml, tzdata, coreutils, sqlite }:
stdenv.mkDerivation rec {
pname = "nim";
- version = "0.20.2";
+ version = "1.0.0";
src = fetchurl {
url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
- sha256 = "0pibil10x0c181kw705phlwk8bn8dy5ghqd9h9fm6i9afrz5ryp1";
+ sha256 = "1pg0lxahis8zfk6rdzdj281bahl8wglpjgngkc4vg1pc9p61fj03";
};
doCheck = !stdenv.isDarwin;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# as part of building it, so it cannot be read-only
checkInputs = [
- nodejs-slim-11_x tzdata coreutils
+ nodejs-slim tzdata coreutils
];
nativeBuildInputs = [
@@ -64,9 +64,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- # reported upstream: https://github.com/nim-lang/Nim/issues/11435
- ${disableTest} ./tests/misc/tstrace.nim
-
# runs out of memory on a machine with 8GB RAM
${disableTest} ./tests/system/t7894.nim
@@ -80,11 +77,20 @@ stdenv.mkDerivation rec {
${disableCompile} ./lib/nimhcr.nim
${disableTest} ./tests/dll/nimhcr_unit.nim
${disableTest} ./tests/dll/nimhcr_integration.nim
+
+ # reported upstream: https://github.com/nim-lang/Nim/issues/12262
+ ${disableTest} ./tests/range/tcompiletime_range_checks.nim
+
+ # requires "immintrin.h" which is available only on x86
+ ${disableTest} ./tests/misc/tsizeof3.nim
'';
checkPhase = ''
runHook preCheck
+ # Fortify hardening breaks tests
+ # https://github.com/nim-lang/Nim/issues/11435#issuecomment-534545696
+ NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} \
./koch tests --nim:bin/nim all
runHook postCheck
@@ -97,7 +103,10 @@ stdenv.mkDerivation rec {
./koch install $out
mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin
mv $out/nim/* $out/ && rmdir $out/nim
+
+ # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
wrapProgram $out/bin/nim \
+ --run 'NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}' \
--suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
runHook postInstall
@@ -107,7 +116,7 @@ stdenv.mkDerivation rec {
description = "Statically typed, imperative programming language";
homepage = "https://nim-lang.org/";
license = licenses.mit;
- maintainers = with maintainers; [ ehmry peterhoeg ];
+ maintainers = with maintainers; [ ehmry ];
platforms = with platforms; linux ++ darwin; # arbitrary
};
}
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 9e6d30efda8..43fe8ed8387 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -83,6 +83,9 @@ in makePackage {
cp -r build/modular-sdk $out
'';
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
stripDebugList = [ "." ];
postFixup = ''
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix
index 418c58ac683..356ac4800d9 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/12.nix
@@ -83,6 +83,9 @@ in makePackage {
cp -r build/modular-sdk $out
'';
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
stripDebugList = [ "." ];
postFixup = ''
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 43a72985dde..7b774d066b7 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
- version = "1.36.0";
+ version = "1.37.0";
- # fetch hashes by running `print-hashes.sh 1.36.0`
+ # fetch hashes by running `print-hashes.sh 1.37.0`
hashes = {
- i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d";
- x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55";
- armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb";
- aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d";
- i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60";
- x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325";
+ i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9";
+ x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb";
+ armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98";
+ aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba";
+ i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8";
+ x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
};
platform =
diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
deleted file mode 100644
index 583a6027f83..00000000000
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ru rustc-1.36.0-src-orig/src/libstd/net/tcp.rs rustc-1.36.0-src/src/libstd/net/tcp.rs
---- rustc-1.36.0-src-orig/src/libstd/net/tcp.rs 2019-07-03 10:00:00.000000000 +0200
-+++ rustc-1.36.0-src/src/libstd/net/tcp.rs 2019-07-07 11:33:35.378130207 +0200
-@@ -973,6 +973,7 @@
- }
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- fn listen_localhost() {
- let socket_addr = next_test_ip4();
-@@ -1031,6 +1032,7 @@
- })
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- fn read_eof() {
- each_ip(&mut |addr| {
-@@ -1050,6 +1052,7 @@
- })
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- fn write_close() {
- each_ip(&mut |addr| {
-@@ -1076,6 +1079,7 @@
- })
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- fn multiple_connect_serial() {
- each_ip(&mut |addr| {
-@@ -1098,6 +1102,7 @@
- })
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- fn multiple_connect_interleaved_greedy_schedule() {
- const MAX: usize = 10;
-@@ -1134,6 +1139,7 @@
- }
-
- #[test]
-+ #[cfg_attr(target_os = "macos", ignore)]
- fn multiple_connect_interleaved_lazy_schedule() {
- const MAX: usize = 10;
- each_ip(&mut |addr| {
-@@ -1467,6 +1473,7 @@
- }
-
- #[test]
-+ #[cfg_attr(target_os = "macos", ignore)]
- fn clone_while_reading() {
- each_ip(&mut |addr| {
- let accept = t!(TcpListener::bind(&addr));
-@@ -1597,7 +1604,7 @@
-
- // FIXME: re-enabled openbsd tests once their socket timeout code
- // no longer has rounding errors.
-- #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)]
-+ #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd", target_os = "macos"), ignore)]
- #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
- #[test]
- fn timeouts() {
-@@ -1643,6 +1650,7 @@
- drop(listener);
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
- fn test_read_with_timeout() {
-@@ -1687,6 +1695,7 @@
- drop(listener);
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- #[cfg_attr(target_env = "sgx", ignore)]
- fn nodelay() {
-@@ -1719,6 +1728,7 @@
- assert_eq!(ttl, t!(stream.ttl()));
- }
-
-+ #[cfg_attr(target_os = "macos", ignore)]
- #[test]
- #[cfg_attr(target_env = "sgx", ignore)]
- fn set_nonblocking() {
diff --git a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
deleted file mode 100644
index 6ef7fd0f7ce..00000000000
--- a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs
-index 32915c332..7cb54f31e 100644
---- a/src/stdsimd/coresimd/x86/mod.rs
-+++ b/src/stdsimd/coresimd/x86/mod.rs
-@@ -279,7 +279,6 @@ types! {
- ///
- /// # Examples
- ///
-- /// ```
- /// # #![feature(cfg_target_feature, target_feature, stdsimd)]
- /// # #![cfg_attr(not(dox), no_std)]
- /// # #[cfg(not(dox))]
-@@ -301,7 +300,6 @@ types! {
- /// # }
- /// # if is_x86_feature_detected!("sse") { unsafe { foo() } }
- /// # }
-- /// ```
- pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32);
-
- /// 256-bit wide set of four `f64` types, x86-specific
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index daf7af1babd..27336aa501b 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,7 +1,8 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
-, fetchurl, file, python2, tzdata, ps
-, llvmPackages_7, darwin, git, cmake, rustPlatform
-, which, libffi, gdb
+, fetchurl, file, python2
+, llvm_7, darwin, git, cmake, rustPlatform
+, pkgconfig, openssl
+, which, libffi
, withBundledLLVM ? false
}:
@@ -9,31 +10,21 @@ let
inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
- llvmPackages = llvmPackages_7;
-
- llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; };
- llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
- llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
+ llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
+ llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
+ llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
# For use at runtime
- llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; };
-in
-
-stdenv.mkDerivation rec {
+ llvmShared = llvm_7.override { enableSharedLibraries = true; };
+in stdenv.mkDerivation rec {
pname = "rustc";
- version = "1.37.0";
+ version = "1.38.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
+ sha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4";
};
- # Provide the compiler-rt sources needed for profiling.
- preConfigure = ''
- mkdir src/llvm-project/compiler-rt
- tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1
- '';
-
__darwinAllowLocalNetworking = true;
# rustc complains about modified source files otherwise
@@ -107,18 +98,6 @@ stdenv.mkDerivation rec {
--replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)'
'';
- patches = [
- ./patches/net-tcp-disable-tests.patch
-
- # Re-evaluate if this we need to disable this one
- #./patches/stdsimd-disable-doctest.patch
-
- # Fails on hydra - not locally; the exact reason is unknown.
- # Comments in the test suggest that some non-reproducible environment
- # variables such $RANDOM can make it fail.
- # ./patches/disable-test-inherit-env.patch
- ];
-
# the rust build system complains that nix alters the checksums
dontFixLibtool = true;
@@ -131,74 +110,26 @@ stdenv.mkDerivation rec {
sed -i configure \
-e '/probe_need CFG_CURL curl/d'
- # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
- sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
-
- # https://github.com/rust-lang/rust/issues/39522
- echo removing gdb-version-sensitive tests...
- find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
- rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums.rs,generic-enum-with-different-disr-sizes.rs}
-
# Useful debugging parameter
# export VERBOSE=1
- '' + optionalString stdenv.isDarwin ''
- # Disable all lldb tests.
- # error: Can't run LLDB test because LLDB's python path is not set
- rm -vr src/test/debuginfo/*
- rm -v src/test/run-pass/backtrace-debuginfo.rs || true
-
- # error: No such file or directory
- rm -v src/test/ui/run-pass/issues/issue-45731.rs || true
-
- # Disable tests that fail when sandboxing is enabled.
- substituteInPlace src/libstd/sys/unix/ext/net.rs \
- --replace '#[test]' '#[test] #[ignore]'
- substituteInPlace src/test/run-pass/env-home-dir.rs \
- --replace 'home_dir().is_some()' true
- rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes?
- rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ???
'';
# rustc unfortunately needs cmake to compile llvm-rt but doesn't
# use it for the normal build. This disables cmake in Nix.
dontUseCmakeConfigure = true;
- # ps is needed for one of the test cases
nativeBuildInputs = [
- file python2 ps rustPlatform.rust.rustc git cmake
- which libffi removeReferencesTo
- ] # Only needed for the debuginfo tests
- ++ optional (!stdenv.isDarwin) gdb;
+ file python2 rustPlatform.rust.rustc git cmake
+ which libffi removeReferencesTo pkgconfig
+ ];
- buildInputs = optional stdenv.isDarwin Security
+ buildInputs = [ openssl ]
+ ++ optional stdenv.isDarwin Security
++ optional (!withBundledLLVM) llvmShared;
outputs = [ "out" "man" "doc" ];
setOutputFlags = false;
- # Disable codegen units and hardening for the tests.
- preCheck = ''
- export RUSTFLAGS=
- export TZDIR=${tzdata}/share/zoneinfo
- export hardeningDisable=all
- '' +
- # Ensure TMPDIR is set, and disable a test that removing the HOME
- # variable from the environment falls back to another home
- # directory.
- optionalString stdenv.isDarwin ''
- export TMPDIR=/tmp
- sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs
- '';
-
- # 1. Upstream is not running tests on aarch64:
- # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
- # So we do the same.
- # 2. Tests run out of memory for i686
- #doCheck = !stdenv.isAarch64 && !stdenv.isi686;
-
- # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598.
- doCheck = false;
-
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
# and thus a transitive dependency on ncurses
postInstall = ''
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 15ed7f8bd29..9714a8ebd50 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -22,27 +22,20 @@ let
};
in {
- "0.38" = fp {
- commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263";
- sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp";
- };
# NOTE: the openembedded-core project doesn't have a patch for 0.40.12
# We've fixed the single merge conflict in the following patch.
# 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.40" = ./disable-graphviz-0.40.12.patch;
- "0.42" = fp {
- commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8";
- sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g";
- };
-
# NOTE: the openembedded-core project doesn't have a patch for 0.44.1
# We've reverted the addition of the "--disable-valadoc" option
# and then applied the following patch.
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.44" = ./disable-graphviz-0.44.3.patch;
+ "0.46" = ./disable-graphviz-0.46.1.patch;
+
}.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
@@ -108,14 +101,8 @@ let
in rec {
vala_0_36 = generic {
- version = "0.36.19";
- sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar";
- };
-
- vala_0_38 = generic {
- version = "0.38.10";
- sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
- extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
+ version = "0.36.20";
+ sha256 = "19v7zjhr9yxkh9lxg46n9gjr0lb7j6v0xqfhrdvgz18xhj3hm5my";
};
vala_0_40 = generic {
@@ -123,15 +110,15 @@ in rec {
sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
};
- vala_0_42 = generic {
- version = "0.42.7";
- sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83";
- };
-
vala_0_44 = generic {
- version = "0.44.6";
- sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb";
+ version = "0.44.7";
+ sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz";
};
- vala = vala_0_44;
+ vala_0_46 = generic {
+ version = "0.46.1";
+ sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l";
+ };
+
+ vala = vala_0_46;
}
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
new file mode 100644
index 00000000000..8c3e54b6a95
--- /dev/null
+++ b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch
@@ -0,0 +1,261 @@
+diff --git a/Makefile.am b/Makefile.am
+index f70234759..b3d6c3833 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,19 +13,9 @@ SUBDIRS = \
+ doc \
+ gobject-introspection \
+ vapigen \
+- $(NULL)
+-
+-if ENABLE_VALADOC
+-SUBDIRS += \
+ libvaladoc \
+ valadoc \
+ $(NULL)
+-endif
+-
+-DISTCHECK_CONFIGURE_FLAGS = \
+- --enable-valadoc \
+- --enable-unversioned \
+- $(NULL)
+
+ if ENABLE_UNVERSIONED
+ aclocaldir = $(datadir)/aclocal
+diff --git a/configure.ac b/configure.ac
+index 6de326bbb..91f159b16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,10 +160,11 @@ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+
+ AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check)
+-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
+-if test x$enable_valadoc = xyes; then
++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
++if test x$enable_graphviz = xyes; then
+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+ AC_MSG_CHECKING([for CGRAPH])
++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
+ cgraph_tmp_LIBADD="$LIBADD"
+ cgraph_tmp_CFLAGS="$CFLAGS"
+ LIBADD="$LIBADD $LIBGVC_LIBS"
+@@ -201,8 +202,8 @@ if test x$enable_valadoc = xyes; then
+ LIBADD="$cgraph_tmp_LIBADD"
+ CFLAGS="$cgraph_tmp_CFLAGS"
+ fi
++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
+ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
+-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
+
+ AC_PATH_PROG([XSLTPROC], [xsltproc], :)
+ AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d2684a0e0..b343c7c10 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -6,16 +6,11 @@ SUBDIRS = \
+
+ dist_man_MANS = \
+ valac.1 \
++ valadoc.1 \
+ vala-gen-introspect.1 \
+ vapigen.1 \
+ $(NULL)
+
+-if ENABLE_VALADOC
+-dist_man_MANS += \
+- valadoc.1 \
+- $(NULL)
+-endif
+-
+ EXTRA_DIST = \
+ valac.h2m \
+ valadoc.h2m \
+@@ -24,11 +19,7 @@ EXTRA_DIST = \
+ $(NULL)
+
+ if HAVE_HELP2MAN
+-if ENABLE_VALADOC
+ manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
+-else
+-manpages: valac.1 vala-gen-introspect.1 vapigen.1
+-endif
+ @rm $^
+ $(MAKE) $(AM_MAKEFLAGS) $^
+
+@@ -37,13 +28,11 @@ valac.1:
+ --include $(srcdir)/valac.h2m \
+ --libtool --no-info \
+ --output=$@
+-if ENABLE_VALADOC
+ valadoc.1:
+ $(HELP2MAN) $(top_builddir)/valadoc/valadoc \
+ --include $(srcdir)/valadoc.h2m \
+ --libtool --no-info \
+ --output=$@
+-endif
+ vala-gen-introspect.1:
+ $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
+ --include $(srcdir)/vala-gen-introspect.h2m \
+@@ -60,15 +49,12 @@ endif
+ if ENABLE_UNVERSIONED
+ install-data-hook:
+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
+-if ENABLE_VALADOC
+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
+-endif
+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
+ endif
+
+
+-if ENABLE_VALADOC
+ COMMON_VALADOCFLAGS = \
+ --force \
+ --verbose \
+@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
+ @touch $@
+
+ internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
+-endif
+
+ clean-local:
+ rm -rf $(builddir)/internal-apis
+diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
+index 8a3924b54..81fde9ac8 100644
+--- a/libvaladoc/Makefile.am
++++ b/libvaladoc/Makefile.am
+@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \
+ content/tablerow.vala \
+ content/taglet.vala \
+ content/text.vala \
+- charts/chart.vala \
+- charts/chartfactory.vala \
+- charts/hierarchychart.vala \
+- charts/simplechartfactory.vala \
+ parser/manyrule.vala \
+ parser/oneofrule.vala \
+ parser/optionalrule.vala \
+@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \
+ highlighter/codetoken.vala \
+ highlighter/highlighter.vala \
+ html/basicdoclet.vala \
+- html/htmlchartfactory.vala \
+ html/linkhelper.vala \
+ html/cssclassresolver.vala \
+ html/htmlmarkupwriter.vala \
+ html/htmlrenderer.vala \
+ $(NULL)
+
++if ENABLE_GRAPHVIZ
++libvaladoc_la_VALASOURCES += \
++ charts/chart.vala \
++ charts/chartfactory.vala \
++ charts/hierarchychart.vala \
++ charts/simplechartfactory.vala \
++ html/htmlchartfactory.vala \
++ $(NULL)
++
++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
++endif
++
+ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
+ libvaladoc.vala.stamp \
+ $(libvaladoc_la_VALASOURCES:.vala=.c) \
+@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+ --library valadoc \
+ --vapi valadoc@PACKAGE_SUFFIX@.vapi \
+ --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
+- --vapidir $(top_srcdir)/vapi --pkg libgvc \
+ --vapidir $(top_srcdir)/gee --pkg gee \
+ --vapidir $(top_srcdir)/vala --pkg vala \
+ --vapidir $(top_srcdir)/ccode --pkg ccode \
+ --vapidir $(top_srcdir)/codegen --pkg codegen \
++ $(LIBGVC_PKG) \
+ --pkg config \
+ $(filter %.vala %.c,$^)
+ touch $@
+@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
+
+ valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
+ cp $< $@
++if !ENABLE_GRAPHVIZ
++ sed -i "s/libgvc //g" $@
++endif
+
+ vapidir = $(datadir)/vala/vapi
+ dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
+@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
+
+ valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
+ cp $< $@
++if !ENABLE_GRAPHVIZ
++ sed -i "s/libgvc//g" $@
++endif
+
+ EXTRA_DIST = \
+ $(libvaladoc_la_VALASOURCES) \
+diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
+index 46578c28f..f6ce7097c 100644
+--- a/libvaladoc/html/basicdoclet.vala
++++ b/libvaladoc/html/basicdoclet.vala
+@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ protected HtmlRenderer _renderer;
+ protected Html.MarkupWriter writer;
+ protected Html.CssClassResolver cssresolver;
++#if HAVE_GRAPHVIZ
+ protected Charts.Factory image_factory;
++#else
++ protected void* image_factory;
++#endif
+ protected ErrorReporter reporter;
+ protected string package_list_link = "../index.html";
+
+@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ this.linker = new LinkHelper ();
+
+ _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
++#if HAVE_GRAPHVIZ
+ this.image_factory = new SimpleChartFactory (settings, linker);
++#endif
+ }
+
+
+@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ }
+
+ protected void write_image_block (Api.Node element) {
++#if HAVE_GRAPHVIZ
+ if (element is Class || element is Interface || element is Struct) {
+ unowned string format = (settings.use_svg_images ? "svg" : "png");
+ var chart = new Charts.Hierarchy (image_factory, element);
+@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+ this.get_img_path_html (element, format)});
+ writer.add_usemap (chart);
+ }
++#endif
+ }
+
+ public void write_namespace_content (Namespace node, Api.Node? parent) {
+diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
+index 5aa4afdea..e79b0b8f5 100644
+--- a/libvaladoc/html/htmlmarkupwriter.vala
++++ b/libvaladoc/html/htmlmarkupwriter.vala
+@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
+ }
+ }
+
++#if HAVE_GRAPHVIZ
+ public unowned MarkupWriter add_usemap (Charts.Chart chart) {
+ string? buf = (string?) chart.write_buffer ("cmapx");
+ if (buf != null) {
+ raw_text ("\n");
+ raw_text ((!) buf);
+ }
++#else
++ public unowned MarkupWriter add_usemap (void* chart) {
++#endif
+
+ return this;
+ }
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 35ad09320de..961e28da82e 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
stdenv.mkDerivation rec {
- version = "0.4.0";
+ version = "0.5.0";
pname = "zig";
src = fetchFromGitHub {
owner = "ziglang";
repo = pname;
rev = version;
- sha256 = "1cq6cc5pvybz9kn3y0j5gskkjq88hkmmcsva54mfzpcc65l3pv6p";
+ sha256 = "0xyl0riakh6kwb3yvxihb451kqs4ai4q0aygqygnlb2rlr1dn1zb";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
+ preBuild = ''
+ export HOME=$TMPDIR;
+ '';
+
meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = https://ziglang.org/;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 75ad9337b82..1ddc15a2ca4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1035,6 +1035,8 @@ self: super: {
generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall
);
+ dhall_1_26_1 = dontCheck super.dhall_1_26_1;
+
# Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997
@@ -1054,12 +1056,13 @@ self: super: {
# https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext;
+ # 2.23.0 supports GHC 8.x and up
+ haddock = super.haddock_2_22_0;
# haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6”
- haddock-api = dontHaddock (doJailbreak (super.haddock-api));
+ haddock-api = dontHaddock (doJailbreak (super.haddock-api_2_22_0));
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
haddock-library = doJailbreak (dontCheck super.haddock-library);
- # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
@@ -1191,8 +1194,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;
# Requires dhall >= 1.23.0
- ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
- dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };
+ ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_1; };
+ dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_1; };
# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
@@ -1202,7 +1205,7 @@ self: super: {
constraints-deriving = dontCheck super.constraints-deriving;
# need newer version of ghc-libparser
- hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; };
+ hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; };
# https://github.com/sol/hpack/issues/366
hpack = self.hpack_0_32_0;
@@ -1225,10 +1228,4 @@ self: super: {
# The LTS-14.x version of optparse-applicative is too old.
cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
- # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
- amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
-
- # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
- amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
-
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 5b7b70305ff..7c0866bfbe5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -74,7 +74,11 @@ self: super: {
# Newer versions don't compile.
resolv = self.resolv_0_1_1_2;
- # cabal2nix needs the latest version of Cabal.
- cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+ # cabal2nix needs the latest version of Cabal, and the one
+ # hackage-db uses must match, so take the latest
+ cabal2nix = super.cabal2nix.overrideScope (self: super: {
+ Cabal = self.Cabal_3_0_0_0;
+ hackage-db = self.hackage-db_2_1_0;
+ });
}
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 2c4f3967a22..09faec3cfa3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -84,9 +84,11 @@ self: super: {
})) (drv: {
preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal";
});
- regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch {
+ regex-posix = overrideCabal (appendPatch super.regex-posix (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
+ })) (drv: {
+ preConfigure = "sed -i -e 's/base >= 4 && < 4.13/base/' regex-posix.cabal";
});
optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 489f363db6a..862b45299a6 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -43,13 +43,12 @@ self: super:
# integer-simple is wrong.
#integer-simple = null;
- # These packages are core libraries in GHC 7.10.x, but not here.
+ # These packages are core libraries in GHC 8.6..x, but not here.
bin-package-db = null;
- haskeline = self.haskeline_0_7_3_1;
- hoopl = self.hoopl_3_10_2_1;
- hpc = self.hpc_0_6_0_2;
- terminfo = self.terminfo_0_4_1_1;
- xhtml = self.xhtml_3000_2_1;
+ haskeline = self.haskeline_0_7_5_0;
+ hpc = self.hpc_0_6_0_3;
+ terminfo = self.terminfo_0_4_1_4;
+ xhtml = self.xhtml_3000_2_2_1;
## OTHER PACKAGES
@@ -115,7 +114,6 @@ self: super:
];
license = pkgs.stdenv.lib.licenses.mit;
description = "bindings for https://github.com/Matt-Esch/virtual-dom";
- inherit (src) homepage;
}) {};
ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0c92abbd0a2..64d90730ecb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2485,15 +2485,9 @@ extra-packages:
- dbus <1 # for xmonad-0.26
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- - ghc-lib-parser == 8.8.0.20190723 # required by hlint-2.2.2
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
- - haddock < 2.17 # required on GHC 7.10.x
- - haddock == 2.17.* # required on GHC 8.0.x
- - haddock-api == 2.15.* # required on GHC 7.8.x
- - haddock-api == 2.16.* # required on GHC 7.10.x
- - haddock-api == 2.17.* # required on GHC 8.0.x
- - haddock-library == 1.2.* # required for haddock-api-2.16.x
- - haddock-library == 1.4.3 # required for haddock-api-2.17.x
+ - haddock == 2.22.* # required on GHC 8.0.x
+ - haddock-api == 2.22.* # required on GHC 7.8.x
- happy <1.19.6 # newer versions break Agda
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
@@ -3129,6 +3123,7 @@ broken-packages:
- base-feature-macros
- base-generics
- base-io-access
+ - base62
- base64-conduit
- baserock-schema
- BASIC
@@ -3704,6 +3699,7 @@ broken-packages:
- codex
- coin
- coinbase-exchange
+ - coinbase-pro
- coincident-root-loci
- colada
- colchis
@@ -6475,6 +6471,7 @@ broken-packages:
- json-python
- json-schema
- json-togo
+ - json-tokens
- json-tools
- json-tracer
- json2
@@ -7393,6 +7390,7 @@ broken-packages:
- net-spider-cli
- net-spider-pangraph
- net-spider-rpl
+ - net-spider-rpl-cli
- netclock
- netcore
- netease-fm
@@ -7461,7 +7459,6 @@ broken-packages:
- Ninjas
- nirum
- nitro
- - niv
- nixfromnpm
- nkjp
- nlp-scores
@@ -7931,6 +7928,7 @@ broken-packages:
- porte
- PortFusion
- ports
+ - poseidon-postgis
- posix-acl
- posix-api
- posix-realtime
@@ -8555,6 +8553,7 @@ broken-packages:
- scholdoc-types
- scidb-hquery
- science-constants-dimensional
+ - scientific-notation
- SciFlow
- SciFlow-drmaa
- scion
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2e5b423c1d5..f8a49558c09 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,11 +94,9 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
- cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
- postPatch = (drv.postPatch or "") + ''
- substituteInPlace cachix.cabal --replace "c++14" "c++17"
- '';
- });
+ cachix = enableSeparateBinOutput super.cachix;
+
+ niv = enableSeparateBinOutput super.niv;
ghcid = enableSeparateBinOutput super.ghcid;
@@ -589,7 +587,6 @@ self: super: builtins.intersectAttrs super {
snap-server = dontCheck super.snap-server;
# Tests require internet
- dhall_1_26_0 = dontCheck super.dhall_1_26_0;
http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2c3a304f2ca..acab9c23765 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -264,25 +264,27 @@ self: {
}) {};
"ADPfusion" = callPackage
- ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl
- , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict, tasty
- , tasty-quickcheck, tasty-th, template-haskell, th-orphans
- , transformers, tuple, vector
+ ({ mkDerivation, base, bits, containers, deepseq, DPutils, ghc-prim
+ , mmorph, mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck
+ , singletons, strict, tasty, tasty-quickcheck, tasty-th
+ , template-haskell, th-orphans, transformers, tuple, vector
}:
mkDerivation {
pname = "ADPfusion";
- version = "0.5.2.2";
- sha256 = "1r87pbwhghxyk4ivbyivrs8iwrzyvhy5lp0cy4c7kmvh50w0swlh";
+ version = "0.6.0.0";
+ sha256 = "093gg9s2rk2sqjpkyy9z4smlsjlxnn5afnasj1bklf09d2z324gn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bits containers DPutils mmorph mtl OrderedBits primitive
- PrimitiveArray QuickCheck strict template-haskell th-orphans
- transformers tuple vector
+ base bits containers deepseq DPutils ghc-prim mmorph mtl
+ OrderedBits primitive PrimitiveArray QuickCheck singletons strict
+ template-haskell th-orphans transformers tuple vector
];
testHaskellDepends = [
- base bits OrderedBits PrimitiveArray QuickCheck strict tasty
- tasty-quickcheck tasty-th vector
+ base bits containers deepseq DPutils ghc-prim mmorph mtl
+ OrderedBits primitive PrimitiveArray QuickCheck singletons strict
+ tasty tasty-quickcheck tasty-th template-haskell th-orphans
+ transformers tuple vector
];
description = "Efficient, high-level dynamic programming";
license = stdenv.lib.licenses.bsd3;
@@ -6096,28 +6098,23 @@ self: {
"FormalGrammars" = callPackage
({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
- , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers
- , PrimitiveArray, QuickCheck, semigroups, smallcheck, tasty
- , tasty-quickcheck, tasty-smallcheck, tasty-th, template-haskell
- , text, transformers, trifecta, unordered-containers, vector
+ , containers, data-default, lens, mtl, parsers, PrimitiveArray
+ , semigroups, template-haskell, text, transformers, trifecta
+ , unordered-containers, vector
}:
mkDerivation {
pname = "FormalGrammars";
- version = "0.3.1.2";
- sha256 = "02c80cjn4cprkcyd6vyjp7d0q9180cv0ajf6gj4x7ai5n4z2fl1q";
- isLibrary = true;
- isExecutable = true;
+ version = "0.4.0.0";
+ sha256 = "1gl0z40g8vc52zhjzdysrzgjyj5qrwhh6dnzkpfj83m13zahhy1p";
libraryHaskellDepends = [
ADPfusion ansi-wl-pprint base bytestring containers data-default
- HaTeX lens mtl parsers PrimitiveArray semigroups template-haskell
- text transformers trifecta unordered-containers vector
- ];
- executableHaskellDepends = [
- ansi-wl-pprint base cmdargs trifecta
+ lens mtl parsers PrimitiveArray semigroups template-haskell text
+ transformers trifecta unordered-containers vector
];
testHaskellDepends = [
- base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
- tasty-th
+ ADPfusion ansi-wl-pprint base bytestring containers data-default
+ lens mtl parsers PrimitiveArray semigroups template-haskell text
+ transformers trifecta unordered-containers vector
];
description = "(Context-free) grammars in formal language theory";
license = stdenv.lib.licenses.gpl3;
@@ -7261,8 +7258,8 @@ self: {
}:
mkDerivation {
pname = "GrammarProducts";
- version = "0.1.1.3";
- sha256 = "1mr5pdm0nprs997vq7xdk7f5m85pdyncgs8qnfy2fjcs5zl8zzr0";
+ version = "0.2.0.0";
+ sha256 = "15iqga816zkc9fwfb4aiab6xjs84z56v9fm2jxbhvigvadd153bj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -7270,6 +7267,7 @@ self: {
FormalGrammars lens newtype parsers PrimitiveArray semigroups
template-haskell transformers trifecta
];
+ testHaskellDepends = [ base ];
description = "Grammar products and higher-dimensional grammars";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -7761,6 +7759,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HDBC_2_4_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, containers, convertible, mtl
+ , old-time, text, time, utf8-string
+ }:
+ mkDerivation {
+ pname = "HDBC";
+ version = "2.4.0.3";
+ sha256 = "0vv2l99wpm2azm1wmbiqvra5aw708rsldd8y4fdf660q7lgvqqqy";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers convertible mtl old-time text time
+ utf8-string
+ ];
+ description = "Haskell Database Connectivity";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HDBC-mysql" = callPackage
({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient
, openssl, time, utf8-string, zlib
@@ -7798,15 +7815,16 @@ self: {
}) {inherit (pkgs) unixODBC;};
"HDBC-postgresql" = callPackage
- ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
- , parsec, postgresql, time, utf8-string
+ ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl
+ , old-time, parsec, postgresql, time, utf8-string
}:
mkDerivation {
pname = "HDBC-postgresql";
- version = "2.3.2.6";
- sha256 = "1kas80zv3vbqq9cd73w87fj4mwxcphfmf7ycfnl4jwdzpqjzr0yj";
+ version = "2.3.2.7";
+ sha256 = "0mfx172lrhwxx6gbqfqji8m14llng76x0mxksm3s556kakvv1cgg";
isLibrary = true;
isExecutable = true;
+ setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring convertible HDBC mtl old-time parsec time
utf8-string
@@ -9449,6 +9467,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HaTeX_3_22_0_0" = callPackage
+ ({ mkDerivation, base, bibtex, bytestring, containers, hashable
+ , matrix, parsec, prettyprinter, QuickCheck, tasty
+ , tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "HaTeX";
+ version = "3.22.0.0";
+ sha256 = "06n5r66giqwg9235fdzlky181ll1n7qlqhc9nv8gsb8dv9a6a6yv";
+ libraryHaskellDepends = [
+ base bibtex bytestring containers hashable matrix parsec
+ prettyprinter QuickCheck text transformers
+ ];
+ testHaskellDepends = [
+ base parsec QuickCheck tasty tasty-quickcheck text
+ ];
+ description = "The Haskell LaTeX library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HaTeX-meta" = callPackage
({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
, haddock, haskell-src-exts, mtl, parsec
@@ -13343,16 +13382,16 @@ self: {
}) {};
"Monadoro" = callPackage
- ({ mkDerivation, ansi-terminal, base, doctest, time }:
+ ({ mkDerivation, ansi-terminal, base, doctest, process, time }:
mkDerivation {
pname = "Monadoro";
- version = "0.2.1.5";
- sha256 = "1k4f7ks0cbyqz2g6y5kdzrlbx2j3xz7mrvj79k2m3lbhs4hcik6l";
+ version = "0.2.1.8";
+ sha256 = "19xnj9hcb3dk3igkwzh5vfvkixyya84r1jxrh1x1k663fapcnkp5";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ ansi-terminal base time ];
- executableHaskellDepends = [ ansi-terminal base time ];
- testHaskellDepends = [ ansi-terminal base doctest time ];
+ libraryHaskellDepends = [ ansi-terminal base process time ];
+ executableHaskellDepends = [ ansi-terminal base process time ];
+ testHaskellDepends = [ ansi-terminal base doctest process time ];
description = "A minimalistic CLI Pomodoro timer";
license = stdenv.lib.licenses.mit;
}) {};
@@ -15957,8 +15996,8 @@ self: {
({ mkDerivation, base, mtl, QuickCheck, random }:
mkDerivation {
pname = "QuickCheck-GenT";
- version = "0.2.0";
- sha256 = "0vbc4zw9f03hm6mnlkiymp75yi9knar12zyyrchlr8792acwlcrd";
+ version = "0.2.1";
+ sha256 = "1bf3vx2szdb0svnmhn0k7vfkv86vhfxgcfklzlf5w7y49s4369k0";
libraryHaskellDepends = [ base mtl QuickCheck random ];
description = "A GenT monad transformer for QuickCheck library";
license = stdenv.lib.licenses.mit;
@@ -20518,6 +20557,25 @@ self: {
inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
+ "X11_1_9_1" = callPackage
+ ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
+ , libXrandr, libXrender, libXScrnSaver
+ }:
+ mkDerivation {
+ pname = "X11";
+ version = "1.9.1";
+ sha256 = "0gg6852mrlgl8zng1j84fismz7k81jr5fk92glgkscf8q6ryg0bm";
+ libraryHaskellDepends = [ base data-default ];
+ librarySystemDepends = [
+ libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
+ ];
+ description = "A binding to the X11 graphics library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver;
+ inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
+ inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
+
"X11-extras" = callPackage
({ mkDerivation, base, libX11, X11 }:
mkDerivation {
@@ -23570,6 +23628,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "aeson-pretty_0_8_8" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+ , cmdargs, scientific, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson-pretty";
+ version = "0.8.8";
+ sha256 = "09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base-compat bytestring scientific text
+ unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ aeson attoparsec base bytestring cmdargs
+ ];
+ description = "JSON pretty-printing library and command-line tool";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-qq" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
, haskell-src-meta, hspec, parsec, scientific, template-haskell
@@ -23649,8 +23729,8 @@ self: {
}:
mkDerivation {
pname = "aeson-schemas";
- version = "1.0.2";
- sha256 = "1f75fk4775gri6qvgkcsfx9v7f832zy76z61wl63q8h0yh6lapxl";
+ version = "1.0.3";
+ sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi";
libraryHaskellDepends = [
aeson base bytestring first-class-families megaparsec
template-haskell text unordered-containers
@@ -23833,6 +23913,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "aeson-yaml" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
+ , tasty-discover, tasty-hunit, text, unordered-containers, vector
+ , yaml
+ }:
+ mkDerivation {
+ pname = "aeson-yaml";
+ version = "1.0.0.0";
+ sha256 = "1d9ijcd9vry7fx5ks0qcq5q6pmncibg3m9k798i4vnl8ahncjqcq";
+ revision = "2";
+ editedCabalFile = "1zvil7w7a8j4d6dxkpdizs63qm8ylz18nvz6s2hjs5kgnfjd3dxm";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring string-qq tasty tasty-discover tasty-hunit
+ unordered-containers yaml
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Output any Aeson value as YAML (pure Haskell library)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"affection" = callPackage
({ mkDerivation, base, bytestring, clock, containers, glib, linear
, monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
@@ -25365,6 +25470,8 @@ self: {
pname = "amazonka";
version = "1.6.1";
sha256 = "104ifvmwdc1w3y42qcbq57v579zcnmlfv3f0bsazbcqdxnvr9dzd";
+ revision = "1";
+ editedCabalFile = "0xn4wy5gb1h4f4wd2h5ic17nb6ilikmsp1qip6xxc3img5rmaqyq";
libraryHaskellDepends = [
amazonka-core base bytestring conduit conduit-extra directory
exceptions http-client http-conduit http-types ini mmorph
@@ -25985,6 +26092,8 @@ self: {
pname = "amazonka-core";
version = "1.6.1";
sha256 = "0hx250dja1l4n4y5115w0qngzlqj8f6p861sdaykh0yjm4nzb621";
+ revision = "1";
+ editedCabalFile = "1656dyw6fk3gvph6v3xzvdp3p8xny3ji0gxg7qxvmvn60gj9ricv";
libraryHaskellDepends = [
aeson attoparsec base bifunctors bytestring case-insensitive
conduit conduit-extra cryptonite deepseq exceptions hashable
@@ -28658,8 +28767,8 @@ self: {
}:
mkDerivation {
pname = "antiope-athena";
- version = "7.4.2";
- sha256 = "0mbxg2d5hwd7v17wdqdg61rkhag30pvp84a12bwhjr5ijqhfwbf8";
+ version = "7.4.3";
+ sha256 = "0kzsj1zxic9c434s4jj86i2ydilhjz2rxa5826h581yq4g1mz6g8";
libraryHaskellDepends = [
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
@@ -28679,8 +28788,8 @@ self: {
({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
mkDerivation {
pname = "antiope-contract";
- version = "7.4.2";
- sha256 = "0p5lahs7vmah0ww87wxrd7pp579zijyb9n2wh4mys8i0qiqq7fq0";
+ version = "7.4.3";
+ sha256 = "0i1x7nds4j5rszfh6n8zhgfga3dpxbazmi7dysc0xh6yl9kfs1d4";
libraryHaskellDepends = [
aeson antiope-s3 avro base bytestring text
];
@@ -28698,8 +28807,8 @@ self: {
}:
mkDerivation {
pname = "antiope-core";
- version = "7.4.2";
- sha256 = "13s6shrhm2d17dialmpyi40vrdq5qw1zy960hl0g8d1fyg954ipx";
+ version = "7.4.3";
+ sha256 = "1k4vsfhd72lhkawww64vwz5iks310ixsrz29rhcj5vgfpc8ac0d4";
libraryHaskellDepends = [
aeson amazonka amazonka-core base bytestring exceptions
generic-lens http-client http-types lens mtl resourcet text
@@ -28725,8 +28834,8 @@ self: {
}:
mkDerivation {
pname = "antiope-dynamodb";
- version = "7.4.2";
- sha256 = "1wmxq228wr18j4qpxqhrnv8y3yzhy3gpa1daa2zbq5zflbkxjcvf";
+ version = "7.4.3";
+ sha256 = "1ha2067dbi5qnfscbh93hy7w1z768134m23vy59mhp830swk21vz";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
@@ -28750,8 +28859,8 @@ self: {
}:
mkDerivation {
pname = "antiope-messages";
- version = "7.4.2";
- sha256 = "0xlzz9dr06s03pqfra8agy80a3r8593kjcfs0w7b1v6m0ahwi9ip";
+ version = "7.4.3";
+ sha256 = "1jbnlawj3dnz5sa035wik3padchh6wkrgbc3rgv9986kaqxswnf2";
libraryHaskellDepends = [
aeson amazonka amazonka-core base bytestring generic-lens lens
lens-aeson monad-loops network-uri text unliftio-core
@@ -28775,8 +28884,8 @@ self: {
}:
mkDerivation {
pname = "antiope-optparse-applicative";
- version = "7.4.2";
- sha256 = "0nvmv0db1v0iw446cy2hfczpsll2if3w0cjmhgr5zgj9l5ja9x1c";
+ version = "7.4.3";
+ sha256 = "0365ianldf99jvhsip4lypvm6g1i0j5h0j3j7fbdr9z2sgn1jrjs";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-s3 base optparse-applicative text
];
@@ -28794,19 +28903,19 @@ self: {
"antiope-s3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
, antiope-core, antiope-messages, attoparsec, base, bytestring
- , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec
- , hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl
+ , conduit, conduit-extra, dlist, exceptions, generic-lens, hedgehog
+ , hspec, hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl
, network-uri, resourcet, text, time, unliftio-core
}:
mkDerivation {
pname = "antiope-s3";
- version = "7.4.2";
- sha256 = "1gpsc6y18h63wwkawvzwz8qmpw21pqhgpvgnb7apl9jc06xp2v0h";
+ version = "7.4.3";
+ sha256 = "0j8anrlilprik0n54fn0vx7jyh9yrfinkifvmjgdmsv3m372w3r8";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 antiope-core
antiope-messages attoparsec base bytestring conduit conduit-extra
- exceptions generic-lens http-types lens mtl network-uri resourcet
- text time unliftio-core
+ dlist exceptions generic-lens http-types lens mtl network-uri
+ resourcet text time unliftio-core
];
testHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
@@ -28831,8 +28940,8 @@ self: {
}:
mkDerivation {
pname = "antiope-shell";
- version = "7.4.2";
- sha256 = "1xg98dg52qmp8sz2r4b0srh7kasvd411i6wl3cj9m3nngignbab8";
+ version = "7.4.3";
+ sha256 = "07q3y1znyacwlrz1b51hamqzgbv3lks6kby93la024im4mhf4hd2";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 antiope-core
antiope-messages antiope-s3 attoparsec base bytestring exceptions
@@ -28859,8 +28968,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sns";
- version = "7.4.2";
- sha256 = "09g6jsdi20xa43ipb31y5i3afn75gldm0xyr2mqkfyhb8ay6simx";
+ version = "7.4.3";
+ sha256 = "05zj4r32pvdj98zfbq21hvlm2xai2lky7l54y7cqwx2wr6wfa98k";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sns base bytestring
generic-lens lens text time unliftio-core
@@ -28886,8 +28995,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sqs";
- version = "7.4.2";
- sha256 = "044sa2skvbr492bal52ncbsybr9wrkkq5kcvsdaiqwvkpfwq66v0";
+ version = "7.4.3";
+ sha256 = "0f7k4kh8njibnapn1b5f9xxx505cq017ixc4k2yn8fd24g0dz9jw";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -28911,8 +29020,8 @@ self: {
}:
mkDerivation {
pname = "antiope-swf";
- version = "7.4.2";
- sha256 = "1zp63q8dd400ll6cl9wsp6rhghzm56rsak8sh5p860adlk49y9il";
+ version = "7.4.3";
+ sha256 = "05a34lz4ih0vmmr6zfr5g6m7ai8yh8anqq38b2g6j9h22sy32iv7";
libraryHaskellDepends = [ amazonka-swf base lens text ];
testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
testToolDepends = [ hspec-discover ];
@@ -30389,14 +30498,28 @@ self: {
broken = true;
}) {debian-mirror = null; help = null;};
+ "archive-libarchive" = callPackage
+ ({ mkDerivation, base, bytestring, composition-prelude, libarchive
+ }:
+ mkDerivation {
+ pname = "archive-libarchive";
+ version = "0.2.0.0";
+ sha256 = "0gy52dw00b110f5nc6gbnfgs5nssv7r8az1vy8xr1xj1dnpjwb74";
+ libraryHaskellDepends = [
+ base bytestring composition-prelude libarchive
+ ];
+ description = "Common interface using libarchive";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"archive-sig" = callPackage
({ mkDerivation, base, bytestring, composition-prelude
, dir-traverse
}:
mkDerivation {
pname = "archive-sig";
- version = "0.2.0.1";
- sha256 = "1x7kpyxfhn4i9c9wrxwda53qyj4jgw9vd3wfrzxvdfj5wdrdn79d";
+ version = "0.2.0.2";
+ sha256 = "0pfznlkw0vj8y1ahsmiy904hkhkf76qgqlp6h3hlgzrmhdy5yz9d";
libraryHaskellDepends = [
base bytestring composition-prelude dir-traverse
];
@@ -31455,6 +31578,47 @@ self: {
broken = true;
}) {};
+ "asif_6_0_3" = callPackage
+ ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
+ , conduit-combinators, conduit-extra, containers, cpu, directory
+ , either, exceptions, foldl, generic-lens, hedgehog, hspec
+ , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-ip, lens, network
+ , old-locale, optparse-applicative, profunctors, resourcet
+ , temporary-resourcet, text, thyme, transformers, vector
+ }:
+ mkDerivation {
+ pname = "asif";
+ version = "6.0.3";
+ sha256 = "14c77hvghh6116ca29xzj1l7j95557mcfx0j9s73wxc82hl14wjg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base binary bytestring conduit conduit-combinators
+ conduit-extra containers cpu either exceptions foldl generic-lens
+ hw-bits hw-ip lens network old-locale profunctors resourcet
+ temporary-resourcet text thyme transformers vector
+ ];
+ executableHaskellDepends = [
+ attoparsec base binary bytestring conduit conduit-combinators
+ conduit-extra containers cpu directory either exceptions foldl
+ generic-lens hw-bits hw-ip lens network old-locale
+ optparse-applicative profunctors resourcet temporary-resourcet text
+ thyme transformers vector
+ ];
+ testHaskellDepends = [
+ attoparsec base binary bytestring conduit conduit-combinators
+ conduit-extra containers cpu either exceptions foldl generic-lens
+ hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network
+ old-locale profunctors resourcet temporary-resourcet text thyme
+ transformers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Library for creating and querying segmented feeds";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"asil" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, data-binary-ieee754, directory, filepath, haskell-src-exts, mtl
@@ -31552,6 +31716,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "asn1-encoding_0_9_6" = callPackage
+ ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
+ , tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "asn1-encoding";
+ version = "0.9.6";
+ sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r";
+ revision = "1";
+ editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n";
+ libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
+ testHaskellDepends = [
+ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
+ ];
+ description = "ASN1 data reader and writer in RAW, BER and DER forms";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"asn1-parse" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }:
mkDerivation {
@@ -31565,6 +31748,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "asn1-parse_0_9_5" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }:
+ mkDerivation {
+ pname = "asn1-parse";
+ version = "0.9.5";
+ sha256 = "17pk8y3nwv9b9i5j15qlmwi7fmq9ab2z4kfpjk2rvcrh9lsf27wg";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-types base bytestring
+ ];
+ description = "Simple monadic parser for ASN1 stream types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"asn1-types" = callPackage
({ mkDerivation, base, bytestring, hourglass, memory }:
mkDerivation {
@@ -31671,8 +31868,8 @@ self: {
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "asset-bundle";
- version = "0.1.0.1";
- sha256 = "0wf0xnf4ljihzvbz8pkaiqwhvp00bwnyx0334s4757z6lsc2hsrw";
+ version = "0.1.0.2";
+ sha256 = "1c0678qjkr1q3pi20ch05k8ri4zxcc1drc4j44fvb1sz7b8y260c";
libraryHaskellDepends = [ base Cabal directory filepath ];
description = "A build-time Cabal library that bundles executables with assets";
license = stdenv.lib.licenses.bsd3;
@@ -33494,8 +33691,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "32";
- editedCabalFile = "0p4jhc8rxvm82cp3zaibazb5jnjs33vl4f71pvgvzf31xd7immyy";
+ revision = "34";
+ editedCabalFile = "0mj6881npk0xdkf4nkcy52sn6y4414wdpysbw03kkb5vx6cgjws9";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -35661,6 +35858,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "base62" = callPackage
+ ({ mkDerivation, base, byteslice, doctest, natural-arithmetic
+ , primitive, small-bytearray-builder, tasty, tasty-hunit
+ , tasty-quickcheck, wide-word
+ }:
+ mkDerivation {
+ pname = "base62";
+ version = "0.1.0.0";
+ sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p";
+ libraryHaskellDepends = [
+ base byteslice natural-arithmetic primitive small-bytearray-builder
+ wide-word
+ ];
+ testHaskellDepends = [
+ base byteslice doctest primitive tasty tasty-hunit tasty-quickcheck
+ wide-word
+ ];
+ description = "Base62 encoding and decoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"base64-bytestring" = callPackage
({ mkDerivation, base, bytestring, containers, criterion, deepseq
, HUnit, QuickCheck, split, test-framework, test-framework-hunit
@@ -35772,6 +35992,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "basen" = callPackage
+ ({ mkDerivation, base, bytestring, quickcheck-instances, tasty
+ , tasty-discover, tasty-hspec, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "basen";
+ version = "0.1.0.0";
+ sha256 = "0v7dksk1zq17kpa5nknn5am1ywy58d0f6jr2vnb9jzy4v70m6ngx";
+ revision = "1";
+ editedCabalFile = "0iwmv5kmh7lj96jvnllkrmrbivv1kbwk6f3nnd80zcv5iifsdxj8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring text ];
+ executableHaskellDepends = [ base bytestring text ];
+ testHaskellDepends = [
+ base bytestring quickcheck-instances tasty tasty-discover
+ tasty-hspec tasty-quickcheck text
+ ];
+ testToolDepends = [ tasty-discover ];
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"basen-bytestring" = callPackage
({ mkDerivation, base, bytestring, QuickCheck }:
mkDerivation {
@@ -36546,8 +36789,8 @@ self: {
({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }:
mkDerivation {
pname = "bearriver";
- version = "0.10.4.4";
- sha256 = "14aqp6jqca5b4z0bf5q18pq5l9q43bzz18zjwn3j0ns1fakrq5bb";
+ version = "0.10.4.6";
+ sha256 = "1m038d6brzp2h2fbwmxvwazm9d59sf5r2nlnw2csmdkck11zzw3j";
libraryHaskellDepends = [
base dunai MonadRandom mtl transformers
];
@@ -36570,6 +36813,28 @@ self: {
broken = true;
}) {};
+ "bech32" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, deepseq
+ , extra, hspec, hspec-discover, QuickCheck, text, vector
+ }:
+ mkDerivation {
+ pname = "bech32";
+ version = "1.0.0";
+ sha256 = "1pq0izcjsnyrwjik7p6xw1y8b5g3x4rxi95jh08x81lfp53pr9bn";
+ revision = "1";
+ editedCabalFile = "0xkdidn53amg5ihbiwjw44yc87rnw6wivcgx84nimmhi9az3mlkb";
+ libraryHaskellDepends = [
+ array base bytestring containers extra text
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq extra hspec QuickCheck text
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"bed-and-breakfast" = callPackage
({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck
, template-haskell
@@ -39191,8 +39456,8 @@ self: {
}:
mkDerivation {
pname = "birch-beer";
- version = "0.1.4.5";
- sha256 = "1yyb897yg2ipvz6jsc6np1jwlckyi41jq94dwxlpyj2sigawzvwh";
+ version = "0.2.0.0";
+ sha256 = "0ks87mqyg0yxg8w2y2332clwjxwi42h2x3x9alvi33c8b9k2ws17";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -39200,9 +39465,9 @@ self: {
diagrams-cairo diagrams-graphviz diagrams-gtk diagrams-lib
diversity fgl foldl graphviz gtk hierarchical-clustering
hierarchical-spectral-clustering lens matrix-market-attoparsec mtl
- palette plots safe scientific sparse-linear-algebra
- spectral-clustering split statistics SVGFonts temporary text
- text-show typed-spreadsheet vector
+ optparse-generic palette plots safe scientific
+ sparse-linear-algebra spectral-clustering split statistics SVGFonts
+ temporary text text-show typed-spreadsheet vector
];
executableHaskellDepends = [
aeson base bytestring cassava colour containers diagrams
@@ -39758,6 +40023,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bits-extra_0_0_1_4" = callPackage
+ ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec
+ , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector
+ }:
+ mkDerivation {
+ pname = "bits-extra";
+ version = "0.0.1.4";
+ sha256 = "1hkl71661hh8czd7hrfwj48blav4g3jdy3nl06bw2iw8bkl00nz2";
+ libraryHaskellDepends = [ base ghc-prim vector ];
+ testHaskellDepends = [
+ base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
+ description = "Useful bitwise operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bits-extras" = callPackage
({ mkDerivation, base, gcc_s }:
mkDerivation {
@@ -39944,6 +40228,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bitvec_1_0_1_1" = callPackage
+ ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp
+ , integer-gmp, primitive, quickcheck-classes, random, tasty
+ , tasty-hunit, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "bitvec";
+ version = "1.0.1.1";
+ sha256 = "0r11av150f6gr6l4894195h1iya667vny9crjpgagfhnrbzhmfaq";
+ libraryHaskellDepends = [
+ base deepseq ghc-prim integer-gmp primitive vector
+ ];
+ librarySystemDepends = [ gmp ];
+ testHaskellDepends = [
+ base integer-gmp primitive quickcheck-classes tasty tasty-hunit
+ tasty-quickcheck vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers gauge integer-gmp random vector
+ ];
+ description = "Space-efficient bit vectors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gmp;};
+
"bitwise" = callPackage
({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
mkDerivation {
@@ -41484,8 +41793,8 @@ self: {
}:
mkDerivation {
pname = "boolector";
- version = "0.0.0.8";
- sha256 = "09zhrg6zrf3viigjdw4q4c1i0x4ww467m9ghapdfwq4d01cr0c43";
+ version = "0.0.0.9";
+ sha256 = "1f4lnshc4b3r9qyc6y476qpkcl3hkripqsd2vfyg9q0xbyg9pxq6";
libraryHaskellDepends = [
base containers directory mtl temporary time
];
@@ -42523,6 +42832,46 @@ self: {
license = stdenv.lib.licenses.agpl3;
}) {};
+ "brittany_0_12_1_0" = callPackage
+ ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+ , containers, czipwith, data-tree-print, deepseq, directory, extra
+ , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
+ , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
+ , random, safe, semigroups, strict, syb, text, transformers
+ , uniplate, unsafe, yaml
+ }:
+ mkDerivation {
+ pname = "brittany";
+ version = "0.12.1.0";
+ sha256 = "1r5nbw63hv5nq02lx6igin70lbzbdglldb2lf1m52jpiwwz5j0i4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base butcher bytestring cmdargs containers czipwith
+ data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+ ghc-exactprint ghc-paths monad-memo mtl multistate
+ neat-interpolation pretty random safe semigroups strict syb text
+ transformers uniplate unsafe yaml
+ ];
+ executableHaskellDepends = [
+ aeson base butcher bytestring cmdargs containers czipwith
+ data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+ ghc-exactprint ghc-paths monad-memo mtl multistate
+ neat-interpolation pretty safe semigroups strict syb text
+ transformers uniplate unsafe yaml
+ ];
+ testHaskellDepends = [
+ aeson base butcher bytestring cmdargs containers czipwith
+ data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+ ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+ neat-interpolation parsec pretty safe semigroups strict syb text
+ transformers uniplate unsafe yaml
+ ];
+ description = "Haskell source code formatter";
+ license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"broadcast-chan" = callPackage
({ mkDerivation, async, base, criterion, deepseq, stm
, unliftio-core
@@ -43353,30 +43702,36 @@ self: {
broken = true;
}) {};
- "bulletproofs_1_0_1" = callPackage
- ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite
- , galois-field, memory, MonadRandom, protolude, QuickCheck
- , random-shuffle, tasty, tasty-discover, tasty-hunit
+ "bulletproofs_1_1_0" = callPackage
+ ({ mkDerivation, arithmoi, base, bytestring, containers, criterion
+ , cryptonite, elliptic-curve, galois-field, memory, MonadRandom
+ , protolude, QuickCheck, SHA, tasty, tasty-discover, tasty-hunit
, tasty-quickcheck, text
}:
mkDerivation {
pname = "bulletproofs";
- version = "1.0.1";
- sha256 = "1c23dppl851a1ga9x8axkl27bswb0hlwql0mfabsd9ydclmipzf0";
+ version = "1.1.0";
+ sha256 = "1sj38m2x4y9483nwnk61jk4jphsyllgv5bgrx26nqlph45a9222a";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- arithmoi base containers cryptonite galois-field memory MonadRandom
- protolude QuickCheck random-shuffle text
+ arithmoi base bytestring containers elliptic-curve galois-field
+ memory MonadRandom protolude QuickCheck SHA text
+ ];
+ executableHaskellDepends = [
+ arithmoi base bytestring containers elliptic-curve galois-field
+ memory MonadRandom protolude QuickCheck SHA text
];
testHaskellDepends = [
- arithmoi base containers cryptonite galois-field memory MonadRandom
- protolude QuickCheck random-shuffle tasty tasty-discover
- tasty-hunit tasty-quickcheck text
+ arithmoi base bytestring containers cryptonite elliptic-curve
+ galois-field memory MonadRandom protolude QuickCheck SHA tasty
+ tasty-discover tasty-hunit tasty-quickcheck text
];
testToolDepends = [ tasty-discover ];
benchmarkHaskellDepends = [
- arithmoi base containers criterion cryptonite galois-field memory
- MonadRandom protolude QuickCheck random-shuffle tasty tasty-hunit
- tasty-quickcheck text
+ arithmoi base bytestring containers criterion elliptic-curve
+ galois-field memory MonadRandom protolude QuickCheck SHA tasty
+ tasty-hunit tasty-quickcheck text
];
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -43586,6 +43941,8 @@ self: {
pname = "butcher";
version = "1.3.2.3";
sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5";
+ revision = "1";
+ editedCabalFile = "06vy9018ia6sncgxdmv4ili2krkqn1b6r7xz4raa18kdvgnl100v";
libraryHaskellDepends = [
base bifunctors containers deque extra free microlens microlens-th
mtl multistate pretty transformers unsafe void
@@ -43890,8 +44247,8 @@ self: {
}:
mkDerivation {
pname = "bytesmith";
- version = "0.2.0.1";
- sha256 = "1qscwrsn18fms4kkia9rw9nqm115if97n8vhk8c71ri1hjqxvmb1";
+ version = "0.3.0.0";
+ sha256 = "0zwa0klj1slazsvd37l33p5j2ii3ab114ic5fvd10aic37y6w82s";
libraryHaskellDepends = [
base byteslice bytestring contiguous primitive run-st text-short
];
@@ -44966,6 +45323,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cabal-doctest_1_0_8" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath }:
+ mkDerivation {
+ pname = "cabal-doctest";
+ version = "1.0.8";
+ sha256 = "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0";
+ libraryHaskellDepends = [ base Cabal directory filepath ];
+ description = "A Setup.hs helper for doctests running";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cabal-file-th" = callPackage
({ mkDerivation, base, Cabal, directory, pretty, template-haskell
}:
@@ -45394,20 +45763,19 @@ self: {
"cabal-rpm" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
- , http-client, http-client-tls, http-conduit, process, simple-cmd
- , time, unix
+ , http-client, http-client-tls, http-conduit, process, simple-cabal
+ , simple-cmd, simple-cmd-args, time, unix
}:
mkDerivation {
pname = "cabal-rpm";
- version = "0.13.3";
- sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4";
- revision = "1";
- editedCabalFile = "1ngw9afzplbz4q707nak9zcjmk9fdynw0jvis4lgjq02y4i14hj6";
+ version = "1.0.1";
+ sha256 = "0p0z5yar9dzbssqy1flwvj15gnfyi708n9pf8ij8h15bya9qrg3a";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring Cabal directory filepath http-client
- http-client-tls http-conduit process simple-cmd time unix
+ http-client-tls http-conduit process simple-cabal simple-cmd
+ simple-cmd-args time unix
];
description = "RPM packaging tool for Haskell Cabal-based packages";
license = stdenv.lib.licenses.gpl3;
@@ -45983,10 +46351,10 @@ self: {
}) {};
"cachix" = callPackage
- ({ mkDerivation, async, base, base64-bytestring, boost_context
- , bytestring, cachix-api, conduit, conduit-extra, containers
- , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
- , here, hnix-store-core, hspec, hspec-discover, http-client
+ ({ mkDerivation, async, base, base64-bytestring, boost, bytestring
+ , cachix-api, conduit, conduit-extra, containers, cookie
+ , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
+ , hnix-store-core, hspec, hspec-discover, http-client
, http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp
, lzma-conduit, megaparsec, memory, mmorph, netrc, nix
, optparse-applicative, process, protolude, resourcet, retry
@@ -45996,8 +46364,8 @@ self: {
}:
mkDerivation {
pname = "cachix";
- version = "0.3.2";
- sha256 = "0i0p5cp6g5ai2xxdkr0bbdlf469b52lp3fh37rq075zaw94f6qr8";
+ version = "0.3.4";
+ sha256 = "1zafbwy0pbdnaybf7q9izrwi6w1l0df6l5628i6m9j9d82k75iqx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -46010,7 +46378,7 @@ self: {
servant-auth-client servant-client servant-client-core
servant-conduit text unix uri-bytestring versions
];
- librarySystemDepends = [ boost_context ];
+ librarySystemDepends = [ boost ];
libraryPkgconfigDepends = [ nix ];
executableHaskellDepends = [ base cachix-api ];
executableToolDepends = [ hspec-discover ];
@@ -46019,7 +46387,7 @@ self: {
];
description = "Command line client for Nix binary cache hosting https://cachix.org";
license = stdenv.lib.licenses.asl20;
- }) {boost_context = null; inherit (pkgs) nix;};
+ }) {inherit (pkgs) boost; inherit (pkgs) nix;};
"cachix-api" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
@@ -46569,14 +46937,14 @@ self: {
}) {};
"can-i-haz" = callPackage
- ({ mkDerivation, base, deepseq, hspec, should-not-typecheck }:
+ ({ mkDerivation, base, deepseq, hspec, HUnit }:
mkDerivation {
pname = "can-i-haz";
- version = "0.1.0.1";
- sha256 = "1nay2hrvf8cxazsy5ha3affwxayirznjf0zlir0n7vbyl5w92im0";
+ version = "0.2.0.0";
+ sha256 = "1sf42vxaqk10kxspib6lzdvs4hjmgyq61gbqp5l59vq7qxfz43ar";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base deepseq hspec should-not-typecheck ];
- description = "Generic implementation of the Has pattern";
+ testHaskellDepends = [ base deepseq hspec HUnit ];
+ description = "Generic implementation of the Has and CoHas patterns";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -46758,8 +47126,8 @@ self: {
pname = "cantor-pairing";
version = "0.1.1.0";
sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw";
- revision = "1";
- editedCabalFile = "1rl4zjxwiys9mf75bvw363ydpr3nwvi6d77p19rwnmxc9k5spap6";
+ revision = "2";
+ editedCabalFile = "0vl4b3v7qzbsd93vb0flyd6xkpayji49il97d2a6v35cliph5yw2";
libraryHaskellDepends = [
arithmoi base containers integer-gmp integer-logarithms
];
@@ -49616,8 +49984,8 @@ self: {
}:
mkDerivation {
pname = "chiphunk";
- version = "0.1.1.0";
- sha256 = "0avh87427i06ds79kkiikf6czylgwscxim3hjaz0fbpgvsd9snrm";
+ version = "0.1.2.0";
+ sha256 = "0bdmvsspbnyqqf4bp8g8xggly1xs2yglh60y63633h27qdy2062b";
libraryHaskellDepends = [
base hashable safe-exceptions StateVar vector-space
];
@@ -50009,6 +50377,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "chs-cabal" = callPackage
+ ({ mkDerivation, base, Cabal, chs-deps }:
+ mkDerivation {
+ pname = "chs-cabal";
+ version = "0.1.0.1";
+ sha256 = "0s734zls7gjihw0l27mfxyzbphq4n443vy08d47s3znri4fn6r58";
+ libraryHaskellDepends = [ base Cabal chs-deps ];
+ description = "Cabal with c2hs dependencies";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "chs-deps" = callPackage
+ ({ mkDerivation, alex, array, base, bytestring, criterion, tasty
+ , tasty-hunit
+ }:
+ mkDerivation {
+ pname = "chs-deps";
+ version = "0.1.0.0";
+ sha256 = "0mgi44nvsbmfxj2xr7ja7yslsxvbnznd9xbprz967705nhbs2cqb";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ array base bytestring ];
+ libraryToolDepends = [ alex ];
+ testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+ benchmarkHaskellDepends = [ base bytestring criterion ];
+ description = "c2hs dependency analyzer";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"chu2" = callPackage
({ mkDerivation, base, bytestring, data-default, hack2
, hack2-handler-snap-server, utf8-string
@@ -53308,6 +53704,8 @@ self: {
];
description = "Client for Coinbase Pro";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"coincident-root-loci" = callPackage
@@ -57217,8 +57615,8 @@ self: {
({ mkDerivation, aeson, base, constraints, template-haskell }:
mkDerivation {
pname = "constraints-extras";
- version = "0.3.0.1";
- sha256 = "0majx5yrddpyvymfl84dqwrqf4bf91jskgaki4ia0h8vhzqfcivx";
+ version = "0.3.0.2";
+ sha256 = "1n3k5ld6qzq7vlwsqwrm3gsg4z7mk11ah3amazzbvbmxwz8wviys";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base constraints template-haskell ];
@@ -58880,10 +59278,8 @@ self: {
}:
mkDerivation {
pname = "cpkg";
- version = "0.2.3.3";
- sha256 = "1wd53g5isk284im2vzyis9n38qchg6m62zb3x4gkmy21zrjh50f1";
- revision = "1";
- editedCabalFile = "1ihawlb4xkq5lhj56ry5n2mhykrkjnan33s577f6gzzmzyz0rd1h";
+ version = "0.2.3.4";
+ sha256 = "0q54dwhlp9x6k363n5p12722davfalxljxlbiskirky02kba9bdl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -58895,7 +59291,7 @@ self: {
];
libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
- base directory optparse-applicative text
+ base dhall directory optparse-applicative text
];
testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
description = "Build tool for C";
@@ -59824,6 +60220,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "criterion_1_5_6_1" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
+ , base-compat-batteries, binary, binary-orphans, bytestring
+ , cassava, code-page, containers, criterion-measurement, deepseq
+ , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery
+ , microstache, mtl, mwc-random, optparse-applicative, parsec
+ , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
+ , text, time, transformers, transformers-compat, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "criterion";
+ version = "1.5.6.1";
+ sha256 = "0m2k323r00q3x5fk8gfcd2y39kmj35nzb8fwqmxjlg7kiz3nkyx5";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint base base-compat-batteries binary
+ binary-orphans bytestring cassava code-page containers
+ criterion-measurement deepseq directory exceptions filepath Glob
+ js-flot js-jquery microstache mtl mwc-random optparse-applicative
+ parsec statistics text time transformers transformers-compat vector
+ vector-algorithms
+ ];
+ executableHaskellDepends = [
+ base base-compat-batteries optparse-applicative
+ ];
+ testHaskellDepends = [
+ aeson base base-compat base-compat-batteries bytestring deepseq
+ directory HUnit QuickCheck statistics tasty tasty-hunit
+ tasty-quickcheck vector
+ ];
+ description = "Robust, reliable performance measurement and analysis";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"criterion-compare" = callPackage
({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams
, clay, colour, containers, data-default, filepath, lens, lucid
@@ -60232,6 +60666,8 @@ self: {
pname = "crypto-enigma";
version = "0.1.1.5";
sha256 = "001kl84ngfwr644v7dyk5shkqfw606bpza8b61bv4p4lqyfk96l2";
+ revision = "1";
+ editedCabalFile = "0ld72k1zq13vg1xh75qj1zrrrc4w5fzj0jv7idrynybjwmhvq92n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers split text ];
@@ -64318,6 +64754,8 @@ self: {
pname = "data-tree-print";
version = "0.1.0.2";
sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3";
+ revision = "1";
+ editedCabalFile = "1r6dnvc7d50q5p9fdqqwfvi7kwn7r89319plj7v284sjai9b6ld4";
libraryHaskellDepends = [ base pretty syb ];
description = "Print Data instances as a nested tree";
license = stdenv.lib.licenses.bsd3;
@@ -65733,8 +66171,8 @@ self: {
}:
mkDerivation {
pname = "debug-me";
- version = "1.20181208";
- sha256 = "0gnnhgqzhbhgc49y3md7440plgfv1wry8fk73f81s2f1c1agqh1i";
+ version = "1.20190926";
+ sha256 = "0qy2ianwal4v4s0m13yjszk032dp3y6k4p61whwmlp49xmqvwjyb";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -66619,6 +67057,8 @@ self: {
pname = "dependent-map";
version = "0.2.4.0";
sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx";
+ revision = "1";
+ editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
libraryHaskellDepends = [ base containers dependent-sum ];
description = "Dependent finite maps (partial dependent products)";
license = "unknown";
@@ -67529,7 +67969,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_26_0" = callPackage
+ "dhall_1_26_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, bytestring, case-insensitive, cborg, cborg-json, containers
, contravariant, cryptonite, data-fix, deepseq, Diff, directory
@@ -67546,8 +67986,8 @@ self: {
}:
mkDerivation {
pname = "dhall";
- version = "1.26.0";
- sha256 = "1jk8zfdbvgp2ipkmhx5m1n467c1k6g24kgi295lcbyvlwahv9l7j";
+ version = "1.26.1";
+ sha256 = "1g0ynl3b1bgjwp1zk3xj9nr0x9m0n29vg82jabn01rl6z6vrw9pn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -67679,6 +68119,8 @@ self: {
pname = "dhall-json";
version = "1.4.1";
sha256 = "1widvpgrswj6bz9330i2xyxv1h6asw0pm5rrwdhyf926qgag83pp";
+ revision = "1";
+ editedCabalFile = "0vwr27ikw0y39za9jc91g3xbd7vb745zkkni0x3k73944w0w47n3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -69280,13 +69722,13 @@ self: {
}) {};
"dimensions" = callPackage
- ({ mkDerivation, base, Cabal, constraints-deriving, ghc, QuickCheck
- }:
+ ({ mkDerivation, base, Cabal, constraints-deriving, QuickCheck }:
mkDerivation {
pname = "dimensions";
- version = "2.0.0.0";
- sha256 = "1k0j8lcshscs5cd18i6qqiwb7sjy55mcfha5kl5f4x9nxrnn6xa8";
- libraryHaskellDepends = [ base constraints-deriving ghc ];
+ version = "2.1.0.0";
+ sha256 = "08jkcr1lbjb8n4n9pmfy1jg5djaxn4fs6f1jk4dbpk4paxp3psc9";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base constraints-deriving ];
testHaskellDepends = [
base Cabal constraints-deriving QuickCheck
];
@@ -69711,8 +70153,8 @@ self: {
}:
mkDerivation {
pname = "dirtree";
- version = "0.1.0";
- sha256 = "0hyvaf17rfaqjag6qg3pfhbhjnhrd4xdknvn0k494vi3wd1ddzap";
+ version = "0.1.1";
+ sha256 = "18iahbw6hzjxsnmr3yi80w0xvf6iphdxb2yg5kpnww26lmlgk6dc";
libraryHaskellDepends = [
base bytestring containers deepseq directory filepath lens unix
zip-archive
@@ -71028,23 +71470,21 @@ self: {
broken = true;
}) {};
- "dl-fedora_0_7" = callPackage
+ "dl-fedora_0_7_1" = callPackage
({ mkDerivation, base, bytestring, directory, filepath
, http-directory, http-types, optparse-applicative, regex-posix
- , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
+ , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
}:
mkDerivation {
pname = "dl-fedora";
- version = "0.7";
- sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv";
- revision = "1";
- editedCabalFile = "1njib3nnknqpa4kmrrrfabkrh1iaqx8xsw7jn4qrhlnqhh0mqwqd";
+ version = "0.7.1";
+ sha256 = "1wn4pmksamy3nqriv9c4fim2vwylf6x1n7r767lqdr637jww8yd4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring directory filepath http-directory http-types
optparse-applicative regex-posix simple-cmd simple-cmd-args text
- unix xdg-userdirs
+ time unix xdg-userdirs
];
description = "Fedora image download tool";
license = stdenv.lib.licenses.gpl3;
@@ -73224,6 +73664,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dunai_0_5_2_1" = callPackage
+ ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "dunai";
+ version = "0.5.2.1";
+ sha256 = "18ccvjmr03v4fghlv2hcb3g4c9zrq0ccasr2i9r71dp07mhrpaba";
+ libraryHaskellDepends = [
+ base MonadRandom transformers transformers-base
+ ];
+ description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dunai-core" = callPackage
({ mkDerivation, base, MonadRandom, transformers, transformers-base
}:
@@ -74077,8 +74532,9 @@ self: {
}:
mkDerivation {
pname = "easytensor";
- version = "2.0.1.0";
- sha256 = "018g738yq7ac386ahbl18jnkjzd25jbgb744fg0kxz90734iwwdv";
+ version = "2.1.0.0";
+ sha256 = "1d11i3g0rhcl43jd2pklbagazv2az73ns9sfkky8yx078cf79xyd";
+ setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base constraints-deriving dimensions ];
testHaskellDepends = [
base Cabal constraints-deriving dimensions QuickCheck
@@ -74095,8 +74551,8 @@ self: {
({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
mkDerivation {
pname = "easytensor-vulkan";
- version = "2.0.1.0";
- sha256 = "0j3np8b24kr30bc2lcrvgpnv440a0mzcksjiyf37sp6l9fml65m5";
+ version = "2.0.2.0";
+ sha256 = "0gi8p76x7h78frv3yrg6a7qnzjczx3j7warqclc36pkwv050dn3i";
libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
description = "Use easytensor with vulkan-api";
license = stdenv.lib.licenses.bsd3;
@@ -75421,25 +75877,25 @@ self: {
}) {};
"elliptic-curve" = callPackage
- ({ mkDerivation, arithmoi, base, criterion, galois-field
- , MonadRandom, protolude, tasty, tasty-hunit, tasty-quickcheck
- , text, wl-pprint-text
+ ({ mkDerivation, base, criterion, galois-field, groups, MonadRandom
+ , protolude, tasty, tasty-hunit, tasty-quickcheck, text
+ , wl-pprint-text
}:
mkDerivation {
pname = "elliptic-curve";
- version = "0.2.2";
- sha256 = "082q01xqfqa73c0wasmh8v0hgf76gsfg8jzd78n9vgrp69zali1n";
+ version = "0.3.0";
+ sha256 = "1rvil4va3dy04474kiihadsplhqbpbrkjsqnmaykw23lqgzp32iq";
libraryHaskellDepends = [
- base galois-field MonadRandom protolude tasty-quickcheck text
- wl-pprint-text
+ base galois-field groups MonadRandom protolude tasty-quickcheck
+ text wl-pprint-text
];
testHaskellDepends = [
- arithmoi base galois-field MonadRandom protolude tasty tasty-hunit
+ base galois-field groups MonadRandom protolude tasty tasty-hunit
tasty-quickcheck text wl-pprint-text
];
benchmarkHaskellDepends = [
- base criterion galois-field MonadRandom protolude tasty-quickcheck
- text wl-pprint-text
+ base criterion galois-field groups MonadRandom protolude
+ tasty-quickcheck text wl-pprint-text
];
description = "Elliptic curve library";
license = stdenv.lib.licenses.mit;
@@ -76125,6 +76581,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "email-validate_2_3_2_12" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+ , QuickCheck, template-haskell
+ }:
+ mkDerivation {
+ pname = "email-validate";
+ version = "2.3.2.12";
+ sha256 = "0ar3cfjia3x11chb7w60mi7hp5djanms883ddk875l6lifr2lyqf";
+ libraryHaskellDepends = [
+ attoparsec base bytestring template-haskell
+ ];
+ testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+ description = "Email address validation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"email-validate-json" = callPackage
({ mkDerivation, aeson, base, email-validate, text }:
mkDerivation {
@@ -76292,21 +76765,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "emd_0_1_6_0" = callPackage
- ({ mkDerivation, base, binary, containers, criterion
- , data-default-class, deepseq, finite-typelits
+ "emd_0_1_7_0" = callPackage
+ ({ mkDerivation, array, base, binary, carray, containers, criterion
+ , data-default-class, deepseq, fft, finite-typelits
, ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
, mwc-random, statistics, transformers, typelits-witnesses, vector
, vector-sized
}:
mkDerivation {
pname = "emd";
- version = "0.1.6.0";
- sha256 = "0x478z1j15swqj1y1knnf3q7z49hfxp86w37x4pd27pclhlx0hm5";
+ version = "0.1.7.0";
+ sha256 = "0r2c3awwy57mxac2imjhbss0kr63miblnz2d1a9bzriy035jwfl0";
libraryHaskellDepends = [
- base binary containers data-default-class deepseq finite-typelits
- ghc-typelits-knownnat ghc-typelits-natnormalise transformers
- typelits-witnesses vector vector-sized
+ array base binary carray containers data-default-class deepseq fft
+ finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise
+ transformers typelits-witnesses vector vector-sized
];
testHaskellDepends = [ base containers HUnit ];
benchmarkHaskellDepends = [
@@ -79206,6 +79679,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "exception-transformers_0_4_0_8" = callPackage
+ ({ mkDerivation, base, HUnit, stm, test-framework
+ , test-framework-hunit, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "exception-transformers";
+ version = "0.4.0.8";
+ sha256 = "079vwd0lkv7y5cijpjxsxn6wyba1y22fw9mfirzgjpiswx46isrr";
+ libraryHaskellDepends = [
+ base stm transformers transformers-compat
+ ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit transformers
+ transformers-compat
+ ];
+ description = "Type classes and monads for unchecked extensible exceptions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"exceptional" = callPackage
({ mkDerivation, base, exceptions }:
mkDerivation {
@@ -83543,6 +84036,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "first-class-patterns_0_3_2_5" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "first-class-patterns";
+ version = "0.3.2.5";
+ sha256 = "1bh8ndf77pfh851d7szx0q2lpima6zm1d652s9j7jzchr7icyjvs";
+ libraryHaskellDepends = [ base transformers ];
+ description = "First class patterns and pattern matching, using type families";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"firstify" = callPackage
({ mkDerivation, base, containers, directory, filepath
, homeomorphic, mtl, Safe, yhccore
@@ -84669,6 +85174,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "flow_1_0_19" = callPackage
+ ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+ mkDerivation {
+ pname = "flow";
+ version = "1.0.19";
+ sha256 = "00pfsyfn7wpgghsw9xgakrxa3n04lizfhrxkg9jbyw0gvd5w6hi9";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+ description = "Write more understandable Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"flow-er" = callPackage
({ mkDerivation, base, doctest, flow, QuickCheck }:
mkDerivation {
@@ -85485,6 +86003,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "folds_0_7_5" = callPackage
+ ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
+ , cabal-doctest, comonad, constraints, contravariant, data-reify
+ , deepseq, directory, distributive, doctest, filepath, lens, mtl
+ , pointed, profunctors, reflection, semigroupoids, semigroups
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "folds";
+ version = "0.7.5";
+ sha256 = "17a8xggx17m59hiwd2lxd2379sw4xblgyv1pk9g5h93w3m8wgq1r";
+ configureFlags = [ "-f-test-hlint" ];
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ adjunctions base bifunctors comonad constraints contravariant
+ data-reify distributive lens mtl pointed profunctors reflection
+ semigroupoids transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base bytestring deepseq directory doctest filepath mtl semigroups
+ ];
+ description = "Beautiful Folding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"folds-common" = callPackage
({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck
}:
@@ -86535,6 +87079,28 @@ self: {
broken = true;
}) {};
+ "franz" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, containers, cpu
+ , directory, fast-builder, filepath, fsnotify, network, process
+ , sendfile, stm, stm-delay, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "franz";
+ version = "0.2.1";
+ sha256 = "0azkvqy4xgrs4wac6rd23rqc051hmm2r3nmdhgk8p2fs5cdkhncx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring cereal containers cpu directory fast-builder
+ filepath fsnotify network process sendfile stm stm-delay
+ transformers unordered-containers vector
+ ];
+ executableHaskellDepends = [ base bytestring network stm ];
+ description = "Append-only database";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fraxl" = callPackage
({ mkDerivation, async, base, dependent-map, dependent-sum
, exceptions, fastsum, free, mtl, time, transformers, type-aligned
@@ -86613,6 +87179,17 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
+ "free-categories" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "free-categories";
+ version = "0.1.0.0";
+ sha256 = "0lzal6vbh1zjcag4dwmhnsv4j66n00gkl0cmf0pssdjwwywxgpwx";
+ libraryHaskellDepends = [ base ];
+ description = "free categories";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"free-category" = callPackage
({ mkDerivation, base, free-algebras }:
mkDerivation {
@@ -89003,26 +89580,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "galois-field_0_4_1" = callPackage
- ({ mkDerivation, base, criterion, integer-gmp, MonadRandom, poly
- , protolude, semirings, tasty, tasty-quickcheck, vector
+ "galois-field_1_0_0" = callPackage
+ ({ mkDerivation, base, criterion, groups, integer-gmp, MonadRandom
+ , poly, protolude, semirings, tasty, tasty-quickcheck, vector
, wl-pprint-text
}:
mkDerivation {
pname = "galois-field";
- version = "0.4.1";
- sha256 = "1q577m518gb3q7z7l84pf2ghw786p86sjx7b5mr3xhrvplwdvhcl";
+ version = "1.0.0";
+ sha256 = "0afmqavxca8p1zfmqibn9kh1xigq9y1s8wail6rdmq9ci1gzd90y";
libraryHaskellDepends = [
- base integer-gmp MonadRandom poly protolude semirings
+ base groups integer-gmp MonadRandom poly protolude semirings
tasty-quickcheck vector wl-pprint-text
];
testHaskellDepends = [
- base integer-gmp MonadRandom poly protolude semirings tasty
+ base groups integer-gmp MonadRandom poly protolude semirings tasty
tasty-quickcheck vector wl-pprint-text
];
benchmarkHaskellDepends = [
- base criterion integer-gmp MonadRandom poly protolude semirings
- tasty-quickcheck vector wl-pprint-text
+ base criterion groups integer-gmp MonadRandom poly protolude
+ semirings tasty-quickcheck vector wl-pprint-text
];
description = "Galois field library";
license = stdenv.lib.licenses.mit;
@@ -90123,14 +90700,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "generic-lens_1_2_0_0" = callPackage
+ "generic-lens_1_2_0_1" = callPackage
({ mkDerivation, base, criterion, deepseq, doctest, HUnit
, inspection-testing, lens, profunctors, QuickCheck, tagged, text
}:
mkDerivation {
pname = "generic-lens";
- version = "1.2.0.0";
- sha256 = "0qf49s01xkbhlfclc4a3ybhhf65g6mmigkkqj2psdjndgjdaxhb2";
+ version = "1.2.0.1";
+ sha256 = "0dl7xrrrrbcsz6m69liiz6r8jaa7yi1h8ppgxj94r2zi7pjmwvwf";
libraryHaskellDepends = [ base profunctors tagged text ];
testHaskellDepends = [
base doctest HUnit inspection-testing lens profunctors
@@ -90198,6 +90775,8 @@ self: {
pname = "generic-monoid";
version = "0.1.0.0";
sha256 = "0jzhmy6vi38p3cnlvi4hw59zga239y67nszzl7zscx263wsk7q0w";
+ revision = "1";
+ editedCabalFile = "1xsgnb87k80p3gn0jyiv3a1c6g77q8sqml6bmbpppfa24z8paa1p";
libraryHaskellDepends = [ base ];
description = "Derive monoid instances for product types";
license = stdenv.lib.licenses.bsd3;
@@ -90377,12 +90956,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "generics-mrsop_2_2_0" = callPackage
+ ({ mkDerivation, base, containers, mtl, sop-core, template-haskell
+ }:
+ mkDerivation {
+ pname = "generics-mrsop";
+ version = "2.2.0";
+ sha256 = "0ni0pvwgpb1a8irgxn20hv2pxn2mx0d40s3raz9v38vyiyb6l05x";
+ libraryHaskellDepends = [
+ base containers mtl sop-core template-haskell
+ ];
+ description = "Generic Programming with Mutually Recursive Sums of Products";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generics-mrsop-gdiff" = callPackage
({ mkDerivation, base, generics-mrsop }:
mkDerivation {
pname = "generics-mrsop-gdiff";
- version = "0.0.0";
- sha256 = "0a60q7g5x7kwd864dc7yz83kz83fxf4gpj7q5lj4f2fg69ih0ybm";
+ version = "0.0.1";
+ sha256 = "0r5i9m07bl3m0m0vkzf38dddp0bjwg4lpyiyhjysb0s5sw4djrnh";
libraryHaskellDepends = [ base generics-mrsop ];
description = "Reimplementation of the `gdiff` algorithm for `generics-mrsop`";
license = stdenv.lib.licenses.bsd3;
@@ -90696,12 +91290,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "genvalidity_0_9_0_0" = callPackage
+ "genvalidity_0_9_0_1" = callPackage
({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
mkDerivation {
pname = "genvalidity";
- version = "0.9.0.0";
- sha256 = "1q2ylz0id5b85ycqymrybpgczqmm9cc9yqzlg9lilhq8rnp0na0x";
+ version = "0.9.0.1";
+ sha256 = "1f0jhahgh0kyyk74g2vmjb3vcv4qvg2xhib1n92r8yyggxih3msl";
libraryHaskellDepends = [ base QuickCheck validity ];
testHaskellDepends = [ base hspec hspec-core QuickCheck ];
description = "Testing utilities for the validity library";
@@ -90939,8 +91533,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-mergeful";
- version = "0.0.0.0";
- sha256 = "07j3dczqxmwri458r8nml3rn31ii14fdz3b2sc8g41f2czr6fa75";
+ version = "0.1.0.0";
+ sha256 = "04vk1jrn69i61l445y3nyw8pklfgbfcja30ghjvcrxxdf9nlmciy";
libraryHaskellDepends = [
base containers genvalidity genvalidity-containers genvalidity-time
mergeful QuickCheck
@@ -91759,8 +92353,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.9.1";
- sha256 = "1phq4jxhm05xj42y7aqpjj43vj5mixi3hhf3h5c0dh1vmsz9w3z1";
+ version = "0.10.0";
+ sha256 = "153rivbk7zma04hk7hqd2ra051jrh372mh1sfrjyw7x5crh07ac7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -92069,26 +92663,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-lib-parser_8_8_0_20190723" = callPackage
- ({ mkDerivation, alex, array, base, binary, bytestring, containers
- , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
- , process, time, transformers, unix
- }:
- mkDerivation {
- pname = "ghc-lib-parser";
- version = "8.8.0.20190723";
- sha256 = "0szrv98h2c1db3400cbb7vbhqnwagqncgpllzd9jiw74rq6y8mjq";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq directory filepath
- ghc-prim hpc pretty process time transformers unix
- ];
- libraryToolDepends = [ alex happy ];
- description = "The GHC API, decoupled from GHC versions";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"ghc-lib-parser_8_8_1" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
@@ -92264,6 +92838,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "ghc-parser_0_2_1_0" = callPackage
+ ({ mkDerivation, base, cpphs, ghc, happy }:
+ mkDerivation {
+ pname = "ghc-parser";
+ version = "0.2.1.0";
+ sha256 = "0z6gr3zs89agyc2iw2lv8rddw78yn6wxzyzkip7gfca1n9f7xwd9";
+ libraryHaskellDepends = [ base ghc ];
+ libraryToolDepends = [ cpphs happy ];
+ description = "Haskell source parser from GHC";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-paths" = callPackage
({ mkDerivation, base, Cabal, directory }:
mkDerivation {
@@ -92520,6 +93107,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-syntax-highlighter_0_0_4_1" = callPackage
+ ({ mkDerivation, base, ghc, ghc-boot, hspec, hspec-discover, text
+ }:
+ mkDerivation {
+ pname = "ghc-syntax-highlighter";
+ version = "0.0.4.1";
+ sha256 = "0glsfz2sn6a161m3sy08nf739ndgslqd8s7fawyas9ziqg06lvjg";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base ghc ghc-boot text ];
+ testHaskellDepends = [ base hspec text ];
+ testToolDepends = [ hspec-discover ];
+ description = "Syntax highlighter for Haskell using lexer of GHC itself";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-tcplugins-extra" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
@@ -95095,8 +95698,8 @@ self: {
}:
mkDerivation {
pname = "github";
- version = "0.22";
- sha256 = "15py79qcpj0k331i42njgwkirwyiacbc5razmxnm4672dvvip2qk";
+ version = "0.23";
+ sha256 = "1d08m0kajl6zaralz1rbm4miv2a5zrbm6asjyrl75n915l56m9mb";
libraryHaskellDepends = [
aeson base base-compat base16-bytestring binary binary-instances
bytestring containers cryptohash-sha1 deepseq deepseq-generics
@@ -96082,14 +96685,13 @@ self: {
, bytestring, Cabal, config-schema, config-value, containers
, directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
, HUnit, irc-core, kan-extensions, lens, network, process, psqueues
- , regex-tdfa, regex-tdfa-text, semigroupoids, split, stm
- , template-haskell, text, time, transformers, unix
- , unordered-containers, vector, vty
+ , regex-tdfa, semigroupoids, split, stm, template-haskell, text
+ , time, transformers, unix, unordered-containers, vector, vty
}:
mkDerivation {
pname = "glirc";
- version = "2.33";
- sha256 = "14znjbgy67mh68hpbr2xxl1aff1b0bzmrwkknp402zq0y9p81iwy";
+ version = "2.33.1";
+ sha256 = "0vzrx0904s8r7srld4c3wkw3j0rx3l6jszz3m5friwkdwfs60a83";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -96097,9 +96699,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 regex-tdfa regex-tdfa-text semigroupoids split stm
- template-haskell text time transformers unix unordered-containers
- vector vty
+ psqueues regex-tdfa semigroupoids split stm template-haskell text
+ time transformers unix unordered-containers vector vty
];
executableHaskellDepends = [ base lens text vty ];
testHaskellDepends = [ base HUnit ];
@@ -102199,8 +102800,8 @@ self: {
}:
mkDerivation {
pname = "gtk2hs-buildtools";
- version = "0.13.5.0";
- sha256 = "01a3q7ciinrwa6xjk0qwpyjabdjzfsy8qqfkp0iir2h8i8prnpz4";
+ version = "0.13.5.1";
+ sha256 = "0b941qm4rj9xd5g04hzagdhn5i30n542izr15x89giardr8f95iz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -104191,43 +104792,7 @@ self: {
broken = true;
}) {};
- "haddock_2_16_1" = callPackage
- ({ mkDerivation, base, Cabal, directory, filepath, haddock-api
- , process
- }:
- mkDerivation {
- pname = "haddock";
- version = "2.16.1";
- sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [ base haddock-api ];
- testHaskellDepends = [ base Cabal directory filepath process ];
- doCheck = false;
- preCheck = "unset GHC_PACKAGE_PATH";
- description = "A documentation-generation tool for Haskell libraries";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "haddock_2_17_5" = callPackage
- ({ mkDerivation, base, filepath, haddock-api, hspec }:
- mkDerivation {
- pname = "haddock";
- version = "2.17.5";
- sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [ base haddock-api ];
- testHaskellDepends = [ base filepath hspec ];
- doCheck = false;
- preCheck = "unset GHC_PACKAGE_PATH";
- description = "A documentation-generation tool for Haskell libraries";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "haddock" = callPackage
+ "haddock_2_22_0" = callPackage
({ mkDerivation, base, filepath, haddock-api }:
mkDerivation {
pname = "haddock";
@@ -104241,69 +104806,26 @@ self: {
preCheck = "unset GHC_PACKAGE_PATH";
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "haddock-api_2_15_0_2" = callPackage
- ({ mkDerivation, array, base, bytestring, Cabal, containers
- , deepseq, directory, filepath, ghc, ghc-paths, haddock-library
- , xhtml
- }:
- mkDerivation {
- pname = "haddock-api";
- version = "2.15.0.2";
- sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- array base bytestring Cabal containers deepseq directory filepath
- ghc ghc-paths haddock-library xhtml
- ];
- description = "A documentation-generation tool for Haskell libraries";
- license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "haddock-api_2_16_1" = callPackage
- ({ mkDerivation, array, base, bytestring, Cabal, containers
- , deepseq, directory, filepath, ghc, ghc-paths, haddock-library
- , xhtml
- }:
+ "haddock" = callPackage
+ ({ mkDerivation, base, filepath, haddock-api }:
mkDerivation {
- pname = "haddock-api";
- version = "2.16.1";
- sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- array base bytestring Cabal containers deepseq directory filepath
- ghc ghc-paths haddock-library xhtml
- ];
+ pname = "haddock";
+ version = "2.23.0";
+ sha256 = "1f7n4l1kkq1msl8csnvzg2xh3i5a056dzmcf40gib0im91wcwl0x";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base haddock-api ];
+ testHaskellDepends = [ base filepath ];
+ doCheck = false;
+ preCheck = "unset GHC_PACKAGE_PATH";
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "haddock-api_2_17_4" = callPackage
- ({ mkDerivation, array, base, bytestring, Cabal, containers
- , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
- , haddock-library, hspec, QuickCheck, transformers, xhtml
- }:
- mkDerivation {
- pname = "haddock-api";
- version = "2.17.4";
- sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss";
- revision = "1";
- editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- array base bytestring Cabal containers deepseq directory filepath
- ghc ghc-boot ghc-paths haddock-library transformers xhtml
- ];
- testHaskellDepends = [ base containers ghc hspec QuickCheck ];
- description = "A documentation-generation tool for Haskell libraries";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "haddock-api" = callPackage
+ "haddock-api_2_22_0" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, containers
, deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
, haddock-library, hspec, hspec-discover, QuickCheck, transformers
@@ -104326,6 +104848,31 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "haddock-api" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, deepseq
+ , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library
+ , hspec, hspec-discover, QuickCheck, transformers, xhtml
+ }:
+ mkDerivation {
+ pname = "haddock-api";
+ version = "2.23.0";
+ sha256 = "0fbk458qr7iw1j8vh6455n2819c0pfdw1m3gy1y3fs6fdpj9qbjj";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq directory filepath ghc
+ ghc-boot ghc-paths haddock-library transformers xhtml
+ ];
+ testHaskellDepends = [
+ array base bytestring containers deepseq directory filepath ghc
+ ghc-boot ghc-paths haddock-library hspec QuickCheck transformers
+ xhtml
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A documentation-generation tool for Haskell libraries";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"haddock-cheatsheet" = callPackage
@@ -104359,40 +104906,6 @@ self: {
broken = true;
}) {};
- "haddock-library_1_2_1" = callPackage
- ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
- , QuickCheck, transformers
- }:
- mkDerivation {
- pname = "haddock-library";
- version = "1.2.1";
- sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
- libraryHaskellDepends = [ base bytestring deepseq transformers ];
- testHaskellDepends = [
- base base-compat bytestring deepseq hspec QuickCheck transformers
- ];
- description = "Library exposing some functionality of Haddock";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "haddock-library_1_4_3" = callPackage
- ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
- , QuickCheck, transformers
- }:
- mkDerivation {
- pname = "haddock-library";
- version = "1.4.3";
- sha256 = "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p";
- libraryHaskellDepends = [ base bytestring deepseq transformers ];
- testHaskellDepends = [
- base base-compat bytestring deepseq hspec QuickCheck transformers
- ];
- description = "Library exposing some functionality of Haddock";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"haddock-library" = callPackage
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
, hspec, hspec-discover, parsec, QuickCheck, text, transformers
@@ -104413,6 +104926,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haddock-library_1_8_0" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+ , directory, filepath, hspec, hspec-discover, optparse-applicative
+ , parsec, QuickCheck, text, transformers, tree-diff
+ }:
+ mkDerivation {
+ pname = "haddock-library";
+ version = "1.8.0";
+ sha256 = "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh";
+ libraryHaskellDepends = [
+ base bytestring containers parsec text transformers
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring containers deepseq directory filepath
+ hspec optparse-applicative parsec QuickCheck text transformers
+ tree-diff
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Library exposing some functionality of Haddock";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haddock-test" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, process, syb, xhtml, xml
@@ -105327,6 +105863,22 @@ self: {
broken = true;
}) {};
+ "hakyll-typescript" = callPackage
+ ({ mkDerivation, base, bytestring, directory, hakyll, hjsmin, tasty
+ , tasty-hunit, typed-process
+ }:
+ mkDerivation {
+ pname = "hakyll-typescript";
+ version = "0.0.1.0";
+ sha256 = "1vhkhbmy0pflcnzfhb9gck436rr5wr6hfpcb3sz8r27l1fml26ji";
+ libraryHaskellDepends = [
+ base bytestring hakyll hjsmin typed-process
+ ];
+ testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
+ description = "Typescript and javascript hakyll compilers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hal" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, envy
, exceptions, http-conduit, http-types, mtl, text, time
@@ -111126,8 +111678,8 @@ self: {
}:
mkDerivation {
pname = "haskseg";
- version = "0.1.0.2";
- sha256 = "0p9z71gbrgssjs1zgbjfqn2g4k4i6ahs9lj1x82mjqppvc4gr0n3";
+ version = "0.1.0.3";
+ sha256 = "1az5gj51wr3bfalbm6nq50cgzv02x48c68qrmd7y9dji4865vnya";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -111454,6 +112006,8 @@ self: {
pname = "haskus-binary";
version = "1.4";
sha256 = "0riqgfy9ai1vb7555l1w9rfcp10ylg7sbk46ph1f2y00pjbxsmv3";
+ revision = "1";
+ editedCabalFile = "1b1dxsrl6iq97dbjsw90jpy6s37dik245w4jgaj2pgqsw1w1vz5h";
libraryHaskellDepends = [
base bytestring cereal directory filepath ghc-prim haskus-utils
haskus-utils-data haskus-utils-types megaparsec mtl primitive
@@ -113511,8 +114065,8 @@ self: {
}:
mkDerivation {
pname = "hdiff";
- version = "0.0.0";
- sha256 = "0vs55wrcip9djhdwd5wz44d8w5hfafdck4abhc488b23chdxxxi9";
+ version = "0.0.1";
+ sha256 = "09a4vp80ik7fza2qzv9n3zddkk1phm0yd3f9v1r5zp3i8s38aa89";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -114301,6 +114855,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hedn_0_3_0_0" = callPackage
+ ({ mkDerivation, base, containers, deepseq, deriving-compat
+ , hedgehog, megaparsec, parser-combinators, prettyprinter
+ , scientific, template-haskell, text, time, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "hedn";
+ version = "0.3.0.0";
+ sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y";
+ libraryHaskellDepends = [
+ base containers deepseq deriving-compat megaparsec
+ parser-combinators prettyprinter scientific template-haskell text
+ time uuid-types vector
+ ];
+ testHaskellDepends = [
+ base containers hedgehog megaparsec text time uuid-types vector
+ ];
+ description = "EDN parsing and encoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hedn-functor" = callPackage
({ mkDerivation, base, containers, hedn, recursion-schemes, text
, vector
@@ -116609,21 +117185,21 @@ self: {
({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava
, clustering, containers, directory, fgl, filepath
, hierarchical-clustering, hmatrix, lens, managed, modularity, mtl
- , optparse-generic, safe, sparse-linear-algebra
+ , mwc-random, optparse-generic, safe, sparse-linear-algebra
, spectral-clustering, streaming, streaming-bytestring
, streaming-cassava, streaming-with, text, text-show, tree-fun
, vector
}:
mkDerivation {
pname = "hierarchical-spectral-clustering";
- version = "0.4.1.3";
- sha256 = "1vhndwkny2sjh7c7m8qym6iasqacsaim0rkihdq3x58mdm2848n7";
+ version = "0.5.0.1";
+ sha256 = "08pz68vw8pbm70iqgrq6h9jhmq4zpg801byjlgkr2rvx6x8d1ghv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base cassava clustering containers fgl
- hierarchical-clustering hmatrix managed modularity mtl safe
- sparse-linear-algebra spectral-clustering streaming
+ hierarchical-clustering hmatrix managed modularity mtl mwc-random
+ safe sparse-linear-algebra spectral-clustering streaming
streaming-bytestring streaming-cassava streaming-with text tree-fun
vector
];
@@ -117277,6 +117853,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hint_0_9_0_2" = callPackage
+ ({ mkDerivation, base, containers, directory, exceptions
+ , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit
+ , mtl, random, temporary, unix
+ }:
+ mkDerivation {
+ pname = "hint";
+ version = "0.9.0.2";
+ sha256 = "06xnlfpf9h7i4fvm3p69accm18h7hblh7173040vlk5qvjywblhf";
+ libraryHaskellDepends = [
+ base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+ random temporary unix
+ ];
+ testHaskellDepends = [
+ base containers directory exceptions extensible-exceptions filepath
+ HUnit unix
+ ];
+ description = "Runtime Haskell interpreter (GHC API wrapper)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hint-server" = callPackage
({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
}:
@@ -118030,6 +118628,24 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "hkgr_0_2_3_3" = callPackage
+ ({ mkDerivation, base, directory, filepath, simple-cabal
+ , simple-cmd, simple-cmd-args
+ }:
+ mkDerivation {
+ pname = "hkgr";
+ version = "0.2.3.3";
+ sha256 = "1a7ibkfdn4xkr89xlps3znr7ry9bdzdijylbqnlsvikri7vibaaz";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base directory filepath simple-cabal simple-cmd simple-cmd-args
+ ];
+ description = "Simple Hackage release workflow for package maintainers";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hkt" = callPackage
({ mkDerivation, base, hspec, inspection-testing, protolude, text
}:
@@ -118552,21 +119168,21 @@ self: {
({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
, containers, cpphs, data-default, directory, extra, filepath
, ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour
- , process, refact, text, transformers, uniplate
+ , mtl, process, refact, syb, text, transformers, uniplate
, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hlint";
- version = "2.2.2";
- sha256 = "1v10xcz4vdzk1a3gjlvqbdckldax2643sg7s3xkm3dnlj5hg05yp";
+ version = "2.2.3";
+ sha256 = "0amkk315mpqc1b2pf5mngfzmzfx4bad4pzcg4h0120825909zpz6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal base bytestring cmdargs containers cpphs
data-default directory extra filepath ghc-lib-parser
- haskell-src-exts haskell-src-exts-util hscolour process refact text
- transformers uniplate unordered-containers vector yaml
+ haskell-src-exts haskell-src-exts-util hscolour mtl process refact
+ syb text transformers uniplate unordered-containers vector yaml
];
executableHaskellDepends = [ base ];
description = "Source code suggestions";
@@ -119541,6 +120157,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hnock" = callPackage
+ ({ mkDerivation, base, parsec, text }:
+ mkDerivation {
+ pname = "hnock";
+ version = "0.4.0";
+ sha256 = "1d3w6lmvsanzwjs3r424fhalv19ia6k4w6m37jaqkq60lmzkfp5d";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base parsec text ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [ base ];
+ description = "A Nock interpreter";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hnop" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -120776,8 +121407,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-docs";
- version = "0.5.0";
- sha256 = "08i15jbn7k21qfmmi1f8151bakqivbk440gi44jjnndhkdj8lwwa";
+ version = "0.6.0";
+ sha256 = "0wgzjzjnj1f9mw1099l5h2fh8y91v45a243paksb5dp76y27baxg";
libraryHaskellDepends = [
base haskell-src hoppy-generator hoppy-runtime
];
@@ -120788,15 +121419,16 @@ self: {
}) {};
"hoppy-generator" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, haskell-src
- , mtl
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , haskell-src, mtl, process, temporary, text
}:
mkDerivation {
pname = "hoppy-generator";
- version = "0.5.2";
- sha256 = "0ifk7ja1nynbgcf7q8v2dl4sn5ivif9rbd2d7pjp9lx43di9axfc";
+ version = "0.6.0";
+ sha256 = "1y10s0lbc0k7vir2h7bgghxmjh3zgja764i6w1j056rr0qh9v5bj";
libraryHaskellDepends = [
- base containers directory filepath haskell-src mtl
+ base bytestring containers directory filepath haskell-src mtl
+ process temporary text
];
description = "C++ FFI generator - Code generator";
license = stdenv.lib.licenses.agpl3;
@@ -120808,8 +121440,8 @@ self: {
({ mkDerivation, base, Cabal, containers, directory, filepath }:
mkDerivation {
pname = "hoppy-runtime";
- version = "0.5.1";
- sha256 = "0gh6kjfy9wcdppbq9ml5i2iz7bi12pbvnzqhj25sg9dy77iwc7cp";
+ version = "0.6.0";
+ sha256 = "0zlh84ibyvyl9wxmiyjgm26s6avjvqphg17bmsls69pqawzzgphy";
libraryHaskellDepends = [
base Cabal containers directory filepath
];
@@ -120823,8 +121455,8 @@ self: {
({ mkDerivation, base, filepath, haskell-src, hoppy-generator }:
mkDerivation {
pname = "hoppy-std";
- version = "0.5.0";
- sha256 = "1x4a4z434nhkgd5nndwrj3y9zm3pf4mln1mccsclf8kkyaj4hyqd";
+ version = "0.6.0";
+ sha256 = "0z7jmhv9xkmky8gn0qgk6f3l3w943qvfhwlq18p1gf6x7iq1ijdg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base filepath haskell-src hoppy-generator
@@ -127656,8 +128288,8 @@ self: {
}:
mkDerivation {
pname = "http-client-overrides";
- version = "0.1.0.0";
- sha256 = "1s6qblbw4z9afzdy43hk8rfhgxj3k60x03p3y0dmp1l2i712x89g";
+ version = "0.1.1.0";
+ sha256 = "15asl6xksr7qmjbm64my3h1x3sx7558vdidx7zlkl8lf1k0w0kcl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129399,14 +130031,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hvega_0_4_1_0" = callPackage
+ "hvega_0_4_1_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, filepath, tasty, tasty-golden, text, unordered-containers, vector
}:
mkDerivation {
pname = "hvega";
- version = "0.4.1.0";
- sha256 = "1qjswpgn1ass1x4bk5zjv6vvw7vvsbzh00qc6jjfq3bnljrl4i75";
+ version = "0.4.1.1";
+ sha256 = "1dmb5w250l11p7hyzi7v9b286s4qdalg41bz1ckahrwaaaz8qa1d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129469,7 +130101,7 @@ self: {
broken = true;
}) {};
- "hw-balancedparens_0_3_0_0" = callPackage
+ "hw-balancedparens_0_3_0_1" = callPackage
({ mkDerivation, base, criterion, deepseq, hedgehog, hspec
, hspec-discover, hw-bits, hw-excess, hw-fingertree
, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers
@@ -129477,10 +130109,8 @@ self: {
}:
mkDerivation {
pname = "hw-balancedparens";
- version = "0.3.0.0";
- sha256 = "1xb2pyhmcwl927v4hc7nfi31bf9lvlz9mnqdbb7mzpl6bdlg7xc7";
- revision = "1";
- editedCabalFile = "1a8zs7j05vxbamcc63fi1xf6vvz7bg1zf0a72930xh4y4bd2m0qk";
+ version = "0.3.0.1";
+ sha256 = "1lndl9f1bvdj79979bp8bnff6y7qskvx6fdjfkwnnaf9sxxsi5jl";
libraryHaskellDepends = [
base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
hw-rankselect-base vector
@@ -129526,6 +130156,30 @@ self: {
broken = true;
}) {};
+ "hw-bits_0_7_0_7" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+ , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
+ , hw-string-parse, QuickCheck, vector
+ }:
+ mkDerivation {
+ pname = "hw-bits";
+ version = "0.7.0.7";
+ sha256 = "11j43d8fxi3s6mfhnx2kcj03gpxj7gxmi00vbbnxnwby66vvbbib";
+ libraryHaskellDepends = [
+ base bytestring hw-int hw-prim hw-string-parse vector
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Bit manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-ci-assist" = callPackage
({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog
, hw-hspec-hedgehog, optparse-applicative
@@ -129641,27 +130295,29 @@ self: {
}) {};
"hw-dump" = callPackage
- ({ mkDerivation, base, bits-extra, bytestring, criterion, hedgehog
- , hspec, hw-bits, hw-hspec-hedgehog, hw-prim, lens
- , optparse-applicative, QuickCheck, safe, vector
+ ({ mkDerivation, base, bits-extra, bytestring, criterion
+ , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+ , hw-hspec-hedgehog, hw-prim, lens, optparse-applicative
+ , QuickCheck, safe, vector
}:
mkDerivation {
pname = "hw-dump";
- version = "0.0.0.1";
- sha256 = "0sxw0fgrq83ahil1sa2mqndwxw7bjxya42sxym6jjsky9jr0mygl";
+ version = "0.1.0.0";
+ sha256 = "1srbn2xkaa8ab1x00hasanj829h5pypa8dan37zcmdhdqvpc6k25";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bits-extra bytestring hw-bits hw-prim safe vector
];
executableHaskellDepends = [
- base bits-extra bytestring hw-bits hw-prim lens
+ base bits-extra bytestring generic-lens hw-bits hw-prim lens
optparse-applicative vector
];
testHaskellDepends = [
base bits-extra bytestring hedgehog hspec hw-bits hw-hspec-hedgehog
hw-prim QuickCheck vector
];
+ testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
base bits-extra bytestring criterion hw-bits hw-prim vector
];
@@ -129718,6 +130374,8 @@ self: {
pname = "hw-excess";
version = "0.2.2.0";
sha256 = "07d6q5m98z6r7p4hhzzm8ihn9sbd05hhf40a0hcq3ixxrdz7yyrb";
+ revision = "1";
+ editedCabalFile = "13k4fm6cyqmsh3wbqh76jn8r0rw9z1nw65zb061smgkk1v9ii3j7";
libraryHaskellDepends = [
base hw-bits hw-prim hw-rankselect-base safe vector
];
@@ -129792,6 +130450,8 @@ self: {
pname = "hw-hspec-hedgehog";
version = "0.1.0.8";
sha256 = "0c54mhzbmjfjvy5lyvr6xffrncqmbbr10lran2x9czbkhhbikrss";
+ revision = "1";
+ editedCabalFile = "0msy1a646w5m0z5670b7xgc1apzan3myaqrq6i6khsayzk5z597j";
libraryHaskellDepends = [
base call-stack hedgehog hspec HUnit transformers
];
@@ -129972,6 +130632,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hw-json-simd_0_1_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens
+ , optparse-applicative, vector
+ }:
+ mkDerivation {
+ pname = "hw-json-simd";
+ version = "0.1.0.3";
+ sha256 = "0cgi7q0cx3zx56wq9l115vbhwc6yjbdrmiyz6z8zcnlhgq6cfgjl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring hw-prim lens vector ];
+ libraryToolDepends = [ c2hs ];
+ executableHaskellDepends = [
+ base bytestring hw-prim lens optparse-applicative vector
+ ];
+ testHaskellDepends = [ base bytestring hw-prim lens vector ];
+ description = "SIMD-based JSON semi-indexer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hw-json-simple-cursor" = callPackage
({ mkDerivation, base, bytestring, criterion, directory
, generic-lens, hedgehog, hspec, hspec-discover, hw-balancedparens
@@ -130081,8 +130762,8 @@ self: {
}:
mkDerivation {
pname = "hw-kafka-client";
- version = "2.6.0";
- sha256 = "1318gyl3jn3q2namzpzf0254hqpib2nn1kipf6gnfp4dvwv0wbgn";
+ version = "2.6.1";
+ sha256 = "01481i1cw7rdxr006ksiizggh7gjlqzhrxw2lmg953sa35bgz784";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -130250,15 +130931,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-prim_0_6_2_33" = callPackage
+ "hw-prim_0_6_2_35" = callPackage
({ mkDerivation, base, bytestring, criterion, directory, exceptions
, ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
, mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.33";
- sha256 = "1n4bg5q8mdphsd9v7xgabks4r3vl70rlvfz4hj6kwcrqnamqdhl1";
+ version = "0.6.2.35";
+ sha256 = "0fm1bmk2da0bsvpf8qvyyapwwc8vlybhibs5n53v067faf38dxqf";
libraryHaskellDepends = [
base bytestring ghc-prim mmap semigroups transformers unliftio-core
vector
@@ -130347,8 +131028,8 @@ self: {
pname = "hw-rankselect";
version = "0.13.2.0";
sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4";
- revision = "1";
- editedCabalFile = "0a0mlfbln3whziv2rp63qr1qjm4vxgrd8535irnlyy5ba0a0lad8";
+ revision = "2";
+ editedCabalFile = "12c35s16x77wch32jcbxqy35gwkvnfrx3s1xca4crg7mcwd5lcg4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -130384,8 +131065,8 @@ self: {
pname = "hw-rankselect-base";
version = "0.3.2.1";
sha256 = "0q4kywln4bls2dvazhqh2acw4yqnabnx0mdkhldgg70q8amnq2nj";
- revision = "2";
- editedCabalFile = "0djyix1fp00s8j0qjja4557wdflgixpz4fvrmwiw7x294zr9f9fw";
+ revision = "3";
+ editedCabalFile = "1hbbxxzmar0djj4r43nr3ar9nsl659wnq20rw6cp6q974ivlglx2";
libraryHaskellDepends = [
base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
];
@@ -130502,19 +131183,27 @@ self: {
"hw-uri" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , antiope-core, antiope-s3, base, bytestring, directory, exceptions
- , filepath, generic-lens, hedgehog, hspec, hspec-discover
- , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
- , text
+ , antiope-core, antiope-optparse-applicative, antiope-s3, base
+ , bytestring, directory, dlist, exceptions, filepath, generic-lens
+ , hedgehog, hspec, hspec-discover, http-client, http-types
+ , hw-hspec-hedgehog, hw-prim, lens, mtl, optparse-applicative
+ , resourcet, text, unliftio-core
}:
mkDerivation {
pname = "hw-uri";
- version = "0.1.1.4";
- sha256 = "1y3rf1npqx3y3pkaipbwhabszvp0427h3sa9f6a5dfy14c6vm88b";
+ version = "0.1.1.9";
+ sha256 = "0l6ihhl79z1l361c4xh13qmbw8h2hnf85ncha7hivqafb585m1yr";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
- base bytestring directory exceptions filepath generic-lens
- http-client http-types lens mtl resourcet text
+ base bytestring directory dlist exceptions filepath generic-lens
+ http-client http-types hw-prim lens mtl resourcet text
+ unliftio-core
+ ];
+ executableHaskellDepends = [
+ antiope-core antiope-optparse-applicative base bytestring
+ generic-lens lens mtl optparse-applicative resourcet text
];
testHaskellDepends = [
aeson antiope-core antiope-s3 base bytestring filepath hedgehog
@@ -130551,8 +131240,8 @@ self: {
}:
mkDerivation {
pname = "hw-xml";
- version = "0.4.0.0";
- sha256 = "07mv58bwzafzcaddnahj6p1qvblm4fjrydrq1adi7slydmsxa61z";
+ version = "0.4.0.1";
+ sha256 = "07xjdn2wzcvlhfbf3jlvrmw8mcbl1g5sc62xk6s73figs26gjm6z";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -131787,6 +132476,23 @@ self: {
license = "(BSD-3-Clause OR Apache-2.0)";
}) {};
+ "hz3" = callPackage
+ ({ mkDerivation, base, containers, hspec, QuickCheck, transformers
+ , z3
+ }:
+ mkDerivation {
+ pname = "hz3";
+ version = "96.0.0.0";
+ sha256 = "080bhbnhswic7m35rzbqi9i7lb57szag6khprrjccpa80vq7lj6n";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers transformers ];
+ librarySystemDepends = [ z3 ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ description = "Bindings for the Z3 Theorem Prover";
+ license = stdenv.lib.licenses.bsd3;
+ }) {inherit (pkgs) z3;};
+
"hzaif" = callPackage
({ mkDerivation, aeson, base, bytestring, http-conduit, text }:
mkDerivation {
@@ -132750,6 +133456,43 @@ self: {
broken = true;
}) {};
+ "ihaskell_0_10_0_2" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+ , cmdargs, containers, directory, filepath, ghc, ghc-boot
+ , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+ , hspec, hspec-contrib, http-client, http-client-tls, HUnit
+ , ipython-kernel, mtl, parsec, process, random, raw-strings-qq
+ , setenv, shelly, split, stm, strict, text, time, transformers
+ , unix, unordered-containers, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "ihaskell";
+ version = "0.10.0.2";
+ sha256 = "01jk48kj5z7n547z1lg78c0bphpjyv2nfzjrh4jv7xygkw5asqxb";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring cereal cmdargs containers
+ directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
+ haskell-src-exts hlint http-client http-client-tls ipython-kernel
+ mtl parsec process random shelly split stm strict text time
+ transformers unix unordered-containers utf8-string vector
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring containers directory ghc ipython-kernel
+ process strict text transformers unix unordered-containers
+ ];
+ testHaskellDepends = [
+ base directory ghc ghc-paths here hspec hspec-contrib HUnit
+ raw-strings-qq setenv shelly text transformers
+ ];
+ description = "A Haskell backend kernel for the IPython project";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ihaskell-aeson" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
, ihaskell, text
@@ -134010,6 +134753,20 @@ self: {
broken = true;
}) {};
+ "indents_0_5_0_1" = callPackage
+ ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "indents";
+ version = "0.5.0.1";
+ sha256 = "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51";
+ libraryHaskellDepends = [ base mtl parsec ];
+ testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
+ description = "indentation sensitive parser-combinators for parsec";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"index-core" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -136171,6 +136928,37 @@ self: {
broken = true;
}) {};
+ "ip_1_6_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith
+ , bytestring, criterion, deepseq, doctest, hashable, hspec
+ , hspec-discover, HUnit, natural-arithmetic, primitive, QuickCheck
+ , quickcheck-classes, small-bytearray-builder, tasty, tasty-hunit
+ , tasty-quickcheck, text, text-short, vector, wide-word
+ }:
+ mkDerivation {
+ pname = "ip";
+ version = "1.6.0";
+ sha256 = "19qs04lcjpzcdl9b1yi6clc72w25i0qc04nm877bgy3sqp7qj2zm";
+ libraryHaskellDepends = [
+ aeson attoparsec base byteslice bytesmith bytestring deepseq
+ hashable natural-arithmetic primitive small-bytearray-builder text
+ text-short vector wide-word
+ ];
+ testHaskellDepends = [
+ attoparsec base byteslice bytestring doctest hspec HUnit QuickCheck
+ quickcheck-classes tasty tasty-hunit tasty-quickcheck text
+ text-short wide-word
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ attoparsec base byteslice bytestring criterion text
+ ];
+ description = "Library for IP and MAC addresses";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ip-quoter" = callPackage
({ mkDerivation, base, cpu, network, tasty, tasty-hunit
, template-haskell
@@ -136459,6 +137247,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "ipython-kernel_0_10_1_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
+ , containers, cryptonite, directory, filepath, memory, mtl, process
+ , temporary, text, transformers, unordered-containers, uuid
+ , zeromq4-haskell
+ }:
+ mkDerivation {
+ pname = "ipython-kernel";
+ version = "0.10.1.0";
+ sha256 = "03sygh5jvigfjg3il49wy41p6ac1wh2gx8wj3hg2rvsh91p9f4dw";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring cereal cereal-text containers cryptonite
+ directory filepath memory mtl process temporary text transformers
+ unordered-containers uuid zeromq4-haskell
+ ];
+ description = "A library for creating kernels for IPython frontends";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"irc" = callPackage
({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
, test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -137334,6 +138145,8 @@ self: {
pname = "iterm-show";
version = "0.1.0.1";
sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw";
+ revision = "1";
+ editedCabalFile = "1xyb5dj53vl4nf2a68zda95lz0fr987rghvh3610bmrgr8hg3y02";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base base64-bytestring bytestring ];
@@ -139702,6 +140515,35 @@ self: {
broken = true;
}) {};
+ "json-tokens" = callPackage
+ ({ mkDerivation, array-builder, array-chunks, base, byteslice
+ , bytesmith, bytestring, gauge, neat-interpolation, primitive
+ , QuickCheck, scientific-notation, small-bytearray-builder, tasty
+ , tasty-hunit, text, text-short, vector
+ }:
+ mkDerivation {
+ pname = "json-tokens";
+ version = "0.1.0.1";
+ sha256 = "031x1k0j86qnkq8xddxf6q8mhrbmd88aa40x8w6485zr1v16dnis";
+ libraryHaskellDepends = [
+ array-builder array-chunks base byteslice bytesmith bytestring
+ primitive scientific-notation text-short
+ ];
+ testHaskellDepends = [
+ base byteslice bytestring neat-interpolation primitive QuickCheck
+ scientific-notation small-bytearray-builder tasty tasty-hunit text
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ base byteslice bytestring gauge neat-interpolation primitive
+ scientific-notation text
+ ];
+ description = "Tokenize JSON";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"json-tools" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
, process, tar, text, unordered-containers, vector
@@ -140308,8 +141150,8 @@ self: {
}:
mkDerivation {
pname = "jvm-binary";
- version = "0.7.0";
- sha256 = "1ism2fq66qdh72nm9cq4km9yn7v79j2qq6glpyf9yk10549kv7dv";
+ version = "0.8.0";
+ sha256 = "0mzzfdsxh6r8blx447c25bdzv3y8gqb984p48y5cfpvrn2dwhs41";
libraryHaskellDepends = [
attoparsec base binary bytestring containers data-binary-ieee754
deepseq deriving-compat mtl template-haskell text vector
@@ -144441,6 +145283,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "language-javascript_0_6_0_14" = callPackage
+ ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+ , Cabal, containers, happy, hspec, mtl, QuickCheck, text
+ , utf8-light, utf8-string
+ }:
+ mkDerivation {
+ pname = "language-javascript";
+ version = "0.6.0.14";
+ sha256 = "1j4f9jg98kwr1jiwk9y7akdgpc63dpwzcp53888adayxn5h6mqf1";
+ libraryHaskellDepends = [
+ array base blaze-builder bytestring containers mtl text utf8-string
+ ];
+ libraryToolDepends = [ alex happy ];
+ testHaskellDepends = [
+ array base blaze-builder bytestring Cabal containers hspec mtl
+ QuickCheck utf8-light utf8-string
+ ];
+ description = "Parser for JavaScript";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-js" = callPackage
({ mkDerivation, base, hspec, parsec }:
mkDerivation {
@@ -144974,8 +145838,8 @@ self: {
}:
mkDerivation {
pname = "language-thrift";
- version = "0.10.0.0";
- sha256 = "0y6klcw036cjw72snwyhkz1mzg2cp6p7cfdc449ynzwsg5l9kz99";
+ version = "0.11.0.0";
+ sha256 = "0gxhpaspb8iyfhl8gxxn9an17blrh5vnkn3y9ywzslxkvj31nds5";
libraryHaskellDepends = [
ansi-wl-pprint base containers megaparsec scientific semigroups
text transformers
@@ -146665,8 +147529,8 @@ self: {
pname = "lens-process";
version = "0.3.0.0";
sha256 = "1bp2mw38qvlq98596pn1illb6c1l8prd6qrzrg0g6xin98sqigb0";
- revision = "1";
- editedCabalFile = "1wwj258gq4qg97dx7pn2sxj8znrlb5sm2xcidwkhyrs45r75500b";
+ revision = "2";
+ editedCabalFile = "1smhrlj7i2nsvf5x50svafydfmmy706n69xffzp6ij75s13fa37c";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base filepath lens process ];
testHaskellDepends = [
@@ -146676,6 +147540,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lens-process_0_3_0_1" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
+ , lens, process, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "lens-process";
+ version = "0.3.0.1";
+ sha256 = "05vznfn28a35k3qyjx28jva9d5acgzcdzn8s24mkb8mz1l8722d6";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base filepath lens process ];
+ testHaskellDepends = [
+ base doctest filepath lens process tasty tasty-hunit
+ ];
+ description = "Optics for system processes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-properties" = callPackage
({ mkDerivation, base, lens, QuickCheck, transformers }:
mkDerivation {
@@ -146909,8 +147791,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.3.0.0";
- sha256 = "15z32gk4ki0iz5mcakajyd70bcyn5impp0i322sc905j1wivvcz2";
+ version = "1.3.1.0";
+ sha256 = "0jvabc8p69wgf20q3mq0nn9kg6x20gym3xl251vnbyl7chkg9can";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -147275,20 +148157,26 @@ self: {
}) {};
"libarchive" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, composition-prelude, dlist
- , filepath, libarchive
+ ({ mkDerivation, base, bytestring, c2hs, chs-cabal
+ , composition-prelude, criterion, deepseq, directory, dlist
+ , filepath, hspec, libarchive, mtl, tar, tar-conduit, temporary
+ , unix-compat
}:
mkDerivation {
pname = "libarchive";
- version = "1.0.5.1";
- sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz";
- revision = "5";
- editedCabalFile = "1fmsrrg8q46fwv6zgg5afc5jyd9y1qz193ypyh2kb4zf9psl3bdc";
+ version = "2.0.0.1";
+ sha256 = "173h1id6fdii7g850xifji70fz4i4xqhzaxh8727q8ld0q57lfjx";
+ setupHaskellDepends = [ base chs-cabal ];
libraryHaskellDepends = [
- base bytestring composition-prelude dlist filepath
+ base bytestring composition-prelude deepseq dlist filepath mtl
+ unix-compat
];
libraryPkgconfigDepends = [ libarchive ];
libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [ base bytestring directory filepath hspec ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion tar tar-conduit temporary
+ ];
description = "Haskell interface to libarchive";
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libarchive;};
@@ -149818,6 +150706,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "list-t_1_0_4" = callPackage
+ ({ mkDerivation, base, base-prelude, foldl, HTF, mmorph
+ , monad-control, mtl, mtl-prelude, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "list-t";
+ version = "1.0.4";
+ sha256 = "0xsmq4rhp91k4az1d0hnpiy2b3d3nqqdywjrrryrjiway55q8qrq";
+ libraryHaskellDepends = [
+ base foldl mmorph monad-control mtl transformers transformers-base
+ ];
+ testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+ description = "ListT done right";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"list-t-attoparsec" = callPackage
({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
, list-t-text, text, transformers
@@ -150512,7 +151417,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {llvm-config = null;};
- "llvm-hs_9_0_0" = callPackage
+ "llvm-hs_9_0_1" = callPackage
({ mkDerivation, array, attoparsec, base, bytestring, Cabal
, containers, exceptions, llvm-config, llvm-hs-pure, mtl
, pretty-show, process, QuickCheck, tasty, tasty-hunit
@@ -150521,8 +151426,8 @@ self: {
}:
mkDerivation {
pname = "llvm-hs";
- version = "9.0.0";
- sha256 = "0sz1rhdf73v43jz8x7f5f7bjwrkvyyvf950gw9063aapbsdzm76h";
+ version = "9.0.1";
+ sha256 = "0723xgh45h9cyxmmjsvxnsp8bpn1ljy4qgh7a7vqq3sj9d6wzq00";
setupHaskellDepends = [ base Cabal containers ];
libraryHaskellDepends = [
array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -155333,6 +156238,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "massiv_0_4_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, cabal-doctest
+ , data-default-class, deepseq, doctest, exceptions
+ , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
+ , splitmix, template-haskell, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "massiv";
+ version = "0.4.2.0";
+ sha256 = "051za4zdphpsscliza6v9y81bcgzmn0flyirs29x4jfhsyk81qjy";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq exceptions primitive
+ scheduler unliftio-core vector
+ ];
+ testHaskellDepends = [
+ base doctest mersenne-random-pure64 QuickCheck random splitmix
+ template-haskell
+ ];
+ description = "Massiv (Массив) is an Array Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"massiv-io" = callPackage
({ mkDerivation, base, bytestring, data-default-class, deepseq
, directory, filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -155390,6 +156319,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "massiv-test_0_1_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default
+ , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec
+ , massiv, primitive, QuickCheck, scheduler, unliftio, vector
+ }:
+ mkDerivation {
+ pname = "massiv-test";
+ version = "0.1.1";
+ sha256 = "0fz3bf0lmwhzbxwpfschwk4yn3dzr5p542dqkvkbdmlx97spm1vi";
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq exceptions hspec massiv
+ primitive QuickCheck scheduler unliftio vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers data-default deepseq genvalidity-hspec
+ hspec massiv QuickCheck scheduler vector
+ ];
+ description = "Library that contains generators, properties and tests for Massiv Array Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"master-plan" = callPackage
({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific
, hspec, megaparsec, mtl, optparse-applicative, QuickCheck
@@ -157334,8 +158285,8 @@ self: {
}:
mkDerivation {
pname = "mergeful";
- version = "0.0.0.0";
- sha256 = "1zvli3gqw5svr5k36yl420ih2x8drl1522khn8jmjp9n26hc080w";
+ version = "0.1.0.0";
+ sha256 = "1cw3mrbza5fqrh4qg4bjzw4dv23vwb0aglh0dcwzmzsl23hnvhad";
libraryHaskellDepends = [
aeson base containers mtl text time validity validity-containers
validity-time
@@ -158139,6 +159090,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-process_0_2_0_1" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
+ , microlens, process
+ }:
+ mkDerivation {
+ pname = "microlens-process";
+ version = "0.2.0.1";
+ sha256 = "0grnqs0b76la48ql6amrjnqfkgcb0rcq3s2xqs2czjg2jgp3zw5r";
+ revision = "2";
+ editedCabalFile = "0jy50p09axr5gwkhc2qnlragpzvy3s6b947s7r3354ya2byli4dz";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base filepath microlens process ];
+ testHaskellDepends = [ base doctest microlens process ];
+ description = "Micro-optics for the process library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-th" = callPackage
({ mkDerivation, base, containers, microlens, template-haskell
, th-abstraction, transformers
@@ -158790,6 +159759,23 @@ self: {
broken = true;
}) {};
+ "mini-egison" = callPackage
+ ({ mkDerivation, base, containers, haskell-src-meta, hspec, primes
+ , regex-compat, split, template-haskell
+ }:
+ mkDerivation {
+ pname = "mini-egison";
+ version = "0.1.1";
+ sha256 = "1b73igp5n2z5z910rfif2ag8ir97vr5bn1jrkmv30rnw6pnp5a5d";
+ libraryHaskellDepends = [
+ base containers haskell-src-meta regex-compat split
+ template-haskell
+ ];
+ testHaskellDepends = [ base hspec primes ];
+ description = "Template Haskell Implementation of Egison Pattern Matching";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"miniball" = callPackage
({ mkDerivation, base, vector }:
mkDerivation {
@@ -159735,10 +160721,10 @@ self: {
({ mkDerivation, base, vector }:
mkDerivation {
pname = "mmsyn2";
- version = "0.1.2.0";
- sha256 = "04ryfj058z6vkbfmvg4vvza36zj5m1akb64bfm61l4g2rxj7s3nv";
+ version = "0.1.6.0";
+ sha256 = "1jwfm24ybgsb1ryx2kk1a65s2bprpppy1nkyjxcy34kckj534gjp";
libraryHaskellDepends = [ base vector ];
- description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
+ description = "The library that can be used for multiple (Ord a) => a -> b transformations";
license = stdenv.lib.licenses.mit;
}) {};
@@ -159919,6 +160905,8 @@ self: {
pname = "modern-uri";
version = "0.3.1.0";
sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5";
+ revision = "1";
+ editedCabalFile = "09fwv2sx49kbabkllag01g1g85m92fmz60k5lf0w8qnr7hkxv3rd";
libraryHaskellDepends = [
base bytestring containers contravariant deepseq exceptions
megaparsec mtl profunctors QuickCheck reflection tagged
@@ -161104,8 +162092,8 @@ self: {
({ mkDerivation, base, mmorph, mtl, transformers }:
mkDerivation {
pname = "monad-resumption";
- version = "0.1.3.0";
- sha256 = "0zi4p8v02shw0m471xsq1d3wbskz6jd2j92wpdi3qcd8fx4i283q";
+ version = "0.1.4.0";
+ sha256 = "0hc9dbqhd609lzn79c25zwhm55262i9yip16ag9rysxv6rxbshml";
libraryHaskellDepends = [ base mmorph mtl transformers ];
description = "Resumption and reactive resumption monads for Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -166912,18 +167900,21 @@ self: {
}) {};
"net-spider-rpl" = callPackage
- ({ mkDerivation, aeson, base, conduit, conduit-parse, greskell
- , hashable, hspec, ip, mtl, net-spider, safe-exceptions, text, time
+ ({ mkDerivation, aeson, base, bytestring, conduit, conduit-parse
+ , fast-logger, greskell, hashable, hspec, ip, monad-logger, mtl
+ , net-spider, safe-exceptions, text, time
}:
mkDerivation {
pname = "net-spider-rpl";
- version = "0.2.3.0";
- sha256 = "1nsx9y8g2fpqkh52wnlzpq6p9vsp8y3rcikin1gsf7fjs18n74k8";
+ version = "0.3.0.0";
+ sha256 = "1b0035j4y4gd8jhisnjs4fgw2jmyh91az6b29869wxwdcrvk3cm4";
libraryHaskellDepends = [
- aeson base conduit conduit-parse greskell hashable ip mtl
- net-spider safe-exceptions text time
+ aeson base conduit conduit-parse greskell hashable ip monad-logger
+ mtl net-spider safe-exceptions text time
+ ];
+ testHaskellDepends = [
+ base bytestring fast-logger hspec monad-logger net-spider text
];
- testHaskellDepends = [ base hspec net-spider text ];
description = "NetSpider data model and utility for RPL networks";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -166951,6 +167942,8 @@ self: {
];
description = "CLI executable of NetSpider.RPL.";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"netclock" = callPackage
@@ -168878,15 +169871,16 @@ self: {
}) {};
"newtype-zoo" = callPackage
- ({ mkDerivation, base, data-default, deepseq, pointed, profunctors
- , QuickCheck, random
+ ({ mkDerivation, base, comonad, data-default, deepseq, pointed
+ , profunctors, QuickCheck, random
}:
mkDerivation {
pname = "newtype-zoo";
- version = "1.1.0.0";
- sha256 = "0sw476mmczq6gfgbbbrybrna472p5bjrimsbblw9rlyzcg2szqrp";
+ version = "1.2.0.0";
+ sha256 = "12p2nyjpvbqjc7p6jd59ggl37jlg5rh9z8y1bxy4w98m47p8lj31";
libraryHaskellDepends = [
- base data-default deepseq pointed profunctors QuickCheck random
+ base comonad data-default deepseq pointed profunctors QuickCheck
+ random
];
description = "Newtype Wrapper Zoo";
license = stdenv.lib.licenses.bsd3;
@@ -169287,8 +170281,6 @@ self: {
];
description = "Easy dependency management for Nix projects";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"nix-delegate" = callPackage
@@ -173180,6 +174172,8 @@ self: {
pname = "openssl-streams";
version = "1.2.2.0";
sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr";
+ revision = "1";
+ editedCabalFile = "125bxb2axgpcq7rrpamfq0yz017i0ks9zsykh6hn0ifw3lxj1k29";
libraryHaskellDepends = [
base bytestring HsOpenSSL io-streams network
];
@@ -174645,21 +175639,24 @@ self: {
"overloaded" = callPackage
({ mkDerivation, base, bytestring, containers, fin, generic-lens
- , ghc, HUnit, lens, singleton-bool, sop-core, split, syb, symbols
- , tasty, tasty-hunit, text, time, vec
+ , ghc, HUnit, lens, optics-core, record-hasfield, singleton-bool
+ , sop-core, split, syb, symbols, tasty, tasty-hunit, text, time
+ , vec
}:
mkDerivation {
pname = "overloaded";
- version = "0.1.1";
- sha256 = "0palmwxknrc5pqwhlij3rfbzfz9csi5h41iild89bxkb3qj0x2z4";
+ version = "0.1.2";
+ sha256 = "0m2ddb48vsl0x0hz6pq8wabl1s6vl7s66rz7z9v2i6d809zl83kw";
libraryHaskellDepends = [
- base bytestring containers fin ghc sop-core split syb symbols text
- time vec
+ base bytestring containers fin ghc optics-core record-hasfield
+ sop-core split syb symbols text time vec
];
testHaskellDepends = [
- base bytestring containers fin generic-lens HUnit lens
- singleton-bool sop-core symbols tasty tasty-hunit text time vec
+ base bytestring containers fin generic-lens HUnit lens optics-core
+ record-hasfield singleton-bool sop-core symbols tasty tasty-hunit
+ text time vec
];
+ doHaddock = false;
description = "Overloaded pragmas as a plugin";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -175172,29 +176169,27 @@ self: {
broken = true;
}) {};
- "pairing_0_5_0" = callPackage
+ "pairing_1_0_0" = callPackage
({ mkDerivation, base, bytestring, criterion, elliptic-curve
- , errors, galois-field, MonadRandom, protolude, QuickCheck
+ , errors, galois-field, groups, MonadRandom, protolude, QuickCheck
, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
- , wl-pprint-text
}:
mkDerivation {
pname = "pairing";
- version = "0.5.0";
- sha256 = "0qnwkkfzd1jiqg4b989knvzzf05aljqjfqv1z35nl2ms46sqdv1b";
+ version = "1.0.0";
+ sha256 = "0mcjd463ffgq2ghvbi2h02dxy0p40ilhazznn2zqzqp7gksrhvfd";
libraryHaskellDepends = [
- base bytestring elliptic-curve errors galois-field MonadRandom
- protolude QuickCheck wl-pprint-text
+ base bytestring elliptic-curve errors galois-field groups
+ MonadRandom protolude tasty-quickcheck
];
testHaskellDepends = [
- base bytestring elliptic-curve errors galois-field MonadRandom
- protolude QuickCheck quickcheck-instances tasty tasty-hunit
- tasty-quickcheck wl-pprint-text
+ base bytestring elliptic-curve errors galois-field groups
+ MonadRandom protolude QuickCheck quickcheck-instances tasty
+ tasty-hunit tasty-quickcheck
];
benchmarkHaskellDepends = [
- base bytestring criterion elliptic-curve errors galois-field
- MonadRandom protolude QuickCheck quickcheck-instances tasty
- tasty-hunit tasty-quickcheck wl-pprint-text
+ base bytestring criterion elliptic-curve errors galois-field groups
+ MonadRandom protolude tasty-quickcheck
];
description = "Bilinear pairings";
license = stdenv.lib.licenses.mit;
@@ -175354,6 +176349,42 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pandoc-citeproc_0_16_3" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+ , Cabal, containers, data-default, directory, filepath, hs-bibutils
+ , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
+ , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb
+ , tagsoup, temporary, text, time, unordered-containers, vector
+ , xml-conduit, yaml
+ }:
+ mkDerivation {
+ pname = "pandoc-citeproc";
+ version = "0.16.3";
+ sha256 = "1jj4j71xx63k3hhcr2l9vgxsj3v038dska1pdlz8pi6b4kmp00hb";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ aeson base bytestring containers data-default directory filepath
+ hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc
+ pandoc-types parsec rfc5051 setenv split syb tagsoup text time
+ unordered-containers vector xml-conduit yaml
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty attoparsec base bytestring filepath libyaml
+ pandoc pandoc-types safe syb text yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers directory filepath mtl pandoc
+ pandoc-types process temporary text yaml
+ ];
+ doCheck = false;
+ description = "Supports using pandoc with citeproc";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pandoc-citeproc-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
}:
@@ -177781,8 +178812,8 @@ self: {
pname = "path";
version = "0.6.1";
sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb";
- revision = "1";
- editedCabalFile = "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463";
+ revision = "2";
+ editedCabalFile = "05pgmg0w1mfwcmx9ad4p09xqxld8njhgwmgq38v7pr58czvmd6ks";
libraryHaskellDepends = [
aeson base deepseq exceptions filepath hashable template-haskell
];
@@ -179052,8 +180083,8 @@ self: {
}:
mkDerivation {
pname = "perceptual-hash";
- version = "0.1.3.0";
- sha256 = "1g7hp5ijfqc2b3jacgabhq1mza9lqlxid309cvcm0jgppm4lvdpp";
+ version = "0.1.3.2";
+ sha256 = "0nmky6x40wcc9b3n9ijjw8ynbwmpqa4gb26mqzi6dxn298bgm12g";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -181432,8 +182463,8 @@ self: {
}:
mkDerivation {
pname = "pinch";
- version = "0.3.4.1";
- sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk";
+ version = "0.3.5.0";
+ sha256 = "0bw7pfywa9qr6mrs340znqgzhg9yy8brh6v833wvk87sxjs8psdv";
libraryHaskellDepends = [
array base bytestring containers deepseq ghc-prim hashable
semigroups text unordered-containers vector
@@ -185003,6 +186034,50 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "poseidon" = callPackage
+ ({ mkDerivation, aeson, async, base, binary, binary-bits
+ , bytestring, generics-eot, hspec, postgresql-libpq, QuickCheck
+ , random, scientific, text, time, unordered-containers, uuid
+ }:
+ mkDerivation {
+ pname = "poseidon";
+ version = "0.1.1.0";
+ sha256 = "1y33xrbqlhavk8z9lnpy9wx0hiys1bqp8dnqdibrmfs3s5zq2w92";
+ libraryHaskellDepends = [
+ aeson async base binary binary-bits bytestring generics-eot
+ postgresql-libpq random scientific text time unordered-containers
+ uuid
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec postgresql-libpq QuickCheck scientific
+ text time unordered-containers uuid
+ ];
+ description = "Simple extensible library to run SQL file against PostgreSQL database";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "poseidon-postgis" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, geojson, hspec
+ , poseidon, postgresql-libpq, QuickCheck, scientific, text, time
+ , unordered-containers, uuid, wkt-geom
+ }:
+ mkDerivation {
+ pname = "poseidon-postgis";
+ version = "0.1.1.0";
+ sha256 = "04j0pwrbmfa746la7ss5acns1miidyng48scska0qsf3xsxfqash";
+ libraryHaskellDepends = [
+ base binary bytestring geojson poseidon wkt-geom
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring hspec poseidon postgresql-libpq
+ QuickCheck scientific text time unordered-containers uuid
+ ];
+ description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"positive" = callPackage
({ mkDerivation, base, nats, semigroups }:
mkDerivation {
@@ -185709,24 +186784,25 @@ self: {
}) {};
"postgresql-simple-opts" = callPackage
- ({ mkDerivation, base, bytestring, data-default, either
- , generic-deriving, hspec, optparse-applicative, optparse-generic
- , postgres-options, postgresql-simple, split, uri-bytestring
+ ({ mkDerivation, base, bytestring, containers, data-default, either
+ , envy, generic-deriving, hspec, optparse-applicative
+ , optparse-generic, postgres-options, postgresql-simple, split
+ , uri-bytestring
}:
mkDerivation {
pname = "postgresql-simple-opts";
- version = "0.4.0.0";
- sha256 = "0zrmqd25xni2d51jna2a52l3bmdn6lpx9mbjzllnf6zn6ckw4ja8";
+ version = "0.5.0.0";
+ sha256 = "1a2z6pcdvg51k6n5k1ppp43pv2vvdbkgx2rpwm4ip15qh63gm7i3";
libraryHaskellDepends = [
- base bytestring data-default either generic-deriving
+ base bytestring data-default either envy generic-deriving
optparse-applicative optparse-generic postgres-options
postgresql-simple split uri-bytestring
];
testHaskellDepends = [
- base bytestring data-default hspec optparse-applicative
+ base bytestring containers data-default hspec optparse-applicative
postgres-options postgresql-simple
];
- description = "An optparse-applicative parser for postgresql-simple's connection options";
+ description = "An optparse-applicative and envy parser for postgresql-simple's connection options";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -187665,6 +188741,17 @@ self: {
broken = true;
}) {};
+ "primitive-convenience" = callPackage
+ ({ mkDerivation, primitive }:
+ mkDerivation {
+ pname = "primitive-convenience";
+ version = "0.1";
+ sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
+ libraryHaskellDepends = [ primitive ];
+ description = "convenience class for PrimMonad m/PrimState m";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"primitive-extras" = callPackage
({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
, foldl, list-t, primitive, profunctors, QuickCheck
@@ -188155,14 +189242,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "process_1_6_5_1" = callPackage
+ "process_1_6_6_0" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
, unix
}:
mkDerivation {
pname = "process";
- version = "1.6.5.1";
- sha256 = "1x9vdcj4g19ibf34w96nzgv2blxx727z0xb7dq012ky04ssblx8j";
+ version = "1.6.6.0";
+ sha256 = "140as37rfad7hy1lg03n19dzfbcdaahv64aydl6frv06qvdlc49w";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
@@ -190135,8 +191222,8 @@ self: {
}:
mkDerivation {
pname = "publicsuffix";
- version = "0.20190826";
- sha256 = "1z6apxnp88jjpf5q7zg04r18lja7rafwlx1w2cy7d74qfrh1v2b7";
+ version = "0.20190927";
+ sha256 = "1yvv9yjpaj9f4ck1g7qdcglm7xli2h30nbrcc8s9vnl8im4gmy25";
libraryHaskellDepends = [ base filepath template-haskell ];
testHaskellDepends = [ base hspec ];
benchmarkHaskellDepends = [ base criterion random ];
@@ -191006,6 +192093,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pusher-http-haskell_1_5_1_11" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , cryptonite, hashable, hspec, http-client, http-types, memory
+ , QuickCheck, scientific, text, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "pusher-http-haskell";
+ version = "1.5.1.11";
+ sha256 = "02r6w64ll7gka1zgvv6yqalbzpjmw0rx2ji84fmbnk0f7c1793sq";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring cryptonite hashable
+ http-client http-types memory text time transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base base16-bytestring bytestring cryptonite hspec
+ http-client http-types QuickCheck scientific text time transformers
+ unordered-containers vector
+ ];
+ description = "Haskell client library for the Pusher HTTP API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pusher-ws" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, deepseq
, hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -192517,8 +193629,8 @@ self: {
}:
mkDerivation {
pname = "quickcheck-string-random";
- version = "0.1.2.0";
- sha256 = "0n5h7nlicgm8xn23pvrsxrw4y2f4j1ammpbccl6z1c37yasf1xm7";
+ version = "0.1.3.0";
+ sha256 = "0pyh2xa68d6jhca1lr5ymmxqs19m17hjxdlrplyl0pww65mfrj8d";
libraryHaskellDepends = [ base QuickCheck string-random text ];
testHaskellDepends = [
base QuickCheck tasty tasty-quickcheck text
@@ -194489,8 +195601,8 @@ self: {
}:
mkDerivation {
pname = "raven-haskell";
- version = "0.1.2.0";
- sha256 = "1g6102p6adn5jc2jvqjgyzpylvacv52yj754rki21l6d13cn07a4";
+ version = "0.1.2.1";
+ sha256 = "1mzz7z99a2agivwypcl62y68vpmihyh6rvy79w1jd29n1l2p621x";
libraryHaskellDepends = [
aeson base bytestring http-conduit mtl network random resourcet
text time unordered-containers uuid
@@ -195487,28 +196599,29 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
- "reanimate_0_1_6_0" = callPackage
+ "reanimate_0_1_8_0" = callPackage
({ mkDerivation, ansi-wl-pprint, attoparsec, base
- , base64-bytestring, bytestring, cassava, colour, containers
- , cubicbezier, diagrams, diagrams-contrib, diagrams-core
- , diagrams-lib, diagrams-svg, directory, filepath, fsnotify
- , hashable, here, JuicyPixels, lens, linear, matrices, matrix, mtl
- , open-browser, palette, parallel, process, QuickCheck
- , random-shuffle, reanimate-svg, svg-builder, tasty, tasty-golden
- , tasty-hunit, temporary, text, time, vector, websockets, xml
+ , base64-bytestring, bytestring, cassava, chiphunk, colour
+ , containers, cubicbezier, diagrams, diagrams-contrib
+ , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath
+ , fsnotify, hashable, here, JuicyPixels, lens, linear, matrix, mtl
+ , open-browser, optparse-applicative, palette, parallel, process
+ , QuickCheck, random-shuffle, reanimate-svg, svg-builder, tasty
+ , tasty-golden, tasty-hunit, temporary, text, time, vector
+ , websockets, xml
}:
mkDerivation {
pname = "reanimate";
- version = "0.1.6.0";
- sha256 = "10nivxmj8lkvr7g8fjnq7m7kxy3jmy9vka0lva6ahr91c9qk1fcz";
+ version = "0.1.8.0";
+ sha256 = "1vr0cqn47gl7810clqvn1wgkz3glzd216jmyvxfp6q1i5jhbizvw";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava
- colour containers cubicbezier diagrams diagrams-contrib
+ chiphunk colour containers cubicbezier diagrams diagrams-contrib
diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify
- hashable here JuicyPixels lens linear matrices matrix mtl
- open-browser palette parallel process random-shuffle reanimate-svg
- svg-builder temporary text time vector websockets xml
+ hashable here JuicyPixels lens linear matrix mtl open-browser
+ optparse-applicative palette parallel process random-shuffle
+ reanimate-svg svg-builder temporary text time vector websockets xml
];
testHaskellDepends = [
ansi-wl-pprint base bytestring directory filepath process
@@ -195539,6 +196652,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "reanimate-svg_0_9_3_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
+ , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
+ , transformers, vector, xml
+ }:
+ mkDerivation {
+ pname = "reanimate-svg";
+ version = "0.9.3.0";
+ sha256 = "1wwk2bd802nznwb9nlc7pq16krldw3dzj89fjd1v00plg9b5i3i4";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers JuicyPixels lens linear mtl
+ scientific text transformers vector xml
+ ];
+ testHaskellDepends = [
+ attoparsec base hspec linear scientific svg-tree
+ ];
+ description = "SVG file loader and serializer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"reason-export" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
@@ -197040,24 +198174,52 @@ self: {
pname = "regex-base";
version = "0.93.2";
sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
- revision = "1";
- editedCabalFile = "1ijzh7yz7i6hvn8xlgyrc75l7zzn0z3kd4ks2yjfih4iir63y4ns";
+ revision = "2";
+ editedCabalFile = "0dks3m5xwcjqqlyyg7abh12ci3ap5qn6wz3bz80kr6rcfgk0fhvd";
libraryHaskellDepends = [ array base bytestring containers mtl ];
description = "Replaces/Enhances Text.Regex";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-base_0_94_0_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, mtl, text }:
+ mkDerivation {
+ pname = "regex-base";
+ version = "0.94.0.0";
+ sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4";
+ libraryHaskellDepends = [
+ array base bytestring containers mtl text
+ ];
+ description = "Common \"Text.Regex.*\" API for Regex matching";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-compat" = callPackage
({ mkDerivation, array, base, regex-base, regex-posix }:
mkDerivation {
pname = "regex-compat";
version = "0.95.1";
sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
+ revision = "1";
+ editedCabalFile = "0yg34p0rkql07y6rs6l70zlk8x51lra9vabkin921l581k6br498";
libraryHaskellDepends = [ array base regex-base regex-posix ];
description = "Replaces/Enhances Text.Regex";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-compat_0_95_2_0" = callPackage
+ ({ mkDerivation, array, base, regex-base, regex-posix }:
+ mkDerivation {
+ pname = "regex-compat";
+ version = "0.95.2.0";
+ sha256 = "01l44zrfpqb4k1rrzd1j18hn6922xhrl9h7s0hjfs363dx3hxj8z";
+ libraryHaskellDepends = [ array base regex-base regex-posix ];
+ description = "Replaces/Enhances \"Text.Regex\"";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-compat-tdfa" = callPackage
({ mkDerivation, array, base, regex-base, regex-tdfa }:
mkDerivation {
@@ -197235,6 +198397,8 @@ self: {
pname = "regex-pcre";
version = "0.94.4";
sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
+ revision = "1";
+ editedCabalFile = "0jk29n0may65ghixlx1wwfmfcabsm730y8ppry1qy4naywhi1vs7";
libraryHaskellDepends = [
array base bytestring containers regex-base
];
@@ -197243,12 +198407,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) pcre;};
+ "regex-pcre_0_95_0_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, pcre
+ , regex-base
+ }:
+ mkDerivation {
+ pname = "regex-pcre";
+ version = "0.95.0.0";
+ sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n";
+ libraryHaskellDepends = [
+ array base bytestring containers regex-base
+ ];
+ libraryPkgconfigDepends = [ pcre ];
+ description = "PCRE Backend for \"Text.Regex\" (regex-base)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) pcre;};
+
"regex-pcre-builtin" = callPackage
({ mkDerivation, array, base, bytestring, containers, regex-base }:
mkDerivation {
pname = "regex-pcre-builtin";
version = "0.94.4.8.8.35";
sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
+ revision = "1";
+ editedCabalFile = "0r29q3fwlji0vxypk0pywrqgrqz84ryd0n5zmk44bgy2k534mk6c";
libraryHaskellDepends = [
array base bytestring containers regex-base
];
@@ -197256,6 +198439,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-pcre-builtin_0_95_0_8_8_35" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, regex-base }:
+ mkDerivation {
+ pname = "regex-pcre-builtin";
+ version = "0.95.0.8.8.35";
+ sha256 = "071zlipd90vyb0d986a0pnlszjmnwvhfi5vqahpnr2b8zz40lsrk";
+ libraryHaskellDepends = [
+ array base bytestring containers regex-base
+ ];
+ description = "Replaces/Enhances Text.Regex";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-pcre-text" = callPackage
({ mkDerivation, array, base, bytestring, regex-base
, regex-pcre-builtin, regex-tdfa-text, text
@@ -197296,6 +198493,8 @@ self: {
pname = "regex-posix";
version = "0.95.2";
sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
+ revision = "2";
+ editedCabalFile = "1zrlwmmrb3x3r3af1r42xwhwspzfgnzh4dw1158523sndsg8qn08";
libraryHaskellDepends = [
array base bytestring containers regex-base
];
@@ -197303,6 +198502,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-posix_0_96_0_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, regex-base }:
+ mkDerivation {
+ pname = "regex-posix";
+ version = "0.96.0.0";
+ sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5";
+ libraryHaskellDepends = [
+ array base bytestring containers regex-base
+ ];
+ description = "POSIX Backend for \"Text.Regex\" (regex-base)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "regex-posix-clib" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "regex-posix-clib";
+ version = "2.7";
+ sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7";
+ doHaddock = false;
+ description = "\"Regex for Windows\" C library";
+ license = stdenv.lib.licenses.lgpl21;
+ }) {};
+
"regex-posix-unittest" = callPackage
({ mkDerivation, array, base, bytestring, containers, mtl
, regex-base, regex-posix
@@ -197329,6 +198553,8 @@ self: {
pname = "regex-tdfa";
version = "1.2.3.2";
sha256 = "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf";
+ revision = "1";
+ editedCabalFile = "03z5jmpkgyd6ydwmnxcmhysjfwb0m5ngfgvxzf4f1vx2qgifqm5i";
libraryHaskellDepends = [
array base bytestring containers ghc-prim mtl parsec regex-base
];
@@ -197336,6 +198562,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-tdfa_1_3_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, file-embed
+ , filepath, ghc-prim, mtl, parsec, regex-base, utf8-string
+ }:
+ mkDerivation {
+ pname = "regex-tdfa";
+ version = "1.3.0";
+ sha256 = "1qzcix4bmz5lj0w433qrfi576rvy8y8flv5wvlp6cchb2s8mfq0v";
+ libraryHaskellDepends = [
+ array base bytestring containers ghc-prim mtl parsec regex-base
+ ];
+ testHaskellDepends = [
+ array base bytestring containers file-embed filepath mtl regex-base
+ utf8-string
+ ];
+ description = "Replaces/Enhances Text.Regex";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-tdfa-pipes" = callPackage
({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
, regex-tdfa
@@ -197389,6 +198635,8 @@ self: {
pname = "regex-tdfa-text";
version = "1.0.0.3";
sha256 = "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq";
+ revision = "1";
+ editedCabalFile = "00swglzmdw30g4bn47z6j71all0djjb2hjm7bkfl7pza4wv14wpv";
libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
description = "Text interface for regex-tdfa";
license = stdenv.lib.licenses.bsd3;
@@ -199052,6 +200300,8 @@ self: {
pname = "req";
version = "2.1.0";
sha256 = "07sm483bkwqq7fvhwqysl4ac0nw1mvhkywawwpgq0c1gw2wnv56n";
+ revision = "1";
+ editedCabalFile = "0dgd4wgijd0k96khy56b6gnzmqzmz44a4qsj0v5mwslvnvkq598a";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson authenticate-oauth base blaze-builder bytestring
@@ -199143,8 +200393,8 @@ self: {
}:
mkDerivation {
pname = "reqcatcher";
- version = "0.1.2.0";
- sha256 = "0vwk4cl3jcahwg9sggic1rac2l2ia3nv3f4ri8iv8qknwah8mf5n";
+ version = "0.2.1.0";
+ sha256 = "1fh9p7437czn7rw5jmpxlmg0zhrkkj5hwd0kzlr2jainxzvlw2b3";
libraryHaskellDepends = [ base http-types network text wai warp ];
testHaskellDepends = [
base http-client http-types HUnit lens tasty tasty-hunit wai wreq
@@ -199885,8 +201135,8 @@ self: {
pname = "rethinkdb-client-driver";
version = "0.0.25";
sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
- revision = "3";
- editedCabalFile = "1g4shgl944fd3qbqkd68jv6vh65plaivci4vjzfs4py7a2p62db1";
+ revision = "4";
+ editedCabalFile = "1fjavc5gmz15za1yzj4b23gd50b2jj83l0d5pc2kmz8f6bs5nx9f";
libraryHaskellDepends = [
aeson base binary bytestring containers hashable mtl network
old-locale scientific stm template-haskell text time
@@ -199963,6 +201213,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "retry_0_8_0_2" = callPackage
+ ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl
+ , random, stm, tasty, tasty-hedgehog, tasty-hunit, time
+ , transformers
+ }:
+ mkDerivation {
+ pname = "retry";
+ version = "0.8.0.2";
+ sha256 = "1i98a5pp37fcny28wfp002bc16m9jf793jicbp83ffwlk0g123v5";
+ libraryHaskellDepends = [
+ base exceptions ghc-prim random transformers
+ ];
+ testHaskellDepends = [
+ base exceptions ghc-prim hedgehog HUnit mtl random stm tasty
+ tasty-hedgehog tasty-hunit time transformers
+ ];
+ description = "Retry combinators for monadic actions that may fail";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"retryer" = callPackage
({ mkDerivation, base, optparse-applicative, process }:
mkDerivation {
@@ -200555,8 +201826,8 @@ self: {
({ mkDerivation, base, Only, postgresql-simple, text, time }:
mkDerivation {
pname = "ribbit";
- version = "0.3.0.1";
- sha256 = "0n2xgwwff1bgpqza2l0d5j7agynkz2ps3vc0y73rrpxwc0kn8z3n";
+ version = "0.4.0.0";
+ sha256 = "0nmpsi8b6m88za9jxawz36jjhsybn39ldi503ap7m9wd765j1dbz";
libraryHaskellDepends = [ base Only postgresql-simple text time ];
description = "Type-level Relational DB combinators";
license = stdenv.lib.licenses.mit;
@@ -201431,6 +202702,25 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "rocksdb-query_0_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, conduit, data-default
+ , hspec, resourcet, rocksdb-haskell, unliftio
+ }:
+ mkDerivation {
+ pname = "rocksdb-query";
+ version = "0.3.0";
+ sha256 = "0fy7d9m9g0jwssjgkhyg2d170s7mp7g9kz73zgnnp0xgl6mpxrsi";
+ libraryHaskellDepends = [
+ base bytestring cereal conduit resourcet rocksdb-haskell unliftio
+ ];
+ testHaskellDepends = [
+ base cereal data-default hspec rocksdb-haskell unliftio
+ ];
+ description = "RocksDB database querying library for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"roguestar" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, old-time
, process
@@ -203358,6 +204648,8 @@ self: {
pname = "safecopy";
version = "0.10.1";
sha256 = "173lkpp6mj0kaklkwx1vypi7bwxgjwrbc3zk9akyfh3f2mlz0wi0";
+ revision = "1";
+ editedCabalFile = "0pgpnpg41p8gkq9l53bj4jj0hq863c5g0hzfjz9y5dqmjrwkvw8w";
libraryHaskellDepends = [
array base bytestring cereal containers generic-data old-time
template-haskell text time transformers vector
@@ -204848,6 +206140,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scheduler_1_4_2_1" = callPackage
+ ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
+ , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec
+ , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly
+ , template-haskell, unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "scheduler";
+ version = "1.4.2.1";
+ sha256 = "074m037ksjl7kgpgfldimaadhc4f6mmv40y6cq54m9shhg7rxw1c";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ atomic-primops base deepseq exceptions primitive unliftio-core
+ ];
+ testHaskellDepends = [
+ base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
+ template-haskell unliftio vector
+ ];
+ benchmarkHaskellDepends = [
+ async base criterion deepseq monad-par parallel streamly unliftio
+ ];
+ description = "Work stealing scheduler";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"schedyield" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -204873,6 +206191,29 @@ self: {
license = stdenv.lib.licenses.agpl3;
}) {};
+ "schemas" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring
+ , free, generic-lens, generics-sop, hashable, hspec, lens
+ , lens-aeson, pretty-simple, profunctors, QuickCheck, scientific
+ , text, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "schemas";
+ version = "0.2.0.1";
+ sha256 = "19dqs2px9gj17lrav6syypn86pqk0yai29vn7z7a1gydmgvbzpw6";
+ libraryHaskellDepends = [
+ aeson base bifunctors bytestring free generics-sop hashable lens
+ lens-aeson profunctors scientific text transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring generic-lens generics-sop hspec
+ lens pretty-simple QuickCheck text unordered-containers
+ ];
+ description = "schema guided serialization";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"schematic" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hjsonschema
, hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens
@@ -205138,8 +206479,8 @@ self: {
}:
mkDerivation {
pname = "scientific-notation";
- version = "0.1.0.0";
- sha256 = "0150krfwm5ya5ws6h39fngbgdhi5hd29jpci07ap3fbq27ygrds0";
+ version = "0.1.0.1";
+ sha256 = "1a877ryswq5h7i3lml55ksrx5hzd9gwbm2yzp0a7cw1hb6r5pjs7";
libraryHaskellDepends = [ base bytesmith ];
testHaskellDepends = [
base byteslice bytesmith bytestring primitive QuickCheck tasty
@@ -205151,6 +206492,8 @@ self: {
];
description = "Scientific notation intended for tokenization";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"scion" = callPackage
@@ -206563,6 +207906,8 @@ self: {
pname = "selda-postgresql";
version = "0.1.8.0";
sha256 = "0x7ncc8593lialllgsjdy759cinvgwh4spq2aarfd0j3zv78yvdi";
+ revision = "1";
+ editedCabalFile = "0zbx50lw8d5x7lsx9gpy2ql1n2nryhyd6x7w98lbnb3nzn3szzqr";
libraryHaskellDepends = [
base bytestring exceptions postgresql-binary postgresql-libpq selda
selda-json text time uuid-types
@@ -206579,6 +207924,8 @@ self: {
pname = "selda-sqlite";
version = "0.1.7.0";
sha256 = "0qiagfsd45v3vk1npdm8g28mlbdbnrp3drvb6hdnxyp3b5cmyzik";
+ revision = "1";
+ editedCabalFile = "0m9zps90idp41h3fggd30xjqyjy2yyyb572231w5m2ygl4kv8hvh";
libraryHaskellDepends = [
base bytestring direct-sqlite directory exceptions selda text time
uuid-types
@@ -207812,6 +209159,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-JuicyPixels_0_3_0_5" = callPackage
+ ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
+ , servant-server, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-JuicyPixels";
+ version = "0.3.0.5";
+ sha256 = "1lhxb6z8xypx48k8hwzqpp92qww8wxbp3a1ggik4dfrcxkcklmlx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring http-media JuicyPixels servant
+ ];
+ executableHaskellDepends = [
+ base JuicyPixels servant servant-server wai warp
+ ];
+ description = "Servant support for JuicyPixels";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-aeson-specs" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
, doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery
@@ -208602,6 +209970,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-errors" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, http-api-data, http-media
+ , http-types, markdown-unlit, scientific, servant, servant-server
+ , string-conversions, text, unordered-containers, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-errors";
+ version = "0.1.3.1";
+ sha256 = "120rl4adz54c3psb6qv8l6im4xv2649kwazvfr7h0l11jjfb6hni";
+ libraryHaskellDepends = [
+ aeson base bytestring http-api-data http-media http-types
+ scientific servant string-conversions text unordered-containers wai
+ ];
+ testHaskellDepends = [ aeson base servant-server text wai warp ];
+ testToolDepends = [ markdown-unlit ];
+ description = "Servant Errors wai-middlware";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"servant-examples" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, either
, http-types, js-jquery, lucid, random, servant, servant-client
@@ -208952,6 +210339,47 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-jsonrpc" = callPackage
+ ({ mkDerivation, aeson, base, servant }:
+ mkDerivation {
+ pname = "servant-jsonrpc";
+ version = "1.0.0";
+ sha256 = "0kqs2bnkkhakg5401ylv3ys00p3s5w5r11spylkxgzi77l1q2vli";
+ libraryHaskellDepends = [ aeson base servant ];
+ description = "JSON-RPC messages and endpoints";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
+ "servant-jsonrpc-client" = callPackage
+ ({ mkDerivation, aeson, base, servant, servant-client-core
+ , servant-jsonrpc
+ }:
+ mkDerivation {
+ pname = "servant-jsonrpc-client";
+ version = "1.0.0";
+ sha256 = "0ir7lljaiczlfakzl95vpmzvx3z5n40agd0gwrscklqpdpc9n8lm";
+ libraryHaskellDepends = [
+ aeson base servant servant-client-core servant-jsonrpc
+ ];
+ description = "Generate JSON-RPC servant clients";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
+ "servant-jsonrpc-server" = callPackage
+ ({ mkDerivation, aeson, base, mtl, servant, servant-jsonrpc
+ , servant-server
+ }:
+ mkDerivation {
+ pname = "servant-jsonrpc-server";
+ version = "1.0.0";
+ sha256 = "13ryxq8y7mcmq70jnwd2gv3anq7k3p9vpi2vnp0kn4552332wpa4";
+ libraryHaskellDepends = [
+ aeson base mtl servant servant-jsonrpc servant-server
+ ];
+ description = "JSON-RPC servant servers";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"servant-kotlin" = callPackage
({ mkDerivation, aeson, base, containers, directory, formatting
, hspec, http-api-data, lens, servant, servant-foreign, shelly
@@ -210173,8 +211601,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.8.11";
- sha256 = "1jvfjq7qlyqyprvhlk0licr8mrnc7xn5l4g3l95g3x4qii48j4s0";
+ version = "0.9.1";
+ sha256 = "09l9d43ls4ca10y0fx39l8bqsmb226sa0f5yprsm5jz5nbvl70qv";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -212003,6 +213431,24 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
+ "shellmet_0_0_3_0" = callPackage
+ ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text
+ }:
+ mkDerivation {
+ pname = "shellmet";
+ version = "0.0.3.0";
+ sha256 = "1i39zl8khsriadi7k28rn0w2y8wf6jmnz5x3nlkdd9spkdy1qz49";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base process text ];
+ executableHaskellDepends = [ base text ];
+ executableToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [ base doctest Glob ];
+ description = "Out of the shell solution for scripting in Haskell";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shellout" = callPackage
({ mkDerivation, async, base, stm, text, typed-process }:
mkDerivation {
@@ -212738,10 +214184,8 @@ self: {
}:
mkDerivation {
pname = "sign";
- version = "0.4.3";
- sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp";
- revision = "2";
- editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya";
+ version = "0.4.4";
+ sha256 = "1z9csfbl5h4cprvykszn81xncsry7fama2y3gbgnqr7mq15qziq7";
libraryHaskellDepends = [
base containers deepseq hashable lattices universe-base
];
@@ -212993,6 +214437,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simple-cabal_0_1_0" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath }:
+ mkDerivation {
+ pname = "simple-cabal";
+ version = "0.1.0";
+ sha256 = "03isazzxy8bhk9mpzyzr5ls235d0ax7vah0js2jx656ksbbbn8v9";
+ libraryHaskellDepends = [ base Cabal directory filepath ];
+ description = "Cabal file wrapper library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-cmd" = callPackage
({ mkDerivation, base, directory, filepath, process, unix }:
mkDerivation {
@@ -214648,6 +216104,24 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "skylighting_0_8_2_2" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers
+ , skylighting-core
+ }:
+ mkDerivation {
+ pname = "skylighting";
+ version = "0.8.2.2";
+ sha256 = "1fw9ay8h22vlf2nk8nvijsq1rqfyahz9h2zw4lkkl0ja71l4d589";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring containers skylighting-core
+ ];
+ description = "syntax highlighting library";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"skylighting-core" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
@@ -214680,6 +216154,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "skylighting-core_0_8_2_2" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+ , base64-bytestring, binary, blaze-html, bytestring
+ , case-insensitive, colour, containers, criterion, Diff, directory
+ , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+ , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+ , tasty-quickcheck, text, transformers, utf8-string
+ }:
+ mkDerivation {
+ pname = "skylighting-core";
+ version = "0.8.2.2";
+ sha256 = "18zs0j2ckaryskq6n4pky3dfbd85kkx24d154wkswydvybkn9gl7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal attoparsec base base64-bytestring binary
+ blaze-html bytestring case-insensitive colour containers directory
+ filepath hxt mtl regex-pcre-builtin safe text transformers
+ utf8-string
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers Diff directory filepath HUnit
+ pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+ tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion directory filepath text
+ ];
+ description = "syntax highlighting library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"skylighting-extensions" = callPackage
({ mkDerivation, base, containers, skylighting, skylighting-modding
, text
@@ -215499,6 +217006,17 @@ self: {
broken = true;
}) {};
+ "smith" = callPackage
+ ({ mkDerivation, base, bytesmith, primitive }:
+ mkDerivation {
+ pname = "smith";
+ version = "0.1.0.0";
+ sha256 = "13h0v7fl8xi84n0nq9mjsb5hphv2b7l8yaz1hg9ky3bkmqki6vml";
+ libraryHaskellDepends = [ base bytesmith primitive ];
+ description = "Parse arrays of tokens";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"smith-cli" = callPackage
({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
, cereal, crypto-pubkey-openssh, crypto-pubkey-types, directory
@@ -217746,6 +219264,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "socks_0_6_1" = callPackage
+ ({ mkDerivation, base, basement, bytestring, cereal, network }:
+ mkDerivation {
+ pname = "socks";
+ version = "0.6.1";
+ sha256 = "0wvaxy3dkv97wrncjv1rxrmjr4014hgxz82kixvcwqdhidalfi3k";
+ libraryHaskellDepends = [
+ base basement bytestring cereal network
+ ];
+ description = "Socks proxy (ver 5)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sodium" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -220260,8 +221792,8 @@ self: {
pname = "stache";
version = "2.0.1";
sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk";
- revision = "2";
- editedCabalFile = "17da7jih43nl3zqgpmlk3n2kpwjmb2np4w8ldpq2vyi9ab8p6vjm";
+ revision = "3";
+ editedCabalFile = "1y1wff5mdcin3wc9pbj3agsircrf1pxjjm8j90n8g40l7acnf63c";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath
@@ -220289,6 +221821,8 @@ self: {
pname = "stache";
version = "2.1.0";
sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk";
+ revision = "1";
+ editedCabalFile = "19vkvp6gkhld4lm8d87sicw63cd6d5awphyjpsdg9iha44j6sh11";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath
@@ -224012,6 +225546,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "string-fromto" = callPackage
+ ({ mkDerivation, base, bytestring, memory, text }:
+ mkDerivation {
+ pname = "string-fromto";
+ version = "1.0.0.0";
+ sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx";
+ libraryHaskellDepends = [ base bytestring memory text ];
+ description = "Conversions between common string types, as well as Base16/Base32/Base64";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"string-interpolate" = callPackage
({ mkDerivation, base, bytestring, criterion, formatting
, haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
@@ -224320,6 +225865,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "stripe-concepts_1_0_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, text }:
+ mkDerivation {
+ pname = "stripe-concepts";
+ version = "1.0.2.0";
+ sha256 = "0a8p4pm8v83kcgxm3jpmpl4811pdjjn2rmdl0mkq649rfnm3cg2k";
+ libraryHaskellDepends = [ base bytestring text ];
+ description = "Types for the Stripe API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"stripe-core" = callPackage
({ mkDerivation, aeson, base, bytestring, mtl, text, time
, transformers, unordered-containers
@@ -224462,6 +226019,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "stripe-wreq_1_0_1_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts
+ , text, unordered-containers, wreq
+ }:
+ mkDerivation {
+ pname = "stripe-wreq";
+ version = "1.0.1.0";
+ sha256 = "0i5d0c9zha4v9361p92kq5bpma5dq5aqdkqdrghwpzx0pppfpx3y";
+ libraryHaskellDepends = [
+ aeson base bytestring lens stripe-concepts text
+ unordered-containers wreq
+ ];
+ description = "Use the Stripe API via Wreq";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"strips" = callPackage
({ mkDerivation, base, containers, hspec, mtl }:
mkDerivation {
@@ -225730,8 +227304,8 @@ self: {
pname = "sv";
version = "1.4";
sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5";
- revision = "1";
- editedCabalFile = "0lzl0602dbq8nih9ylqk18vqg3xgj3bnf8c6hkxhbc2mryszrhyj";
+ revision = "2";
+ editedCabalFile = "0kacp654mmj9h038mrxnq69ln5ipbbp2ifvyzqixgjask2bf9f41";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -225810,8 +227384,8 @@ self: {
pname = "sv-core";
version = "0.5";
sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa";
- revision = "1";
- editedCabalFile = "1vsd3g5kh50c7vrx9y04crrw6pfs3g74z3sr9s1dbapa9411pif8";
+ revision = "2";
+ editedCabalFile = "066kpnyvpzl6bvc11ng6xq4mdd84lxjiif83i265mkjc8hq21xd4";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq double-conversion lens mtl parsec profunctors readable
@@ -226243,6 +227817,32 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
+ "swish_0_10_0_2" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, hashable
+ , HUnit, intern, mtl, network-uri, old-locale, polyparse
+ , semigroups, test-framework, test-framework-hunit, text, time
+ }:
+ mkDerivation {
+ pname = "swish";
+ version = "0.10.0.2";
+ sha256 = "1r6wfj8x5r3w2gvnhvdkjgn3rq4a4smna81gsxah2ibpwhinjjf1";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base containers directory filepath hashable intern mtl network-uri
+ old-locale polyparse text time
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers hashable HUnit network-uri old-locale semigroups
+ test-framework test-framework-hunit text time
+ ];
+ description = "A semantic web toolkit";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sws" = callPackage
({ mkDerivation, base, bytestring, cryptonite, directory, filepath
, hourglass, http-types, network, resourcet, transformers, wai
@@ -226648,21 +228248,23 @@ self: {
}) {};
"symbiote" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
- , monad-control, mtl, QuickCheck, quickcheck-instances, stm, tasty
- , tasty-hunit, text
+ ({ mkDerivation, abides, aeson, async, base, bytestring, cereal
+ , cereal-text, containers, monad-control, mtl, QuickCheck
+ , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck
+ , text
}:
mkDerivation {
pname = "symbiote";
- version = "0.0.0.1";
- sha256 = "06341y9bfr6h9sf7llxm2zc36q0zabn2ildp0gyskspybibl1sdy";
+ version = "0.0.1";
+ sha256 = "1pq5nncn0sg0246a569arncgj98b9d0j7l499yych97r016rg5bf";
libraryHaskellDepends = [
- aeson async base bytestring cereal containers monad-control mtl
- QuickCheck stm text
+ abides aeson async base bytestring cereal cereal-text containers
+ monad-control mtl QuickCheck quickcheck-instances stm text
];
testHaskellDepends = [
- aeson async base bytestring cereal containers monad-control mtl
- QuickCheck quickcheck-instances stm tasty tasty-hunit text
+ abides aeson async base bytestring cereal cereal-text containers
+ monad-control mtl QuickCheck quickcheck-instances stm tasty
+ tasty-hunit tasty-quickcheck text
];
description = "Data serialization, communication, and operation verification implementation";
license = stdenv.lib.licenses.bsd3;
@@ -231129,8 +232731,8 @@ self: {
pname = "test-framework";
version = "0.8.2.0";
sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
- revision = "4";
- editedCabalFile = "1g1z9h55ii55b44gzgrjgi1lpk85yfi4yhrynvfy0199ywpckpd5";
+ revision = "5";
+ editedCabalFile = "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base containers hostname old-locale
random regex-posix time xml
@@ -233277,6 +234879,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-orphans_0_13_9" = callPackage
+ ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover
+ , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many
+ }:
+ mkDerivation {
+ pname = "th-orphans";
+ version = "0.13.9";
+ sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z";
+ libraryHaskellDepends = [
+ base mtl template-haskell th-lift th-lift-instances th-reify-many
+ ];
+ testHaskellDepends = [
+ base bytestring ghc-prim hspec template-haskell th-lift
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Orphan instances for TH datatypes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-pprint" = callPackage
({ mkDerivation, base, lens, pretty, template-haskell }:
mkDerivation {
@@ -233388,6 +235010,8 @@ self: {
pname = "th-test-utils";
version = "1.0.0";
sha256 = "1kpkf6h0vr06z7iphkcjva9x28mfjg967hrih4im527g9vw5mdq6";
+ revision = "2";
+ editedCabalFile = "1m2fh0js7cyqr8g0yn0222jjc62bib4lvb1lq570p0c4zd508dpn";
libraryHaskellDepends = [ base template-haskell transformers ];
testHaskellDepends = [
base tasty tasty-hunit template-haskell transformers
@@ -233396,6 +235020,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-test-utils_1_0_1" = callPackage
+ ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "th-test-utils";
+ version = "1.0.1";
+ sha256 = "1qbxj4zarw1nm0c2shrr4wrrkmqlxx2qdh9q3q9arkic4lwgsxcx";
+ libraryHaskellDepends = [ base template-haskell transformers ];
+ testHaskellDepends = [
+ base tasty tasty-hunit template-haskell transformers
+ ];
+ description = "Utility functions for testing Template Haskell code";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-to-exp" = callPackage
({ mkDerivation, base, hspec, template-haskell }:
mkDerivation {
@@ -236576,8 +238217,8 @@ self: {
}:
mkDerivation {
pname = "too-many-cells";
- version = "0.1.12.4";
- sha256 = "02qgin4x0vmj56y4yv3zb4fimd6zaqnx344gyj9lrq11fnr202yr";
+ version = "0.2.0.0";
+ sha256 = "05ky77q0smz27917zk6k4ladyf8vbg6biidjmfwx0y1mbsq50k4y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -237214,8 +238855,8 @@ self: {
}:
mkDerivation {
pname = "traction";
- version = "0.3.0";
- sha256 = "1y0l02hcbxmc3vidg477z7dlbikalmi448dv8dl5pl7zpflcp7di";
+ version = "0.4.0";
+ sha256 = "1prd4wq5jb4flzdg78861w1x8xwdbgd0b64xbksdprhlvlyrvmxk";
libraryHaskellDepends = [
base bytestring containers exceptions mmorph postgresql-simple
resource-pool syb template-haskell text time transformers
@@ -238092,16 +239733,16 @@ self: {
"tree-sitter" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
- , filepath, fused-effects, hedgehog, split, template-haskell, text
- , unordered-containers
+ , filepath, fused-effects, hedgehog, semantic-source, split
+ , template-haskell, text, unordered-containers
}:
mkDerivation {
pname = "tree-sitter";
- version = "0.3.0.0";
- sha256 = "1ai587a8m67j0rjg1gbhxnv1kl4awpcr7jvh4qnlvx91g7s1gq2g";
+ version = "0.4.0.0";
+ sha256 = "0iqyqj2wavm4qrnmls4nwcnr0y8lgxsj42jbm22riwfh3wlg4dnf";
libraryHaskellDepends = [
aeson base bytestring containers directory filepath fused-effects
- split template-haskell text unordered-containers
+ semantic-source split template-haskell text unordered-containers
];
testHaskellDepends = [ base hedgehog ];
description = "Unstable bindings for the tree-sitter parsing library";
@@ -238114,8 +239755,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-go";
- version = "0.2.0.0";
- sha256 = "1yrhn025rdllfcmlcaiz6idxhxqh02qjpw71dm3zynmnmgmpqcc0";
+ version = "0.2.0.1";
+ sha256 = "1l1phqnsfsi47pqcjn84i8pqxfyslnrhw8an9g6fxx21gc6sdn45";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Go";
@@ -238128,10 +239769,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-haskell";
- version = "0.2.0.0";
- sha256 = "0cds6xmps88vx3x7ifkpjbbbgvnbc22hxam6qdwy2m1njbff3wad";
- revision = "1";
- editedCabalFile = "07kgsp70bwggcnxh9229dvbfysc9s4ykzir4973pn02qs5l7kb6y";
+ version = "0.2.0.1";
+ sha256 = "0c02sv4hzlyfdpk7s8ykgm9cr6xwmjw8npy356v2vgbr0l238bgw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base template-haskell tree-sitter ];
@@ -238146,8 +239785,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-java";
- version = "0.2.0.0";
- sha256 = "1gayg7ln4iy56a4pl3dqrl2iq689b1a8z2n59dnrhmzhq87lzx7y";
+ version = "0.2.0.1";
+ sha256 = "17dpqd3ddhgaiav332wzgiqzlx8rbnzziv7gal3mvjbz0nv78rk6";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Java";
@@ -238160,8 +239799,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-json";
- version = "0.2.0.0";
- sha256 = "0x30pwmganjabzkgqgrkk249r8v4frag9ww64j4sfq6r2vbfc7l3";
+ version = "0.2.0.1";
+ sha256 = "107ymwb1fyff8b5qvvrg7rm32xnvzfh6mz2mr1nq3yjdqp6rz3n9";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for JSON";
@@ -238174,8 +239813,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-php";
- version = "0.2.0.0";
- sha256 = "0wdyppjp879wb3m73kczsa78c0lyqvpnkvsh13bh22vw66jypj6x";
+ version = "0.2.0.1";
+ sha256 = "0dxszds10fr3zp1vjcj18b44mv6hmbzskmai14x03zgimxgwwaqm";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for PHP";
@@ -238186,15 +239825,16 @@ self: {
"tree-sitter-python" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
- , hedgehog, template-haskell, tree-sitter
+ , hedgehog, semantic-source, template-haskell, tree-sitter
}:
mkDerivation {
pname = "tree-sitter-python";
- version = "0.4.0.0";
- sha256 = "02i12ys845j4n0j7a1qpdlbx9ia51m7ab9lhk7d4028ysx82crn9";
+ version = "0.5.0.0";
+ sha256 = "1ikl7r2lmcynb4ahbmzjlq04s0ydnv8jixwgcihywnfn410w82sx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base directory filepath template-haskell tree-sitter
+ aeson base directory filepath semantic-source template-haskell
+ tree-sitter
];
testHaskellDepends = [ base bytestring hedgehog tree-sitter ];
doHaddock = false;
@@ -238208,8 +239848,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-ruby";
- version = "0.2.0.0";
- sha256 = "0n2ls3mkinqv0h2h05pmi8scmgr70bpg3pdg9wnid1gdpcwn07qx";
+ version = "0.2.0.1";
+ sha256 = "1rk49pm93avr9fap8xim7zl26wms50q2f5x2yp9nq5w3mbm3j3sc";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Ruby";
@@ -238222,8 +239862,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-tsx";
- version = "0.2.1.0";
- sha256 = "1lj2mmgqkswn8n5p4j4zdd0fw3syvg8v4d0ahnipvv1b05g1y1f4";
+ version = "0.2.1.1";
+ sha256 = "1r4kr4c0vslw3j2hanzf8wifabfynz5brayd6kz1hpczg8icandm";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TSX";
@@ -238236,8 +239876,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-typescript";
- version = "0.2.1.0";
- sha256 = "1dgb5b1yhpwrr8qd18l4jlxx3g5c34zaxffh934pssyldckfbid6";
+ version = "0.2.1.1";
+ sha256 = "0i8vnc0afqnf8lnl8rmsax6b9pfx3s14s8q35f0h3ghpv9b38bs6";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TypeScript";
@@ -239440,6 +241080,8 @@ self: {
pname = "turtle";
version = "1.5.15";
sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f";
+ revision = "1";
+ editedCabalFile = "02q1rv7zx31xz9wnmcqwd4w3iw7623p07iyi21zr0cqlignic5pg";
libraryHaskellDepends = [
ansi-wl-pprint async base bytestring clock containers directory
exceptions foldl hostname managed optional-args
@@ -243630,12 +245272,14 @@ self: {
}) {};
"unpacked-maybe-numeric" = callPackage
- ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes }:
+ ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
+ , wide-word
+ }:
mkDerivation {
pname = "unpacked-maybe-numeric";
- version = "0.1.0.0";
- sha256 = "19jz91jkbvnldy56kv9wb1nmbwvlxjh7nqlxc99nq6yi4whsh8gj";
- libraryHaskellDepends = [ base primitive ];
+ version = "0.1.1.0";
+ sha256 = "1bhipjz20zajbkg6zjgw99w1bzdn6w6ixl34m6wnhvz8bms27lm1";
+ libraryHaskellDepends = [ base primitive wide-word ];
testHaskellDepends = [ base QuickCheck quickcheck-classes ];
description = "maybes of numeric values with fewer indirections";
license = stdenv.lib.licenses.bsd3;
@@ -243643,6 +245287,17 @@ self: {
broken = true;
}) {};
+ "unpacked-maybe-text" = callPackage
+ ({ mkDerivation, base, bytestring, text-short }:
+ mkDerivation {
+ pname = "unpacked-maybe-text";
+ version = "0.1.0.0";
+ sha256 = "10mc9kjjqf82ddi586g5r6h065znhj9s0ih9w800yw4xl65ygayv";
+ libraryHaskellDepends = [ base bytestring text-short ];
+ description = "optional text that unpacks well";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"unpacked-these" = callPackage
({ mkDerivation, base, deepseq, ghc-prim, QuickCheck
, quickcheck-classes, these, unpacked-maybe
@@ -245573,6 +247228,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "validity_0_9_0_2" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "validity";
+ version = "0.9.0.2";
+ sha256 = "1aa93lp1pqwv7vhx19nazlig8qhbp3psblbz360s5lii3s5rli2v";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ description = "Validity typeclass";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"validity-aeson" = callPackage
({ mkDerivation, aeson, base, validity, validity-scientific
, validity-text, validity-unordered-containers, validity-vector
@@ -245639,6 +247307,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "validity-path_0_4_0_0" = callPackage
+ ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
+ , validity
+ }:
+ mkDerivation {
+ pname = "validity-path";
+ version = "0.4.0.0";
+ sha256 = "1clma6ll0n5biaci0bsi0zzf8xr2xnc1ff5vmbxyr98pz1wy6yn4";
+ libraryHaskellDepends = [ base filepath path validity ];
+ testHaskellDepends = [
+ base filepath genvalidity-hspec hspec path validity
+ ];
+ description = "Validity instances for Path";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"validity-primitive" = callPackage
({ mkDerivation, base, primitive, validity }:
mkDerivation {
@@ -246329,6 +248014,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "vector-builder_0_3_8" = callPackage
+ ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck
+ , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
+ , tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "vector-builder";
+ version = "0.3.8";
+ sha256 = "0ww0l52p8s6gmh985adnjbvm1vrqpqbm08qdcrvxwhhcqmxgv6m3";
+ libraryHaskellDepends = [ base base-prelude semigroups vector ];
+ testHaskellDepends = [
+ attoparsec QuickCheck quickcheck-instances rerebase tasty
+ tasty-hunit tasty-quickcheck
+ ];
+ description = "Vector builder";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-bytes-instances" = callPackage
({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }:
mkDerivation {
@@ -246990,8 +248694,8 @@ self: {
({ mkDerivation, base, containers, hspec, QuickCheck, time }:
mkDerivation {
pname = "vformat";
- version = "0.9.0.0";
- sha256 = "01a6msv2iirrkxp950wvf28cvbl91kilffwavymll3l7wd3w1mb3";
+ version = "0.9.1.0";
+ sha256 = "1bq7m1yjqkgqk1bxh28n67n04yfxvp2466xmrb83a93w22h98k7l";
libraryHaskellDepends = [ base containers time ];
testHaskellDepends = [ base containers hspec QuickCheck time ];
description = "A Python str.format() like formatter";
@@ -247269,6 +248973,32 @@ self: {
pname = "vinyl";
version = "0.11.0";
sha256 = "0sqa4x8cwg6hdx3lrnq9pbggsh5vv6rhng2az4grl60c4kw6zr08";
+ revision = "1";
+ editedCabalFile = "05i1sjkgn9vf488sa063fnp0p56ic39a5vyni9b2llm4vbpl4kwz";
+ libraryHaskellDepends = [ array base ghc-prim ];
+ testHaskellDepends = [
+ aeson base doctest hspec lens lens-aeson microlens mtl
+ should-not-typecheck singletons text unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base criterion linear microlens mwc-random primitive tagged vector
+ ];
+ description = "Extensible Records";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "vinyl_0_12_0" = callPackage
+ ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
+ , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
+ , primitive, should-not-typecheck, singletons, tagged, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "vinyl";
+ version = "0.12.0";
+ sha256 = "04lzhlmm57yp1x0z4g0dl1q96wqsygsldxdksam0gisdidk133vi";
libraryHaskellDepends = [ array base ghc-prim ];
testHaskellDepends = [
aeson base doctest hspec lens lens-aeson microlens mtl
@@ -247862,6 +249592,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vty_5_26" = callPackage
+ ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+ , deepseq, directory, filepath, hashable, HUnit, microlens
+ , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+ , quickcheck-assertions, random, smallcheck, stm, string-qq
+ , terminfo, test-framework, test-framework-hunit
+ , test-framework-smallcheck, text, transformers, unix, utf8-string
+ , vector
+ }:
+ mkDerivation {
+ pname = "vty";
+ version = "5.26";
+ sha256 = "03iznvkdm11blzx09il96262qpgc4mmi3qzarhl8grrijkgzxj4x";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base blaze-builder bytestring containers deepseq directory filepath
+ hashable microlens microlens-mtl microlens-th mtl parallel parsec
+ stm terminfo text transformers unix utf8-string vector
+ ];
+ executableHaskellDepends = [
+ base containers microlens microlens-mtl mtl
+ ];
+ testHaskellDepends = [
+ base blaze-builder bytestring Cabal containers deepseq HUnit
+ microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+ smallcheck stm string-qq terminfo test-framework
+ test-framework-hunit test-framework-smallcheck text unix
+ utf8-string vector
+ ];
+ description = "A simple terminal UI library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vty-examples" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, containers
, data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -252102,6 +253867,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "winery_1_1_3" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal
+ , containers, cpu, deepseq, directory, fast-builder, gauge
+ , hashable, HUnit, megaparsec, mtl, prettyprinter
+ , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+ , scientific, semigroups, serialise, store, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "winery";
+ version = "1.1.3";
+ sha256 = "1qh2i6fwwgncmx15gp4h3cg04plff3h8252x66rzxnd22g1sk3d9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers cpu fast-builder hashable HUnit
+ megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck
+ scientific semigroups text time transformers unordered-containers
+ vector
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring megaparsec prettyprinter
+ prettyprinter-ansi-terminal text
+ ];
+ testHaskellDepends = [
+ base bytestring containers fast-builder QuickCheck
+ quickcheck-instances scientific text time unordered-containers
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ aeson base binary bytestring cereal deepseq directory gauge
+ serialise store text
+ ];
+ description = "A compact, well-typed seralisation format for Haskell values";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"winio" = callPackage
({ mkDerivation, base, bytestring, extensible-exceptions, kernel32
, network, winerror, ws2_32
@@ -261187,8 +262990,8 @@ self: {
pname = "zip";
version = "1.2.0";
sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
- revision = "1";
- editedCabalFile = "084dfylc1h45r4v2zyld1vvrxs6x1ljq8hzinqrkv2ii748cmzdb";
+ revision = "2";
+ editedCabalFile = "09ak8h11hm1jnpkvljradbj3a741s31k8cvyvwypr927khi5y9mp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -261894,8 +263697,8 @@ self: {
}:
mkDerivation {
pname = "zxcvbn-hs";
- version = "0.2.0.0";
- sha256 = "1524j8mgvp26cz4n4cd1vyslniw0xbw9ngrgkcyj3jmkh6p53ngh";
+ version = "0.2.1.0";
+ sha256 = "1gvarz005nlz9q5bkdwvplvsmwwchhx0arpq1grmh39r706lh4d8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index a4c04067348..cd9a101d3c5 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -122,9 +122,9 @@ let
haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
let
sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"'';
- in pkgs.buildPackages.stdenv.mkDerivation {
+ in buildPackages.stdenv.mkDerivation {
name = "cabal2nix-${name}";
- nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ];
+ nativeBuildInputs = [ buildPackages.cabal2nix ];
preferLocalBuild = true;
allowSubstitutes = false;
phases = ["installPhase"];
@@ -137,7 +137,7 @@ let
'';
};
- all-cabal-hashes-component = name: version: pkgs.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
+ all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
mkdir -p $out
mv */${name}/${version}/${name}.{json,cabal} $out
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 3494c8dee24..723a4978234 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -212,26 +212,26 @@ let
in {
ruby_2_4 = generic {
- version = rubyVersion "2" "4" "7" "";
+ version = rubyVersion "2" "4" "9" "";
sha256 = {
- src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd";
- git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z";
+ src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
+ git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
};
};
ruby_2_5 = generic {
- version = rubyVersion "2" "5" "6" "";
+ version = rubyVersion "2" "5" "7" "";
sha256 = {
- src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx";
- git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz";
+ src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
+ git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
};
};
ruby_2_6 = generic {
- version = rubyVersion "2" "6" "4" "";
+ version = rubyVersion "2" "6" "5" "";
sha256 = {
- src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag";
- git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf";
+ src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
+ git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
};
};
}
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 56164de5b5f..6fbb33b27fc 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,27 +1,17 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
- "2.3.8" = ops useRailsExpress [
- "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
- "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
- "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
- ];
- "2.4.7" = ops useRailsExpress [
+ "2.4.9" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.5.6" = ops useRailsExpress [
+ "2.5.7" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
];
- "2.6.4" = [
- (fetchpatch {
- url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5";
- sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd";
- })
- ] ++ ops useRailsExpress [
+ "2.6.5" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index a805949bf11..4af9c9ce32b 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -10,23 +10,20 @@
, dbus
, glib
, libxml2
-, fixDarwinDylibNames
, gnome3 # To pass updateScript
}:
stdenv.mkDerivation rec {
pname = "at-spi2-atk";
- version = "2.32.0";
+ version = "2.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b";
+ sha256 = "00250s72ii8w6lb6ww61v49y9k4cswfj0hhawqlram7bl6b7x6is";
};
- nativeBuildInputs = [ meson ninja pkgconfig ]
- # Fixup rpaths because of meson, remove with meson-0.47
- ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
doCheck = false; # fails with "No test data file provided"
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk;
- license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2
+ license = licenses.lgpl21Plus;
maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index e7cea235ceb..bda809b1a5a 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -13,25 +13,22 @@
, libX11
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
, libXi
-, fixDarwinDylibNames
, gnome3 # To pass updateScript
}:
stdenv.mkDerivation rec {
pname = "at-spi2-core";
- version = "2.32.1";
+ version = "2.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw";
+ sha256 = "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]
- # Fixup rpaths because of meson, remove with meson-0.47
- ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ];
buildInputs = [ dbus glib libX11 libXtst libXi ];
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
@@ -58,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
- license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2
+ license = licenses.lgpl21Plus;
maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 0a076442b42..9e80d4fc6ca 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -4,7 +4,7 @@
let
pname = "atk";
- version = "2.32.0";
+ version = "2.34.1";
in
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb";
+ sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l";
};
outputs = [ "out" "dev" ];
@@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
glib
];
+ patches = [
+ # meson builds an incorrect .pc file
+ # glib should be Requires not Requires.private
+ ./fix_pc.patch
+ ];
+
doCheck = true;
passthru = {
diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/pkgs/development/libraries/atk/fix_pc.patch
new file mode 100644
index 00000000000..3d19d9862cb
--- /dev/null
+++ b/pkgs/development/libraries/atk/fix_pc.patch
@@ -0,0 +1,9 @@
+--- a/atk/meson.build
++++ b/atk/meson.build
+@@ -162,5 +162,6 @@ pkgconfig.generate(libatk,
+ name: 'Atk',
+ description: 'Accessibility Toolkit',
+ subdirs: atk_api_name,
++ requires: glib_dep,
+ filebase: 'atk',
+ )
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index b1fb17b08fa..58d44a54137 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
# TODO: Requires /etc/machine-id
doCheck = false;
- # ignore deprecation errors
- NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
meta = with stdenv.lib; {
description = "Application matching framework";
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index cf76d9e7d24..bc8b7a8c760 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -15,20 +15,18 @@ stdenv.mkDerivation rec {
};
outputs = [ "out" "dev" "doc" ];
- separateDebugInfo = stdenv.isLinux;
+ separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
'';
- patches =
- # https://github.com/ivmai/bdwgc/pull/208
+ patches = # https://github.com/ivmai/bdwgc/pull/208
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
configureFlags =
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
- ++ lib.optional enableLargeConfig "--enable-large-config"
- ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
+ ++ lib.optional enableLargeConfig "--enable-large-config";
doCheck = true; # not cross;
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index f6041802a9c..1b6c56f13af 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range";
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+ "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing";
meta = with stdenv.lib; {
description = "A professional free 3D Game Multiphysics Library";
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 093cc2bdf05..dd26e5eb8ba 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -1,11 +1,12 @@
{ stdenv
, fetchgit
+, fetchpatch
, pkgconfig
, glib
, icu
, gobject-introspection
, dbus-glib
-, vala_0_40
+, vala
, python3
, autoreconfHook
}:
@@ -18,20 +19,26 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/dee";
- rev = "import/1.2.7+17.10.20170616-4ubuntu1";
- sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394";
+ rev = "import/1.2.7+17.10.20170616-4ubuntu3";
+ sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk";
};
patches = [
"${src}/debian/patches/gtkdocize.patch"
"${src}/debian/patches/strict-prototype.patch"
- "${src}/debian/patches/icu-pkg-config.patch"
+ "${src}/debian/patches/vapi-skip-properties.patch"
+
+ # Fixes glib 2.62 deprecations
+ (fetchpatch {
+ name = "dee-1.2.7-deprecated-g_type_class_add_private.patch";
+ url = "https://src.fedoraproject.org/rpms/dee/raw/1a9a4ce3377074fabfca653ffe0287cd73aef82f/f/dee-1.2.7-deprecated-g_type_class_add_private.patch";
+ sha256 = "13nyprq7bb7lnzkcb7frcpzidbl836ycn5bvmwa2k0nhmj6ycbx5";
+ })
];
nativeBuildInputs = [
pkgconfig
- # https://gitlab.gnome.org/GNOME/vala/issues/803
- vala_0_40
+ vala
autoreconfHook
gobject-introspection
python3
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index 84ab5fedebc..38e4d2c6884 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "folks";
- version = "0.12.1";
+ version = "0.13.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xfl6rnzhdbmw1q26xiq34cdiy7a9karpi2r7wyplnnz1zaz5a9w";
+ sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x";
};
mesonFlags = [
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index dcb4df1419e..18b568b0f6c 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib
+{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib
, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
, gobject-introspection, makeWrapper, libxslt, vala, gnome3
-, python2 }:
+, python3 }:
stdenv.mkDerivation rec {
pname = "gcr";
- version = "3.28.1";
+ version = "3.33.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m";
+ sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm";
};
passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig intltool gobject-introspection libxslt makeWrapper vala ];
+ nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ];
buildInputs = let
gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gtk3 p11-kit ];
- checkInputs = [ python2 ];
+ checkInputs = [ python3 ];
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
#enableParallelBuilding = true; issues on hydra
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 59e7808057f..86d89d6eef5 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -4,13 +4,13 @@
let
pname = "gdk-pixbuf";
- version = "2.38.1";
+ version = "2.38.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi";
+ sha256 = "10875lywkabh6nm2rgf0vxqn39h34b72kcbh63fp77fqq0g6bykk";
};
patches = [
diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix
index 45a29e15ede..c4baaa3fae9 100644
--- a/pkgs/development/libraries/gdl/default.nix
+++ b/pkgs/development/libraries/gdl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gdl";
- version = "3.28.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
+ sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index ae386f46bff..ad3b77c1bc6 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
- version = "2.60.3";
+ version = "2.62.0";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm";
+ sha256 = "1p7vgav0g03r00qiafhrdiad2gh1w6wsd1a7nnn79psng5gnh8ck";
};
patches = [
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de7505e6cde..204aa03e06f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales
+{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null
@@ -44,17 +44,15 @@ let
done
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
-
- binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
in
stdenv.mkDerivation rec {
pname = "glib";
- version = "2.60.7";
+ version = "2.62.0";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0433m0na8nc4cf0gidf4gfzz8k5d3dsssmh541qkpzcsaspw04lb";
+ sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -66,10 +64,33 @@ stdenv.mkDerivation rec {
./schema-override-variable.patch
# Require substituteInPlace in postPatch
./fix-gio-launch-desktop-path.patch
+
+ # GLib contains many binaries used for different purposes;
+ # we will install them to different outputs:
+ # 1. Tools for desktop environment ($bin)
+ # * gapplication (non-darwin)
+ # * gdbus
+ # * gio
+ # * gio-launch-desktop (symlink to $out)
+ # * gsettings
+ # 2. Development/build tools ($dev)
+ # * gdbus-codegen
+ # * gio-querymodules
+ # * glib-compile-resources
+ # * glib-compile-schemas
+ # * glib-genmarshal
+ # * glib-gettextize
+ # * glib-mkenums
+ # * gobject-query
+ # * gresource
+ # * gtester
+ # * gtester-report
+ # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
+ # * gio-launch-desktop
+ ./split-dev-programs.patch
];
outputs = [ "bin" "out" "dev" "devdoc" ];
- outputBin = "dev";
setupHook = ./setup-hook.sh;
@@ -84,7 +105,7 @@ stdenv.mkDerivation rec {
]);
nativeBuildInputs = [
- meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales
+ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@@ -94,10 +115,9 @@ stdenv.mkDerivation rec {
# Instead we just copy them over from the native output.
"-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
"-Dnls=enabled"
+ "-Ddevbindir=${placeholder ''dev''}/bin"
];
- LC_ALL = "en_US.UTF-8";
-
NIX_CFLAGS_COMPILE = [
"-Wno-error=nonnull"
# Default for release buildtype but passed manually because
@@ -111,6 +131,8 @@ stdenv.mkDerivation rec {
chmod +x gio/tests/gengiotypefuncs.py
patchShebangs gio/tests/gengiotypefuncs.py
+ chmod +x docs/reference/gio/concat-files-helper.py
+ patchShebangs docs/reference/gio/concat-files-helper.py
patchShebangs glib/gen-unicode-tables.pl
patchShebangs tests/gen-casefold-txt.py
patchShebangs tests/gen-casemap-txt.py
@@ -122,18 +144,6 @@ stdenv.mkDerivation rec {
DETERMINISTIC_BUILD = 1;
postInstall = ''
- mkdir -p $bin/bin
- for app in ${concatStringsSep " " binPrograms}; do
- mv "$dev/bin/$app" "$bin/bin"
- done
-
- '' + optionalString (!stdenv.isDarwin) ''
- # Add gio-launch-desktop to $out so we can refer to it from $dev
- mkdir $out/bin
- mv "$dev/bin/gio-launch-desktop" "$out/bin/"
- ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
-
- '' + ''
moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
@@ -141,6 +151,11 @@ stdenv.mkDerivation rec {
# This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
+ '' + optionalString (!stdenv.isDarwin) ''
+ # Add gio-launch-desktop to $out so we can refer to it from $lib
+ mkdir $out/bin
+ mv "$bin/bin/gio-launch-desktop" "$out/bin/"
+ ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
'' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
cp -r ${buildPackages.glib.devdoc} $devdoc
'';
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch
new file mode 100644
index 00000000000..9d3989a30a5
--- /dev/null
+++ b/pkgs/development/libraries/glib/split-dev-programs.patch
@@ -0,0 +1,154 @@
+diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
+index 121e9e6bb..b76fa0188 100644
+--- a/gio/gdbus-2.0/codegen/meson.build
++++ b/gio/gdbus-2.0/codegen/meson.build
+@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
+ # Install gdbus-codegen executable
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
+ output : 'gdbus-codegen',
+- install_dir : get_option('bindir'),
++ install_dir : get_option('devbindir'),
+ configuration : gdbus_codegen_conf
+ )
+ # Provide tools for others when we're a subproject and they use the Meson GNOME module
+diff --git a/gio/meson.build b/gio/meson.build
+index 9a9e621b3..12e1d146a 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -830,14 +830,15 @@ pkg.generate(libgio,
+ variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
+ 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
+ 'bindir=' + join_paths('${prefix}', get_option('bindir')),
++ 'devbindir=' + get_option('devbindir'),
+ 'giomoduledir=' + giomodulesdir,
+ 'gio=' + join_paths('${bindir}', 'gio'),
+- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
+- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
+- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
++ 'gio_querymodules=' + join_paths('${devbindir}', 'gio-querymodules'),
++ 'glib_compile_schemas=' + join_paths('${devbindir}', 'glib-compile-schemas'),
++ 'glib_compile_resources=' + join_paths('${devbindir}', 'glib-compile-resources'),
+ 'gdbus=' + join_paths('${bindir}', 'gdbus'),
+- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+- 'gresource=' + join_paths('${bindir}', 'gresource'),
++ 'gdbus_codegen=' + join_paths('${devbindir}', 'gdbus-codegen'),
++ 'gresource=' + join_paths('${devbindir}', 'gresource'),
+ 'gsettings=' + join_paths('${bindir}', 'gsettings')],
+ version : glib_version,
+ install_dir : glib_pkgconfigreldir,
+@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources,
+
+ executable('gresource', 'gresource-tool.c',
+ install : true,
++ install_dir : get_option('devbindir'),
+ # intl.lib is not compatible with SAFESEH
+ link_args : noseh_link_args,
+ dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
+
+ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
+ install : true,
++ install_dir : get_option('devbindir'),
+ c_args : gio_c_args,
+ # intl.lib is not compatible with SAFESEH
+ link_args : noseh_link_args,
+@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+ glib_compile_schemas = executable('glib-compile-schemas',
+ [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
+ install : true,
++ install_dir : get_option('devbindir'),
+ # intl.lib is not compatible with SAFESEH
+ link_args : noseh_link_args,
+ dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
+@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
+ glib_compile_resources = executable('glib-compile-resources',
+ [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
+ install : true,
++ install_dir : get_option('devbindir'),
+ c_args : gio_c_args,
+ # intl.lib is not compatible with SAFESEH
+ link_args : noseh_link_args,
+diff --git a/glib/meson.build b/glib/meson.build
+index 91a48f194..80472a06b 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -375,9 +375,10 @@ pkg.generate(libglib,
+ subdirs : ['glib-2.0'],
+ extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
+ variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
+- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
+- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
+- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
++ 'devbindir=' + get_option('devbindir'),
++ 'glib_genmarshal=' + join_paths('${devbindir}', 'glib-genmarshal'),
++ 'gobject_query=' + join_paths('${devbindir}', 'gobject-query'),
++ 'glib_mkenums=' + join_paths('${devbindir}', 'glib-mkenums')],
+ version : glib_version,
+ install_dir : glib_pkgconfigreldir,
+ filebase : 'glib-2.0',
+@@ -413,6 +414,7 @@ if host_system == 'windows'
+ else
+ gtester = executable('gtester', 'gtester.c',
+ install : true,
++ install_dir : get_option('devbindir'),
+ c_args : ['-UG_DISABLE_ASSERT'],
+ include_directories : configinc,
+ dependencies : [libglib_dep])
+@@ -424,7 +426,7 @@ report_conf.set('PYTHON', python_name)
+ configure_file(
+ input: 'gtester-report.in',
+ output: 'gtester-report',
+- install_dir: get_option('bindir'),
++ install_dir: get_option('devbindir'),
+ configuration: report_conf,
+ install_mode: 'rwxr-xr-x'
+ )
+diff --git a/gobject/meson.build b/gobject/meson.build
+index c7805c556..22ec629a4 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -75,7 +75,7 @@ foreach tool: python_tools
+ input : tool + '.in',
+ output : tool,
+ configuration : python_tools_conf,
+- install_dir : glib_bindir,
++ install_dir : get_option('devbindir'),
+ )
+
+ # Set variables for later use
+@@ -145,6 +145,7 @@ libgobject_dep = declare_dependency(link_with : libgobject,
+
+ executable('gobject-query', 'gobject-query.c',
+ install : true,
++ install_dir : get_option('devbindir'),
+ dependencies : [libglib_dep, libgobject_dep])
+
+ install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
+diff --git a/meson.build b/meson.build
+index 717d1bccb..fb0bee8a1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2118,7 +2118,7 @@ if have_sh
+ gettextize_conf.set('datarootdir', glib_datadir)
+ gettextize_conf.set('datadir', glib_datadir)
+ configure_file(input : 'glib-gettextize.in',
+- install_dir : glib_bindir,
++ install_dir : get_option('devbindir'),
+ output : 'glib-gettextize',
+ configuration : gettextize_conf)
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 2c831e37e..5d8928577 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,6 +3,11 @@ option('runtime_libdir',
+ value : '',
+ description : 'install runtime libraries relative to libdir')
+
++option('devbindir',
++ type : 'string',
++ value : '',
++ description : 'bindir for development tools')
++
+ option('iconv',
+ type : 'combo',
+ choices : ['auto', 'libc', 'external'],
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 829dca04c18..18963e31b6e 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "glibmm";
- version = "2.60.0";
+ version = "2.62.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3";
+ sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index 8ea6b3ae7e3..82847853588 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -6,13 +6,13 @@
let
pname = "gnome-online-accounts";
- version = "3.32.0";
+ version = "3.34.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w";
+ sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4";
};
outputs = [ "out" "man" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 43695d8db58..81df734a2ce 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -9,7 +9,7 @@
let
pname = "gobject-introspection";
- version = "1.60.2";
+ version = "1.62.0";
in
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz";
+ sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
new file mode 100644
index 00000000000..cb6a1a35494
--- /dev/null
+++ b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
@@ -0,0 +1,13 @@
+diff --git a/src/chromaprint/grl-chromaprint.c b/src/chromaprint/grl-chromaprint.c
+index 5a3598b..8979291 100644
+--- a/src/chromaprint/grl-chromaprint.c
++++ b/src/chromaprint/grl-chromaprint.c
+@@ -111,6 +111,8 @@
+
+ gst_init (NULL, NULL);
+
++ @load_plugins@
++
+ source = grl_chromaprint_source_new ();
+ grl_registry_register_source (registry,
+ plugin,
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 118a910a168..ddf29c2dcd8 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
+, substituteAll
, meson
, ninja
, pkgconfig
@@ -16,8 +17,10 @@
, libgdata
, libmediaart
, grilo
+, gst_all_1
, gnome-online-accounts
, gmime
+, gom
, json-glib
, avahi
, tracker
@@ -28,13 +31,28 @@
stdenv.mkDerivation rec {
pname = "grilo-plugins";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1";
+ sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0";
};
+ patches = [
+ # grl-chromaprint requires the following GStreamer elements:
+ # * fakesink (gstreamer)
+ # * playbin (gst-plugins-base)
+ # * chromaprint (gst-plugins-bad)
+ (substituteAll {
+ src = ./chromaprint-gst-plugins.patch;
+ load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-bad
+ ]);
+ })
+ ];
+
nativeBuildInputs = [
meson
ninja
@@ -57,11 +75,13 @@ stdenv.mkDerivation rec {
libarchive
libsoup
gmime
+ gom
json-glib
avahi
libmediaart
tracker
dleyna-server
+ gst_all_1.gstreamer
];
passthru = {
diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
index b2a7f0bd5ae..79ccc931972 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
let
pname = "grilo";
- version = "0.3.9"; # if you change minor, also change ./setup-hook.sh
+ version = "0.3.10"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -13,30 +13,13 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk";
+ sha256 = "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y";
};
setupHook = ./setup-hook.sh;
mesonFlags = [
- "-Dgtk_doc=true"
- ];
-
- patches = [
- # https://gitlab.gnome.org/GNOME/grilo/merge_requests/45
- # commits are from a separate branch so they shouldn't 404
- (fetchpatch {
- url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch";
- sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch";
- sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch";
- sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w";
- })
+ "-Denable-gtk-doc=true"
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index ffb8be85d3a..ea6e08811af 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gsettings-desktop-schemas";
- version = "3.32.0";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
+ sha256 = "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8";
};
passthru = {
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index fd6b12ccaac..8adb6264e37 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -2,7 +2,7 @@
let
pname = "gspell";
- version = "1.8.1";
+ version = "1.8.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1";
+ sha256 = "1miybm1z5cl91i25l7mfqlxhv7j8yy8rcgi0s1bgbb2vm71rb4dv";
};
propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 49e562ef80b..a5bbb73e97f 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -44,7 +44,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
- version = "3.24.10";
+ version = "3.24.11";
outputs = [ "out" "dev" ];
outputBin = "dev";
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
- sha256 = "00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m";
+ sha256 = "1598k357xvffbswsrvc63lyj73wq0b510lhg4vcgl6rf1a6nb9yv";
};
patches = [
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index fde94e79f05..d3a7d849062 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
-, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala
+, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
+, meson, ninja }:
stdenv.mkDerivation rec {
pname = "gtksourceview";
- version = "4.2.0";
+ version = "4.4.0";
src = fetchurl {
url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4";
+ sha256 = "16k8kqw9w775f1ijsk898hp210an5mv4yfyrmik9m8khxx593nwx";
};
propagatedBuildInputs = [
@@ -19,11 +20,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ];
checkInputs = [ xvfb_run dbus ];
- buildInputs = [ atk cairo glib pango libxml2 ];
+ buildInputs = [ atk cairo glib pango fribidi libxml2 ];
patches = [ ./4.x-nix_share_path.patch ];
@@ -31,11 +32,10 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux;
checkPhase = ''
- NO_AT_BRIDGE=1 \
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
- make check
+ meson test --no-rebuild --print-errorlogs
'';
passthru = {
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 8b3bc30a661..43305291db6 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -14,7 +14,7 @@
, libgphoto2
, avahi
, libarchive
-, fuse
+, fuse3
, libcdio
, libxml2
, libxslt
@@ -36,15 +36,16 @@
, libsecret
, libgdata
, python3
+, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "gvfs";
- version = "1.40.2";
+ version = "1.42.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx";
+ sha256 = "1wbc0qsa97ihpn24fqvl7zwxy0zy20ggakm7vn6vnm7vxsf8v5fh";
};
postPatch = ''
@@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
libgphoto2
avahi
libarchive
- fuse
+ fuse3
libcdio
samba
libmtp
@@ -87,6 +88,7 @@ stdenv.mkDerivation rec {
libcdio-paranoia
libnfs
openssh
+ gsettings-desktop-schemas
# TODO: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport [
gnome3.libsoup
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index 8012c6b3b14..63ccc620033 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
stdenv.mkDerivation rec {
pname = "jsonrpc-glib";
- version = "3.32.0";
+ version = "3.33.3";
outputs = [ "out" "dev" "devdoc" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1sx6xvzzdm9k0vfmpgg07abz7a9kar20h1a9ml0wgjdxr0valq5w";
+ sha256 = "03vni35vxhajpgcaz104fzpzgs1yw6lc78d0bz1q1b1yi1b0807q";
};
mesonFlags = [
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 89ca984767b..15561677ad5 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
dontUpdateAutotoolsGnuConfigScripts = true;
nativeBuildInputs = [ autoreconfHook bison ];
- buildInputs = [ libiberty zlib ];
+ buildInputs = [ libiberty zlib.dev ];
configurePlatforms = [ "build" "host" ];
configureFlags = [
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 5b6d92d629d..2c63a3c71db 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,35 +1,28 @@
{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }:
-let
- version = "3.32.3";
+stdenv.mkDerivation rec {
pname = "libdazzle";
-in
-stdenv.mkDerivation {
- name = "${pname}-${version}";
+ version = "3.34.0";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1s37hv12ikfzhvh86qzgmfcjm3wvp12l2vsr0whl5xmm2harp3bc";
+ sha256 = "0z3395mpa9qwviazrlgf3356121ypzq9dziyzfhbvmmcnay291cd";
};
- nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
+ nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ];
buildInputs = [ glib gtk3 ];
mesonFlags = [
"-Denable_gtk_doc=true"
];
- LC_ALL = "en_US.UTF-8";
-
- # https://gitlab.gnome.org/GNOME/libdazzle/issues/25
- doCheck = false;
+ doCheck = true;
checkPhase = ''
- export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 4aec6fdef91..fc12096ef5b 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -2,12 +2,12 @@
, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec {
- version = "3.13.7";
+ version = "3.14.0";
pname = "libdigidocpp";
src = fetchurl {
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
- sha256 = "1d8yx8avijp55p53fz4pd4ihjz6nyap0g8dq23bwg33411mdiqff";
+ sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl";
};
nativeBuildInputs = [ cmake pkgconfig xxd ];
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 410496a7bb7..9a6db72ae05 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,11 +1,27 @@
-{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
-, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }:
+{ thinkpad ? false
+, stdenv
+, fetchFromGitHub
+, fetchurl
+, pkgconfig
+, meson
+, ninja
+, libusb
+, pixman
+, glib
+, nss
+, gtk3
+, coreutils
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, openssl ? null
+}:
assert thinkpad -> openssl != null;
stdenv.mkDerivation rec {
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
- version = "0.99.0";
+ version = "1.0";
src = {
libfprint-thinkpad =
@@ -16,19 +32,36 @@ stdenv.mkDerivation rec {
sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
};
libfprint = fetchurl {
- url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
- sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
+ url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
+ sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
};
}.${pname};
- buildInputs = [ libusb pixman glib nss gtk3 ]
- ++ stdenv.lib.optional thinkpad openssl;
+ nativeBuildInputs = [
+ pkgconfig
+ meson
+ ninja
+ gtk-doc
+ docbook_xsl
+ docbook_xml_dtd_43
+ ];
- nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+ buildInputs = [
+ libusb
+ pixman
+ glib
+ nss
+ gtk3
+ ]
+ ++ stdenv.lib.optional thinkpad openssl
+ ;
- mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
+ mesonFlags = [
+ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
+ "-Dx11-examples=false"
+ ];
- preConfigure = ''
+ postPatch = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';
diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix
index 5e35a43fb9d..65f3592eba0 100644
--- a/pkgs/development/libraries/libgweather/default.nix
+++ b/pkgs/development/libraries/libgweather/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libgweather";
- version = "3.32.2";
+ version = "3.33.92";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "00iwbllh8dmnqch0ysng9xhkzzs3ir9jl9f4hp41vbvg1pq5zv98";
+ sha256 = "1w9y79lrl0ablbxr3zpgkgad1296z3nxh1573icx26fwaklyakkz";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 7a7bd115328..2d026452e6f 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmbim";
- version = "1.18.2";
+ version = "1.20.0";
src = fetchurl {
url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
- sha256 = "0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp";
+ sha256 = "0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 314d5884501..cdb1b95935f 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3
, glib, gtk3, gobject-introspection, python3, ncurses
}:
stdenv.mkDerivation rec {
pname = "libpeas";
- version = "1.22.0";
+ version = "1.24.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
+ sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";
};
- configureFlags = [ "--enable-python3" ];
-
- nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+ nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ];
propagatedBuildInputs = [
# Required by libpeas-1.0.pc
gobject-introspection
];
+ patches = [
+ ./fix-libpeas-gtk-pc.patch
+ ];
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
new file mode 100644
index 00000000000..8016939716d
--- /dev/null
+++ b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
@@ -0,0 +1,22 @@
+diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build
+index bf590de..00def42 100644
+--- a/libpeas-gtk/meson.build
++++ b/libpeas-gtk/meson.build
+@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency(
+ sources: libpeas_gtk_dep_sources,
+ )
+
++libpeas_gtk_pc_reqs = [
++ glib_dep,
++ gtk_dep,
++ package_string + ' >= @0@'.format(version)
++]
++
+ libpeas_gtk_pc = pkg.generate(
+ libpeas_gtk_sha,
+ name: package_gtk_string,
+ description: 'GObject plugins library widgetery',
++ requires: libpeas_gtk_pc_reqs,
+ subdirs: package_string,
+ install_dir: pkgconfigdir,
+ )
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 773acd03535..c9b08079c38 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -6,7 +6,7 @@
, fetchpatch
, dbus
, networkmanager
-, spidermonkey_38
+, spidermonkey_60
, pcre
, gsettings-desktop-schemas
, glib
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
JavaScriptCore
] else [
glib
- spidermonkey_38
+ spidermonkey_60
dbus
networkmanager
]);
@@ -59,7 +59,21 @@ stdenv.mkDerivation rec {
"-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
];
- patches = stdenv.lib.optionals stdenv.isDarwin [
+ patches = [
+ # Make build with spidermonkey_60
+ (fetchpatch {
+ url = "https://github.com/libproxy/libproxy/pull/86.patch";
+ sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs";
+ })
+ (fetchpatch {
+ url = "https://github.com/libproxy/libproxy/pull/87.patch";
+ sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc";
+ })
+ (fetchpatch {
+ url = "https://github.com/libproxy/libproxy/pull/95.patch";
+ sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi";
+ })
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 930eafc9675..4d365e5be36 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libqmi";
- version = "1.22.4";
+ version = "1.22.6";
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
- sha256 = "1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc";
+ sha256 = "1pnma62kib6zbs4wr7h5g53v3p81jb8cvyvqcvaidb1hlfibwnvm";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 4653b8b86a2..54aed7b4fed 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,25 +1,24 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
-, withGTK ? false, gtk3 ? null
, vala, gobject-introspection }:
let
pname = "librsvg";
- version = "2.44.15";
+ version = "2.46.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1p4cifnxppz2qwsk2wvn2a6c7dpvgfrsf5vlhdkmsd373czm9396";
+ sha256 = "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n";
};
outputs = [ "out" "dev" "installedTests" ];
buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
- propagatedBuildInputs = [ glib gdk-pixbuf cairo ] ++ lib.optional withGTK gtk3;
+ propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 6c2723bbd90..6c14269c2d5 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libsecret";
- version = "0.18.8";
+ version = "0.19.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv";
+ sha256 = "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5";
};
postPatch = ''
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 8c88abd2c44..a2b6ba6224e 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
outputs = [ "out" "dev" ];
- separateDebugInfo = stdenv.isLinux;
+ separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 263623c3d37..071111ae4c2 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- version = "0.7.5";
+ version = "0.7.6";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
- sha256 = "0khks19i01s9h297c7af4bpq448abs2pqw55scf56xfdvxpv23aw";
+ sha256 = "0rrf7i2zs2kbz6k2sj1mg30i05h2msl1q9h95dp5brq2k0w94rna";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 5f88ba80cd6..fae1581c87a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
-, libpsl, python3 }:
+, libpsl, python3, brotli }:
stdenv.mkDerivation rec {
pname = "libsoup";
- version = "2.66.2";
+ version = "2.68.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx";
+ sha256 = "13dz7x092yswdidj69hadzqfyv6cyfnjbzidjym7nycf7gjj60vz";
};
postPatch = ''
@@ -17,15 +17,16 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- buildInputs = [ python3 sqlite libpsl ];
+ buildInputs = [ python3 sqlite libpsl brotli ];
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
propagatedBuildInputs = [ glib libxml2 ];
mesonFlags = [
"-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
- "-Dgssapi=false"
- "-Dvapi=true"
+ "-Dgssapi=disabled"
+ "-Dvapi=enabled"
"-Dgnome=${if gnomeSupport then "true" else "false"}"
+ "-Dntlm=disabled"
];
doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index b96fdf5eedd..e0022411221 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
};
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
# Patches from Gentoo portage
patches = [
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 2baaa14b88e..daaf3de6bcc 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation {
libdbusmenu
];
+ patches = [
+ # See: https://gitlab.gnome.org/GNOME/vala/issues/766
+ ./fix-vala.patch
+ ];
+
preConfigure = ''
intltoolize
'';
diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch
new file mode 100644
index 00000000000..ec34229b444
--- /dev/null
+++ b/pkgs/development/libraries/libunity/fix-vala.patch
@@ -0,0 +1,36 @@
+diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala
+--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500
++++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400
+@@ -51,7 +51,7 @@
+ */
+ public abstract int category_index_for_scope_id (string scope_id);
+
+- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
++ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+ {
+ Object (dbus_path: dbus_path_, id: id_, is_master: true,
+ merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
+diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala
+--- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500
++++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400
+@@ -61,7 +61,7 @@
+ internal CategorySet _categories;
+ internal FilterSet _filters;
+
+- public DeprecatedScopeBase (string dbus_path_, string id_)
++ protected DeprecatedScopeBase (string dbus_path_, string id_)
+ {
+ Object (dbus_path: dbus_path_, id: id_);
+ }
+diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala
+--- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500
++++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400
+@@ -63,7 +63,7 @@
+ */
+ public abstract class GridRenderer: PreviewRenderer
+ {
+- public GridRenderer()
++ protected GridRenderer()
+ {
+ Object();
+ }
diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
new file mode 100644
index 00000000000..b5549c6735f
--- /dev/null
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchFromGitHub, glibcLocales
+, cmake, python3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "onnxruntime";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "microsoft";
+ repo = "onnxruntime";
+ rev = "v${version}";
+ sha256 = "0s8ylc5xr55490hbz7zn3hnp9dnyp92d320ln8xw5hqkw3mgyr3p";
+ # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc.
+ # submodules increase src size and compile times significantly
+ # not currently feasible due to how integrated cmake build is with git
+ fetchSubmodules = true;
+ };
+
+ # TODO: build server, and move .so's to lib output
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [
+ cmake
+ python3 # for shared-lib or server
+ ];
+
+ cmakeDir = "../cmake";
+
+ cmakeFlags = [
+ "-Donnxruntime_USE_OPENMP=ON"
+ "-Donnxruntime_BUILD_SHARED_LIB=ON"
+ "-Donnxruntime_ENABLE_LTO=ON"
+ ];
+
+ # ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8"
+ preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+ export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+ '';
+ doCheck = true;
+
+ postInstall = ''
+ rm -r $out/bin # ctest runner
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Cross-platform, high performance scoring engine for ML models";
+ longDescription = ''
+ ONNX Runtime is a performance-focused complete scoring engine
+ for Open Neural Network Exchange (ONNX) models, with an open
+ extensible architecture to continually address the latest developments
+ in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX
+ standard with complete implementation of all ONNX operators, and
+ supports all ONNX releases (1.2+) with both future and backwards
+ compatibility.
+ '';
+ homepage = "https://github.com/microsoft/onnxruntime";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+
+}
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 1b6b5b1b57b..4f49e015852 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
- version = "6.2.2";
+ version = "6.2.4";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
- sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2";
+ sha256 = "08077agbimm7738xrknkw6fjw9f8jv6x3igp8b5pmsj9l954ywma";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch
index f55bbe3f24f..5c22cf0b84e 100644
--- a/pkgs/development/libraries/science/math/lcalc/makefile.patch
+++ b/pkgs/development/libraries/science/math/lcalc/makefile.patch
@@ -104,10 +104,10 @@ index 84e4e88..56ca676 100644
- cp -rf ../include $(INSTALL_DIR)/include/Lfunction
+ install -d $(INSTALL_DIR)/bin
+ install -d $(INSTALL_DIR)/$(LIB_DIR)
-+ install -d $(INSTALL_DIR)/include/libLfunction
++ install -d $(INSTALL_DIR)/include/Lfunction
+ install lcalc $(INSTALL_DIR)/bin
+ install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR)
-+ install -m 644 -t $(INSTALL_DIR)/include/libLfunction ../include/*.h
++ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h
SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c
diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix
index 3db7a6f1d1e..f9f300883a1 100644
--- a/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix
@@ -1,6 +1,6 @@
{ stdenv
, fetchurl
-, patchelf
+, addOpenGLRunpath
, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
}:
@@ -35,6 +35,9 @@ let
else ''
patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so
patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so
+ ${optionalString cudaSupport ''
+ addOpenGLRunpath $out/lib/libtensorflow.so $out/lib/libtensorflow_framework.so
+ ''}
'';
in stdenv.mkDerivation rec {
@@ -43,6 +46,8 @@ in stdenv.mkDerivation rec {
src = fetchurl url;
+ nativeBuildInputs = optional cudaSupport addOpenGLRunpath;
+
# Patch library to use our libc, libstdc++ and others
buildCommand = ''
mkdir -pv $out
diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix
index 11f9d301347..b57d90eb21c 100644
--- a/pkgs/development/libraries/serialdv/default.nix
+++ b/pkgs/development/libraries/serialdv/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "serialdv";
- version ="1.1.1";
+ version ="1.1.2";
src = fetchFromGitHub {
owner = "f4exb";
repo = "serialdv";
rev = "v${version}";
- sha256 = "0swalyp8cbs7if6gxbcl7wf83ml8ch3k7ww4hws89rzpjvf070fr";
+ sha256 = "0d2lnvfzf31i3f2klm46s87gby3yz3hc46cap0yqifzml0ff1qbm";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 716f3d313b4..96ae5c1ec9a 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,14 +1,14 @@
{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
stdenv.mkDerivation rec {
- version = "1.4.0";
+ version = "1.5.0";
pname = "tdlib";
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
rev = "v${version}";
- sha256 = "1ijyn14rjb87rqm39hg7md8ab33yiy8cgzw3p0m37scn58gabpp7";
+ sha256 = "1rqxdvzlryqln5jzj35cwz1fjwy4s8xq97p0wdnpzbfjpcalvrm5";
};
buildInputs = [ gperf openssl readline zlib ];
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index cb105235678..0bff95f02a7 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "tpm2-tss";
- version = "2.2.3";
+ version = "2.3.1";
src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "1hwrka0g817a4d1177vv0z13gp66bxzxhflfxswjhcdk93kaws8k";
+ sha256 = "1ryy6da3s91ks3m66y3xp6yh3v096kny0f9br74mxf2635n5g5kh";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index 9f31e70ad53..99374b572c6 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
- version = "2.2.2";
+ version = "2.3.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw";
+ sha256 = "1ky7hd0vms1z40a0y9wq9pg3l7gxh4p6a0ngmnjqh8p23qfxdrxd";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch
index 724c51cb56f..ce44416055c 100644
--- a/pkgs/development/libraries/tracker-miners/fix-paths.patch
+++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch
@@ -9,12 +9,3 @@
DEFAULT_RULE, NULL);
if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
-@@ -388,7 +388,7 @@
- if (!priv->ontology_location) {
- gchar *ontology_path;
-
-- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies",
-+ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies",
- priv->ontology_name, NULL);
-
- if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) {
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index db4f620a740..4add8046de1 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -1,37 +1,32 @@
-{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobject-introspection, python3
+{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, gobject-introspection, python3
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
-, gnome3, icu, libuuid, networkmanager, libsoup, json-glib
-, substituteAll}:
+, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, systemd
+, substituteAll }:
-let
+stdenv.mkDerivation rec {
pname = "tracker";
- version = "2.2.2";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "2.3.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0yxzqvjm3ij28p6g8jc4pd90yhhslmykcvi1cnyb069lm16m611c";
};
nativeBuildInputs = [
- meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection
+ meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection
gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
python3 # for data-generators
+ systemd # used for checks to install systemd user service
];
buildInputs = [
glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer
];
- LC_ALL = "en_US.UTF-8";
-
mesonFlags = [
- "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
- "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
"-Dfunctional_tests=false"
"-Ddocs=true"
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 35bc881d3d1..b3f1d9306f1 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -1,36 +1,67 @@
-{ stdenv, fetchurl, intltool, pkgconfig
-, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
-, gperf, pcre2
+{ stdenv
+, fetchurl
+, gettext
+, pkgconfig
+, meson
+, ninja
+, gnome3
+, glib
+, gtk3
+, gobject-introspection
+, vala
+, libxml2
+, gnutls
+, gperf
+, pango
+, pcre2
+, fribidi
+, zlib
}:
stdenv.mkDerivation rec {
pname = "vte";
- version = "0.56.3";
+ version = "0.58.0";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p";
+ sha256 = "0ifvza9sdrkxxqq7m9i7ry23sv7widjz6nzbvgc60kpph4fmf187";
};
passthru = {
updateScript = gnome3.updateScript { packageName = pname; };
};
- nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ];
- buildInputs = [ glib gtk3 ncurses ];
+ nativeBuildInputs = [
+ gettext
+ gobject-introspection
+ gperf
+ libxml2
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ fribidi
+ gnutls
+ pcre2
+ zlib
+ ];
propagatedBuildInputs = [
# Required by vte-2.91.pc.
gtk3
- gnutls
- pcre2
+ glib
+ pango
];
- preConfigure = "patchShebangs .";
-
- configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
-
- enableParallelBuilding = true;
+ postPatch = ''
+ patchShebangs perf/*
+ patchShebangs src/box_drawing_generate.sh
+ '';
meta = with stdenv.lib; {
homepage = https://www.gnome.org/;
@@ -45,7 +76,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
};
}
-
diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix
deleted file mode 100644
index c00be4c008f..00000000000
--- a/pkgs/development/libraries/vte/ng.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }:
-
-vte.overrideAttrs (oldAttrs: rec {
- name = "vte-ng-${version}";
- version = "0.54.2.a";
-
- src = fetchFromGitHub {
- owner = "thestinger";
- repo = "vte-ng";
- rev = version;
- sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags";
- };
-
- patches = [
- # Fix build with vala 0.44
- # See: https://github.com/thestinger/vte-ng/issues/32
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch";
- sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66";
- })
- ];
-
- preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh";
-
- nativeBuildInputs = oldAttrs.nativeBuildInputs or []
- ++ [ gtk-doc autoconf automake gettext libtool gperf ];
-})
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index c0fae2f7176..7d48b68d14c 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -6,6 +6,7 @@
, enableGeoLocation ? true, geoclue2, sqlite
, enableGtk2Plugins ? false, gtk2 ? null
, gst-plugins-base, gst-plugins-bad, woff2
+, bubblewrap, libseccomp, xdg-dbus-proxy, substituteAll
}:
assert enableGeoLocation -> geoclue2 != null;
@@ -15,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.24.4";
+ version = "2.26.1";
meta = {
description = "Web content rendering engine, GTK port";
@@ -28,11 +29,14 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46";
+ sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb";
};
- patches = optionals stdenv.isDarwin [
- ## TODO add necessary patches for Darwin
+ patches = optionals stdenv.isLinux [
+ (substituteAll {
+ src = ./fix-bubblewrap-paths.patch;
+ inherit (builtins) storeDir;
+ })
];
postPatch = ''
@@ -41,8 +45,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DPORT=GTK"
- "-DUSE_LIBHYPHEN=0"
+ "-DUSE_LIBHYPHEN=OFF"
"-DENABLE_INTROSPECTION=ON"
+ "-DUSE_WPE_RENDERER=OFF"
]
++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
@@ -73,11 +78,14 @@ stdenv.mkDerivation rec {
++ optional enableGtk2Plugins gtk2
++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
- ++ optional stdenv.isLinux wayland;
+ ++ optionals stdenv.isLinux [
+ wayland bubblewrap libseccomp xdg-dbus-proxy
+ ];
propagatedBuildInputs = [
libsoup gtk3
];
outputs = [ "out" "dev" ];
+
}
diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
new file mode 100644
index 00000000000..6485ba0f261
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
@@ -0,0 +1,23 @@
+diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
+--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400
++++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400
+@@ -585,7 +585,7 @@
+ { SCMP_SYS(keyctl), nullptr },
+ { SCMP_SYS(request_key), nullptr },
+
+- // Scary VM/NUMA ops
++ // Scary VM/NUMA ops
+ { SCMP_SYS(move_pages), nullptr },
+ { SCMP_SYS(mbind), nullptr },
+ { SCMP_SYS(get_mempolicy), nullptr },
+@@ -724,6 +724,10 @@
+ "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
+
+ "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
++
++ // Nix Directories
++ "--ro-bind", "@storeDir@", "@storeDir@",
++ "--ro-bind", "/run/current-system", "/run/current-system",
+ };
+ // We would have to parse ld config files for more info.
+ bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");
diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix
index 82d2d20cb3e..7025fd2eb1c 100644
--- a/pkgs/development/libraries/yder/default.nix
+++ b/pkgs/development/libraries/yder/default.nix
@@ -4,13 +4,13 @@
assert withSystemd -> systemd != null;
stdenv.mkDerivation rec {
pname = "yder";
- version = "1.4.7";
+ version = "1.4.8";
src = fetchFromGitHub {
owner = "babelouest";
repo = pname;
rev = "v${version}";
- sha256 = "19ghiwpi972wjqvlgg576nk2nkf1ii5l1kvzb056496xfmlysrwa";
+ sha256 = "0r3rhcsp182cg0vmx8wwibb415mg2qkx8zrfpb0b97nz30h9hbvd";
};
patches = [
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
index 6a4c2b4ad1a..0f7941a0115 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
@@ -265,7 +265,9 @@ parasitic systems will be tracked."
(cond
(source-file
(loop :for system-name :being :the :hash-keys :of asdf/find-system::*registered-systems* :do
- (when (and (parasitic-relationship-p system system-name)
+ ; for an unclear reason, a literal 0 which is not a key in the hash table gets observed
+ (when (and (gethash system-name asdf/find-system::*registered-systems*)
+ (parasitic-relationship-p system system-name)
(not (blacklisted-parasite-p system-name)))
(found-new-parasite system-name)
(let ((*track-dependencies* t))
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index a0a00472a4d..e1e213eca78 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchgit, ocaml, findlib, ncurses }:
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "camlpdf is not available for OCaml ${ocaml.version}"
+else
stdenv.mkDerivation rec {
- version = "2.2.1";
+ version = "2.3";
name = "ocaml${ocaml.version}-camlpdf-${version}";
- src = fetchgit {
- url = https://github.com/johnwhitington/camlpdf.git;
- rev = "refs/tags/v${version}";
- sha256 = "0wa4rw8ccpb8xprslg88hbk352bi8bia4iffc22y55gkjr60f8gj";
+ src = fetchFromGitHub {
+ owner = "johnwhitington";
+ repo = "camlpdf";
+ rev = "v${version}";
+ sha256 = "1z8h6bjzmlscr6h6kdvzj8kspifb4n9dg7zi54z1cv2qi03kr8dk";
};
- buildInputs = [ ocaml findlib ncurses ];
+ buildInputs = [ ocaml findlib ];
# Version number in META file is wrong
patchPhase = ''
@@ -21,12 +26,6 @@ stdenv.mkDerivation rec {
EOF
'';
- makeFlags = with stdenv.lib;
- optionals (versionAtLeast ocaml.version "4.06") [
- "OCAMLBCFLAGS+=-unsafe-string"
- "OCAMLNCFLAGS+=-unsafe-string"
- ];
-
createFindlibDestdir = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index b6473126158..5df15316e32 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -1,25 +1,20 @@
-{ stdenv, fetchgit, ocaml, findlib, camlpdf, ncurses }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
-let version = "2.2.1"; in
+let version = "2.3"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-cpdf-${version}";
- src = fetchgit {
- url = https://github.com/johnwhitington/cpdf-source.git;
- rev = "refs/tags/v${version}";
- sha256 = "1i2z417agnzzdavjfwb20r6716jl3sk5yi43ssy4jqzy6ah8x1ff";
+ src = fetchFromGitHub {
+ owner = "johnwhitington";
+ repo = "cpdf-source";
+ rev = "v${version}";
+ sha256 = "0i976y1v0l7x7k2n8k6v0h4bw9zlxsv04y4fdxss6dzpsfz49w23";
};
buildInputs = [ ocaml findlib ncurses ];
propagatedBuildInputs = [ camlpdf ];
- makeFlags = with stdenv.lib;
- optionals (versionAtLeast ocaml.version "4.06") [
- "OCAMLBCFLAGS+=-unsafe-string"
- "OCAMLNCFLAGS+=-unsafe-string"
- ];
-
createFindlibDestdir = true;
postInstall = ''
diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix
index 4556fb1eb41..4b35ce25fde 100644
--- a/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb";
};
- buildInputs =
- [ ocaml findlib dune base stdio liblapack blas ] ++
+ buildInputs = [ ocaml findlib dune base stdio ];
+ propagatedBuildInputs = [ liblapack blas ] ++
stdenv.lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.Accelerate ];
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index cb90c200547..c97078c62ed 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -6,9 +6,9 @@
let source =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then {
- version = "1.8";
- url = https://github.com/ocaml/Zarith/archive/release-1.8.tar.gz;
- sha256 = "1cn63c97aij19nrw5hc1zh1jpnbsdkzq99zyyk649c4s3xi3iqq7";
+ version = "1.9.1";
+ url = https://github.com/ocaml/Zarith/archive/release-1.9.1.tar.gz;
+ sha256 = "0pfa271476dic5pvn6kxz3dfswxs6kqm2cxmhdx5xq2ayca05gj9";
} else {
version = "1.3";
url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix
index 503fefc0013..74a3ffdfcc8 100644
--- a/pkgs/development/python-modules/Logbook/default.nix
+++ b/pkgs/development/python-modules/Logbook/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Logbook";
- version = "1.4.3";
+ version = "1.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5";
+ sha256 = "0mvsig6sk4dywpw5naah1npf6h621qzhg0sd427j5znr06a2ksqs";
};
checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index b1b71b39572..6ff6a7b9f07 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.5.6";
+ version = "0.5.7";
src = fetchPypi {
inherit pname version;
- sha256 = "126gpx6zj7fpx87v1qgicpfdahmmkqqmd2a8abllq0jlckrmjsyh";
+ sha256 = "0wvqzppflph3fkgkyv3k11ga28fv1g1bz8sbf227d7pql8c6ia8k";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix
index e2fd802cf80..ba137ed5178 100644
--- a/pkgs/development/python-modules/affine/default.nix
+++ b/pkgs/development/python-modules/affine/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "affine";
- version = "2.2.2";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz";
+ sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix
index 8297c67b90d..42bb4cbad6c 100644
--- a/pkgs/development/python-modules/azure-batch/default.nix
+++ b/pkgs/development/python-modules/azure-batch/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-batch";
- version = "7.0.0";
+ version = "8.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1q8mdjdbz408z2j0y1zxqg9zg8j1v84p0dnh621vq73a2x1g298j";
+ sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix
index 73873076bda..22b32e20eee 100644
--- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix
+++ b/pkgs/development/python-modules/azure-cli-telemetry/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "azure-cli-telemetry";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "14wmxdsrrlnixaj52q37rrvp9wg5b54gf5wn2z1vq68kxpg1s560";
+ sha256 = "0sf27pcz653h0cnxsg47nndilhqlw9fl019aqbnji2vn967r9rnl";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index 508fa8bf87e..f2fdbd40edc 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "azure-datalake-store";
- version = "0.0.45";
+ version = "0.0.47";
src = fetchPypi {
inherit pname version;
- sha256 = "1k2wkpdv30wjmi53zdcsa5xfqw8gyak39na73ja6rb7wy8196wbd";
+ sha256 = "19fkkabr76r851r95kh5dpk4bdn3jkysv3aij6i2x99mkb4vxg2m";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 67fe9c568ea..f218fe58e87 100644
--- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-batch";
- version = "6.0.0";
+ version = "7.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3";
+ sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index d0ebe0470ae..fc12cafc117 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cognitiveservices";
- version = "4.0.0";
+ version = "5.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "05zbgy1d6mschqv6y14byr4nwdnv48x9skx4rbsbz1fcqqx3j2sd";
+ sha256 = "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 72be0b3dbb9..aa3f44d0797 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1d9xzf9ydlhwlsk7ij64ji1r2j0l7bwaykwngcy5lh8sdxax305r";
+ sha256 = "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 9d1bdb7a013..d752abd6012 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datamigration";
- version = "2.2.0";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0bixyya9afas0sv2wji7ivfi64z4dvv8p1gjnppibi5zas1mb4zw";
+ sha256 = "0pc5pf7jpkpdrad5hafh2hki01dpx5773whp6kpxp71gh265mm5n";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index f5d60a74b60..62ae975f8d5 100644
--- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-devtestlabs";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700";
+ sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 6384df020e0..a950f1f7c03 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "4.0.0";
+ version = "5.0.0";
pname = "azure-mgmt-network";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0h2lnigmh2arq0ppwjk8h9rqxplj6s7h7qxwyv7wirk0ydx6cfd9";
+ sha256 = "03ymxm3ryhgh4f1pw00fiyb3lxv2w6nkvn8xnj91h8xdd34flqzc";
};
postInstall = if isPy3k then "" else ''
diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 3dad2bccdc2..cf44d66eab7 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-servicefabric";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0cirsp8wnsswba6gbmw4s2ljsjwi3855my063gvi2mqr55spvx2n";
+ sha256 = "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 5751bfb042c..050e8e7b4e9 100644
--- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-signalr";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0k39hf6r2rfy2wyxd9czha2mwmcqf6sc1v69jyh6ml3slbliivlz";
+ sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index 913eb150224..2cb1c16c503 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f";
+ sha256 = "184jma28nyn4c52mjj0g0p6rci6kajsdjqy8mbdaisphpjl4f77l";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix
index 87a39255561..0a2e733ea1a 100644
--- a/pkgs/development/python-modules/azure/default.nix
+++ b/pkgs/development/python-modules/azure/default.nix
@@ -34,5 +34,6 @@ buildPythonPackage rec {
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.asl20;
maintainers = with maintainers; [ olcai ];
+ broken = true; # this should propagate over 70 azure packages, many of which are not added yet
};
}
diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index 61dc1db1a48..a3fd59eea43 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bidict";
- version = "0.18.0";
+ version = "0.18.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a";
+ sha256 = "0br3ljvd56nqifr1mbwksvl5jjk40pihrrjlyn7hmc40yq6m5bvh";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index e038e07507a..6afbe0e2f5d 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "blis";
- version = "0.2.4";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d";
+ sha256 = "1khh02z6wryrnrxlx2wrxzhaqsg5hlgypy0643rvi4zcqanvdpym";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "BLAS-like linear algebra library";
homepage = https://github.com/explosion/cython-blis;
- license = licenses.mit;
+ license = licenses.bsd3;
maintainers = with maintainers; [ danieldk ];
- };
+ };
}
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index a6c3f485d74..004669d605b 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "canmatrix";
- version = "0.7";
+ version = "0.8";
# uses fetchFromGitHub as PyPi release misses test/ dir
src = fetchFromGitHub {
owner = "ebroecker";
repo = pname;
rev = version;
- sha256 = "0q8qb282nfgirl8r2i9c8whm3hvr14ig2r42ssgnv2hya971cwjq";
+ sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 1c209353f0e..2ebc6f44b44 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -1,14 +1,11 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, configobj
-, terminaltables
-, tabulate
+{ lib, buildPythonPackage, fetchPypi, isPy27
, backports_csv
-, wcwidth
-, pytest
+, configobj
, mock
-, isPy27
+, pytest
+, tabulate
+, terminaltables
+, wcwidth
}:
buildPythonPackage rec {
@@ -27,6 +24,9 @@ buildPythonPackage rec {
wcwidth
] ++ (lib.optionals isPy27 [ backports_csv ]);
+ # namespace collision between backport.csv and backports.configparser
+ doCheck = !isPy27;
+
checkInputs = [ pytest mock ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 1ac684e6d69..37a41c7fba4 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "clikit";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0f8ba0kbka208faxdlny8byqb2w2cdyspq73zalymq8vr91796lp";
+ sha256 = "1pvzq3glf4sjgrm0wyxln3s6vicdc9q8r5sgaiqmxdmd9pylw0xm";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix
index 905b274a055..054e302dfe7 100644
--- a/pkgs/development/python-modules/cnvkit/default.nix
+++ b/pkgs/development/python-modules/cnvkit/default.nix
@@ -39,6 +39,11 @@ buildPythonPackage rec {
pomegranate
];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pandas >= 0.20.1, < 0.25.0" "pandas"
+ '';
+
meta = with lib; {
homepage = "https://cnvkit.readthedocs.io";
description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data";
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index d0f3a7dc762..407988b6c73 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cupy";
- version = "6.2.0";
+ version = "6.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0d6liaavgqks772rqam53qha3yk6dfw24i0pj3izxvvawzhlp10z";
+ sha256 = "1q38riv63110ch170c1pyhq5jfbg8y0qmcdsqn8vb9sb79amvg93";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 48de7e86b92..828976f0e9f 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, click
, click-default-group
-, sanic
, jinja2
, hupper
, pint
@@ -14,17 +13,20 @@
, black
, aiohttp
, beautifulsoup4
+, uvicorn
+, asgiref
+, aiofiles
}:
buildPythonPackage rec {
pname = "datasette";
- version = "0.28";
+ version = "0.29.3";
src = fetchFromGitHub {
owner = "simonw";
repo = "datasette";
rev = version;
- sha256 = "1m2s03gyq0ghjc3s0b5snpinisddywpgii2f0zqa3v4ljmzanx7h";
+ sha256 = "0cib7pd4z240ncck0pskzvizblhwkr42fsjpd719wdxy4scs7yqa";
};
buildInputs = [ pytestrunner ];
@@ -32,11 +34,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [
click
click-default-group
- sanic
jinja2
hupper
pint
pluggy
+ uvicorn
+ aiofiles
];
checkInputs = [
@@ -45,6 +48,7 @@ buildPythonPackage rec {
aiohttp
beautifulsoup4
black
+ asgiref
];
postConfigure = ''
@@ -52,8 +56,9 @@ buildPythonPackage rec {
--replace "click-default-group==1.2" "click-default-group" \
--replace "Sanic==0.7.0" "Sanic" \
--replace "hupper==1.0" "hupper" \
- --replace "pint==0.8.1" "pint" \
- --replace "Jinja2==2.10.1" "Jinja2"
+ --replace "pint~=0.8.1" "pint" \
+ --replace "Jinja2==2.10.1" "Jinja2" \
+ --replace "uvicorn~=0.8.4" "uvicorn"
'';
# many tests require network access
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index c3d5224dd4d..f81b7d1c8bf 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dbf";
- version = "0.98.2";
+ version = "0.98.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0d8m3zhhxy1f35r1s8k0s218iz86bs6v89vy65lslrxbdg5pjia0";
+ sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh";
};
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 4a892ddb705..b8383ec3daf 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,12 +28,12 @@
buildPythonPackage rec {
pname = "distributed";
- version = "2.3.0";
+ version = "2.4.0";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
- sha256 = "15lb6fz3739nkyxi1igzm5p2lk40digkc9fkzjqx1jpymfac9dwl";
+ sha256 = "1cz7n84g8dgx3cs28qnrh1sd6lka9lx8llysxa6mxyz6wf3ngl9h";
};
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 50922ccded2..10fe8cde826 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "django-allauth";
- version = "0.39.1";
+ version = "0.40.0";
# no tests on PyPI
src = fetchFromGitHub {
owner = "pennersr";
repo = pname;
rev = version;
- sha256 = "1kplkanhj26z3i6p0l1r5lczha4pavcx96vj3kpcp1rvyk1v0f7r";
+ sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1";
};
propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix
index 24146306af7..a91d6bf2870 100644
--- a/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/pkgs/development/python-modules/django-cors-headers/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-cors-headers";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0b11nkcviwv5dqnlmv63bgzciczb51wairm8b6wr6sda4p7y5wzb";
+ sha256 = "0g1vqhc36ay518vs67kkf6w76ay27dc73w145bpwgp9fky81r6z6";
};
propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix
new file mode 100644
index 00000000000..67005d577cd
--- /dev/null
+++ b/pkgs/development/python-modules/entrance/default.nix
@@ -0,0 +1,45 @@
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, routerFeatures
+, janus, ncclient, paramiko, pyyaml, sanic }:
+
+let
+ # The `routerFeatures` flag optionally brings in some somewhat heavy
+ # dependencies, in order to enable interacting with routers
+ opts = if routerFeatures then {
+ prePatch = ''
+ substituteInPlace ./setup.py --replace "extra_deps = []" "extra_deps = router_feature_deps"
+ '';
+ extraBuildInputs = [ janus ncclient paramiko ];
+ } else {
+ prePatch = "";
+ extraBuildInputs = [];
+ };
+
+in
+
+buildPythonPackage rec {
+ pname = "entrance";
+ version = "1.1.10";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "080qkvkmfw4004cl721l5bvpg001xz8vs6q59dg797kqxfrwk5kw";
+ };
+
+ # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later
+ disabled = pythonOlder "3.6";
+
+ # No useful tests
+ doCheck = false;
+
+ propagatedBuildInputs = [ pyyaml sanic ] ++ opts.extraBuildInputs;
+
+ prePatch = opts.prePatch;
+
+ meta = with lib; {
+ description = "A server framework for web apps with an Elm frontend";
+ homepage = https://github.com/ensoft/entrance;
+ license = licenses.mit;
+ maintainers = with maintainers; [ simonchatts ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index f7f8360fa48..2fc0fa8569b 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "flask-restplus";
- version = "0.12.1";
+ version = "0.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3fad697e1d91dfc13c078abcb86003f438a751c5a4ff41b84c9050199d2eab62";
+ sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6";
};
checkInputs = [ nose blinker tzlocal mock rednose ];
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index bd0cbda48d8..07be912a65a 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "holoviews";
- version = "1.12.3";
+ version = "1.12.5";
src = fetchPypi {
inherit pname version;
- sha256 = "df64c0f163fe8b43d28cf5bcdeb8abc45d882aedca525b870f17987edd0c80a2";
+ sha256 = "15cay2fnhwqr42s4hiq37b8q87sir5k59p14g96mvg5p0gjnhg3w";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 8987ce97c71..3b53038321c 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
- version = "1.4.5";
+ version = "1.4.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1z8xjvpkj599h3s76q05y10iysjjky7b0s5g3zicfyxhzm7x59a3";
+ sha256 = "0vi9qxgnjgxdk4wj3c5ha3hjmc97j3pw1zh2cg39jprapn4rb4fq";
};
# Tests not included in PyPI tarball
diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix
new file mode 100644
index 00000000000..da0f43811f2
--- /dev/null
+++ b/pkgs/development/python-modules/janus/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, pythonOlder }:
+
+buildPythonPackage rec {
+ pname = "janus";
+ version = "0.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef";
+ };
+
+ disabled = pythonOlder "3.6";
+
+ checkInputs = [ pytest ];
+
+ meta = with lib; {
+ description = "Mixed sync-async queue";
+ homepage = "https://github.com/aio-libs/janus";
+ license = licenses.asl20;
+ maintainers = [ maintainers.simonchatts ];
+ };
+}
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index e6c4086c386..184c86e9268 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -1,37 +1,32 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, fasteners
+, jinja2
, pbr
-, mock
, python-jenkins
, pyyaml
, six
, stevedore
-, isPy27
-, fasteners
-, jinja2
}:
buildPythonPackage rec {
pname = "jenkins-job-builder";
- version = "3.0.1";
- disabled = !isPy27;
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "16x97pdr90x3xsc1xl66l7q77pgja5dzsk921by2h09k7dvxaqmh";
+ sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf";
};
postPatch = ''
export HOME=$TMPDIR
'';
- propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ];
+ propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ];
- # Need to fix test deps
- doCheck = false;
+ # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
+ checkPhase = ''$out/bin/jenkins-jobs --help'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index c16c7687c8a..08957304312 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -3,10 +3,11 @@
, fetchPypi
, fetchpatch
, stdenv
-, sphinx
, numpydoc
, pytest
, python-lz4
+, setuptools
+, sphinx
}:
@@ -37,7 +38,7 @@ buildPythonPackage rec {
];
checkInputs = [ sphinx numpydoc pytest ];
- propagatedBuildInputs = [ python-lz4 ];
+ propagatedBuildInputs = [ python-lz4 setuptools ];
# test_disk_used is broken: https://github.com/joblib/joblib/issues/57
# test_dispatch_multiprocessing is broken only on Darwin.
diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix
index 7d83d2c4338..26320cccd1e 100644
--- a/pkgs/development/python-modules/kconfiglib/default.nix
+++ b/pkgs/development/python-modules/kconfiglib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "kconfiglib";
- version = "10.36.0";
+ version = "12.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b";
+ sha256 = "0afc0gidh0pjb0ll99xifzs5z14g365crfj935614zp9w8fcchp0";
};
# doesnt work out of the box but might be possible
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index cf1eeb5392c..65f8697e124 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, isPy27
, dbus-python, setuptools_scm, entrypoints, secretstorage
, pytest, pytest-flake8 }:
buildPythonPackage rec {
pname = "keyring";
- version = "19.1.0";
+ version = "19.2.0";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
+ sha256 = "1cvlm48fggl12m19j9vcnrlplidr2sjf8h3pdyki58f9y357q0wi";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix
index 590ca988023..79bf4636b50 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark-parser/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "lark-parser";
- version = "0.7.3";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
- sha256 = "1d8dbn8wwqqvvjyhai813sqkx6366d8jkjq0gkyh51692pflmwrp";
+ sha256 = "1k9s62ddv6pghzp1yak2ld6sk92zm4sz1xqp8zkzyh3xqdsmfa0f";
};
# tests of Nearley support require js2py
diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index e5741176426..775d1a9ef85 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libversion";
- version = "1.1.4";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0xp0wv4s1537s0iqa1ih3kfh1p70s7d1fkwhvrnbj8m98yjij84q";
+ sha256 = "1p3snjlsg11vhba8h286h19kn6azlxbywg9f6rdhj8sfraccqlmk";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 22f9b445d24..76e641bae2c 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
- version = "0.17.0";
+ version = "0.19.0";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "17pnbv28n9vy3q66ckxfdbb9k1riy6s8lg63zfm5jsx00f0zqqnn";
+ sha256 = "175ydlxmj8pbkrv3wcrsd9jg7smnxhln2y0i691yafhidxgy8fmm";
};
propagatedBuildInputs = [ marshmallow sqlalchemy ];
diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix
index 018a634a43a..a1729ecb04e 100644
--- a/pkgs/development/python-modules/meld3/default.nix
+++ b/pkgs/development/python-modules/meld3/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "meld3";
- version = "1.0.2";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
+ sha256 = "1fbyafwi0d54394hkmp65nf6vk0qm4kipf5z60pdp4244rvadz8y";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix
new file mode 100644
index 00000000000..92acdaf58ed
--- /dev/null
+++ b/pkgs/development/python-modules/merkletools/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, pysha3 }:
+
+buildPythonPackage rec {
+ pname = "merkletools";
+ version = "1.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l";
+ };
+
+ propagatedBuildInputs = [ pysha3 ];
+
+ meta = with lib; {
+ description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs";
+ homepage = "https://github.com/Tierion/pymerkletools";
+ license = licenses.mit;
+ maintainers = with maintainers; [ chiiruno ];
+ };
+}
diff --git a/pkgs/development/python-modules/opt-einsum/2.nix b/pkgs/development/python-modules/opt-einsum/2.nix
new file mode 100644
index 00000000000..11da1ba1ea5
--- /dev/null
+++ b/pkgs/development/python-modules/opt-einsum/2.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
+
+buildPythonPackage rec {
+ version = "2.3.2";
+ pname = "opt_einsum";
+
+ src = fetchPypi {
+ inherit version pname;
+ sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
+ };
+
+ checkInputs = [
+ pytest_4
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ propagatedBuildInputs = [
+ numpy
+ ];
+
+ meta = {
+ description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
+ homepage = http://optimized-einsum.readthedocs.io;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ teh ];
+ };
+}
diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix
index c28105d4e49..f4e7d38ecb8 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/pkgs/development/python-modules/opt-einsum/default.nix
@@ -1,31 +1,26 @@
-{ buildPythonPackage, fetchPypi, lib, numpy, pytest, pytestpep8, pytestcov }:
+{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
+
buildPythonPackage rec {
- version = "2.3.2";
+ version = "3.0.1";
pname = "opt_einsum";
src = fetchPypi {
inherit version pname;
- sha256 = "0ny3v8x83mzpwmqjdzqhzy2pzwyy4wx01r1h9i29xw3yvas69m6k";
+ sha256 = "1agyvq26x0zd6j3wzgczl4apx8v7cb9w1z50azn8c3pq9jphgfla";
};
- checkInputs = [
- pytest
- pytestpep8
- pytestcov
- ];
+ propagatedBuildInputs = [ numpy ];
+
+ checkInputs = [ pytest_4 ];
checkPhase = ''
pytest
'';
- propagatedBuildInputs = [
- numpy
- ];
-
- meta = {
+ meta = with lib; {
description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
homepage = http://optimized-einsum.readthedocs.io;
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ teh ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ teh ];
};
}
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index afb805c0b7e..d2cd79419a4 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "peewee";
- version = "3.10.0";
+ version = "3.11.1";
# pypi release does not provide tests
src = fetchFromGitHub {
owner = "coleifer";
repo = pname;
rev = version;
- sha256 = "166h7vy3j0v4h2jnyiwpmpqgmn95381a5ra40ghghy0fqd9v49g8";
+ sha256 = "0q84r9x99h9a3kqs3i12bgk8rz5my8vpjngg8yaqd2kzsb6gynp8";
};
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 1e61992b49d..30631e06b5f 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pex";
- version = "1.6.8";
+ version = "1.6.11";
src = fetchPypi {
inherit pname version;
- sha256 = "1zibkc074dvk69bkiipfzn2l9glgzs26g16j2ny5lzq320wqszkj";
+ sha256 = "034170w0qh20qkfaha2rpnccm31f7snhb4r9cd079v4v2x2swybk";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 6d2e8169eb7..f52d61e839b 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.10.17";
+ version = "8.10.19";
src = fetchPypi {
inherit pname version;
- sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9";
+ sha256 = "0xdj4faxvcmkw1war203yxcb66jhhbgscjyqxjifknr0mxax3ngw";
};
meta = {
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 226e71c13cc..52be2c3bafc 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -10,6 +10,7 @@
, pkginfo
, html5lib
, shellingham
+, subprocess32
, tomlkit
, typing
, pathlib2
@@ -63,7 +64,7 @@ in buildPythonPackage rec {
shellingham
tomlkit
] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
- ++ lib.optionals isPy27 [ virtualenv functools32 ];
+ ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index 7054485f302..4493ef51075 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pomegranate";
- version = "0.11.0";
+ version = "0.11.1";
src = fetchFromGitHub {
repo = pname;
owner = "jmschrei";
rev = "v${version}";
- sha256 = "0gf7z343ag4g7pfccn1sdap3ihkaxrc9ca75awjhmsa2cyqs66df";
+ sha256 = "19kdzqyj86aldsls68a6ymrs8sasv3a8r4wjmfdmcif1xsg6zb4q";
};
propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ];
diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix
index 7ac093cbc57..5a28a045c3e 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/pkgs/development/python-modules/py3dns/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "py3dns";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "8e88c0648c4d38a880f08aeb05a6e5cb48b8ce2602d381caafc6c71698ee3c21";
+ sha256 = "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz";
};
preConfigure = ''
diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index 4a5577d7e0b..f7a64b9bde4 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pycdio";
- version = "2.0.0";
+ version = "2.1.0";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1a1h0lmfl56a2a9xqhacnjclv81nv3906vdylalybxrk4bhrm3hj";
+ sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
};
prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py";
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 9b713827199..42921ea6483 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pydantic";
- version = "0.31";
+ version = "0.32.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0x9xc5hpyrlf05dc4bx9f7v51fahxcahkvh0ij8ibay15nwli53d";
+ sha256 = "0q565m7d2rapjy6ylbdpd00z9zk99pkqg110191racp1d34kb4va";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index 8f80447b85d..afd7a4599ec 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pyftdi";
- version = "0.29.4";
+ version = "0.30.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0jy0xbqvmhy0nq9v86759d96raa8p52yq8ik3ji5kjlx7cizq67v";
+ sha256 = "0avmxz38bkl6hp3fn1jm31qahsdp76j454mfnpxwx5wlk35iss09";
};
propagatedBuildInputs = [ pyusb pyserial ];
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 74c3724aa19..c8310c39441 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -20,6 +20,10 @@ buildPythonPackage rec {
checkInputs = [ pytestrunner pytest_4 hypothesis ];
+ postPatch = ''
+ substituteInPlace setup.py --replace 'pytest<5' 'pytest'
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/tobgu/pyrsistent/;
description = "Persistent/Functional/Immutable data structures";
diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
index 46d4135d6af..6b19a8f0c73 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -1,21 +1,46 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, taglib
, cython
, pytest
, glibcLocales
+, fetchpatch
}:
buildPythonPackage rec {
pname = "pytaglib";
version = "1.4.5";
- src = fetchPypi {
- inherit pname version;
- sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f";
+ src = fetchFromGitHub {
+ owner = "supermihi";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb";
};
+ patches = [
+ # fix tests on python 2.7
+ (fetchpatch {
+ url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch;
+ sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj";
+ })
+
+ # properly install pyprinttags
+ (fetchpatch {
+ url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch;
+ sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp";
+ })
+ (fetchpatch {
+ url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch;
+ sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "'pytest-runner', " ""
+ '';
+
buildInputs = [ taglib cython ];
checkInputs = [ pytest glibcLocales ];
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index bbd05b6757b..b6e6611ad45 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-gitlab";
- version = "1.9.0";
+ version = "1.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1p0i6gsl4mcv6w1sm0rsxq9bq2cmmg3n7c0dniqlvqmzkk62qqhx";
+ sha256 = "1icnf27wrndglhr7h3gbns6dn6a98y3i46cmyrxpnir79446sdgy";
};
propagatedBuildInputs = [ requests six ];
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index f14200b3542..17bf6f5cdab 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -44,6 +44,7 @@ in buildPythonPackage rec {
})
];
+ dontUseCmakeConfigure = true;
preConfigure = lib.optionalString cudaSupport ''
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
'' + lib.optionalString (cudaSupport && cudnn != null) ''
diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix
new file mode 100644
index 00000000000..7b4cfa501dd
--- /dev/null
+++ b/pkgs/development/python-modules/qds_sdk/default.nix
@@ -0,0 +1,43 @@
+{ lib,
+ fetchFromGitHub,
+ buildPythonPackage,
+ boto,
+ inflection,
+ pytest,
+ mock,
+ requests,
+ six,
+ urllib3 }:
+
+buildPythonPackage rec {
+ pname = "qds_sdk";
+ version = "1.12.0";
+
+ # pypi does not contain tests, using github sources instead
+ src = fetchFromGitHub {
+ owner = "qubole";
+ repo = "qds-sdk-py";
+ rev = "V${version}";
+ sha256 = "18xhvlcfki8llv7fw2r5yfk20zds3gr78b4klwm9mkvhlhwds9rx";
+ };
+
+ propagatedBuildInputs = [
+ boto
+ inflection
+ requests
+ six
+ urllib3
+ ];
+
+ checkInputs = [ pytest mock ];
+ checkPhase = ''
+ py.test --disable-pytest-warnings tests
+ '';
+
+ meta = with lib; {
+ description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API";
+ homepage = "https://github.com/qubole/qds-sdk-py";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ shahrukh330 ];
+ };
+}
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 055a54612a0..95ee3a864e6 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "qtconsole";
- version = "4.5.2";
+ version = "4.5.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0z6d2rmzrx2dzbx94xxmsrl6vn6jjpzvb6014y2bqhwr7znbjzkn";
+ sha256 = "1nf64wl3ni0q69ihcm5y6zl12mmg7gvkhrb98hbgwv3yb09787mr";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix
index 09d815134ef..d21da2c7583 100644
--- a/pkgs/development/python-modules/radio_beam/default.nix
+++ b/pkgs/development/python-modules/radio_beam/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "radio_beam";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1wgd9dyz3pcc9ighkclb6qfyshwbg35s57lz6k62jhcxpvp8r5zb";
+ sha256 = "0g1nqiikv023ab60gfqrvc13kfjv8m70bpfk264vlliaq6mvxdf2";
};
propagatedBuildInputs = [ astropy ];
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 1a4fdff5812..143b5bea155 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -1,24 +1,24 @@
{ buildPythonPackage, lib, fetchFromGitHub, isPy3k
-, cython
+, cython, setuptools
, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
, pytest, pytestcov, packaging, hypothesis, boto3, mock
}:
buildPythonPackage rec {
pname = "rasterio";
- version = "1.0.25";
+ version = "1.0.28";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = "rasterio";
rev = version;
- sha256 = "15m0ajcrxjdzahdkxa3mylk87l31zz48k99bvmmx96hcl31cf347";
+ sha256 = "05rn2ijjv64a765gkpwcq3bb933gzp35zj4l9sk0agh19462myjx";
};
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
nativeBuildInputs = [ cython gdal ];
- propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ];
+ propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ];
meta = with lib; {
description = "Python package to read and write geospatial raster data";
diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index f84508fe53c..d16f9fd2929 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "reproject";
- version = "0.4";
+ version = "0.5.1";
doCheck = false; # tests require pytest-astropy
src = fetchPypi {
inherit pname version;
- sha256 = "dbbb18a8b211292c7ce61121b8538fc279540337be1c05cabc7570c5aca6d734";
+ sha256 = "069rha55cbm8vsi1qf8zydds42lgkcc97sd57hmjw1mgiz025xrp";
};
propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ];
diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index e9e51756d9f..a83e196005d 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "resampy";
- version = "0.2.1";
+ version = "0.2.2";
# No tests in PyPi Archive
src = fetchFromGitHub {
owner = "bmcfee";
repo = pname;
rev = version;
- sha256 = "0a2bxj042y62dimm2i4vglbhpwbybam07mcl67cb6pmfsw9fbqhj";
+ sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs";
};
checkInputs = [ pytest pytestcov ];
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 6aae4c11fdd..5c1e0e81246 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -15,15 +15,76 @@
, pytest-sanic
, pytest-sugar
, pytest-benchmark
+
+# required just httpcore / requests-async
+, h11
+, h2
+, certifi
+, chardet
+, idna
+, requests
+, rfc3986
+, uvicorn
}:
+let
+
+ # This version of sanic depends on two packages that have been deprecated by
+ # their development teams:
+ #
+ # - requests-async [where first line of pypi says to use `http3` instead now]
+ # - httpcore [where the homepage redirects to `http3` now]
+ #
+ # Since no other packages in nixpkg depend on these right now, define these
+ # packages just as local dependencies here, to avoid bloat.
+
+ httpcore = buildPythonPackage rec {
+ pname = "httpcore";
+ version = "0.3.0";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0n3bamaixxhcm27gf1ws3g6rkamvqx87087c88r6hyyl52si1ycn";
+ };
+
+ propagatedBuildInputs = [ certifi chardet h11 h2 idna rfc3986 ];
+
+ # relax pinned old version of h11
+ postConfigure = ''
+ substituteInPlace setup.py \
+ --replace "h11==0.8.*" "h11"
+ '';
+
+ # LICENCE.md gets propagated without this, causing collisions
+ postInstall = ''
+ rm $out/LICENSE.md
+ '';
+ };
+
+ requests-async = buildPythonPackage rec {
+ pname = "requests-async";
+ version = "0.5.0";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8731420451383196ecf2fd96082bfc8ae5103ada90aba185888499d7784dde6f";
+ };
+
+ propagatedBuildInputs = [ requests httpcore ];
+
+ # LICENCE.md gets propagated without this, causing collisions
+ postInstall = ''
+ rm $out/LICENSE.md
+ '';
+ };
+
+in
+
buildPythonPackage rec {
pname = "sanic";
- version = "19.3.1";
+ version = "19.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "ce434eb154872ca64493a6c3a288f11fd10bca0de7be7bf9f1d0d063185e51ec";
+ sha256 = "0b1qqsvdjkibrw5kgr0pm7n7jzb1403132wjmb0lx3k5wyvqfi95";
};
propagatedBuildInputs = [
@@ -31,6 +92,7 @@ buildPythonPackage rec {
aiofiles
websockets
multidict
+ requests-async
uvloop
ujson
];
@@ -44,11 +106,20 @@ buildPythonPackage rec {
pytest-sanic
pytest-sugar
pytest-benchmark
+ uvicorn
];
+ # Sanic says it needs websockets 7.x, but the changelog for 8.x is actually
+ # nearly compatible with sanic's use. So relax this constraint, with a small
+ # required code change.
postConfigure = ''
- substituteInPlace setup.py \
- --replace "websockets>=6.0,<7.0" "websockets"
+ substituteInPlace setup.py --replace \
+ "websockets>=7.0,<8.0" \
+ "websockets>=7.0,<9.0"
+ substituteInPlace sanic/websocket.py --replace \
+ "self.websocket.subprotocol = subprotocol" \
+ "self.websocket.subprotocol = subprotocol
+ self.websocket.is_client = False"
'';
# 10/500 tests ignored due to missing directory and
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 91fa26ef44d..3fe7b9ff4ef 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -22,6 +22,8 @@ buildPythonPackage rec {
requests flake8
];
+ dontUseCmakeConfigure = true;
+
disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
"test_hello_develop" # tries setuptools develop install
"test_source_distribution" # pip has no way to install missing dependencies
diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
index 6e6809663a6..1790ae2e8f5 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
- version = "2.1.0";
+ version = "2.2.0";
pname = "sepaxml";
disabled = isPy27;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
owner = "raphaelm";
repo = "python-sepaxml";
rev = version;
- sha256 = "0lkb0nnyxmwvm6gkwls8w2290b66lwz9bv8p39wwcn7flabviwhj";
+ sha256 = "1qmgdcz61hs65m2fddwn9jpyk2sxifdb0f3jz1n0lgy774z0pmas";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 8723a7b940c..ae9f9e42ecf 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -4,22 +4,24 @@
, click-plugins
, colorama
, requests
+, setuptools
, XlsxWriter
}:
buildPythonPackage rec {
pname = "shodan";
- version = "1.14.0";
+ version = "1.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0c5x53757p6ihh1f8xqsal2gi9ikcl3464b38qinva51s0kkb58k";
+ sha256 = "1sh7a2dsal3kzcl4s9xbpl7hxhm9k55s5hiqdqqnafhvhnh0vmbz";
};
propagatedBuildInputs = [
click-plugins
colorama
requests
+ setuptools
XlsxWriter
];
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 441c656a0e1..a37f7548219 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -35,7 +35,9 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace setup.py \
- --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
+ --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
+ --replace "thinc>=7.0.8,<7.1.0" "thinc>=7.0.8" \
+ --replace "blis>=0.2.2,<0.3.0" "blis>=0.2.2"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index d1685b4d579..17cd3e8c503 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "srsly";
- version = "0.0.7";
+ version = "0.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1v9nn17q2lshnvnc8ff6nk53rggz2hgnmx4fj4czfr40125r98pk";
+ sha256 = "1l9yjp1w2vrkrynxrlrc0v47i2iq9059k4ni44nz23573xbdrh2w";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index e7f8be7b469..2e3071ed29c 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, pbr, six }:
+{ stdenv, buildPythonPackage, fetchPypi, pbr, setuptools, six }:
buildPythonPackage rec {
pname = "stevedore";
- version = "1.30.1";
+ version = "1.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1860zslirsqskc2iifljxcyly28zqgjpmkm7k3bj6zyqagzriq3v";
+ sha256 = "054apq55yg7058pmbnyc8jhrcpi9clmi0sm7znhwg0d676brywz0";
};
doCheck = false;
- propagatedBuildInputs = [ pbr six ];
+ propagatedBuildInputs = [ pbr setuptools six ];
meta = with stdenv.lib; {
description = "Manage dynamic plugins for Python applications";
diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index 5360b951de2..da77691e354 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -5,23 +5,23 @@
, toolz
, zict
, six
-, pytest
+, pytest_4
, networkx
, distributed
, confluent-kafka
, graphviz
+, requests
}:
buildPythonPackage rec {
pname = "streamz";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "80c9ded1d6e68d3b78339deb6e9baf93a633d84b4a8875221e337ac06890103f";
+ sha256 = "127rpdjgkcyjifmkqbhmqfbzlgi32n54rybrdxja610qr906y40c";
};
- checkInputs = [ pytest networkx distributed confluent-kafka graphviz ];
propagatedBuildInputs = [
tornado
toolz
@@ -29,6 +29,15 @@ buildPythonPackage rec {
six
];
+ checkInputs = [
+ confluent-kafka
+ distributed
+ graphviz
+ networkx
+ pytest_4
+ requests
+ ];
+
# Disable test_tcp_async because fails on sandbox build
checkPhase = ''
pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \
@@ -37,7 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Pipelines to manage continuous streams of data";
- homepage = https://github.com/mrocklin/streamz/;
+ homepage = "https://github.com/mrocklin/streamz";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 9c252aa9ce2..68ed8dcf99f 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "stripe";
- version = "2.30.0";
+ version = "2.35.1";
# Tests require network connectivity and there's no easy way to disable
# them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "de6be07c9e8a350d588278186316f66c72af7036aa5e917d1a924fb875249034";
+ sha256 = "0rmzba8yig426anf8fxiacyvwchlsws746757sgvw748n8lrarbw";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 4771ba7a89d..18ab5bca7ea 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -1,27 +1,33 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi
+{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
, mock
, meld3
+, pytest
+, setuptools
}:
+
buildPythonPackage rec {
pname = "supervisor";
- version = "3.3.5";
+ version = "4.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
+ sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n";
};
- checkInputs = [ mock ];
+ # wants to write to /tmp/foo which is likely already owned by another
+ # nixbld user on hydra
+ doCheck = !stdenv.isDarwin;
+ checkInputs = [ mock pytest ];
+ checkPhase = ''
+ pytest
+ '';
- propagatedBuildInputs = [ meld3 ];
+ propagatedBuildInputs = [ meld3 setuptools ];
- # Supervisor requires Python 2.4 or later but does not work on any version of Python 3. You are using version 3.6.5 (default, Mar 28 2018, 10:24:30)
- disabled = isPy3k;
-
- meta = {
+ meta = with lib; {
description = "A system for controlling process state under UNIX";
homepage = http://supervisord.org/;
- license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
- maintainers = with lib.maintainers; [ zimbatm ];
+ license = licenses.free; # http://www.repoze.org/LICENSE.txt
+ maintainers = with maintainers; [ zimbatm ];
};
}
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index e46d0298953..db2308a0be8 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -26,6 +26,7 @@
, symlinkJoin
, keras-applications
, keras-preprocessing
+, addOpenGLRunpath
}:
# We keep this binary build for two reasons:
@@ -76,6 +77,8 @@ in buildPythonPackage {
] ++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
+ nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
+
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions.
# another possibility would be to have tensorboard only in the buildInputs
@@ -94,7 +97,12 @@ in buildPythonPackage {
lib.optionalString stdenv.isLinux ''
rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
- find $out \( -name '*.so' -or -name '*.so.*' \) -exec patchelf --set-rpath "$rrPath" {} \;
+ find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ patchelf --set-rpath "$rrPath" "$lib"
+ ${lib.optionalString cudaSupport ''
+ addOpenGLRunpath "$lib"
+ ''}
+ done
'';
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 7f6952e8fe5..e180c9d70e9 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,4 +1,5 @@
{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
+, addOpenGLRunpath
# Python deps
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
# Python libraries
@@ -112,7 +113,7 @@ let
nativeBuildInputs = [
swig which pythonEnv
- ];
+ ] ++ lib.optional cudaSupport addOpenGLRunpath;
buildInputs = [
jemalloc
@@ -203,6 +204,7 @@ let
TF_NEED_CUDA = tfFeature cudaSupport;
TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}";
GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
+ GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
postPatch = ''
@@ -295,6 +297,21 @@ let
bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist"
cp -Lr "$PWD/dist" "$python"
'';
+
+ postFixup = lib.optionalString cudaSupport ''
+ find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ addOpenGLRunpath "$lib"
+ done
+ '';
+ };
+
+ meta = with stdenv.lib; {
+ description = "Computation using data flow graphs for scalable machine learning";
+ homepage = http://tensorflow.org;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jyp abbradar ];
+ platforms = platforms.linux;
+ broken = !(xlaSupport -> cudaSupport);
};
};
@@ -337,6 +354,14 @@ in buildPythonPackage {
tensorflow-tensorboard
];
+ nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
+
+ postFixup = lib.optionalString cudaSupport ''
+ find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ addOpenGLRunpath "$lib"
+ done
+ '';
+
# Actual tests are slow and impure.
# TODO try to run them anyway
# TODO better test (files in tensorflow/tools/ci_build/builds/*test)
@@ -346,12 +371,5 @@ in buildPythonPackage {
passthru.libtensorflow = bazel-build.out;
- meta = with stdenv.lib; {
- description = "Computation using data flow graphs for scalable machine learning";
- homepage = http://tensorflow.org;
- license = licenses.asl20;
- maintainers = with maintainers; [ jyp abbradar ];
- platforms = platforms.linux;
- broken = !(xlaSupport -> cudaSupport);
- };
+ inherit (bazel-build) meta;
}
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 945da85b9fa..83c9d8f81b2 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -28,11 +28,11 @@
buildPythonPackage rec {
pname = "thinc";
- version = "7.0.8";
+ version = "7.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "191admjvhqsbxpqn73q42i0i8kvlblj0k6p0z9p7n3pcxzl75nsw";
+ sha256 = "0j2nfzz154j9331gzwa5rmc2f5ljjan728rhgsx6c7jwg323mmsa";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix
index 2b0fc68ca4c..c76cc6645d9 100644
--- a/pkgs/development/python-modules/tilestache/default.nix
+++ b/pkgs/development/python-modules/tilestache/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "tilestache";
- version = "1.51.13";
+ version = "1.51.14";
disabled = !isPy27;
src = fetchPypi {
pname = "TileStache";
inherit version;
- sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27";
+ sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk";
};
propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];
diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index b3d83deeac9..470a4bb40dd 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -2,11 +2,11 @@
python.pkgs.buildPythonPackage rec {
pname = "tld";
- version = "0.9.3";
+ version = "0.9.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp";
+ sha256 = "0figmf80y715zv6viqan2nyzpg9aia5dyl25nskirpm5lh1s99w9";
};
propagatedBuildInputs = with python.pkgs; [ six ];
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index a49e994019e..3fdc11e440e 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "twine";
- version = "1.13.0";
+ version = "1.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc";
+ sha256 = "11rpd653zcgzkq3sgwkzs3mpxl3r5rij59745ni84ikv8smjmlm3";
};
propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ];
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 1fbdbd3782a..a97f69652e8 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "umap-learn";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchFromGitHub {
owner = "lmcinnes";
repo = "umap";
rev = version;
- sha256 = "1cdc7hs3vwzxvzs34l9a06q8rvks29wj6swyj8zvwr32knxch8a9";
+ sha256 = "0nck5va5km7qkbrhn15dsn0p2mms9kc641lcypy7l8haqgm44h8x";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
index f300ed72751..65542cd758b 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "uncompyle6";
- version = "3.3.3";
+ version = "3.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9c492a560ff1c8713f0947cfc3ab755c368e26421d13087cd5b6c01b1529ea5b";
+ sha256 = "0w4m0jywjb0w1y73nkb05zmjxb4plpfi3w2g1rgrf45afa2aqm8z";
};
checkInputs = [ nose pytest hypothesis six ];
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index f85c28b7f57..3d20c31b9be 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "uproot";
- version = "3.8.0";
+ version = "3.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "06s0lym5md59pj8w89acnwk0i0hh92az187h4gz22mb849h308pw";
+ sha256 = "1ir3gxgfidw0lx0d2x1lmmxg9brb5fam3ncfihba2b0bvyq9bqzd";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 9f7efef1e84..a525846be76 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -43,6 +43,12 @@ buildPythonPackage rec {
pytest
'';
+ # LICENCE.md gets propagated without this, causing collisions
+ # see https://github.com/encode/uvicorn/issues/392
+ postInstall = ''
+ rm $out/LICENSE.md
+ '';
+
meta = with lib; {
homepage = https://www.uvicorn.org/;
description = "The lightning-fast ASGI server";
diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix
index bbcca388c93..241dffe7167 100644
--- a/pkgs/development/python-modules/validators/default.nix
+++ b/pkgs/development/python-modules/validators/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "validators";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ea9bf8bf22aa692c205e12830d90b3b93950e5122d22bed9eb2f2fece0bba298";
+ sha256 = "1bhla1l8gbks572zp4f254acz23822dz2mp122djxvp328i87b7h";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 589a8089fca..9202d02ad5b 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -3,6 +3,7 @@
, buildPythonPackage
, pythonOlder
, pytest
+, stdenv
}:
buildPythonPackage rec {
@@ -18,6 +19,9 @@ buildPythonPackage rec {
disabled = pythonOlder "3.3";
+ # Tests fail on Darwin with `OSError: AF_UNIX path too long`
+ doCheck = !stdenv.isDarwin;
+
meta = with lib; {
description = "WebSocket implementation in Python 3";
homepage = "https://github.com/aaugustin/websockets";
diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index a9758580a44..484cc33b1f3 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "0.8.0";
+ version = "0.9.0";
pname = "websockify";
src = fetchPypi {
inherit pname version;
- sha256 = "547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2";
+ sha256 = "1nnalv0jkkj34hw6yb12lp6r6fj1ps9vkkyshjvx65y5xdwmnny3";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index c15f2682e63..05c7fed589e 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -30,7 +30,6 @@ buildPythonPackage rec {
doCheck = true;
checkPhase = ''
- ${python.interpreter} python${pythonSuffix}/smoketest.py
${python.interpreter} python${pythonSuffix}/pythontest.py
'';
diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index 9c9c932cabf..3f9dac6d42c 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "zstd";
- version = "1.4.1.0";
+ version = "1.4.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0laxg0pag1bzmqmg4x81jb32412pn98p9zg2b0li035m779nka95";
+ sha256 = "1h4wvzikar4ryhawm7clh29bvhbpy0ix1rlxhg9x195fpq56vsh7";
};
postPatch = ''
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index decde250ac2..6190b4210cd 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
- version = "1.17.2";
- source.sha256 = "0dbnq6703mjvgsri45vaw7b4wjqr89z1h8xkzsacqcp24a706m5r";
+ version = "1.17.3";
+ source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw";
dontPatchShebangs = true;
postFixup = ''
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 84c56a9b569..252e95e5793 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "radare2-cutter";
- version = "1.8.3";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
- sha256 = "03f3cdckh51anx9gd1b0ndb2fg7061hqngvygf32ky29mm2m2lyv";
+ sha256 = "1ln55ssrasbaam267lwc2vxnm8j0c2x35qsda44xi2p8hqxslf8k";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 41949b0ad42..cc6930fce13 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -120,12 +120,12 @@ in {
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
- version_commit = "22775";
- gittap = "3.6.0";
- gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
- rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
- version = "2019-06-24";
- sha256 = "0vp94qzznqv87vvjbyyj6swkm6gl7byqvb1jv23i8i42zi5n7qmd";
+ version_commit = "22888";
+ gittap = "3.8.0";
+ gittip = "b4860e4eecad2053202965926f16296864b2f1e5";
+ rev = "b4860e4eecad2053202965926f16296864b2f1e5";
+ version = "2019-09-03";
+ sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index cf19862b005..a07cbab285c 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
let
- rev = "53f1edc685d8f269ac551336809e34faf7cd29a6";
- version = "2019-08-14";
+ rev = "aa4425cc96aee5119fb9fee9138b3d3bdb6482f7";
+ version = "2019-09-30";
in
stdenv.mkDerivation {
name = "sbt-extras-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "1fyfwcnr30c0rgq6xfd2is9a8j1hsrl2p0xqicwqi4bzijy4r6gw";
+ sha256 = "15xkd1l0ka1fl77g7p498krvk0mcn25jq6jp4zyq5r8dla5rn832";
};
dontBuild = true;
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index ca04d209fab..717dc2d7951 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -5,14 +5,14 @@
, drivers ? []
}:
let
- version = "3.9.1";
+ version = "4.0.0";
in stdenv.mkDerivation rec {
pname = "squirrel-sql";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
- sha256 = "1xpkh9kwdjzd0zks8c4mq3add9ivc24hb0hflp11dl32dsdmzrai";
+ sha256 = "06njdp2248zxm7zlcpyawx1s7j6hffp5a9mwam3cb53gsmzcz126";
};
nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index a88963c6e2c..e6c485b7ed7 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "0m3f5mrdmnmkfsy7mc6x3jf4ainmq0z42mv935ikcdbjwwjbd5gq";
};
- cargoSha256 = "11kzl0ns84xhdacn0k7nilgzgpwazmaaqdjf2kcarxf2h01b0rjv";
+ cargoSha256 = "0adc525hbs7j7zasvcdxy7k6pf145hs711hjbzgwf72k514ypyrl";
+ verifyCargoDeps = true;
meta = with stdenv.lib; {
description = "Markdown shell pre-processor";
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index d190ee32fca..f7d344506d5 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -43,7 +43,7 @@
let
installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
- version = "1.0.8";
+ version = "1.0.9";
in stdenv.mkDerivation rec {
pname = "flatpak-builder";
inherit version;
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";
+ sha256 = "00qd770qjsiyd8qhhhyn7zg6jyi283ix5dhjzcfdn9yr3h53kvyn";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index 102f911bf85..3d5453af807 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchzip, jdk, makeWrapper }:
+{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }:
stdenv.mkDerivation rec {
pname = "micronaut";
- version = "1.2.1";
+ version = "1.2.3";
src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
sha256 = "0lfl2hfakpdcfii3a3jr6kws731jamy4fb3dmlnj5ydk0zbnmk6r";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper installShellFiles ];
installPhase = ''
rm bin/mn.bat
cp -r . $out
wrapProgram $out/bin/mn \
--prefix JAVA_HOME : ${jdk}
+ installShellCompletion --bash --name mn.bash bin/mn_completion
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 47aa4917814..90605771958 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }:
stdenv.mkDerivation {
pname = "universal-ctags";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
- buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+ buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in
autoreconfPhase = ''
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 720544f4b6c..d01785a8fc0 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -5,6 +5,7 @@
, glib
, gtk3
, itstool
+, libdazzle
, libxml2
, meson, ninja
, pango
@@ -18,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "sysprof";
- version = "3.32.0";
+ version = "3.34.0";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0kamsnnig56lzs4ziwcxm3b1xyis4z361s9nj3nca0c78sgac8pw";
+ sha256 = "0b7rpwvs5wckiy418vs0d4i62wafpcx1zlspw39ag50d1sjcbv58";
};
nativeBuildInputs = [
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook
gnome3.adwaita-icon-theme
];
- buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
+ buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ];
mesonFlags = [
"-Dsystemdunitdir=lib/systemd/system"
diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix
new file mode 100644
index 00000000000..a2433da2997
--- /dev/null
+++ b/pkgs/development/tools/rund/default.nix
@@ -0,0 +1,49 @@
+{stdenv, lib, fetchFromGitHub, ldc ? null, dcompiler ? ldc }:
+
+assert dcompiler != null;
+
+stdenv.mkDerivation rec {
+ pname = "rund";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "dragon-lang";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "10x6f1nn294r5qnpacrpcbp348dndz5fv4nz6ih55c61ckpkvgcf";
+ };
+
+ buildInputs = [ dcompiler ];
+ buildPhase = ''
+ for candidate in dmd ldmd2 gdmd; do
+ echo Checking for DCompiler $candidate ...
+ dc=$(type -P $candidate || echo "")
+ if [ ! "$dc" == "" ]; then
+ break
+ fi
+ done
+ if [ "$dc" == "" ]; then
+ exit "Error: could not find a D compiler"
+ fi
+ echo Using DCompiler $candidate
+ $dc -I=$src/src -i -run $src/make.d build --out $NIX_BUILD_TOP
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ $NIX_BUILD_TOP/rund make.d test
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv $NIX_BUILD_TOP/rund $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A compiler-wrapper that runs and caches D programs";
+ homepage = https://github.com/dragon-lang/rund;
+ license = lib.licenses.boost;
+ maintainers = with maintainers; [ jonathanmarler ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index d84322bb547..3d068b06f40 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sourcetrail";
- version = "2019.2.39";
+ version = "2019.3.46";
src = fetchurl {
name = "sourtrail.tar.gz";
url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit";
- sha256 = "13kzfnsb5lf9v6bqw41qljp5bgz2rd3w163r6xg59hzd3dv8f90q";
+ sha256 = "0dnkxr3fijcsbn6pd20lyxhr9ns6ji1c4dffly9s16yq4x9ad5r4";
};
nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix
new file mode 100644
index 00000000000..2c9367bfe76
--- /dev/null
+++ b/pkgs/games/quake3/quake3e/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "Quake3e";
+ version = "2019-09-09";
+
+ src = fetchFromGitHub {
+ owner = "ec-";
+ repo = pname;
+ rev = version;
+ sha256 = "0i9flw8h87lagdpbci6vgqkriv05p3bidgqb4pwrxls947zwfcw8";
+ };
+
+ buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ];
+ enableParallelBuilding = true;
+
+ postPatch = ''
+ sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c
+ sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsaLib}/lib/libasound.so.2" )#' code/unix/linux_snd.c
+ sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
+ sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
+ sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp build/*/*x64 $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/ec-/Quake3e;
+ description = "Improved Quake III Arena engine";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pmiddend ];
+ };
+}
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 2110de6e4c1..96399b9cd97 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -2,11 +2,14 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
- version = "1.0.29";
+ version = "1.1.1";
src = fetchurl {
- url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm";
- sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5";
+ # To find new versions, visit http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+ # and search for some printer like for instance "WF-7210" to get to the most recent version.
+ # NOTE: keep in mind that many parts of the URL change and not just version.
+ url = "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/${pname}-${version}-1lsb3.2.src.rpm";
+ sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q";
};
patches = [ ./cups-filter-ppd-dirs.patch ];
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index c08b16a0a1d..c63a930cd05 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:
stdenv.mkDerivation rec {
- name = "xlockmore-5.57";
+ name = "xlockmore-5.58";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
- sha256 = "18r8rh8fzdn9miicbpc3qbdd4mm2g1jpsbcvj29sr66pxydzkb7r";
+ sha256 = "1va11sbv5lbkxkp0i0msz5md3n2n82nzppk27rzdrw7y79vq37zw";
curlOpts = "--user-agent 'Mozilla/5.0'";
};
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5f354491691..70f7e77d199 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -303,12 +303,12 @@ let
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
- version = "2019-09-19";
+ version = "2019-09-29";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
- rev = "672beb8976e0a8fe0e5c52dc00263144077b659d";
- sha256 = "0g6cwcbirkqqnljyhlpfdx2q09b5irrp39bqlgl9qb912sz90fqg";
+ rev = "50508a69a02e3598ad1208d4f2f7be9df555892b";
+ sha256 = "18id9gbpx15acyrg695434cjk5ni543y265xjp0jc3jwayl3rwfq";
};
};
@@ -424,12 +424,12 @@ let
coc-prettier = buildVimPluginFrom2Nix {
pname = "coc-prettier";
- version = "2019-09-26";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-prettier";
- rev = "6e7d0e32ecc60c68f0ebbd3cf26ea6b7c3c95faa";
- sha256 = "0fxn2p78d16wgy74mb24hnyq63d2wmzv0873yg950cal4xidw644";
+ rev = "dbe8d23a4397daba8211192c57117ea0f900fbf6";
+ sha256 = "1p7ypmy5x7d1skrfqgl52vrx0y5z8q66fk9zyj4y349n4kgx9i85";
};
};
@@ -755,12 +755,12 @@ let
ctrlp-vim = buildVimPluginFrom2Nix {
pname = "ctrlp-vim";
- version = "2019-02-08";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
- rev = "2e773fd8c7548526853fff6ee2e642eafbbe3d04";
- sha256 = "0jvl4ydxmqnbcrzw71jf64vqlnc91970b25r6xl08a0lfb9xi3vd";
+ rev = "6bca8770a04c099e8c6ec7c7ea58cf9a17c8e44d";
+ sha256 = "1h0k9s5adpplrd5zga8078khdld02wxrwwg47q6n0sz5f40vjncp";
};
};
@@ -777,12 +777,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2019-09-25";
+ version = "2019-09-29";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "6da0c868fbc8c1fbdc99bb2208d1070c30994cd0";
- sha256 = "17mm0hjhvcgkwp48lazjrv9g34bi31xr79f1nr3k55q1g0cqb3a4";
+ rev = "9423625ec729fceed640337012a8a64264f47654";
+ sha256 = "11gwdqyayi9pznkw75z27k7r42bl5dh9l3d79ashfv70z578sp1j";
};
};
@@ -1079,12 +1079,12 @@ let
fastfold = buildVimPluginFrom2Nix {
pname = "fastfold";
- version = "2019-09-03";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "konfekt";
repo = "fastfold";
- rev = "cf38299fee6f6a9b0bc5874545ed3a2415b6b3c5";
- sha256 = "1x2ab1fjiqwmaph2r5dga4bv128ppzb8kpr3bjh6hvmcfabsh1f6";
+ rev = "8450f30c094946fd57719d7c2b667b81a034ef60";
+ sha256 = "00yl0wafr62b95pr4jw3ybg5k8pfvnsybz127hcbf7997smz8141";
};
};
@@ -1410,12 +1410,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2019-09-24";
+ version = "2019-09-28";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "50abb5e95a8d496dbda7b04a9bb78e4a6cd0a968";
- sha256 = "04zag6ngqa1djwc2yk0p6hwknsm06nl3lvlyymz57vl51nhmvc2c";
+ rev = "b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb8";
+ sha256 = "0947003kyy0hpymhnl13mgv2in3q5q26y3d1gqqx4hy63plcxi14";
fetchSubmodules = true;
};
};
@@ -1510,12 +1510,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2019-09-02";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "8adf0b269a1732b43644e2f6083113a4d5704a8b";
- sha256 = "0na11kdp2nksyg1whf89sa4ss909srdqp94i28m5fdngv3z46wqs";
+ rev = "3c041e1e98c207f260f9c0b2f323e724adf1fb6d";
+ sha256 = "063mvhip0pvnil2ip2nlwadn5g845k0v6r3p44zywlklgm5l62ss";
};
};
@@ -1851,12 +1851,12 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2019-09-26";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
- rev = "496b61ead1acd80128164cce5c2ff8e89c42ded2";
- sha256 = "0d7c6rf8sbfvxfqd79i92gas7rcd9lzfw15iiala3xr74bap5kpb";
+ rev = "2d639b70e73ecf3f62884a578fe5e5937e6d8a92";
+ sha256 = "0ahfdbg26yn4phwkbkx29m8z8dabx5qa7zahsab0pd3pvgipjxzj";
};
};
@@ -2236,12 +2236,12 @@ let
semshi = buildVimPluginFrom2Nix {
pname = "semshi";
- version = "2019-09-15";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "numirias";
repo = "semshi";
- rev = "ca6b2c16dd374d672861b2c73c33f41c88e5cb39";
- sha256 = "0nmywnfs8rm6vlcyycnk1zvpp044n1d714xw5sn4qpw4gz1acbm7";
+ rev = "b50f1bcc48bb944704c586b462a5e9d5cdf0d532";
+ sha256 = "1f2wqqhnfyicx8dgna6lcsa3pl5bxbjqf261rz9phxw649rsa9a4";
};
};
@@ -2522,12 +2522,12 @@ let
tlib_vim = buildVimPluginFrom2Nix {
pname = "tlib_vim";
- version = "2019-04-27";
+ version = "2019-09-28";
src = fetchFromGitHub {
owner = "tomtom";
repo = "tlib_vim";
- rev = "19c98450af64fd9d875e009e0868cb119db01755";
- sha256 = "0b95rvlfiiqh3lbmb8kmhq77iyvgsg1ayxp64fdn5809sj4avl79";
+ rev = "a071b6d41b20069a3520e0d101194a752968973b";
+ sha256 = "05swfvjyai32cbdpg10m3k2frkv017i1avf0nzilqavskvg04vi3";
};
};
@@ -2542,14 +2542,26 @@ let
};
};
+ todo-txt-vim = buildVimPluginFrom2Nix {
+ pname = "todo-txt-vim";
+ version = "2016-11-10";
+ src = fetchFromGitHub {
+ owner = "freitass";
+ repo = "todo.txt-vim";
+ rev = "6845221d45bd62e604c2024bc511a56e79d1118b";
+ sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v";
+ fetchSubmodules = true;
+ };
+ };
+
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2019-07-20";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "6c82275b8cd4c70e0610fd87f0574ef2463952a6";
- sha256 = "1pms2bm4g0v0idkva1f9bdcbbwvs6fhbzzx90zdyyhs73xp62k9k";
+ rev = "47a9452038d6aba1b653de21bc6e6bc303f1ae5f";
+ sha256 = "129rism5mj91nmrsrmh2qksw74byfm346d5hizz4c40g87gs72x0";
};
};
@@ -2907,12 +2919,12 @@ let
vim-android = buildVimPluginFrom2Nix {
pname = "vim-android";
- version = "2019-07-02";
+ version = "2019-09-29";
src = fetchFromGitHub {
owner = "hsanson";
repo = "vim-android";
- rev = "94dc352ff8cf0bc5636e548963a7ad99424813ad";
- sha256 = "0iddlbsqijknxd0dwqz5j6kshs41rpja2kfr9ym9fandh466n3l8";
+ rev = "1d5d169044ef71f687df0efcffd9a394528d7f47";
+ sha256 = "07h1091fdjnhi45wql7yadsyln2861m4435wzr8zp5yj2b9k132a";
};
};
@@ -3105,12 +3117,12 @@ let
vim-commentary = buildVimPluginFrom2Nix {
pname = "vim-commentary";
- version = "2018-07-27";
+ version = "2019-09-28";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-commentary";
- rev = "141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a";
- sha256 = "0nncs32ayfhr557aiynq7b0sc7rxqwv7xanram53x1wvmfy14zf0";
+ rev = "62b68aecec2de531bc3978bfb9c07d3b6759ce0e";
+ sha256 = "1fbcdrrhn4l8266zr6rm0f3zbhpql9is6rx4rkim5wxcwmnpkr77";
};
};
@@ -3334,6 +3346,17 @@ let
};
};
+ vim-fetch = buildVimPluginFrom2Nix {
+ pname = "vim-fetch";
+ version = "2019-04-03";
+ src = fetchFromGitHub {
+ owner = "wsdjeg";
+ repo = "vim-fetch";
+ rev = "76c08586e15e42055c9c21321d9fca0677442ecc";
+ sha256 = "0avcqjcqvxgj00r477ps54rjrwvmk5ygqm3qrzghbj9m1gpyp2kz";
+ };
+ };
+
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
version = "2019-09-01";
@@ -3380,12 +3403,23 @@ let
vim-flutter = buildVimPluginFrom2Nix {
pname = "vim-flutter";
- version = "2019-07-08";
+ version = "2019-09-29";
src = fetchFromGitHub {
owner = "thosakwe";
repo = "vim-flutter";
- rev = "7f12c91b9f3789ab3559eeed9ed8905afcca6dfb";
- sha256 = "07hx5hdqw0scgviqn92xjx8zcfl4ils94cdsp9jh2h98jqhcic1p";
+ rev = "030a4e609f8f38922fa4ec9a27836d9dabaae957";
+ sha256 = "0jibmr0v0pqml1cprs3qmkhhmacpb2bwpk8lhaz4dzp8jlga9g00";
+ };
+ };
+
+ vim-fsharp = buildVimPluginFrom2Nix {
+ pname = "vim-fsharp";
+ version = "2018-11-13";
+ src = fetchFromGitHub {
+ owner = "fsharp";
+ repo = "vim-fsharp";
+ rev = "012d98c981139976551a4d9779f5cce7f8d84d5c";
+ sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw";
};
};
@@ -3402,12 +3436,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-09-27";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "ab26e9fdb328cc351933f8d6178178e8ce5c8381";
- sha256 = "0fvn2y7wyj7i39p027d4ijz73vpidzlgg7g7b9bcvyjsfmyds1fk";
+ rev = "621ffb087aee3915cc149f1aa33272229993086a";
+ sha256 = "0d86zd7yi6im0zyjxcpq9gkfqlxqgpmrksdcc767smq0g9d9bm3i";
};
};
@@ -3446,12 +3480,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2019-09-27";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "44bb472bac2fa96c1444fcc02ad981152e56735b";
- sha256 = "0dcm685sdwaajglh8iv2a20sf47a6lmahj5jscdpcbpnhcd3wdia";
+ rev = "1725c13add66c6981d9406f109dcd64dff5fbf59";
+ sha256 = "0xv1w9csl63kl7pm0inkzfjas1q477cpxqxyxa3x1wbmmar6sn46";
};
};
@@ -3479,12 +3513,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-09-27";
+ version = "2019-09-29";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "a7b5edc1872b76e6c0cc18b89fcda3aa98422961";
- sha256 = "1k92n93bcy24fqfairqqkxd7l9adc0azggp4lp3r0rh7dsglnsf0";
+ rev = "e50c57536be5e545663549f87b9f0ec92dbf2e20";
+ sha256 = "0aw4k753fgnwywxb8b229ixd5ngv7db8s7zqvmaaj9dx489w2mc1";
};
};
@@ -3501,12 +3535,12 @@ let
vim-grepper = buildVimPluginFrom2Nix {
pname = "vim-grepper";
- version = "2019-09-04";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-grepper";
- rev = "ebe6d1ffd1fb2faada867c56a55f44cbaa0248e3";
- sha256 = "0axgpc72q4zn3l9b23v03akz1p1y5vy3gkzma4qw9avgbwhq5870";
+ rev = "e550eadf37ed7529fbc103c6153ceaa0ab1e5a62";
+ sha256 = "0zp3q1qd2zwlr0x7ij5gyfpg7kkyws090pamv60ni0ij2y7xjl8n";
};
};
@@ -4019,12 +4053,12 @@ let
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
- version = "2019-07-30";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
- rev = "eede692d8e8ee847de5c59d760f77fa27ea5ff47";
- sha256 = "0c8rjqz0mzi9c69qjd9arljkwdckjp8x5d3ks570xhlcmp17qzn8";
+ rev = "3a512e21a9c91cb61103734b8bb5dc776c1a3146";
+ sha256 = "1dh26qwsky12fhc8v9d6x841nhgbdnp2xgsrlnqak7cyiwmwp41g";
};
};
@@ -4239,12 +4273,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
- version = "2019-09-03";
+ version = "2019-09-29";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
- rev = "46f843aafe6a284765c484397fdc5ad9bb77147a";
- sha256 = "1c9xnjfzr0s6vp6yb7j3sqclj7kazwcmsqvm0whzx1yx5dbisnv7";
+ rev = "ff97806e50196d56b2858cd56bada9d48cada2aa";
+ sha256 = "0n1j35h09hbwinfbk3a276vjv0bv9f73q8prckkpxdnzzcyrs0yl";
};
};
@@ -4470,12 +4504,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
- version = "2019-08-22";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
- rev = "2b5070441dea482cc4f88556b19002f2da6f3566";
- sha256 = "185c8x8nly7jxv0vpf0dsbpby2nsfqdxkyzc6mips6in7ymgg3b3";
+ rev = "909b6110ebccaf1c22b200f14ff8b5d5f0c0a039";
+ sha256 = "0kqwzqpq068hg2g9784zsaam4db6k0sncafx5ksn060ngw1r9jxw";
};
};
@@ -4536,12 +4570,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2019-09-19";
+ version = "2019-09-28";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "db67e54d5998dbfbe9fe4161a29d74323031b1fa";
- sha256 = "1d5mynnb90fnc1w0glfg2m953iphmhxndd5gmflg25720n3msdls";
+ rev = "67f54554409660af1b34562906c9feab4e2d9909";
+ sha256 = "181m3jpn99frds32ash1mvbh6wpawginiy2n04hagf7rmsjz5721";
};
};
@@ -4591,12 +4625,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2019-09-19";
+ version = "2019-10-01";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "9814df57c199271a9b2b70c75ebe4189dc96b126";
- sha256 = "1rsss95six8f9w075k46318kq2sapijik13jzkakf5nfxlbi2raw";
+ rev = "af03e075a3c0dfe5ca17fd49c59a3f4c30a4b342";
+ sha256 = "1dd2vhszck76mpxz2m9qlmyvsravx9xslh4j68y8ygap97y2ykzi";
};
};
@@ -4657,12 +4691,12 @@ let
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
- version = "2019-09-05";
+ version = "2019-09-28";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
- rev = "934778947e28fc8e570e34efdb5f90d5c99fdac7";
- sha256 = "1klvr8xal8iyv6wga324xhq26a31dxp2qlsz0qyri8y4hkrappkf";
+ rev = "126897a6fbcbf24523737502524208f75f255b88";
+ sha256 = "1cdnggcl8vkz74l5k1yl2y3yg1zawvg1zj2nlqrk3c5qm9qzhkzq";
};
};
@@ -5009,12 +5043,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2019-09-27";
+ version = "2019-09-30";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "53ba80c91162aa84ccbfd12dbd30435d869c1391";
- sha256 = "1lmy7fzpyga9mk26xhcq5j2i3nmzzrnbgnpi0darfg8334bzw251";
+ rev = "0bca6e13f4ebd611e0138b81a893581f36a2c49f";
+ sha256 = "0ynwz59gz0j5fd575xlssv3lm5rbhnqa0l5a6kx1dyrqrv4qlg7g";
};
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 59d1726820a..29701f4908d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -85,7 +85,9 @@ fenetikm/falcon
fisadev/vim-isort
flazz/vim-colorschemes
floobits/floobits-neovim
+freitass/todo.txt-vim
frigoeu/psc-ide-vim
+fsharp/vim-fsharp
garbas/vim-snipmate
glts/vim-textobj-comment
gmarik/vundle
@@ -464,6 +466,7 @@ wellle/tmux-complete.vim
will133/vim-dirdiff
wincent/command-t
wincent/ferret
+wsdjeg/vim-fetch
xolox/vim-easytags
xolox/vim-misc
xuhdev/vim-latex-live-preview
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index e1b928b1373..e33a32ffa3e 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -36,6 +36,18 @@ in
};
};
+ cmschuetz12.wal = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "wal";
+ publisher = "cmschuetz12";
+ version = "0.1.0";
+ sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd";
+ };
+ meta = with stdenv.lib; {
+ license = licenses.mit;
+ };
+ };
+
formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "auto-close-tag";
@@ -48,6 +60,18 @@ in
};
};
+ james-yu.latex-workshop = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "latex-workshop";
+ publisher = "James-Yu";
+ version = "8.2.0";
+ sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2";
+ };
+ meta = with stdenv.lib; {
+ license = licenses.mit;
+ };
+ };
+
justusadam.language-haskell = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "language-haskell";
@@ -66,6 +90,18 @@ in
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
+ skyapps.fish-vscode = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "fish-vscode";
+ publisher = "skyapps";
+ version = "0.2.1";
+ sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl";
+ };
+ meta = with stdenv.lib; {
+ license = licenses.mit;
+ };
+ };
+
vscodevim.vim = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vim";
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index f041d2b5042..087209a9d29 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -88,10 +88,6 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';
- postConfigure = lib.optionalString useMusl ''
- makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
- '';
-
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
index c2d82ebc487..036ea0a0f48 100644
--- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix
+++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
@@ -2,8 +2,6 @@
# Minimal shell for use as basic /bin/sh in sandbox builds
busybox.override {
- # musl roadmap has RISC-V support projected for 1.1.20
- useMusl = !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic";
enableStatic = true;
enableMinimal = true;
extraConfig = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 9e1fd6bfd8a..da7347f7c67 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.75";
+ version = "4.19.76";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx";
+ sha256 = "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 9de8418cc5d..db8fc2965cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.2.17";
+ version = "5.2.18";
# 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 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv";
+ sha256 = "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
index 4586e5d64a9..43f096be1a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.3.1";
+ version = "5.3.2";
# 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 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q";
+ sha256 = "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 2b1b37db344..b4c6952d44d 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -59,15 +59,24 @@ installPhase() {
mv $i/lib/libvdpau* $i/lib/vdpau
# Install ICDs, make absolute paths.
+ # Be careful not to modify any original files because this runs twice.
+
+ # OpenCL
sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed
install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd
- if [ -e nvidia_icd.json.template ]; then
- # template patching for version < 435
- sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
- fi
- if [ -e nvidia_icd.json ]; then
- install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
+
+ # Vulkan
+ if [ -e nvidia_icd.json.template ] || [ -e nvidia_icd.json ]; then
+ if [ -e nvidia_icd.json.template ]; then
+ # template patching for version < 435
+ sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json.fixed
+ else
+ sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed
+ fi
+ install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json
fi
+
+ # EGL
if [ "$useGLVND" = "1" ]; then
sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed
install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 274e960a89b..090b9d7183d 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "open-iscsi";
- version = "2.0.877";
+ version = "2.0.878";
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "open-iscsi";
repo = "open-iscsi";
rev = version;
- sha256 = "0v3dsrl34pdx0yl5jsanrpgg3vw466rl8k81hkshgq3a5mq5qhf6";
+ sha256 = "0hkprlni0z1zdkrmhd897knyfws0l95bz67fgp0vvf63ag08b5ly";
};
DESTDIR = "$(out)";
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 0c1c69982fa..e932b772749 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -43,6 +43,11 @@ let
scalaVersion = "2.12";
sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv";
};
+ "2.3" = {
+ kafkaVersion = "2.3.0";
+ scalaVersion = "2.12";
+ sha256 = "1rz3xqv26h0zv5pmk65znzn08gycmrfj6vvbmrvl9i7hm4hm2vyq";
+ };
};
in
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 1b23f652021..5bfb06cb15b 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "powerdns";
- version = "4.1.13";
+ version = "4.2.0";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
- sha256 = "09az5yp5d9wvzw8faifyzsljhmmc8ifm4j70m4n2sr83i9i9rsp7";
+ sha256 = "0flhia156vir03np8va53rw31jsbg9wz3dyqqwddgai5bvr0f812";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 6aaae932906..c5c97b51422 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.11.687";
+ version = "0.11.751";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz";
- sha256 = "0wq6rc12dn5yxa6yyabv234xw5nrsbvlrpgfjppvw3i4vy2cfzh9";
+ sha256 = "09y9pck35pj2g89936zallxr3hanmbgp8jc42nj2js68l0z64qz3";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 96c8ad4a383..dd4d1850b59 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "exim-4.92.2";
+ name = "exim-4.92.3";
src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
- sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1";
+ sha256 = "1zfj4zblv5881qxpzkrg3f6a96pbcq270s9p6p1w85lfxjsknif4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
new file mode 100644
index 00000000000..572535b7fcd
--- /dev/null
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "do-agent";
+ version = "3.5.6";
+
+ src = fetchFromGitHub {
+ owner = "digitalocean";
+ repo = "do-agent";
+ rev = "${version}";
+ sha256 = "1gl034cslqa30fqy2p9rymgx398s1rcgbmfvzk5zjlrw47327k8i";
+ };
+
+ buildFlagsArray = ''
+ -ldflags=
+ -X main.version=${version}
+ '';
+
+ modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d";
+
+ meta = with lib; {
+ description = "DigitalOcean droplet system metrics agent";
+ longDescription = ''
+ do-agent is a program provided by DigitalOcean that collects system
+ metrics from a DigitalOcean Droplet (on which the program runs) and sends
+ them to DigitalOcean to provide resource usage graphs and alerting.
+ '';
+ homepage = https://github.com/digitalocean/do-agent;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ yvt ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 3d61961321d..3c10ec6f985 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "grafana";
- version = "6.3.6";
+ version = "6.4.0";
goPackagePath = "github.com/grafana/grafana";
@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk";
+ sha256 = "0rqfgswlq4fs3kb1cdpisvhawxvfirrs5pja6143sm1via3p8y59";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n";
+ sha256 = "1hyawiq7jgdak93ayzxmksbvkvdmfc26ska0n28f4gqppvrvkcqn";
};
postPatch = ''
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 69b1f28d2d6..c99ccc6e3cc 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nextcloud";
- version = "16.0.4";
+ version = "16.0.5";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
- sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0";
+ sha256 = "0lg5zaakfdngrh0ida0qbq76jbiab5fv46jziqf77zbnlx7wc2c7";
};
installPhase = ''
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index f471017a336..ecc36dc283d 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "neo4j";
- version = "3.5.8";
+ version = "3.5.11";
src = fetchurl {
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
- sha256 = "0kj92vljxdhk9pf6gr9cvd2a2ilc4myp5djjkrj3gm37f074swgg";
+ sha256 = "0xk37rvb37rd7pwpv4ingmb2v6ad1kqka8ldmd16n89fqfvg5m2d";
};
buildInputs = [ makeWrapper jre8 which gawk ];
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 0b774a4b5ad..93499d87e0b 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
- version = "1.3.9";
+ version = "1.3.10";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
- sha256 = "1b91amcpzb7935hpm67iqw92bl5r1a0rkfrc8gfm8w9sngzv8vbj";
+ sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index b2ae7a2f30f..12802b414b5 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2019-09-24";
+ version = "2019-10-01";
pname = "oh-my-zsh";
- rev = "f9e7c45a484723f693a77ab6128a1cc163f3704a";
+ rev = "bb6ae70b92ce720762ff3baed65aadbd34fc1867";
src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
- sha256 = "10ih8bxsha5vq1cvfx5j7w0pd3zqxk8iam787r3z15l12xs9kfsq";
+ sha256 = "1is3rk3bix1i8splamc6fi157pjvx25s66vvgvq298gs50k5jf9x";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 793229f8bbb..eb0711b8885 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -20,6 +20,10 @@ with pkgs;
cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
cc-wrapper-clang-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.stdenv; };
cc-wrapper-libcxx-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.libcxxStdenv; };
+ cc-wrapper-clang-8 = callPackage ./cc-wrapper { stdenv = llvmPackages_8.stdenv; };
+ cc-wrapper-libcxx-8 = callPackage ./cc-wrapper { stdenv = llvmPackages_8.libcxxStdenv; };
+ cc-wrapper-clang-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.stdenv; };
+ cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; };
stdenv-inputs = callPackage ./stdenv-inputs { };
cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index b1770af2406..89aff817f50 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -3,7 +3,7 @@
rustPlatform.buildRustPackage rec {
pname = "xidlehook";
- version = "0.7.0";
+ version = "0.7.1";
doCheck = false;
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
repo = "xidlehook";
rev = version;
- sha256 = "0dl4rnh4l3rhga5pfxmkc9syn6vx05zxdf8xcv0gw9h60y1smp6v";
+ sha256 = "04bb81iwxznkr1zq1q8dql9qklzm9qy7837a71b02ywp3fc6v5b2";
};
cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index 8766e3c0d54..6e6aa1fb60e 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xsecurelock";
- version = "1.4.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "google";
repo = "xsecurelock";
rev = "v${version}";
- sha256 = "1l9xk3hb5fxp4sqlxjldm4j6cvmxa39a7a37hw8f7vbpmcqy6n6w";
+ sha256 = "1if8byaby18ydkrk4k5yy8n0981x1dfqikq59gfpb7c2rv0vgi7i";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix
new file mode 100644
index 00000000000..239fc9691f7
--- /dev/null
+++ b/pkgs/tools/admin/berglas/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+
+ name = "berglas-${version}";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "GoogleCloudPlatform";
+ repo = "berglas";
+ rev = "v0.2.0";
+ sha256 = "1d75x0n1d1ry2xmy6h64qqc0dlnivipycv3p0aihyp3l810gpdbk";
+ };
+
+ modSha256 = "0fvgvrvdpdwjx51wmbf0rdwnr9l1l212qbvznvif3xsi5nnlkx6r";
+
+ meta = with stdenv.lib; {
+ description = "A tool for managing secrets on Google Cloud";
+ homepage = https://github.com/GoogleCloudPlatform/berglas;
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 25330658653..c2035aebb35 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "1aw69kcb2wx832hdfbx0944wwvdn5jbpr164pv6z0bxqzc0yi2kv";
+ sha256 = "0gh6p912y8i295p3vwhlrsxky761zlvrykcl6jm6j2qhwl5k4k29";
};
modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3";
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 07f62fa02ad..ce878075f2a 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "unrar";
- version = "5.7.5";
+ version = "5.8.1";
src = fetchurl {
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
- sha256 = "1vp2pc1n5qhri0zr7fszlpjz8niw9x4cl47wbd9v323sm3dgvhp1";
+ sha256 = "0cp6436ckivljfnv8qic5x2a4z74qff6n57ckahaxhhddx1iypq3";
};
postPatch = ''
diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix
new file mode 100644
index 00000000000..ed4f944a960
--- /dev/null
+++ b/pkgs/tools/backup/stenc/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.7";
+ pname = "stenc";
+
+ src = fetchFromGitHub {
+ owner = "scsitape";
+ repo = "stenc";
+ rev = "${version}";
+ sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k";
+ };
+
+ meta = {
+ description = "SCSI Tape Encryption Manager";
+ homepage = https://github.com/scsitape/stenc;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ woffs ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 0a924bc3ab7..16b7d21e2bd 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,9 +1,7 @@
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection
-, withNetworkManager ?
- config.networking.networkmanager.enable or false, networkmanager
-, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
+, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
let
pythonPackages = python3Packages;
@@ -24,10 +22,9 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ bluez gtk3 pythonPackages.python librsvg
- gnome3.adwaita-icon-theme iproute libappindicator ]
+ gnome3.adwaita-icon-theme iproute libappindicator networkmanager ]
++ pythonPath
- ++ lib.optional withPulseAudio libpulseaudio
- ++ lib.optional withNetworkManager networkmanager;
+ ++ lib.optional withPulseAudio libpulseaudio;
patches = [
# Don't use etc/dbus-1/system.d
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 33b6f12cd46..229c6c8b8e4 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }:
# ?TODO: there's also python lib in there
@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- cmakeFlags = [];
+ patches = stdenv.lib.optional staticOnly (fetchpatch {
+ url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
+ sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
+ });
+
+ cmakeFlags = []
+ ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
outputs = [ "out" "dev" "lib" ];
diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix
index ecf982c21cd..24736b8f0ff 100644
--- a/pkgs/tools/graphics/svgbob/default.nix
+++ b/pkgs/tools/graphics/svgbob/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "svgbob";
- version = "unstable-2018-10-05";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "ivanceras";
repo = pname;
- rev = "43fb0364e989d0e9a7656b148c947d47cc769622";
- sha256 = "1imjj57dx1af3wrs214yzaa2qfk8ld00nj3nx4z450gw2xjjj1gw";
+ rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432";
+ sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr";
};
sourceRoot = "source/svgbob_cli";
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index ad352c04ad9..3efbd6e0765 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "vips";
- version = "8.8.1";
+ version = "8.8.3";
src = fetchFromGitHub {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
- sha256 = "1wnfn92rvafx1g9vvhbvxssifzydx9y95kszg6i4c1p5sv5nhfd2";
+ sha256 = "0wlwcgcp7d3vhjdbi3xlpvnj4jl4321vac9v1sr1mis4aivwzsrn";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index 5408c39920b..cdd1891fb40 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper
, gawk, gnused, utillinux, file
-, wget, python3, qemu, euca2ools
+, wget, python3, qemu-utils, euca2ools
, e2fsprogs, cdrkit }:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# according to https://packages.ubuntu.com/source/zesty/cloud-utils
binDeps = [
- wget e2fsprogs file gnused gawk utillinux qemu euca2ools cdrkit
+ wget e2fsprogs file gnused gawk utillinux qemu-utils euca2ools cdrkit
];
postFixup = ''
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 31642000806..511b4fb1c36 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
- version = "0.2.51";
+ version = "0.2.52";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
- sha256 = "1ckzgzbv2fh5y7c5r0b9n6y2migmsrnlwdg7dybr0c82s39swr7f";
+ sha256 = "0bz0pgv7vdcha6sx2csx3mhkj4ph90w32p7h1wjvcgg3wlk1cgsf";
};
- cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b";
+ cargoSha256 = "01sgk4101ad0zk1k8zz89fsk2iq6j2vr8xd0wi6h88g2lgxvffzf";
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index b59c46a8477..d1d3996bd62 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid,
- libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }:
+ libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl
+, fetchpatch }:
stdenv.mkDerivation rec {
pname = "ldmtool";
@@ -12,13 +13,21 @@ stdenv.mkDerivation rec {
sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk";
};
+ patches = [
+ # Remove useage of deprecrated G_PARAM_PRIVATE
+ (fetchpatch {
+ url = "https://github.com/mdbooth/libldm/commit/ee1b37a034038f09d61b121cc8b3651024acc46f.patch";
+ sha256 = "02y34kbcpcpffvy1n9yqngvdldmxmvdkha1v2xjqvrnclanpigcp";
+ })
+ ];
+
preConfigure = ''
sed -i docs/reference/ldmtool/Makefile.am \
-e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g'
'';
- # ldm.c:951:5: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations]
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
configureScript = "sh autogen.sh";
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index 6c1bc5fcf04..2dfbd227ac0 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "phoronix-test-suite";
- version = "8.8.1";
+ version = "9.0.0";
src = fetchurl {
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
- sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn";
+ sha256 = "1gfmkwfzgpbmhv2wdr5aiknv1jyazx7sb33nna34pnd3bkmak0bq";
};
buildInputs = [ php ];
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 81d7591b740..099c5598958 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "1.6.8";
+ version = "2.0.4";
src = fetchFromGitHub {
owner = "okbob";
repo = "pspg";
rev = version;
- sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q";
+ sha256 = "1xiyshz56qpx3bv0mzx73rqr7wmyamyj8jbqdv05wjb72npkjmzl";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix
new file mode 100644
index 00000000000..c9f43964696
--- /dev/null
+++ b/pkgs/tools/misc/wlr-randr/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }:
+
+stdenv.mkDerivation rec {
+ pname = "wlr-randr";
+ version = "unstable-2019-03-21";
+
+ src = fetchFromGitHub {
+ owner = "emersion";
+ repo = pname;
+ rev = "c4066aa3249963dc7877119cffce10f3fa8b6304";
+ sha256 = "1ahw4sv07xg5rh9vr7j28636iaxs06vnybm3li6y8dz2sky7hk88";
+ };
+
+ nativeBuildInputs = [ meson ninja cmake pkgconfig ];
+ buildInputs = [ wayland ];
+
+ meta = with stdenv.lib; {
+ license = licenses.mit;
+ description = "An xrandr clone for wlroots compositors";
+ homepage = "https://github.com/emersion/wlr-randr";
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix
new file mode 100644
index 00000000000..e2615bef6ce
--- /dev/null
+++ b/pkgs/tools/misc/xprite-editor/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, gtk3
+, AppKit
+, pkg-config
+, python3
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "xprite-editor-unstable";
+ version = "2019-09-22";
+
+ src = fetchFromGitHub {
+ owner = "rickyhan";
+ repo = "xprite-editor";
+ rev = "7f899dff982642927024540e4bafd74e4ea5e52a";
+ sha256 = "1k6k8y8gg1vdmyjz27q689q9rliw0rrnzwlpjcd4vlc6swaq9ahx";
+ fetchSubmodules = true;
+ # Rename unicode file name which leads to different checksums on HFS+
+ # vs. other filesystems because of unicode normalization.
+ postFetch = ''
+ mv $out/config/palettes/Sweet\ Guaran*.hex $out/config/palettes/Sweet\ Guarana.hex
+ '';
+ };
+
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
+
+ nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ];
+
+ cargoSha256 = "0cd58888l7pjmghin31ha780yhs2pz67b10jysyasdw0a88m0dwy";
+
+ cargoBuildFlags = [ "--bin" "xprite-native" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/rickyhan/xprite-editor";
+ description = "Pixel art editor";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.marsam ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index a900e26019c..81d98ff7ab3 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
- version = "0.4.1328";
+ version = "0.4.1347";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1rbsf7dphvlzahrzgdj1bq62mqhp2fmr61lckcyzq6jdq3vsf0w8";
+ sha256 = "11wqk0q2nim7mmi247sflk4sq4yac3f4s71a6kldhbb94l4p8q26";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index ff4d0d64c20..9faad377520 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }:
stdenv.mkDerivation rec {
- version = "0.7.4";
+ version = "0.7.5";
pname = "davix";
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl libxml2 boost libuuid ];
- # using the url below since the 0.7.4 release did carry a broken CMake file,
+ # using the url below since the 0.7.5 release did carry a broken CMake file,
# supposedly fixed in the next release
# https://github.com/cern-fts/davix/issues/40
src = fetchurl {
url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
- sha256 = "1k407ckvsw1w212k3lp2867i0sscnrbigsx79l1sp5ymj3n62aih";
+ sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r";
};
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index bd035e8f03c..0ff6a3baa59 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.2";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
- sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz";
+ sha256 = "06z1l27rp3dpyphg3zqg0ww568a4g8iwz01vy4f7rl62asrbglsy";
};
# test-utils coredumps so don't run those
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index 85bb29b3641..966827a07da 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -29,8 +29,8 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ intltool pkgconfig ];
- # Fixes deprecation errors with networkmanager 1.10.2
- NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
configureFlags = [
"--without-libnm-glib"
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 60c344e8eb4..448fef4226a 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
- # Fixes deprecation errors with networkmanager 1.10.2
- NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+ # glib-2.62 deprecations
+ NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
configureFlags = [
"--without-libnm-glib"
diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 38255a68ffe..5fd1172778e 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- version = "4.1.0";
+ version = "4.1.2";
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
- sha256 = "0pkibvhk1f999mg1zv2ikxzjpkrrbb0wwq5x0gzpmvr5sgywr6k4";
+ sha256 = "18f5ksngx6afh7rrw9aiw7q6yx801qflbbbqc7i28b68l9dh5qy4";
};
phases = [ "installPhase" ];
diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
new file mode 100644
index 00000000000..45422f613d0
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-audit";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ owner = "RustSec";
+ repo = "cargo-audit";
+ rev = "v${version}";
+ sha256 = "0j556dh0lf2l8nq7pfl5bbypgsvp00fh6ckms9wr4dgb8xvpf2r1";
+ };
+
+ cargoSha256 = "0200x0bdllq7mpxmp7ly5jarpkc3gpg22gxq8qvdbnmyd39b7wx0";
+
+ buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
+ nativeBuildInputs = [ pkg-config ];
+
+ # The tests require network access which is not available in sandboxed Nix builds.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Audit Cargo.lock files for crates with security vulnerabilities";
+ homepage = "https://rustsec.org";
+ license = with licenses; [ mit asl20 ];
+ maintainers = with maintainers; [ basvandijk ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix
index 1c3d5f1d465..07682eb22c5 100644
--- a/pkgs/tools/security/diceware/default.nix
+++ b/pkgs/tools/security/diceware/default.nix
@@ -15,6 +15,8 @@ buildPythonApplication rec {
nativeBuildInputs = [ pytestrunner ];
+ propagatedBuildInputs = [ setuptools ];
+
checkInputs = [ coverage pytest ];
# see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index 4f36dc30eed..ab2de77b6b1 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -1,14 +1,26 @@
{ thinkpad ? false
-, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null
-, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd, fetchpatch }:
+, stdenv
+, fetchurl
+, fetchpatch
+, pkgconfig
+, intltool
+, libfprint-thinkpad ? null
+, libfprint ? null
+, glib
+, dbus-glib
+, polkit
+, nss
+, pam
+, systemd
+}:
stdenv.mkDerivation rec {
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchurl {
- url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz";
- sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
+ url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz";
+ sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p";
};
patches = [
@@ -18,16 +30,28 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ glib dbus-glib polkit nss pam systemd ]
- ++ stdenv.lib.optional thinkpad libfprint-thinkpad
- ++ stdenv.lib.optional (!thinkpad) libfprint;
+ nativeBuildInputs = [
+ intltool
+ pkgconfig
+ ];
- nativeBuildInputs = [ pkgconfig intltool ];
+ buildInputs = [
+ glib
+ dbus-glib
+ polkit
+ nss
+ pam
+ systemd
+ ]
+ ++ stdenv.lib.optional thinkpad libfprint-thinkpad
+ ++ stdenv.lib.optional (!thinkpad) libfprint
+ ;
configureFlags = [
- "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
- "--localstatedir=/var"
+ # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target
+ "--localstatedir=${placeholder "out"}/var"
"--sysconfdir=${placeholder "out"}/etc"
+ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 2ca4c1df18c..66313b53649 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "scrypt";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchurl {
url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz";
- sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6";
+ sha256 = "0j17yfrpi2bk5cawb4a4mzpv1vadqxh956hx0pa1gqfisknk8c16";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 2f7986c128b..25d3e8d105b 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -27,6 +27,7 @@ pythonPackages.buildPythonApplication rec {
lxml
pyyaml
requests
+ setuptools
toml
zodb
]);
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 8c803400584..f3b4ab8440e 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -1,34 +1,46 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig
, smartSupport ? false, libatasmart }:
stdenv.mkDerivation rec {
pname = "thinkfan";
- version = "0.9.3";
+ version = "1.0.2";
- src = fetchurl {
- url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
- sha256 = "0nz4c48f0i0dljpk5y33c188dnnwg8gz82s4grfl8l64jr4n675n";
+ src = fetchFromGitHub {
+ owner = "vmatare";
+ repo = "thinkfan";
+ rev = version;
+ sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr";
};
- nativeBuildInputs = [ cmake ];
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}"
+ "-DUSE_NVML=OFF"
+ ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
- buildInputs = stdenv.lib.optional smartSupport libatasmart;
+ nativeBuildInputs = [ cmake pkgconfig ];
- cmakeFlags = stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON";
+ buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart;
installPhase = ''
+ runHook preInstall
+
install -Dm755 {.,$out/bin}/thinkfan
cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust
install -Dm644 {.,$out/share/doc/thinkfan}/README
cp -R examples $out/share/doc/thinkfan
install -Dm644 {src,$out/share/man/man1}/thinkfan.1
+
+ runHook postInstall
'';
- meta = {
- license = stdenv.lib.licenses.gpl3;
- homepage = http://thinkfan.sourceforge.net/;
- maintainers = with stdenv.lib.maintainers; [ domenkozar ];
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "A minimalist fan control program. Originally designed
+specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via
+the sysfs hwmon interface (/sys/class/hwmon).";
+ license = licenses.gpl3;
+ homepage = "https://github.com/vmatare/thinkfan";
+ maintainers = with maintainers; [ domenkozar ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 71a5726759c..2e856aaf9be 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "uptimed";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
- sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j";
+ sha256 = "0wnnpjfxnycigqj6hag0n6p5piss8cv40y9jda72d9s4df5n91z8";
rev = "v${version}";
repo = "uptimed";
owner = "rpodgorny";
diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 9fed14c6d55..fbfc032445b 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mawk-1.3.4-20171017";
+ name = "mawk-1.3.4-20190203";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/mawk/${name}.tgz"
"https://invisible-mirror.net/archives/mawk/${name}.tgz"
];
- sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv";
+ sha256 = "0h5qlslaj5czz4v25hqg8a6kg4c5mlkmdpxhhvpvp1ci08ab7b6s";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix
index 9a11b5fba57..12e68689934 100644
--- a/pkgs/tools/text/transifex-client/default.nix
+++ b/pkgs/tools/text/transifex-client/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonApplication, fetchPypi
-, python-slugify, requests, urllib3, six }:
+, python-slugify, requests, urllib3, six, setuptools }:
buildPythonApplication rec {
pname = "transifex-client";
version = "0.13.6";
propagatedBuildInputs = [
- urllib3 requests python-slugify six
+ urllib3 requests python-slugify six setuptools
];
src = fetchPypi {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
doCheck = false;
meta = with stdenv.lib; {
- homepage = https://www.transifex.com/;
+ homepage = "https://www.transifex.com/";
license = licenses.gpl2;
description = "Transifex translation service client";
maintainers = [ maintainers.etu ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7c6cdb8b1a3..091824a5239 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -48,6 +48,7 @@ mapAliases ({
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
bridge_utils = bridge-utils; # added 2015-02-20
+ bro = zeek; # added 2019-09-29
btrfsProgs = btrfs-progs; # added 2016-01-03
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
@@ -66,6 +67,7 @@ mapAliases ({
compton-git = compton; # added 2019-05-20
conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31
+ corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";
cpp-gsl = microsoft_gsl; # added 2019-05-24
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d240bb2f8d4..86bdf13d4b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,6 +700,8 @@ in
awless = callPackage ../tools/virtualization/awless { };
+ berglas = callPackage ../tools/admin/berglas/default.nix { };
+
brakeman = callPackage ../development/tools/analysis/brakeman { };
brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
@@ -1196,10 +1198,6 @@ in
brltty = callPackage ../tools/misc/brltty { };
- bro = callPackage ../applications/networking/ids/bro {
- openssl = openssl_1_0_2;
- };
-
brook = callPackage ../tools/networking/brook { };
broot = callPackage ../tools/misc/broot { };
@@ -1307,6 +1305,8 @@ in
cardpeek = callPackage ../applications/misc/cardpeek { };
+ cawbird = callPackage ../applications/networking/cawbird { };
+
cde = callPackage ../tools/package-management/cde { };
cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
@@ -1381,8 +1381,6 @@ in
copyright-update = callPackage ../tools/text/copyright-update { };
- corebird = callPackage ../applications/networking/corebird { };
-
inherit (callPackage ../tools/misc/coreboot-utils { })
msrtool
cbmem
@@ -1765,6 +1763,8 @@ in
jellyfin = callPackage ../servers/jellyfin { };
+ jotta-cli = callPackage ../applications/misc/jotta-cli { };
+
kapacitor = callPackage ../servers/monitoring/kapacitor { };
kisslicer = callPackage ../tools/misc/kisslicer { };
@@ -1877,6 +1877,8 @@ in
onboard = callPackage ../applications/misc/onboard { };
+ onnxruntime = callPackage ../development/libraries/onnxruntime { };
+
xkbd = callPackage ../applications/misc/xkbd { };
optar = callPackage ../tools/graphics/optar {};
@@ -2838,6 +2840,8 @@ in
zabbixctl = callPackage ../tools/misc/zabbixctl { };
+ zeek = callPackage ../applications/networking/ids/zeek { };
+
zzuf = callPackage ../tools/security/zzuf { };
### DEVELOPMENT / EMSCRIPTEN
@@ -3374,7 +3378,9 @@ in
git-sizer = callPackage ../applications/version-management/git-sizer { };
- git-up = callPackage ../applications/version-management/git-up { };
+ git-up = callPackage ../applications/version-management/git-up {
+ pythonPackages = python3Packages;
+ };
gitfs = callPackage ../tools/filesystems/gitfs { };
@@ -3745,7 +3751,7 @@ in
halibut = callPackage ../tools/typesetting/halibut { };
- halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; };
+ halide = callPackage ../development/compilers/halide { };
ham = pkgs.perlPackages.ham;
@@ -5939,6 +5945,8 @@ in
runningx = callPackage ../tools/X11/runningx { };
+ rund = callPackage ../development/tools/rund { };
+
runzip = callPackage ../tools/archivers/runzip { };
rw = callPackage ../tools/misc/rw { };
@@ -6224,6 +6232,8 @@ in
stdman = callPackage ../data/documentation/stdman { };
+ stenc = callPackage ../tools/backup/stenc { };
+
stm32loader = with python3Packages; toPythonApplication stm32loader;
storebrowse = callPackage ../tools/system/storebrowse { };
@@ -7144,6 +7154,10 @@ in
xorriso = callPackage ../tools/cd-dvd/xorriso { };
+ xprite-editor = callPackage ../tools/misc/xprite-editor {
+ inherit (darwin.apple_sdk.frameworks) AppKit;
+ };
+
xpf = callPackage ../tools/text/xml/xpf {
libxml2 = libxml2Python;
};
@@ -7441,6 +7455,7 @@ in
llvm-polly = llvmPackages_latest.llvm-polly;
clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
+ clang_9 = llvmPackages_9.clang;
clang_8 = llvmPackages_8.clang;
clang_7 = llvmPackages_7.clang;
clang_6 = llvmPackages_6.clang;
@@ -8124,6 +8139,7 @@ in
lld_6 = llvmPackages_6.lld;
lld_7 = llvmPackages_7.lld;
lld_8 = llvmPackages_8.lld;
+ lld_9 = llvmPackages_9.lld;
lldb = llvmPackages.lldb;
lldb_4 = llvmPackages_4.lldb;
@@ -8131,10 +8147,12 @@ in
lldb_6 = llvmPackages_6.lldb;
lldb_7 = llvmPackages_7.lldb;
lldb_8 = llvmPackages_8.lldb;
+ lldb_9 = llvmPackages_9.lldb;
llvm = llvmPackages.llvm;
llvm-manpages = llvmPackages.llvm-manpages;
+ llvm_9 = llvmPackages_9.llvm;
llvm_8 = llvmPackages_8.llvm;
llvm_7 = llvmPackages_7.llvm;
llvm_6 = llvmPackages_6.llvm;
@@ -8201,7 +8219,15 @@ in
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
});
- llvmPackages_latest = llvmPackages_8;
+ llvmPackages_9 = callPackage ../development/compilers/llvm/9 ({
+ inherit (stdenvAdapters) overrideCC;
+ buildLlvmTools = buildPackages.llvmPackages_9.tools;
+ targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
+ } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+ });
+
+ llvmPackages_latest = llvmPackages_9;
lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being.";
@@ -8353,6 +8379,9 @@ in
defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
+ cargo-audit = callPackage ../tools/package-management/cargo-audit {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
cargo-download = callPackage ../tools/package-management/cargo-download { };
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
cargo-graph = callPackage ../tools/package-management/cargo-graph { };
@@ -8501,10 +8530,9 @@ in
inherit (callPackage ../development/compilers/vala { })
vala_0_36
- vala_0_38
vala_0_40
- vala_0_42
vala_0_44
+ vala_0_46
vala;
valadoc = callPackage ../development/tools/valadoc { };
@@ -9155,7 +9183,7 @@ in
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
- apacheKafka = apacheKafka_2_2;
+ apacheKafka = apacheKafka_2_3;
apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
@@ -9164,6 +9192,7 @@ in
apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; };
+ apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; };
kt = callPackage ../tools/misc/kt {};
@@ -9617,6 +9646,8 @@ in
gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};
+ gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {};
+
gnome-hexgl = callPackage ../games/gnome-hexgl {};
gnome-usage = callPackage ../applications/misc/gnome-usage {};
@@ -9740,7 +9771,7 @@ in
jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
- jenkins-job-builder = pythonPackages.jenkins-job-builder;
+ jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
kafkacat = callPackage ../development/tools/kafkacat { };
@@ -10438,7 +10469,9 @@ in
c-blosc = callPackage ../development/libraries/c-blosc { };
- cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+ cachix = haskellPackages.cachix.bin;
+
+ niv = haskellPackages.niv.bin;
capnproto = callPackage ../development/libraries/capnproto { };
@@ -13916,9 +13949,7 @@ in
uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
- umockdev = callPackage ../development/libraries/umockdev {
- vala = vala_0_40;
- };
+ umockdev = callPackage ../development/libraries/umockdev { };
unconvert = callPackage ../development/tools/unconvert { };
@@ -14022,8 +14053,6 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
- vte-ng = callPackage ../development/libraries/vte/ng.nix { };
-
vtk = callPackage ../development/libraries/vtk {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
@@ -14085,7 +14114,7 @@ in
webkitgtk = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzzFull;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
- stdenv = gcc6Stdenv;
+ stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947
};
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
@@ -14261,7 +14290,7 @@ in
zmqpp = callPackage ../development/libraries/zmqpp { };
zig = callPackage ../development/compilers/zig {
- llvmPackages = llvmPackages_8;
+ llvmPackages = llvmPackages_9;
};
zimlib = callPackage ../development/libraries/zimlib { };
@@ -14626,6 +14655,8 @@ in
dkimproxy = callPackage ../servers/mail/dkimproxy { };
+ do-agent = callPackage ../servers/monitoring/do-agent { };
+
dovecot = callPackage ../servers/mail/dovecot { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
@@ -15463,7 +15494,12 @@ in
bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
busybox = callPackage ../os-specific/linux/busybox { };
- busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { };
+ busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
+ # musl roadmap has RISC-V support projected for 1.1.20
+ busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"
+ then pkgsStatic.busybox
+ else busybox;
+ };
cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
@@ -17279,6 +17315,8 @@ in
wireless-regdb = callPackage ../data/misc/wireless-regdb { };
+ work-sans = callPackage ../data/fonts/work-sans { };
+
wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
@@ -18816,6 +18854,8 @@ in
super-productivity = callPackage ../applications/networking/super-productivity { };
+ wlr-randr = callPackage ../tools/misc/wlr-randr { };
+
wlroots = callPackage ../development/libraries/wlroots { };
sway = callPackage ../applications/window-managers/sway { };
@@ -19567,6 +19607,8 @@ in
ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
+ rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
+
ympd = callPackage ../applications/audio/ympd { };
nload = callPackage ../applications/networking/nload { };
@@ -19760,6 +19802,8 @@ in
sidplayfp = callPackage ../applications/audio/sidplayfp { };
+ sndpeek = callPackage ../applications/audio/sndpeek { };
+
sxhkd = callPackage ../applications/window-managers/sxhkd { };
mpop = callPackage ../applications/networking/mpop {
@@ -20188,6 +20232,8 @@ in
python = python3;
};
+ qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};
+
qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
withGrass = false;
};
@@ -21093,6 +21139,12 @@ in
neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
+ gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim {
+ gtk = pkgs.gtk3;
+ };
+
+ gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
+
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; };
vis = callPackage ../applications/editors/vis {
@@ -22356,6 +22408,7 @@ in
vkquake = callPackage ../games/quakespasm/vulkan.nix { };
ioquake3 = callPackage ../games/quake3/ioquake { };
+ quake3e = callPackage ../games/quake3/quake3e { };
quantumminigolf = callPackage ../games/quantumminigolf {};
@@ -22730,10 +22783,10 @@ in
clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
+ drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
- mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { };
nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { };
@@ -22745,6 +22798,8 @@ in
timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
+
+ mediaplayer = throw "deprecated 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
};
hsetroot = callPackage ../tools/X11/hsetroot { };
@@ -23953,8 +24008,9 @@ in
mkKops
kops_1_12
kops_1_13
+ kops_1_14
;
- kops = kops_1_13;
+ kops = kops_1_14;
lguf-brightness = callPackage ../misc/lguf-brightness { };
@@ -24268,6 +24324,8 @@ in
openssl = openssl_1_0_2;
};
+ pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { };
+
pgf = pgf2;
# Keep the old PGF since some documents don't render properly with
@@ -24948,4 +25006,6 @@ in
wifi-password = callPackage ../os-specific/darwin/wifi-password {};
+ qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {};
+
}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be7c0bc4171..8f1133d9ba2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -7,7 +7,6 @@ let
"ghc863Binary"
"ghc844"
"ghcjs"
- "ghcjs84"
"ghcjs86"
"integer-simple"
];
@@ -70,12 +69,6 @@ in {
llvmPackages = pkgs.llvmPackages_6;
};
ghcjs = compiler.ghcjs86;
- ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
- bootPkgs = packages.ghc844;
- ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
- stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
- ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
- };
ghcjs86 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc865;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json;
@@ -133,12 +126,6 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
};
ghcjs = packages.ghcjs86;
- ghcjs84 = callPackage ../development/haskell-modules rec {
- buildHaskellPackages = ghc.bootPkgs;
- ghc = bh.compiler.ghcjs84;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
- packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
- };
ghcjs86 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs86;
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index fc6d7674338..74c4d202f37 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -262,12 +262,12 @@ let
};
php-cs-fixer = mkDerivation rec {
- version = "2.15.1";
+ version = "2.15.3";
pname = "php-cs-fixer";
src = pkgs.fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "0qbqdki6vj8bgj5m2k4mi0qgj17r6s2v2q7yc30hhgvksf7vamlc";
+ sha256 = "0hbc9y3676dd0841llgp1g7bhklfxi1cw47dcww0qmk69gjfv54c";
};
phases = [ "installPhase" ];
@@ -338,12 +338,12 @@ let
};
phpcbf = mkDerivation rec {
- version = "3.4.2";
+ version = "3.5.0";
pname = "phpcbf";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
- sha256 = "08s47r8i5dyjivk1q3nhrz40n6fx3zghrn5irsxfnx5nj9pb7ffp";
+ sha256 = "15n3r3sc62ar1kq38idw22y7gasvy747bix99zs0l0paapcbxz6n";
};
phases = [ "installPhase" ];
@@ -365,12 +365,12 @@ let
};
phpcs = mkDerivation rec {
- version = "3.4.2";
+ version = "3.5.0";
pname = "phpcs";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
- sha256 = "0hk9w5kn72z9xhswfmxilb2wk96vy07z4a1pwrpspjlr23aajrk9";
+ sha256 = "078anf2r6a3p8v575m65vryazipgfchs07yb92m9xh41lk5wlndf";
};
phases = [ "installPhase" ];
@@ -392,12 +392,12 @@ let
};
phpstan = mkDerivation rec {
- version = "0.11.15";
+ version = "0.11.16";
pname = "phpstan";
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "1fa3bq5k548jpyph2rxkgnarblyy5f1m55awjcps8mjqbw9r6439";
+ sha256 = "0c2417kwkj3nf1zya1flw7g1mz0dwhh27hjs3wz04b0kgnv4syzs";
};
phases = [ "installPhase" ];
@@ -486,6 +486,32 @@ let
};
};
+ psalm = mkDerivation rec {
+ version = "3.5.3";
+ pname = "psalm";
+
+ src = pkgs.fetchurl {
+ url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
+ sha256 = "1n5pfzln82wzk1qa40c436lhbin1g06lfdk89q720yzrrs07r8sw";
+ };
+
+ phases = [ "installPhase" ];
+ nativeBuildInputs = [ pkgs.makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ install -D $src $out/libexec/psalm/psalm.phar
+ makeWrapper ${php}/bin/php $out/bin/psalm \
+ --add-flags "$out/libexec/psalm/psalm.phar"
+ '';
+
+ meta = with pkgs.lib; {
+ description = "A static analysis tool for finding errors in PHP applications";
+ license = licenses.mit;
+ homepage = https://github.com/vimeo/psalm;
+ };
+ };
+
psysh = mkDerivation rec {
version = "0.9.9";
pname = "psysh";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4dc10ebc885..d5069363a13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -563,6 +563,10 @@ in {
diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
+ entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; };
+
+ entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; };
+
eradicate = callPackage ../development/python-modules/eradicate { };
face = callPackage ../development/python-modules/face { };
@@ -689,6 +693,8 @@ in {
inquirer = callPackage ../development/python-modules/inquirer { };
+ janus = callPackage ../development/python-modules/janus { };
+
jira = callPackage ../development/python-modules/jira { };
jwcrypto = callPackage ../development/python-modules/jwcrypto { };
@@ -3162,7 +3168,10 @@ in {
pyro-ppl = callPackage ../development/python-modules/pyro-ppl {};
- opt-einsum = callPackage ../development/python-modules/opt-einsum {};
+ opt-einsum = if isPy27 then
+ callPackage ../development/python-modules/opt-einsum/2.nix {}
+ else
+ callPackage ../development/python-modules/opt-einsum {};
pytorchWithCuda = self.pytorch.override {
cudaSupport = true;
@@ -3883,6 +3892,8 @@ in {
pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
+ merkletools = callPackage ../development/python-modules/merkletools { };
+
monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; });
monotonic = callPackage ../development/python-modules/monotonic { };
@@ -4677,6 +4688,8 @@ in {
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
+ qds_sdk = callPackage ../development/python-modules/qds_sdk { };
+
quamash = callPackage ../development/python-modules/quamash { };
quandl = callPackage ../development/python-modules/quandl { };
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index bc822b466c9..003fb9c4fff 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -143,9 +143,8 @@ in
x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;
- /* Linux on Aarch64 */
- android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // {
- });
+ android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon;
+ android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon;
wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon;
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index f3c524378ea..cc773207c37 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -69,6 +69,10 @@ in {
haskellStaticAdapter;
};
+ nghttp2 = super.nghttp2.override {
+ enableApp = false;
+ };
+
ncurses = super.ncurses.override {
enableStatic = true;
};
@@ -78,14 +82,14 @@ in {
} // optionalAttrs super.stdenv.hostPlatform.isDarwin {
pythonSupport = false;
});
- zlib = super.zlib.override {
+ zlib = (super.zlib.override {
static = true;
shared = false;
# Don’t use new stdenv zlib because
# it doesn’t like the --disable-shared flag
stdenv = super.stdenv;
- };
+ }).static;
xz = super.xz.override {
enableStatic = true;
};
@@ -115,7 +119,9 @@ in {
static = true;
};
openblas = super.openblas.override { enableStatic = true; };
- openssl = super.openssl.override {
+ nix = super.nix.override { withAWS = false; };
+ # openssl 1.1 doesn't compile
+ openssl = super.openssl_1_0_2.override {
static = true;
# Don’t use new stdenv for openssl because it doesn’t like the
@@ -125,6 +131,10 @@ in {
boost = super.boost.override {
enableStatic = true;
enableShared = false;
+
+ # Don’t use new stdenv for boost because it doesn’t like the
+ # --disable-shared flag
+ stdenv = super.stdenv;
};
gmp = super.gmp.override {
withStatic = true;
@@ -159,6 +169,15 @@ in {
};
};
+ curl = super.curl.override {
+ # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
+ gssSupport = false;
+ };
+
+ brotli = super.brotli.override {
+ staticOnly = true;
+ };
+
llvmPackages_8 = super.llvmPackages_8 // {
libraries = super.llvmPackages_8.libraries // rec {
libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override {