diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4577cea2225..706952b208d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,9 +6,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
## Opening issues
* Make sure you have a [GitHub account](https://github.com/signup/free)
-* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist.
- * Clearly describe the issue including steps to reproduce when it is a bug.
- * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision).
+* Make sure there is no open issue on the topic
+* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template
## Submitting changes
diff --git a/doc/builders/trivial-builders.xml b/doc/builders/trivial-builders.xml
index df0e38da1aa..94948c57b91 100644
--- a/doc/builders/trivial-builders.xml
+++ b/doc/builders/trivial-builders.xml
@@ -7,7 +7,7 @@
Nixpkgs provides a couple of functions that help with building derivations. The most important one, stdenv.mkDerivation, has already been documented above. The following functions wrap stdenv.mkDerivation, making it easier to use in certain cases.
-
+
runCommand
@@ -40,7 +40,7 @@
-
+
runCommandCC
@@ -50,7 +50,20 @@
-
+
+
+ runCommandLocal
+
+
+
+ Variant of runCommand that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
+
+
+ This sets allowSubstitutes to false, so only use runCommandLocal if you are certain the user will always have a builder for the system of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the system is usually the same as builtins.currentSystem.
+
+
+
+
writeTextFile, writeText, writeTextDir, writeScript, writeScriptBin
@@ -63,7 +76,7 @@
-
+
symlinkJoin
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ad2b74dfe81..9b616aac321 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3225,6 +3225,12 @@
githubId = 2195834;
name = "Jaakko Luttinen";
};
+ jm2dev = {
+ email = "jomarcar@gmail.com";
+ github = "jm2dev";
+ githubId = 474643;
+ name = "José Miguel Martínez Carrasco";
+ };
jmagnusj = {
email = "jmagnusj@gmail.com";
github = "magnusjonsson";
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index d358b149720..b8af15f59c9 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -77,6 +77,12 @@
be set if the hostname of the node should be non default.
+
+
+ UPower's configuration is now managed by NixOS and can be customized
+ via .
+
+
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 02c172c4a4d..7e575189209 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -312,8 +312,13 @@ class Machine:
self.monitor.send(message)
return self.wait_for_monitor_prompt()
- def wait_for_unit(self, unit: str, user: Optional[str] = None) -> bool:
- while True:
+ def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
+ """Wait for a systemd unit to get into "active" state.
+ Throws exceptions on "failed" and "inactive" states as well as
+ after timing out.
+ """
+
+ def check_active(_: Any) -> bool:
info = self.get_unit_info(unit, user)
state = info["ActiveState"]
if state == "failed":
@@ -329,8 +334,10 @@ class Machine:
'unit "{}" is inactive and there ' "are no pending jobs"
).format(unit)
)
- if state == "active":
- return True
+
+ return state == "active"
+
+ retry(check_active)
def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)
@@ -421,18 +428,34 @@ class Machine:
)
def wait_until_succeeds(self, command: str) -> str:
+ """Wait until a command returns success and return its output.
+ Throws an exception on timeout.
+ """
+ output = ""
+
+ def check_success(_: Any) -> bool:
+ nonlocal output
+ status, output = self.execute(command)
+ return status == 0
+
with self.nested("waiting for success: {}".format(command)):
- while True:
- status, output = self.execute(command)
- if status == 0:
- return output
+ retry(check_success)
+ return output
def wait_until_fails(self, command: str) -> str:
+ """Wait until a command returns failure.
+ Throws an exception on timeout.
+ """
+ output = ""
+
+ def check_failure(_: Any) -> bool:
+ nonlocal output
+ status, output = self.execute(command)
+ return status != 0
+
with self.nested("waiting for failure: {}".format(command)):
- while True:
- status, output = self.execute(command)
- if status != 0:
- return output
+ retry(check_failure)
+ return output
def wait_for_shutdown(self) -> None:
if not self.booted:
@@ -453,25 +476,38 @@ class Machine:
)
return output
- def wait_until_tty_matches(self, tty: str, regexp: str) -> bool:
+ def wait_until_tty_matches(self, tty: str, regexp: str) -> None:
+ """Wait until the visible output on the chosen TTY matches regular
+ expression. Throws an exception on timeout.
+ """
matcher = re.compile(regexp)
+
+ def tty_matches(last: bool) -> bool:
+ text = self.get_tty_text(tty)
+ if last:
+ self.log(
+ f"Last chance to match /{regexp}/ on TTY{tty}, "
+ f"which currently contains: {text}"
+ )
+ return len(matcher.findall(text)) > 0
+
with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
- while True:
- text = self.get_tty_text(tty)
- if len(matcher.findall(text)) > 0:
- return True
+ retry(tty_matches)
def send_chars(self, chars: List[str]) -> None:
with self.nested("sending keys ‘{}‘".format(chars)):
for char in chars:
self.send_key(char)
- def wait_for_file(self, filename: str) -> bool:
+ def wait_for_file(self, filename: str) -> None:
+ """Waits until the file exists in machine's file system."""
+
+ def check_file(_: Any) -> bool:
+ status, _ = self.execute("test -e {}".format(filename))
+ return status == 0
+
with self.nested("waiting for file ‘{}‘".format(filename)):
- while True:
- status, _ = self.execute("test -e {}".format(filename))
- if status == 0:
- return True
+ retry(check_file)
def wait_for_open_port(self, port: int) -> None:
def port_is_open(_: Any) -> bool:
@@ -494,8 +530,8 @@ class Machine:
def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
return self.systemctl("stop {}".format(jobname), user)
- def wait_for_job(self, jobname: str) -> bool:
- return self.wait_for_unit(jobname)
+ def wait_for_job(self, jobname: str) -> None:
+ self.wait_for_unit(jobname)
def connect(self) -> None:
if self.connected:
@@ -700,18 +736,20 @@ class Machine:
"""Wait until it is possible to connect to the X server. Note that
testing the existence of /tmp/.X11-unix/X0 is insufficient.
"""
+
+ def check_x(_: Any) -> bool:
+ cmd = (
+ "journalctl -b SYSLOG_IDENTIFIER=systemd | "
+ + 'grep "Reached target Current graphical"'
+ )
+ status, _ = self.execute(cmd)
+ if status != 0:
+ return False
+ status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
+ return status == 0
+
with self.nested("waiting for the X11 server"):
- while True:
- cmd = (
- "journalctl -b SYSLOG_IDENTIFIER=systemd | "
- + 'grep "Reached target Current graphical"'
- )
- status, _ = self.execute(cmd)
- if status != 0:
- continue
- status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
- if status == 0:
- return
+ retry(check_x)
def get_window_names(self) -> List[str]:
return self.succeed(
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 5e7ac7a6e65..449810b5315 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -37,6 +37,172 @@ in
'';
};
+ enableWattsUpPro = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the Watts Up Pro device.
+
+ The Watts Up Pro contains a generic FTDI USB device without a specific
+ vendor and product ID. When we probe for WUP devices, we can cause
+ the user to get a perplexing "Device or resource busy" error when
+ attempting to use their non-WUP device.
+
+ The generic FTDI device is known to also be used on:
+
+
+ Sparkfun FT232 breakout board
+ Parallax Propeller
+
+ '';
+ };
+
+ noPollBatteries = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Don't poll the kernel for battery level changes.
+
+ Some hardware will send us battery level changes through
+ events, rather than us having to poll for it. This option
+ allows disabling polling for hardware that sends out events.
+ '';
+ };
+
+ ignoreLid = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Do we ignore the lid state
+
+ Some laptops are broken. The lid state is either inverted, or stuck
+ on or off. We can't do much to fix these problems, but this is a way
+ for users to make the laptop panel vanish, a state that might be used
+ by a couple of user-space daemons. On Linux systems, see also
+ logind.conf(5).
+ '';
+ };
+
+ usePercentageForPolicy = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Policy for warnings and action based on battery levels
+
+ Whether battery percentage based policy should be used. The default
+ is to use the percentage, which
+ should work around broken firmwares. It is also more reliable than
+ the time left (frantically saving all your files is going to use more
+ battery than letting it rest for example).
+ '';
+ };
+
+ percentageLow = mkOption {
+ type = types.ints.unsigned;
+ default = 10;
+ description = ''
+ When usePercentageForPolicy is
+ true, the levels at which UPower will consider the
+ battery low.
+
+ This will also be used for batteries which don't have time information
+ such as that of peripherals.
+
+ If any value (of percentageLow,
+ percentageCritical and
+ percentageAction) is invalid, or not in descending
+ order, the defaults will be used.
+ '';
+ };
+
+ percentageCritical = mkOption {
+ type = types.ints.unsigned;
+ default = 3;
+ description = ''
+ When usePercentageForPolicy is
+ true, the levels at which UPower will consider the
+ battery critical.
+
+ This will also be used for batteries which don't have time information
+ such as that of peripherals.
+
+ If any value (of percentageLow,
+ percentageCritical and
+ percentageAction) is invalid, or not in descending
+ order, the defaults will be used.
+ '';
+ };
+
+ percentageAction = mkOption {
+ type = types.ints.unsigned;
+ default = 2;
+ description = ''
+ When usePercentageForPolicy is
+ true, the levels at which UPower will take action
+ for the critical battery level.
+
+ This will also be used for batteries which don't have time information
+ such as that of peripherals.
+
+ If any value (of percentageLow,
+ percentageCritical and
+ percentageAction) is invalid, or not in descending
+ order, the defaults will be used.
+ '';
+ };
+
+ timeLow = mkOption {
+ type = types.ints.unsigned;
+ default = 1200;
+ description = ''
+ When usePercentageForPolicy is
+ false, the time remaining at which UPower will
+ consider the battery low.
+
+ If any value (of timeLow,
+ timeCritical and timeAction) is
+ invalid, or not in descending order, the defaults will be used.
+ '';
+ };
+
+ timeCritical = mkOption {
+ type = types.ints.unsigned;
+ default = 300;
+ description = ''
+ When usePercentageForPolicy is
+ false, the time remaining at which UPower will
+ consider the battery critical.
+
+ If any value (of timeLow,
+ timeCritical and timeAction) is
+ invalid, or not in descending order, the defaults will be used.
+ '';
+ };
+
+ timeAction = mkOption {
+ type = types.ints.unsigned;
+ default = 120;
+ description = ''
+ When usePercentageForPolicy is
+ false, the time remaining at which UPower will
+ take action for the critical battery level.
+
+ If any value (of timeLow,
+ timeCritical and timeAction) is
+ invalid, or not in descending order, the defaults will be used.
+ '';
+ };
+
+ criticalPowerAction = mkOption {
+ type = types.enum [ "PowerOff" "Hibernate" "HybridSleep" ];
+ default = "HybridSleep";
+ description = ''
+ The action to take when timeAction or
+ percentageAction has been reached for the batteries
+ (UPS or laptop batteries) supplying the computer
+ '';
+ };
+
};
};
@@ -54,6 +220,21 @@ in
systemd.packages = [ cfg.package ];
+ environment.etc."UPower/UPower.conf".text = generators.toINI {} {
+ UPower = {
+ EnableWattsUpPro = cfg.enableWattsUpPro;
+ NoPollBatteries = cfg.noPollBatteries;
+ IgnoreLid = cfg.ignoreLid;
+ UsePercentageForPolicy = cfg.usePercentageForPolicy;
+ PercentageLow = cfg.percentageLow;
+ PercentageCritical = cfg.percentageCritical;
+ PercentageAction = cfg.percentageAction;
+ TimeLow = cfg.timeLow;
+ TimeCritical = cfg.timeCritical;
+ TimeAction = cfg.timeAction;
+ CriticalPowerAction = cfg.criticalPowerAction;
+ };
+ };
};
}
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index b837bf816a1..2586f2d74e9 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -180,4 +180,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
index 79f9e1a4308..e53fb7a1578 100644
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix
@@ -197,4 +197,7 @@ in {
};
};
+
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/fakeroute.nix b/nixos/modules/services/networking/fakeroute.nix
index 82a9fb729d8..7916ad4098a 100644
--- a/nixos/modules/services/networking/fakeroute.nix
+++ b/nixos/modules/services/networking/fakeroute.nix
@@ -60,4 +60,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
index 831e4d60d8d..98a3456f639 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixos/modules/services/networking/monero.nix
@@ -224,15 +224,17 @@ in
};
};
- assertions = singleton {
- assertion = cfg.mining.enable -> cfg.mining.address != "";
- message = ''
+ assertions = singleton {
+ assertion = cfg.mining.enable -> cfg.mining.address != "";
+ message = ''
You need a Monero address to receive mining rewards:
specify one using option monero.mining.address.
- '';
- };
+ '';
+ };
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index c8ee0a2f564..43a9a0b2598 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -201,4 +201,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index e55ea363378..6ff181377fc 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -219,4 +219,6 @@ in {
"To change extra Recursor settings use services.pdns-recursor.settings instead.")
];
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 49ca839a2c3..1f41c720adf 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -109,4 +109,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index 9412d0ef8a6..60fb3d5d6d4 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -75,4 +75,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix
index 719827713ff..7465c10e002 100644
--- a/nixos/modules/services/torrent/magnetico.nix
+++ b/nixos/modules/services/torrent/magnetico.nix
@@ -213,4 +213,6 @@ in {
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index f1370c2854b..13d21a0b4ae 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -127,7 +127,7 @@ let
These themes need to be packaged before use, see example.
'';
example = ''
- # For shits and giggles, let's package the responsive theme
+ # Let's package the responsive theme
responsiveTheme = pkgs.stdenv.mkDerivation {
name = "responsive-theme";
# Download the theme from the wordpress site
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 7e488f33a41..455854e2a96 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -207,6 +207,7 @@ with lib;
default = null;
description = ''
Basic Auth password file for a vhost.
+ Can be created via: htpasswd -c <filename> <username>
'';
};
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index a94a76ff0c0..61174672e2d 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -284,4 +284,6 @@ in {
environment.systemPackages = [ pkgs.compton ];
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 5f16a680050..2478aaabb79 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -71,4 +71,7 @@ in {
serviceConfig.Restart = "always";
};
};
+
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index d916fa5bb39..9bfcfa9b065 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -45,4 +45,6 @@ in {
environment.variables.RXVT_SOCKET = "/run/user/$(id -u)/urxvtd-socket";
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index fe11917c609..75581af71ec 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -12,6 +12,7 @@ let
cfgSnapFlags = cfgSnapshots.flags;
cfgScrub = config.services.zfs.autoScrub;
cfgTrim = config.services.zfs.trim;
+ cfgZED = config.services.zfs.zed;
inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
@@ -87,6 +88,17 @@ let
}
'';
+ zedConf = generators.toKeyValue {
+ mkKeyValue = generators.mkKeyValueDefault {
+ mkValueString = v:
+ if isInt v then toString v
+ else if isString v then "\"${v}\""
+ else if true == v then "1"
+ else if false == v then "0"
+ else if isList v then "\"" + (concatStringsSep " " v) + "\""
+ else err "this value is" (toString v);
+ } "=";
+ } cfgZED.settings;
in
{
@@ -312,6 +324,32 @@ in
'';
};
};
+
+ services.zfs.zed.settings = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
+ example = literalExample ''
+ {
+ ZED_DEBUG_LOG = "/tmp/zed.debug.log";
+
+ ZED_EMAIL_ADDR = [ "root" ];
+ ZED_EMAIL_PROG = "mail";
+ ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@";
+
+ ZED_NOTIFY_INTERVAL_SECS = 3600;
+ ZED_NOTIFY_VERBOSE = false;
+
+ ZED_USE_ENCLOSURE_LEDS = true;
+ ZED_SCRUB_AFTER_RESILVER = false;
+ }
+ '';
+ description = ''
+ ZFS Event Daemon /etc/zfs/zed.d/zed.rc content
+
+ See
+ zed8
+ for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables
+ '';
+ };
};
###### implementation
@@ -389,8 +427,32 @@ in
zfsSupport = true;
};
- environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/";
- environment.etc."zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
+ services.zfs.zed.settings = {
+ ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
+ };
+
+ environment.etc = genAttrs
+ (map
+ (file: "zfs/zed.d/${file}")
+ [
+ "all-syslog.sh"
+ "pool_import-led.sh"
+ "resilver_finish-start-scrub.sh"
+ "statechange-led.sh"
+ "vdev_attach-led.sh"
+ "zed-functions.sh"
+ "data-notify.sh"
+ "resilver_finish-notify.sh"
+ "scrub_finish-notify.sh"
+ "statechange-notify.sh"
+ "vdev_clear-led.sh"
+ ]
+ )
+ (file: { source = "${packages.zfsUser}/etc/${file}"; })
+ // {
+ "zfs/zed.d/zed.rc".text = zedConf;
+ "zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
+ };
system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
environment.systemPackages = [ packages.zfsUser ]
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index df65ef249e8..fbc8b511f3b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -103,6 +103,7 @@ in
grafana = handleTest ./grafana.nix {};
graphite = handleTest ./graphite.nix {};
graylog = handleTest ./graylog.nix {};
+ gvisor = handleTest ./gvisor.nix {};
hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix
index 50470379576..5b630a40736 100644
--- a/nixos/tests/gocd-agent.nix
+++ b/nixos/tests/gocd-agent.nix
@@ -9,14 +9,18 @@ let
header = "Accept: application/vnd.go.cd.v2+json";
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "gocd-agent";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ grahamc swarren83 ];
+
+ # gocd agent needs to register with the autoregister key created on first server startup,
+ # but NixOS module doesn't seem to allow to pass during runtime currently
+ broken = true;
};
nodes = {
- gocd_agent =
+ agent =
{ ... }:
{
virtualisation.memorySize = 2046;
@@ -30,11 +34,15 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $gocd_agent->waitForUnit("gocd-server");
- $gocd_agent->waitForOpenPort("8153");
- $gocd_agent->waitForUnit("gocd-agent");
- $gocd_agent->waitUntilSucceeds("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid");
- $gocd_agent->succeed("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle");
+ start_all()
+ agent.wait_for_unit("gocd-server")
+ agent.wait_for_open_port("8153")
+ agent.wait_for_unit("gocd-agent")
+ agent.wait_until_succeeds(
+ "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid"
+ )
+ agent.succeed(
+ "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle"
+ )
'';
})
diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix
index 80cf04ed640..20faf85a1cc 100644
--- a/nixos/tests/gocd-server.nix
+++ b/nixos/tests/gocd-server.nix
@@ -2,7 +2,7 @@
# 1. GoCD server starts
# 2. GoCD server responds
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
{
name = "gocd-server";
@@ -10,19 +10,19 @@ import ./make-test.nix ({ pkgs, ...} :
maintainers = [ swarren83 ];
};
-nodes = {
- gocd_server =
- { ... }:
- {
- virtualisation.memorySize = 2046;
- services.gocd-server.enable = true;
- };
-};
+ nodes = {
+ server =
+ { ... }:
+ {
+ virtualisation.memorySize = 2046;
+ services.gocd-server.enable = true;
+ };
+ };
testScript = ''
- $gocd_server->start;
- $gocd_server->waitForUnit("gocd-server");
- $gocd_server->waitForOpenPort("8153");
- $gocd_server->waitUntilSucceeds("curl -s -f localhost:8153/go");
+ server.start()
+ server.wait_for_unit("gocd-server")
+ server.wait_for_open_port(8153)
+ server.wait_until_succeeds("curl -s -f localhost:8153/go")
'';
})
diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix
new file mode 100644
index 00000000000..4d68a1d8a5f
--- /dev/null
+++ b/nixos/tests/gvisor.nix
@@ -0,0 +1,49 @@
+# This test runs a container through gvisor and checks if simple container starts
+
+import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "gvisor";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ andrew-d ];
+ };
+
+ nodes = {
+ gvisor =
+ { pkgs, ... }:
+ {
+ virtualisation.docker = {
+ enable = true;
+ extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
+ };
+
+ networking = {
+ dhcpcd.enable = false;
+ defaultGateway = "192.168.1.1";
+ interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+ { address = "192.168.1.2"; prefixLength = 24; }
+ ];
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ gvisor.wait_for_unit("network.target")
+ gvisor.wait_for_unit("sockets.target")
+
+ # Start by verifying that gvisor itself works
+ output = gvisor.succeed(
+ "${pkgs.gvisor}/bin/runsc -alsologtostderr do ${pkgs.coreutils}/bin/echo hello world"
+ )
+ assert output.strip() == "hello world"
+
+ # Also test the Docker runtime
+ gvisor.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
+ gvisor.succeed(
+ "docker run -d --name=sleeping --runtime=runsc -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+ )
+ gvisor.succeed("docker ps | grep sleeping")
+ gvisor.succeed("docker stop sleeping")
+ '';
+})
+
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index d309f19a0b4..8afa845f1e2 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "i3wm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
@@ -12,24 +12,35 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = { ... }: ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow(qr/first configuration/);
- $machine->sleep(2);
- $machine->screenshot("started");
- $machine->sendKeys("ret");
- $machine->sleep(2);
- $machine->sendKeys("alt");
- $machine->sleep(2);
- $machine->screenshot("configured");
- $machine->sendKeys("ret");
- # make sure the config file is created before we continue
- $machine->waitForFile("/home/alice/.config/i3/config");
- $machine->sleep(2);
- $machine->sendKeys("alt-ret");
- $machine->waitForWindow(qr/alice.*machine/);
- $machine->sleep(2);
- $machine->screenshot("terminal");
+ with subtest("ensure x starts"):
+ machine.wait_for_x()
+ machine.wait_for_file("/home/alice/.Xauthority")
+ machine.succeed("xauth merge ~alice/.Xauthority")
+
+ with subtest("ensure we get first configuration window"):
+ machine.wait_for_window(r".*?first configuration.*?")
+ machine.sleep(2)
+ machine.screenshot("started")
+
+ with subtest("ensure we generate and save a config"):
+ # press return to indicate we want to gen a new config
+ machine.send_key("\n")
+ machine.sleep(2)
+ machine.screenshot("preconfig")
+ # press alt then return to indicate we want to use alt as our Mod key
+ machine.send_key("alt")
+ machine.send_key("\n")
+ machine.sleep(2)
+ # make sure the config file is created before we continue
+ machine.wait_for_file("/home/alice/.config/i3/config")
+ machine.screenshot("postconfig")
+ machine.sleep(2)
+
+ with subtest("ensure we can open a new terminal"):
+ machine.send_key("alt-ret")
+ machine.sleep(2)
+ machine.wait_for_window(r"alice.*?machine")
+ machine.sleep(2)
+ machine.screenshot("terminal")
'';
})
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index 665b9ee09b5..74b002fc00e 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} :
+import ./make-test-python.nix ({ pkgs, lib, ...} :
let
unlines = lib.concatStringsSep "\n";
@@ -288,108 +288,118 @@ in
client1 = mkClient true; # use nss_pam_ldapd
client2 = mkClient false; # use nss_ldap and pam_ldap
-
};
testScript = ''
- $server->start;
- $server->waitForUnit("default.target");
+ def expect_script(*commands):
+ script = ";".join(commands)
+ return f"${pkgs.expect}/bin/expect -c '{script}'"
- subtest "slapd", sub {
- subtest "auth as database admin with SASL and check a POSIX account", sub {
- $server->succeed(join ' ', 'test',
- '"$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL',
- '-b \'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}\' ',
- '-s base uidNumber |',
- 'sed -ne \'s/^uidNumber: \\(.*\\)/\\1/p\' ',
- ')" -eq ${toString ldapUserId}');
- };
- subtest "auth as database admin with password and check a POSIX account", sub {
- $server->succeed(join ' ', 'test',
- '"$(ldapsearch -LLL -H ldap://server',
- '-D \'cn=admin,${dbSuffix}\' -w \'${dbAdminPwd}\' ',
- '-b \'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}\' ',
- '-s base uidNumber |',
- 'sed -ne \'s/^uidNumber: \\(.*\\)/\\1/p\' ',
- ')" -eq ${toString ldapUserId}');
- };
- };
- $client1->start;
- $client1->waitForUnit("default.target");
+ server.start()
+ server.wait_for_unit("default.target")
- subtest "password", sub {
- subtest "su with password to a POSIX account", sub {
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "${ldapUserPwd}\n"',
- 'expect "*"',
- 'send "whoami\n"',
- 'expect -ex "${ldapUser}" {exit}',
- 'exit 1' . "'");
- };
- subtest "change password of a POSIX account as root", sub {
- $client1->succeed("chpasswd <<<'${ldapUser}:new-password'");
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "new-password\n"',
- 'expect "*"',
- 'send "whoami\n"',
- 'expect -ex "${ldapUser}" {exit}',
- 'exit 1' . "'");
- $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
- };
- subtest "change password of a POSIX account from itself", sub {
- $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su --login ${ldapUser} -c passwd',
- 'expect "Password: "',
- 'send "${ldapUserPwd}\n"',
- 'expect "(current) UNIX password: "',
- 'send "${ldapUserPwd}\n"',
- 'expect "New password: "',
- 'send "new-password\n"',
- 'expect "Retype new password: "',
- 'send "new-password\n"',
- 'expect "passwd: password updated successfully" {exit}',
- 'exit 1' . "'");
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "${ldapUserPwd}\n"',
- 'expect "su: Authentication failure" {exit}',
- 'exit 1' . "'");
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "new-password\n"',
- 'expect "*"',
- 'send "whoami\n"',
- 'expect -ex "${ldapUser}" {exit}',
- 'exit 1' . "'");
- $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
- };
- };
+ with subtest("slapd: auth as database admin with SASL and check a POSIX account"):
+ server.succeed(
+ 'test "$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL '
+ + "-b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' "
+ + "-s base uidNumber | "
+ + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}"
+ )
- $client2->start;
- $client2->waitForUnit("default.target");
+ with subtest("slapd: auth as database admin with password and check a POSIX account"):
+ server.succeed(
+ "test \"$(ldapsearch -LLL -H ldap://server -D 'cn=admin,${dbSuffix}' "
+ + "-w '${dbAdminPwd}' -b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' "
+ + "-s base uidNumber | "
+ + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}"
+ )
- subtest "NSS", sub {
- $client1->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
- $client1->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
- $client1->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
- $client1->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
- $client2->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
- $client2->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
- $client2->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
- $client2->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
- };
+ client1.start()
+ client1.wait_for_unit("default.target")
- subtest "PAM", sub {
- $client1->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
- $client2->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
- };
+ with subtest("password: su with password to a POSIX account"):
+ client1.succeed(
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "*"',
+ 'send "whoami\n"',
+ 'expect -ex "${ldapUser}" {exit}',
+ "exit 1",
+ )
+ )
+
+ with subtest("password: change password of a POSIX account as root"):
+ client1.succeed(
+ "chpasswd <<<'${ldapUser}:new-password'",
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "new-password\n"',
+ 'expect "*"',
+ 'send "whoami\n"',
+ 'expect -ex "${ldapUser}" {exit}',
+ "exit 1",
+ ),
+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}'",
+ )
+
+ with subtest("password: change password of a POSIX account from itself"):
+ client1.succeed(
+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}' ",
+ expect_script(
+ "spawn su --login ${ldapUser} -c passwd",
+ 'expect "Password: "',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "(current) UNIX password: "',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "New password: "',
+ 'send "new-password\n"',
+ 'expect "Retype new password: "',
+ 'send "new-password\n"',
+ 'expect "passwd: password updated successfully" {exit}',
+ "exit 1",
+ ),
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "su: Authentication failure" {exit}',
+ "exit 1",
+ ),
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "new-password\n"',
+ 'expect "*"',
+ 'send "whoami\n"',
+ 'expect -ex "${ldapUser}" {exit}',
+ "exit 1",
+ ),
+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}'",
+ )
+
+ client2.start()
+ client2.wait_for_unit("default.target")
+
+ with subtest("NSS"):
+ client1.succeed(
+ "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}",
+ "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'",
+ "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}",
+ "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'",
+ "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}",
+ "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'",
+ "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}",
+ "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'",
+ )
+
+ with subtest("PAM"):
+ client1.succeed(
+ "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true",
+ "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true",
+ )
'';
})
diff --git a/nixos/tests/moinmoin.nix b/nixos/tests/moinmoin.nix
index 2662b79aa09..ac327498eba 100644
--- a/nixos/tests/moinmoin.nix
+++ b/nixos/tests/moinmoin.nix
@@ -1,6 +1,6 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "moinmoin";
- meta.maintainers = [ ]; # waiting for https://github.com/NixOS/nixpkgs/pull/65397
+ meta.maintainers = with lib.maintainers; [ mmilata ];
machine =
{ ... }:
@@ -13,12 +13,16 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit('moin-ExampleWiki.service');
- $machine->waitForUnit('nginx.service');
- $machine->waitForFile('/run/moin/ExampleWiki/gunicorn.sock');
- $machine->succeed('curl -L http://localhost/') =~ /If you have just installed/ or die;
- $machine->succeed('moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1') =~ /status success/ or die;
+ machine.wait_for_unit("moin-ExampleWiki.service")
+ machine.wait_for_unit("nginx.service")
+ machine.wait_for_file("/run/moin/ExampleWiki/gunicorn.sock")
+
+ assert "If you have just installed" in machine.succeed("curl -L http://localhost/")
+
+ assert "status success" in machine.succeed(
+ "moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1"
+ )
'';
})
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index 3ef90e18347..f8321a2c522 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "openldap";
machine = { pkgs, ... }: {
@@ -24,8 +24,10 @@ import ./make-test.nix {
};
testScript = ''
- $machine->waitForUnit('openldap.service');
- $machine->succeed('systemctl status openldap.service');
- $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
+ machine.wait_for_unit("openldap.service")
+ machine.succeed(
+ "systemctl status openldap.service",
+ 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"',
+ )
'';
}
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index b9d489950e7..6d48199eda9 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }:
+import ./make-test-python.nix ({ ... }:
let
oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
@@ -55,70 +55,54 @@ in
};
};
- testScript =
- ''
- $machine->waitForUnit('multi-user.target');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
- $machine->screenshot("postboot");
+ testScript = ''
+ def switch_to_tty(tty_number):
+ machine.fail(f"pgrep -f 'agetty.*tty{tty_number}'")
+ machine.send_key(f"alt-f{tty_number}")
+ machine.wait_until_succeeds(f"[ $(fgconsole) = {tty_number} ]")
+ machine.wait_for_unit(f"getty@tty{tty_number}.service")
+ machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{tty_number}'")
- subtest "Invalid password", sub {
- $machine->fail("pgrep -f 'agetty.*tty2'");
- $machine->sendKeys("alt-f2");
- $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
- $machine->waitForUnit('getty@tty2.service');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
+ def enter_user_alice(tty_number):
+ machine.wait_until_tty_matches(tty_number, "login: ")
+ machine.send_chars("alice\n")
+ machine.wait_until_tty_matches(tty_number, "login: alice")
+ machine.wait_until_succeeds("pgrep login")
+ machine.wait_until_tty_matches(tty_number, "One-time password")
- $machine->waitUntilTTYMatches(2, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(2, "login: alice");
- $machine->waitUntilSucceeds("pgrep login");
- $machine->waitUntilTTYMatches(2, "One-time password");
- $machine->sendChars("${oathSnakeOilPassword1}\n");
- $machine->waitUntilTTYMatches(2, "Password: ");
- $machine->sendChars("blorg\n");
- $machine->waitUntilTTYMatches(2, "Login incorrect");
- };
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+ machine.screenshot("postboot")
- subtest "Invalid oath token", sub {
- $machine->fail("pgrep -f 'agetty.*tty3'");
- $machine->sendKeys("alt-f3");
- $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]");
- $machine->waitForUnit('getty@tty3.service');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'");
+ with subtest("Invalid password"):
+ switch_to_tty(2)
+ enter_user_alice(2)
- $machine->waitUntilTTYMatches(3, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(3, "login: alice");
- $machine->waitUntilSucceeds("pgrep login");
- $machine->waitUntilTTYMatches(3, "One-time password");
- $machine->sendChars("000000\n");
- $machine->waitUntilTTYMatches(3, "Login incorrect");
- $machine->waitUntilTTYMatches(3, "login:");
- };
+ machine.send_chars("${oathSnakeOilPassword1}\n")
+ machine.wait_until_tty_matches(2, "Password: ")
+ machine.send_chars("blorg\n")
+ machine.wait_until_tty_matches(2, "Login incorrect")
- subtest "Happy path (both passwords are mandatory to get us in)", sub {
- $machine->fail("pgrep -f 'agetty.*tty4'");
- $machine->sendKeys("alt-f4");
- $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]");
- $machine->waitForUnit('getty@tty4.service');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'");
+ with subtest("Invalid oath token"):
+ switch_to_tty(3)
+ enter_user_alice(3)
- $machine->waitUntilTTYMatches(4, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(4, "login: alice");
- $machine->waitUntilSucceeds("pgrep login");
- $machine->waitUntilTTYMatches(4, "One-time password");
- $machine->sendChars("${oathSnakeOilPassword2}\n");
- $machine->waitUntilTTYMatches(4, "Password: ");
- $machine->sendChars("${alicePassword}\n");
+ machine.send_chars("000000\n")
+ machine.wait_until_tty_matches(3, "Login incorrect")
+ machine.wait_until_tty_matches(3, "login:")
- $machine->waitUntilSucceeds("pgrep -u alice bash");
- $machine->sendChars("touch done4\n");
- $machine->waitForFile("/home/alice/done4");
- };
+ with subtest("Happy path: Both passwords are mandatory to get us in"):
+ switch_to_tty(4)
+ enter_user_alice(4)
+ machine.send_chars("${oathSnakeOilPassword2}\n")
+ machine.wait_until_tty_matches(4, "Password: ")
+ machine.send_chars("${alicePassword}\n")
+
+ machine.wait_until_succeeds("pgrep -u alice bash")
+ machine.send_chars("touch done4\n")
+ machine.wait_for_file("/home/alice/done4")
'';
-
})
diff --git a/nixos/tests/tiddlywiki.nix b/nixos/tests/tiddlywiki.nix
index 4a2014a4ec9..cf45578b0f9 100644
--- a/nixos/tests/tiddlywiki.nix
+++ b/nixos/tests/tiddlywiki.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }: {
+import ./make-test-python.nix ({ ... }: {
name = "tiddlywiki";
nodes = {
default = {
@@ -20,48 +20,50 @@ import ./make-test.nix ({ ... }: {
};
};
- testScript = ''
- startAll;
+ testScript =
+ ''
+ start_all()
- subtest "by default works without configuration", sub {
- $default->waitForUnit("tiddlywiki.service");
- };
+ with subtest("by default works without configuration"):
+ default.wait_for_unit("tiddlywiki.service")
- subtest "by default available on port 8080 without auth", sub {
- $default->waitForUnit("tiddlywiki.service");
- $default->waitForOpenPort(8080);
- $default->succeed("curl --fail 127.0.0.1:8080");
- };
+ with subtest("by default available on port 8080 without auth"):
+ default.wait_for_unit("tiddlywiki.service")
+ default.wait_for_open_port(8080)
+ # we output to /dev/null here to avoid a python UTF-8 decode error
+ # but the check will still fail if the service doesn't respond
+ default.succeed("curl --fail -o /dev/null 127.0.0.1:8080")
- subtest "by default creates empty wiki", sub {
- $default->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info");
- };
+ with subtest("by default creates empty wiki"):
+ default.succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info")
- subtest "configured on port 3000 with basic auth", sub {
- $configured->waitForUnit("tiddlywiki.service");
- $configured->waitForOpenPort(3000);
- $configured->fail("curl --fail 127.0.0.1:3000");
- $configured->succeed("curl --fail 127.0.0.1:3000 --user somelogin:somesecret");
- };
+ with subtest("configured on port 3000 with basic auth"):
+ configured.wait_for_unit("tiddlywiki.service")
+ configured.wait_for_open_port(3000)
+ configured.fail("curl --fail -o /dev/null 127.0.0.1:3000")
+ configured.succeed(
+ "curl --fail -o /dev/null 127.0.0.1:3000 --user somelogin:somesecret"
+ )
+
+ with subtest("restart preserves changes"):
+ # given running wiki
+ default.wait_for_unit("tiddlywiki.service")
+ # with some changes
+ default.succeed(
+ 'curl --fail --request PUT --header \'X-Requested-With:TiddlyWiki\' \
+ --data \'{ "title": "title", "text": "content" }\' \
+ --url 127.0.0.1:8080/recipes/default/tiddlers/somepage '
+ )
+ default.succeed("sleep 2")
- subtest "configured with different wikifolder", sub {
- $configured->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info");
- };
+ # when wiki is cycled
+ default.systemctl("restart tiddlywiki.service")
+ default.wait_for_unit("tiddlywiki.service")
+ default.wait_for_open_port(8080)
- subtest "restart preserves changes", sub {
- # given running wiki
- $default->waitForUnit("tiddlywiki.service");
- # with some changes
- $default->succeed("curl --fail --request PUT --header 'X-Requested-With:TiddlyWiki' --data '{ \"title\": \"title\", \"text\": \"content\" }' --url 127.0.0.1:8080/recipes/default/tiddlers/somepage ");
- $default->succeed("sleep 2"); # server syncs to filesystem on timer
-
- # when wiki is cycled
- $default->systemctl("restart tiddlywiki.service");
- $default->waitForUnit("tiddlywiki.service");
- $default->waitForOpenPort(8080);
-
- # the change is preserved
- $default->succeed("curl --fail 127.0.0.1:8080/recipes/default/tiddlers/somepage");
- };
- '';
+ # the change is preserved
+ default.succeed(
+ "curl --fail -o /dev/null 127.0.0.1:8080/recipes/default/tiddlers/somepage"
+ )
+ '';
})
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index bdbf6a45a6d..876889416da 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -80,7 +80,7 @@ in mkDerivation {
homepage = https://github.com/cdrummond/cantata;
description = "A graphical client for MPD";
license = licenses.gpl3;
- maintainers = with maintainers; [ fuuzetsu peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg ];
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index c6fb7c67d58..4c2b97e727f 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
description = "View and edit tags for various audio files";
homepage = https://wiki.gnome.org/Apps/EasyTAG;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 85d0e1fbaf7..69fa75d85f4 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
description = "Tools to work with opus encoded audio streams";
homepage = http://www.opus-codec.org/;
license = stdenv.lib.licenses.bsd2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 993e3c4fe8c..25636863793 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = http://www.opus-codec.org/;
license = licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index d371f500bc8..2ba9d4f50c3 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://ccrma.stanford.edu/software/snd;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.free;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 95dab9f18b9..b03acfbf78a 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.20.6";
+ version = "0.20.7";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "1a65pykdjkiic67fcs8cg2qrvzzrqifa93r1bzza3gdyfdvgv3ww";
+ sha256 = "1d17ry9906zmwj2n3mh77b6rqmdg0dgm7b7ybh8d7q2ml0196ilj";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index b1d84f91251..f3804db48b9 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
@@ -1,24 +1,24 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
-, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, protobuf, python3, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.18.1";
+ pname = if withGui then "bitcoin" else "bitcoind";
+ version = "0.19.0.1";
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
- sha256 = "5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96";
+ sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284";
};
nativeBuildInputs =
[ pkgconfig autoreconfHook ]
++ optional withGui wrapQtAppsHook;
buildInputs = [ openssl db48 boost zlib zeromq
- miniupnpc protobuf libevent]
+ miniupnpc libevent]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qtbase qttools qrencode ];
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index a6bea779eae..a6d657199b9 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -40,6 +40,9 @@ self: let
cl-lib = null; # builtin
tle = null; # builtin
advice = null; # builtin
+ seq = if lib.versionAtLeast self.emacs.version "27"
+ then null
+ else super.seq;
};
elpaPackages = super // overrides;
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index b8b11e5e831..cbff8e606f2 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
homepage = http://flpsed.org/flpsed.html;
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix
index 94db57d593e..19fef1c42dc 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
- version = "5.4.4";
+ version = "5.4.5";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1q80vh2b4bmpa3sh94b6jsa5ymqr6hcn76mr2lyw30h2ppy5hm5l";
+ sha256 = "12j0l2k6ii9ajp90lil3apk0xsz56cb549ighabik73a1w3c6ib6";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 3cd81f4c1a1..7723b9482a2 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
- version = "5.4.4";
+ version = "5.4.5";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "04ig8vmn85z15mlngha4ybynjlmv9g9dn48y58wqrkif2ssliq7m";
+ sha256 = "1iq4lxbl8gq4qvydyz34ild4izw21cp22adlz9dc054v0wis331j";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index dd1f5eea8f4..21b469347df 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -10,11 +10,11 @@
mkDerivation rec {
pname = "kdevelop";
- version = "5.4.4";
+ version = "5.4.5";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "1cangz3ghz39sxxggp2p7kqy2ncgs0r3i19c341b5xbkcxw2y20h";
+ sha256 = "08vhbg9ql0402bw3y3xw1kdxhig9sv3ss8g0h4477vy3z17m1h4j";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index fe5fcc1724b..0f3cd7d136a 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
description = "Allows Yi to find libraries and the compiler easily";
# This wrapper and wrapper only is under PD
license = licenses.publicDomain;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix
new file mode 100644
index 00000000000..adbc1eac379
--- /dev/null
+++ b/pkgs/applications/graphics/akira/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, appstream-glib
+, desktop-file-utils
+, meson
+, ninja
+, pantheon
+, pkgconfig
+, python3
+, vala
+, vala-lint
+, wrapGAppsHook
+, cairo
+, glib
+, goocanvas2
+, gtk3
+, gtksourceview3
+, json-glib
+, libarchive
+, libgee
+, libxml2 }:
+
+stdenv.mkDerivation rec {
+ pname = "akira";
+ version = "2019-10-12";
+
+ src = fetchFromGitHub {
+ owner = "akiraux";
+ repo = "Akira";
+ rev = "cab952dee4591b6bde34d670c1f853f5a3ff6b19";
+ sha256 = "1fp3a79hkh6xwwqqdrx4zqq2zhsm236c6fhhl5f2nmi108yxz04q";
+ };
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ vala-lint
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ cairo
+ glib
+ goocanvas2
+ pantheon.granite
+ gtk3
+ gtksourceview3
+ json-glib
+ libarchive
+ libgee
+ libxml2
+ ];
+
+ mesonFlags = [ "-Dprofile=default" ];
+
+ patches = [ ./fix-build-with-vala-0-44-or-later.patch ];
+
+ postPatch = ''
+ chmod +x build-aux/meson/post_install.py
+ patchShebangs build-aux/meson/post_install.py
+ '';
+
+ meta = with lib; {
+ description = "Native Linux Design application built in Vala and GTK";
+ homepage = "https://github.com/akiraux/Akira";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ filalex77 ] ++ pantheon.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch b/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
new file mode 100644
index 00000000000..3c35900c04f
--- /dev/null
+++ b/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
@@ -0,0 +1,88 @@
+From bcda8fd53f6f232db0b6411269ba108af551629f Mon Sep 17 00:00:00 2001
+From: Alberto Fanjul
+Date: Tue, 9 Apr 2019 09:45:36 +0200
+Subject: [PATCH] Build on vala >= 0.44.2
+
+---
+ src/FileFormat/JsonObject.vala | 2 +-
+ src/FileFormat/JsonObjectArray.vala | 2 +-
+ src/FileFormat/ZipArchiveHandler.vala | 18 +++++++++++++++++-
+ 3 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/src/FileFormat/JsonObject.vala b/src/FileFormat/JsonObject.vala
+index 7bfe46f..805fbad 100644
+--- a/src/FileFormat/JsonObject.vala
++++ b/src/FileFormat/JsonObject.vala
+@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObject : GLib.Object {
+
+ private ObjectClass obj_class;
+
+- public JsonObject.from_object (Json.Object object) {
++ protected JsonObject.from_object (Json.Object object) {
+ Object (object: object);
+ }
+
+diff --git a/src/FileFormat/JsonObjectArray.vala b/src/FileFormat/JsonObjectArray.vala
+index 4f6e573..d0a7dad 100644
+--- a/src/FileFormat/JsonObjectArray.vala
++++ b/src/FileFormat/JsonObjectArray.vala
+@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObjectArray : Object {
+ *
+ * Your JsonObject implementation should have it's own list of items
+ */
+- public JsonObjectArray (Json.Object object, string property_name) {
++ protected JsonObjectArray (Json.Object object, string property_name) {
+ Object (object: object, property_name: property_name);
+ }
+
+diff --git a/src/FileFormat/ZipArchiveHandler.vala b/src/FileFormat/ZipArchiveHandler.vala
+index ca60dd0..5d65aa2 100644
+--- a/src/FileFormat/ZipArchiveHandler.vala
++++ b/src/FileFormat/ZipArchiveHandler.vala
+@@ -262,11 +262,17 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
+ continue;
+ }
+
++ Posix.off_t offset;
++#if VALA_0_42
++ uint8[] buffer;
++ while (archive.read_data_block (out buffer, out offset) == Archive.Result.OK) {
++ if (extractor.write_data_block (buffer, offset) != Archive.Result.OK) {
++#else
+ void* buffer = null;
+ size_t buffer_length;
+- Posix.off_t offset;
+ while (archive.read_data_block (out buffer, out buffer_length, out offset) == Archive.Result.OK) {
+ if (extractor.write_data_block (buffer, buffer_length, offset) != Archive.Result.OK) {
++#endif
+ break;
+ }
+ }
+@@ -316,9 +322,15 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
+ // Add an entry to the archive
+ Archive.Entry entry = new Archive.Entry ();
+ entry.set_pathname (initial_folder.get_relative_path (current_file));
++#if VALA_0_42
++ entry.set_size ((Archive.int64_t) file_info.get_size ());
++ entry.set_filetype (Archive.FileType.IFREG);
++ entry.set_perm (Archive.FileType.IFREG);
++#else
+ entry.set_size (file_info.get_size ());
+ entry.set_filetype ((uint) Posix.S_IFREG);
+ entry.set_perm (0644);
++#endif
+
+ if (archive.write_header (entry) != Archive.Result.OK) {
+ critical ("Error writing '%s': %s (%d)", current_file.get_path (), archive.error_string (), archive.errno ());
+@@ -333,7 +345,11 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
+ break;
+ }
+
++#if VALA_0_42
++ archive.write_data (buffer[0:bytes_read]);
++#else
+ archive.write_data (buffer, bytes_read);
++#endif
+ }
+ }
+ }
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 25cefabbd63..548b004d794 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "12.2.2";
+ version = "12.3.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
- sha256 = "04h11gdy78py9zrs3v6y0hhhc2n1h4s0ymbvf6qn4vv4r3r9vbaw";
+ sha256 = "1hh4616dbq0fqldlph7vyl8vkibwc3xpcv9r1m2v949kn84yi2j3";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index a67a03b3e07..2b3b992d24b 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -157,6 +157,8 @@ in stdenv.mkDerivation rec {
"--without-webkit" # old version is required
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
"--with-icc-directory=/run/current-system/sw/share/color/icc"
+ # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
+ "--libdir=\${exec_prefix}/lib"
];
# on Darwin,
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 7130d21b8ef..c16c0d88b46 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -27,7 +27,7 @@ python27Packages.buildPythonApplication rec {
'';
homepage = http://mcomix.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
+ maintainers = with stdenv.lib.maintainers; [ AndersonTorres ];
};
}
# TODO:
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index acbbf73465d..99c151f8c80 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/muennich/sxiv;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
- maintainers = with maintainers; [ jfrankenau fuuzetsu ];
+ maintainers = with maintainers; [ jfrankenau ];
};
}
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index d0429d135d7..e6cfca5667e 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,14 +1,14 @@
-{ lib, fetchurl, python3Packages, qtbase, wrapQtAppsHook }:
+{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook }:
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
- version = "4.0.10";
+ version = "4.0.11";
- src = fetchurl {
- url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
- # Verified using official SHA-1 and signature from
- # https://github.com/fyookball/keys-n-hashes
- sha256 = "48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5";
+ src = fetchFromGitHub {
+ owner = "Electron-Cash";
+ repo = "Electron-Cash";
+ rev = version;
+ sha256 = "1k4zbaj0g8bgk1l5vrb835a8bqfay2707bcb4ql2vx4igcwpb680";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index c2065d94353..4667427b8a0 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.60.0";
+ version = "0.60.1";
goPackagePath = "github.com/gohugoio/hugo";
src = fetchFromGitHub {
- owner = "gohugoio";
- repo = pname;
- rev = "v${version}";
- sha256 = "0g8rq79xp7c9p31xc0anfjyz7xp8n7qzv3vmvg2nmzl7nayg88aa";
+ owner = "gohugoio";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0l8n87y5zrs09s693rqvqwz0233wlr4jwib7r36ilss1qgm7x6n5";
};
- modSha256 = "12h1ik1hgs4lkmk699wpa34rnycnm03qyr2vp1y5lywz1h93by20";
+ modSha256 = "1an4plbx06fzz2iqzgs08r6vsjpkl5lbqck5jqmv6fv7b7psf7iw";
buildFlags = "-tags extended";
@@ -21,8 +21,8 @@ buildGoModule rec {
meta = with stdenv.lib; {
description = "A fast and modern static website engine.";
- homepage = https://gohugo.io;
+ homepage = "https://gohugo.io";
license = licenses.asl20;
- maintainers = with maintainers; [ schneefux ];
+ maintainers = with maintainers; [ schneefux filalex77 ];
};
}
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 38d69406da4..e7c32c13095 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "nnn";
- version = "2.7";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
- sha256 = "19kiikjblkq3bx2j6h3f2d467p2v582albqr7nbrm9c1yg4qx38z";
+ sha256 = "0h7j0wcpwwd2fibggr1nwkqpvhv2i1qnk54c4x6hixx31yidy2l0";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 81563254abd..f71e7a7a960 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,11 +1,15 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeWrapper
, pkgconfig
, ncurses, libX11
, utillinux, file, which, groff
+
+ # adds support for handling removable media (vifm-media). Linux only!
+, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null
}:
-stdenv.mkDerivation rec {
- pname = "vifm";
+let isFullPackage = mediaSupport;
+in stdenv.mkDerivation rec {
+ pname = if isFullPackage then "vifm-full" else "vifm";
version = "0.10.1";
src = fetchurl {
@@ -13,13 +17,24 @@ stdenv.mkDerivation rec {
sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ ncurses libX11 utillinux file which groff ];
+ postFixup = let
+ path = lib.makeBinPath
+ [ udisks2
+ (python3.withPackages (p: [p.dbus-python]))
+ ];
+
+ wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}";
+ in ''
+ ${if mediaSupport then wrapVifmMedia else ""}
+ '';
+
meta = with stdenv.lib; {
- description = "A vi-like file manager";
+ description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}'';
maintainers = with maintainers; [ raskin ];
- platforms = platforms.unix;
+ platforms = if mediaSupport then platforms.linux else platforms.unix;
license = licenses.gpl2;
downloadPage = "https://vifm.info/downloads.shtml";
homepage = https://vifm.info/;
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 9ad010deb16..4fc06b5c1ad 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
pname = "workrave";
version = "1.10.31";
- src = let
- in fetchFromGitHub {
+ src = fetchFromGitHub {
sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitVersion version);
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index b7f8cfce2fb..56168b34859 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -1,33 +1,43 @@
-{ stdenv, fetchFromGitHub, txt2tags, python2Packages }:
+{ stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
pname = "xdgmenumaker";
version = "1.5";
src = fetchFromGitHub {
owner = "gapan";
- repo = "xdgmenumaker";
+ repo = pname;
rev = version;
sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif";
};
+ format = "other";
+
+ strictDeps = false;
+
nativeBuildInputs = [
+ gobject-introspection
txt2tags
- python2Packages.wrapPython
+ wrapGAppsHook
];
- pythonPath = [
- python2Packages.pyxdg
- python2Packages.pygtk
+ buildInputs = [
+ glib
+ ];
+
+ pythonPath = with python3Packages; [
+ pyxdg
+ pygobject3
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ installFlags = [
+ "DESTDIR="
];
- installPhase = ''
- make install PREFIX=$out DESTDIR=
- wrapProgram "$out/bin/xdgmenumaker" \
- --prefix XDG_DATA_DIRS : "$out/share"
- wrapPythonPrograms
- '';
-
meta = with stdenv.lib; {
description = "Command line tool that generates XDG menus for several window managers";
homepage = https://github.com/gapan/xdgmenumaker;
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 89d06474509..84e9b889943 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, makeWrapper }:
+{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
let
@@ -7,10 +7,10 @@ let
schema = stdenv.mkDerivation {
name = "kubeval-schema";
src = fetchFromGitHub {
- owner = "garethr";
+ owner = "instrumenta";
repo = "kubernetes-json-schema";
- rev = "c7672fd48e1421f0060dd54b6620baa2ab7224ba";
- sha256 = "0picr3wvjx4qv158jy4f60pl225rm4mh0l97pf8nqi9h9x4x888p";
+ rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699";
+ sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr";
};
installPhase = ''
@@ -21,26 +21,26 @@ let
in
-buildGoPackage rec {
+buildGoModule rec {
pname = "kubeval";
- version = "0.7.3";
+ version = "0.14.0";
- goPackagePath = "github.com/garethr/kubeval";
src = fetchFromGitHub {
- owner = "garethr";
+ owner = "instrumenta";
repo = "kubeval";
- rev = version;
- sha256 = "042v4mc5p80vmk56wp6aw89yiibjnfqn79c0zcd6y179br4gpfnb";
+ rev = "${version}";
+ sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv";
};
- goDeps = ./deps.nix;
buildInputs = [ makeWrapper ];
- postFixup = "wrapProgram $bin/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}";
+ modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
+
+ postFixup = "wrapProgram $out/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}/kubernetes-json-schema/master";
meta = with lib; {
description = "Validate your Kubernetes configuration files";
- homepage = https://github.com/garethr/kubeval;
+ homepage = https://github.com/instrumenta/kubeval;
license = licenses.asl20;
maintainers = with maintainers; [ nicknovitski ];
platforms = platforms.all;
diff --git a/pkgs/applications/networking/cluster/kubeval/deps.nix b/pkgs/applications/networking/cluster/kubeval/deps.nix
deleted file mode 100644
index b9565e927de..00000000000
--- a/pkgs/applications/networking/cluster/kubeval/deps.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
- sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-multierror";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-multierror";
- rev = "b7773ae218740a7be65057fc60b366a49b538a44";
- sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
- sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c2353362d570a7bfa228149c62842019201cfb71";
- sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/mapstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
- sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
- sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "787d034dfe70e44075ccc060d346146ef53270ad";
- sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
- sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
- sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
- sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/viper";
- rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
- sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonpointer";
- rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
- sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonreference";
- rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
- sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonschema";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonschema";
- rev = "9ff6d6c47f3f5de55acc6f464d6e3719b02818ae";
- sha256 = "0rpkya4lnpv9g33bs0z3vd5dlnadkyq1lg7114nbd73vm878s6sw";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15";
- sha256 = "1a6x6n1fk5k013w5r4b0bxws1d2fh0s69mbzpi1vkyfpcxabwjhj";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
- sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 6be9a5092ba..cd37083d935 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -12,9 +12,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- rev = "v1.60.0";
- version = "1.60.0";
- sha256 = "14k96ccjrjiqfrdrj9kd090ms1p15z71qv60gm05bhffviyplmgw";
+ rev = "v1.63.0";
+ version = "1.63.0";
+ sha256 = "0353zsga4ic7rsgnk243v202l4hpy0xlzp95fnbmrz7p5wy2k8js";
};
archive =
{
@@ -44,25 +44,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- rev = "v2.34.0";
- version = "2.34.0";
- sha256 = "1kmy6hn1d3padfnix17ibmrm1339q4li0740dlfgjlxjv179bv34";
+ rev = "v2.41.0";
+ version = "2.41.0";
+ sha256 = "0i9bh78ihmxj7hjbqzkkj7k6lvr3xdakf8qv0bfckcinwpzwzbxa";
};
azuread =
{
owner = "terraform-providers";
repo = "terraform-provider-azuread";
- rev = "v0.6.0";
- version = "0.6.0";
- sha256 = "1s3k2plka1lzfij4vhr30vc549zysa6v8j5mphra7fjxy236v40j";
+ rev = "v0.7.0";
+ version = "0.7.0";
+ sha256 = "1a7w31dvjz5498445ia4m5gd1js3k7ghz6qqfq51f2n86iafs0xq";
};
azurerm =
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- rev = "v1.36.1";
- version = "1.36.1";
- sha256 = "1mnbmbfsnc859j6ahcph80z0v1jl82dnbjqmqg2q0kiappz2g2lm";
+ rev = "v1.37.0";
+ version = "1.37.0";
+ sha256 = "0n0582v8g3np8glyxnpnayps014jxclzrglcxf35wszfz9mspryg";
};
azurestack =
{
@@ -76,9 +76,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-bigip";
- rev = "v1.0.0";
- version = "1.0.0";
- sha256 = "0dz5dfv3glx7898a9bi9vi3g0ghyi96pc45brrj41and5835jvdc";
+ rev = "v1.1.0";
+ version = "1.1.0";
+ sha256 = "15fmxr1c39xx6ix38nigf8izrqzlmjjr6hvlkf7yhb5z7485nvsg";
};
bitbucket =
{
@@ -108,9 +108,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-circonus";
- rev = "v0.2.0";
- version = "0.2.0";
- sha256 = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45";
+ rev = "v0.4.0";
+ version = "0.4.0";
+ sha256 = "0iz7v7gfjgbca47vjnvcv9159kgladkad7cmjw2hpncrn2jjinwg";
};
clc =
{
@@ -124,17 +124,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudflare";
- rev = "v2.0.1";
- version = "2.0.1";
- sha256 = "18cxyxgv6x5s1xsd5l460hnl1xdvrvkwb36lhvk3dgziaw2xxr81";
+ rev = "v2.1.0";
+ version = "2.1.0";
+ sha256 = "1ll06p4fz88mr4a51rqgvxykivx9xina6507mflyxaic59xlkdz4";
};
cloudscale =
{
owner = "terraform-providers";
repo = "terraform-provider-cloudscale";
- rev = "v2.0.0";
- version = "2.0.0";
- sha256 = "145hj4pbi5zrkgamicy3m1n3380fpd2ndd6ym7mwd65d95g39vwb";
+ rev = "v2.1.0";
+ version = "2.1.0";
+ sha256 = "12vxzhpsivvq343mqkmnwklvnv6dc9h2ah0ixla9svdwjp91xfcd";
};
cloudstack =
{
@@ -172,9 +172,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- rev = "v1.10.0";
- version = "1.10.0";
- sha256 = "1c53g32mk41lvq4ikfj04m89nhzrdk8d6h35aq3z07yyqp6ap2a0";
+ rev = "v1.11.0";
+ version = "1.11.0";
+ sha256 = "0s8z0zsfibclx0431fcqbi9yqkhwj4w0rz780z1dwv50xpgnmzql";
};
dme =
{
@@ -204,9 +204,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
- rev = "v2.5.0";
- version = "2.5.0";
- sha256 = "1nril7qy1nm1dq19vg6mm0zc0sgkjrm1s39n7p9gxf4s4j78ig1n";
+ rev = "v2.6.0";
+ version = "2.6.0";
+ sha256 = "12qq7m75yxfczik78klqaimrzhp70m2vk5q0h3v8b2dwvvynj0dg";
};
dyn =
{
@@ -252,25 +252,25 @@
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
- rev = "v2.3.0";
- version = "2.3.0";
- sha256 = "012pbgfdmwyq8y8ddrhyf14jc6s7v24f1w3mrpi6mp4glqc5yfqx";
+ rev = "v2.4.0";
+ version = "2.4.0";
+ sha256 = "0409n8miva205wkx968ggzmz0y121s99iybsjlkx0gja20x68yxx";
};
google =
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- rev = "v2.19.0";
- version = "2.19.0";
- sha256 = "00pqkysic3x8iygcxb232dwbpmy5ldf7fdfi6ldiv3g6gbvlcaf7";
+ rev = "v2.20.0";
+ version = "2.20.0";
+ sha256 = "1b19hql244lv74gxdwgqh9955d3zkwj7riaq6kj5ylbj44spcpjy";
};
google-beta =
{
owner = "terraform-providers";
repo = "terraform-provider-google-beta";
- rev = "v2.19.0";
- version = "2.19.0";
- sha256 = "03im9h7r2vyx4y9qnc3l0hsvcqy7rai5dlkmj1za3npm98vpx2d7";
+ rev = "v2.20.0";
+ version = "2.20.0";
+ sha256 = "0zkhyn17kji6yyl5582g5vhqj3rcbin73ym6vn6f0m7sf5yaplky";
};
grafana =
{
@@ -284,17 +284,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- rev = "v1.14.0";
- version = "1.14.0";
- sha256 = "13zxrjx4im25g7m45z95d3py85nzs2k8r9grilxshr6x95bxk2f0";
+ rev = "v1.15.0";
+ version = "1.15.0";
+ sha256 = "0l554mf6s248j0453b4r5pafshcvhn2smk4pp23y9kq5g1xd0xmd";
};
hedvig =
{
owner = "terraform-providers";
repo = "terraform-provider-hedvig";
- rev = "v1.0.4";
- version = "1.0.4";
- sha256 = "0y6brzznxp8khdfbnpmnbjqf140411z0pvnp88p8mj2kmbk7kkjd";
+ rev = "v1.0.5";
+ version = "1.0.5";
+ sha256 = "0dic4kqjwi3s8pss1pmgixnr7xi503gl5i7pcx66fam5y5ar92v5";
};
helm =
{
@@ -324,9 +324,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-huaweicloud";
- rev = "v1.9.0";
- version = "1.9.0";
- sha256 = "06blhsbv5pxlb1m07qanrq5qmbai33dlk89ghzscrqwnvv1nnszr";
+ rev = "v1.10.0";
+ version = "1.10.0";
+ sha256 = "0aa83y0bzfldijd4jbmhqppc13jdqaax83p75kffwaxw1rmxrana";
};
icinga2 =
{
@@ -340,9 +340,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ignition";
- rev = "v1.1.0";
- version = "1.1.0";
- sha256 = "0vpjbb70wnlrvw7z2zc92fbisgjk49ivdmv10ahyqlgvc23js5va";
+ rev = "v1.2.0";
+ version = "1.2.0";
+ sha256 = "0dg5xak02rv7h9z07kjqxf55al188ligzq3m6711rlh62zam2cjc";
};
influxdb =
{
@@ -356,9 +356,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- rev = "v1.9.0";
- version = "1.9.0";
- sha256 = "1ai8w853k4pgr43g9dwdsimw0g0c6vg6vg2f20d9ch7bx8ii4nhf";
+ rev = "v1.10.0";
+ version = "1.10.0";
+ sha256 = "04hd9n9jm72fi81cmdz0yf374fg52r8yinsxy0ag29rd3r2l1k81";
};
librato =
{
@@ -372,9 +372,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-linode";
- rev = "v1.8.0";
- version = "1.8.0";
- sha256 = "1jgh2ij58a5mr6ns604cfpvfvr19qr0q51j57gvchz53iv683m9q";
+ rev = "v1.9.1";
+ version = "1.9.1";
+ sha256 = "10f7nij91fhgf1808r6rv3l13nz7p37mcln5p3nfvhsxskss3vxn";
};
local =
{
@@ -412,9 +412,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mysql";
- rev = "v1.8.0";
- version = "1.8.0";
- sha256 = "1llcg2mp6jbj386liinly62pgy934v0c2g5z976n0xwfdiybyhwx";
+ rev = "v1.9.0";
+ version = "1.9.0";
+ sha256 = "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g";
};
netlify =
{
@@ -428,9 +428,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- rev = "v1.5.2";
- version = "1.5.2";
- sha256 = "1q2vlpzxz04xhmf2wi5pc501454qwzh59kdhfhs8yjg1d1489jng";
+ rev = "v1.8.0";
+ version = "1.8.0";
+ sha256 = "16fdif6hshdb1aswv22k590rcr3f6b3a9gmg8vc4lbyi6l2dfabd";
};
nomad =
{
@@ -444,17 +444,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- rev = "v1.6.0";
- version = "1.6.0";
- sha256 = "1v075wc48pq9kp9rp4kanlfshnxgan9h914nqalq90xgzyl2gf3v";
+ rev = "v1.6.1";
+ version = "1.6.1";
+ sha256 = "0zyn165h42p640k1q85x3n8fw1fs9j72z9lnfa8pas89jy2fmi8b";
};
nsxt =
{
owner = "terraform-providers";
repo = "terraform-provider-nsxt";
- rev = "v1.1.1";
- version = "1.1.1";
- sha256 = "19bbycify25bshpyq65qjxnl72b6wmwwwdb7hxl94hhbgx2c9z29";
+ rev = "v1.1.2";
+ version = "1.1.2";
+ sha256 = "1hnxivad7371j363sp3460mfzl5alb3dhxsbp0qwfl5mzvriwrbl";
};
null =
{
@@ -476,9 +476,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- rev = "v3.50.0-rc1";
- version = "3.50.0-rc1";
- sha256 = "0nzz62zyx5xf2qlvjcbsqnafdhmq194yhyipcab1n2ckji8zb03z";
+ rev = "v3.54.0-rc1";
+ version = "3.54.0-rc1";
+ sha256 = "14mfkjjpq4sfw0j4w1mnh37x9kwn76rs1y6cjqq9zb8fnhva6gax";
};
oneandone =
{
@@ -508,17 +508,17 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- rev = "v1.13.1";
- version = "1.13.1";
- sha256 = "1mxbfskxf9zwm55r3s6fhk634pnyk0sx5pgwk3kmw4sgjv88i1ny";
+ rev = "v1.14.0";
+ version = "1.14.0";
+ sha256 = "1mjb6br8iy76q417lmg04xnv4hkgi2fgdn3qnr3nvlwnnccp230k";
};
opsgenie =
{
owner = "terraform-providers";
repo = "terraform-provider-opsgenie";
- rev = "v0.2.4";
- version = "0.2.4";
- sha256 = "1kgvbx39v6f3hszwrqjsaq3wvwzkxf4gwwfix2m6bprfr5q5vn0d";
+ rev = "v0.2.5";
+ version = "0.2.5";
+ sha256 = "0brjqnlnxqss285n2g1z006bibbdh5v47g75l5kyhyhhchavccma";
};
oraclepaas =
{
@@ -540,9 +540,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- rev = "v2.6.1";
- version = "2.6.1";
- sha256 = "198lkw5b4xfyf82yzym66fna7j0wl3hzvkdr9b9q7f0nffx47xri";
+ rev = "v2.7.1";
+ version = "2.7.1";
+ sha256 = "1hmja9c8ab66yr814psz1zsa4y0nbmd5rcnp3qxdgizp45yrvz3i";
};
pagerduty =
{
@@ -556,9 +556,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-panos";
- rev = "v1.6.0";
- version = "1.6.0";
- sha256 = "0qszdyrj84c8i195y45cnanzmkn8ypi1gi5a03pf3gsf2fdcj9gq";
+ rev = "v1.6.1";
+ version = "1.6.1";
+ sha256 = "06hwi426x7ipmn4dbg5dyv9z84sxaa8q1jlcd2l264n9s2y3xhiq";
};
postgresql =
{
@@ -700,9 +700,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tencentcloud";
- rev = "v1.22.0";
- version = "1.22.0";
- sha256 = "0lamj77n9b5m80201wim0zcjgdcbihcaq27z49himh2qi5j8lxiz";
+ rev = "v1.25.2";
+ version = "1.25.2";
+ sha256 = "1pf4l9rvkarl4vhf51np4kdqcgs4jhsr5gw7vs6rn8gv97lb40kw";
};
terraform =
{
@@ -756,9 +756,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- rev = "v2.5.0";
- version = "2.5.0";
- sha256 = "0h3q2zifjgm05kvdans88dl8wx9hr21c1s64fmfs4an07gkg8947";
+ rev = "v2.6.0";
+ version = "2.6.0";
+ sha256 = "0sw1swy2j9n3ji48sxmj093zzlq7sdmp8ixmz488ps3m4jjyfk6k";
};
vcd =
{
@@ -780,9 +780,9 @@
{
owner = "terraform-providers";
repo = "terraform-provider-yandex";
- rev = "v0.23.0";
- version = "0.23.0";
- sha256 = "0vv8lp834q8i7fam2s8pvs7slfwlf8m4g080i9cij5z2lgipja32";
+ rev = "v0.24.0";
+ version = "0.24.0";
+ sha256 = "0a9isivn3ni0d1id8ww97xbcwrxc0c4pn1m1q21cipqs6mwksq9m";
};
segment =
{
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 47437df25e7..431c9326aac 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.317369.1110";
+ version = "3.5.330166.1202";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "0r4wp9qb1739xwr24kglc4sj8qaxwr4nh5p1igi3x6f1f8gczia7";
+ sha256 = "1fjirl4hmxvy4kp3b0n97mn8sz355ik10297qx6hcr0fhn2v0nig";
};
};
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 587cc40aada..38e4bf5d710 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "Mail filtering utility";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 6cdbe4d58ad..f46e355cd57 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -185,7 +185,7 @@ stdenv.mkDerivation {
free = false;
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 912ab42ce28..395ca901d95 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
+{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
@@ -73,6 +73,19 @@ in stdenv.mkDerivation rec {
patches = [
./xdg-open-brief.patch
+
+ # Poppler-0.82 compatibility
+ # https://gerrit.libreoffice.org/81545
+ (fetchpatch {
+ url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
+ sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
+ })
+ # Poppler-0.83 compatibility
+ # https://gerrit.libreoffice.org/84384
+ (fetchpatch {
+ url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
+ sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
+ })
];
tarballPath = "external/tarballs";
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index ee1497bfb7e..8fb03b437e6 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
+{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
@@ -73,6 +73,19 @@ in stdenv.mkDerivation rec {
patches = [
./xdg-open-brief.patch
+
+ # Poppler-0.82 compatibility
+ # https://gerrit.libreoffice.org/81545
+ (fetchpatch {
+ url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
+ sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
+ })
+ # Poppler-0.83 compatibility
+ # https://gerrit.libreoffice.org/84384
+ (fetchpatch {
+ url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
+ sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
+ })
];
tarballPath = "external/tarballs";
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index 3c5ae4c4b0a..2a602b094ba 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
+{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }:
@@ -14,6 +14,19 @@ mkDerivation rec {
sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E=";
};
+ patches = [
+ # fix build with Poppler 0.82
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
+ sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
+ })
+ # fix build with Poppler 0.83
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
+ sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
+ })
+ ];
+
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 9584c2f41a8..4bb3c7b34fe 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "oct19a";
- version = "20191001_a";
+ srcVersion = "dec19a";
+ version = "20191201_a";
pname = "gildas";
src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
- sha256 = "0h6g16ra7v8x15j21z5hnb3midwm0asc7bjm9gs5v5sw66vn3wc1";
+ sha256 = "0kwq5gzgzx5hkbabwvbrw2958pqz4m2s501k5cbllgxh4sqp86b1";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 8e100716c87..ddefcf1b3aa 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
+{ stdenv, fetchFromGitHub, yosys, bash, python3, yices }:
stdenv.mkDerivation {
pname = "symbiyosys";
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
buildInputs = [ python3 yosys ];
+ propagatedBuildInputs = [ yices ];
+
buildPhase = "true";
installPhase = ''
mkdir -p $out/bin $out/share/yosys/python3
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 93ec1e33cf6..451edb8f085 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
export GLIBC_TUNABLES=glibc.malloc.arena_max=4
echo "Running sage tests with arguments ${timeSpecifier} ${patienceSpecifier} ${testArgs}"
- "sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs}
+ "sage" -t --timeout=0 --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs}
'';
}
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 20c259a9d0c..3e7c7a42eb8 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
homepage = http://vite.gforge.inria.fr/;
license = stdenv.lib.licenses.cecill20;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index b2a9c2a28fc..ceea2f44a8b 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,9 +1,9 @@
{
- "version": "12.5.2",
- "repo_hash": "18mviak37rkpj92m0hzh79rjbfsk8p91r5zzjp7y3y4qjnsf2a8p",
+ "version": "12.5.3",
+ "repo_hash": "1q76yhg4ygs9w5hb8hbv1908d5pfqzr8idmjp06pa4dw5qqqkv97",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v12.5.2-ee",
+ "rev": "v12.5.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.72.1",
"GITLAB_PAGES_VERSION": "1.12.0",
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 5f3a324a802..951ea39e5be 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -306,6 +306,15 @@
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
+ {
+ goPackagePath = "github.com/golang/lint";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/lint";
+ rev = "06c8688daad7";
+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ };
+ }
{
goPackagePath = "github.com/golang/mock";
fetch = {
@@ -540,6 +549,15 @@
sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
};
}
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
{
goPackagePath = "github.com/klauspost/compress";
fetch = {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index 5b5d0b99bcf..d5ea22f960b 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -162,6 +162,15 @@
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
+ {
+ goPackagePath = "github.com/golang/lint";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/lint";
+ rev = "06c8688daad7";
+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ };
+ }
{
goPackagePath = "github.com/golang/mock";
fetch = {
@@ -252,6 +261,15 @@
sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
};
}
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index cef7ea1bf3c..2d332a862c6 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
description = "Cross-platform tools for Matroska";
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
license = licenses.gpl2;
- maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ];
+ maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.linux
++ optionals (!withGUI) platforms.darwin;
};
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 6c86b514afd..91a9f4a7d01 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -235,7 +235,7 @@ in stdenv.mkDerivation rec {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = https://mpv.io;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ivan ];
+ maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ];
platforms = platforms.darwin ++ platforms.linux;
longDescription = ''
diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix
new file mode 100644
index 00000000000..0161a117def
--- /dev/null
+++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
+
+buildGoModule rec {
+ name = "gvisor-containerd-shim-${version}";
+ version = "2019-10-09";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "gvisor-containerd-shim";
+ rev = "f299b553afdd8455a0057862004061ea12e660f5";
+ sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm";
+ };
+
+ modSha256 = "1jdhgbrn59ahnabwnig99i21f6kimmqx9f3dg10ffwfs3dx0gzlg";
+
+ buildPhase = ''
+ make
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ make test
+ '';
+
+ installPhase = ''
+ make install DESTDIR="$out"
+ '';
+
+ meta = with lib; {
+ description = "containerd shim for gVisor";
+ homepage = https://github.com/google/gvisor-containerd-shim;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ andrew-d ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
new file mode 100644
index 00000000000..2d99fb3bf57
--- /dev/null
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -0,0 +1,101 @@
+{ stdenv
+, buildBazelPackage
+, fetchFromGitHub
+, cacert
+, git
+, glibcLocales
+, go
+, iproute
+, iptables
+, makeWrapper
+, procps
+, python3
+}:
+
+let
+ preBuild = ''
+ patchShebangs .
+
+ # Tell rules_go to use the Go binary found in the PATH
+ sed -E -i \
+ -e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \
+ WORKSPACE
+
+ # The gazelle Go tooling needs CA certs
+ export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
+
+ # If we don't reset our GOPATH, the rules_go stdlib builder tries to
+ # install something into it. Ideally that wouldn't happen, but for now we
+ # can also get around it by unsetting GOPATH entirely, since rules_go
+ # doesn't need it.
+ export GOPATH=
+ '';
+
+in buildBazelPackage rec {
+ name = "gvisor-${version}";
+ version = "2019-11-14";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "gvisor";
+ rev = "release-20191114.0";
+ sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1";
+ };
+
+ nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ];
+
+ bazelTarget = "//runsc:runsc";
+
+ # gvisor uses the Starlark implementation of rules_cc, not the built-in one,
+ # so we shouldn't delete it from our dependencies.
+ removeRulesCC = false;
+
+ fetchAttrs = {
+ inherit preBuild;
+
+ preInstall = ''
+ # Remove the go_sdk (it's just a copy of the go derivation) and all
+ # references to it from the marker files. Bazel does not need to download
+ # this sdk because we have patched the WORKSPACE file to point to the one
+ # currently present in PATH. Without removing the go_sdk from the marker
+ # file, the hash of it will change anytime the Go derivation changes and
+ # that would lead to impurities in the marker files which would result in
+ # a different sha256 for the fetch phase.
+ rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
+
+ # Remove the gazelle tools, they contain go binaries that are built
+ # non-deterministically. As long as the gazelle version matches the tools
+ # should be equivalent.
+ rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker}
+
+ # Remove the gazelle repository cache
+ chmod -R +w $bazelOut/external/bazel_gazelle_go_repository_cache
+ rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker}
+
+ # Remove log file(s)
+ rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
+ '';
+
+ sha256 = "122qk6iv8hd7g2a84y9aqqhij4r0m47vpxzbqhhh6k5livc73qd6";
+ };
+
+ buildAttrs = {
+ inherit preBuild;
+
+ installPhase = ''
+ install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc
+
+ # Needed for the 'runsc do' subcomand
+ wrapProgram $out/bin/runsc \
+ --prefix PATH : ${stdenv.lib.makeBinPath [ iproute iptables procps ]}
+ '';
+ };
+
+ meta = with stdenv.lib; {
+ description = "Container Runtime Sandbox";
+ homepage = https://github.com/google/gvisor;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ andrew-d ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 16fe748c3e5..3e5d8e6c384 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -1,6 +1,4 @@
# Builder for Agda packages. Mostly inspired by the cabal builder.
-#
-# Contact: stdenv.lib.maintainers.fuuzetsu
{ stdenv, Agda, glibcLocales
, writeShellScriptBin
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 55df09121b4..5210b7d7ba2 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -2,11 +2,16 @@
let
- runCommand' = stdenv: name: env: buildCommand:
+ runCommand' = runLocal: stdenv: name: env: buildCommand:
stdenv.mkDerivation ({
inherit name buildCommand;
passAsFile = [ "buildCommand" ];
- } // env);
+ }
+ // (lib.optionalAttrs runLocal {
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+ })
+ // env);
in
@@ -21,11 +26,27 @@ rec {
* runCommand "name" {envVariable = true;} ''echo hello > $out''
* runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
* runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
+ *
+ * The `*Local` variants force a derivation to be built locally,
+ * it is not substituted.
+ *
+ * This is intended for very cheap commands (<1s execution time).
+ * It saves on the network roundrip and can speed up a build.
+ *
+ * It is the same as adding the special fields
+ * `preferLocalBuild = true;`
+ * `allowSubstitutes = false;`
+ * to a derivation’s attributes.
*/
runCommand = runCommandNoCC;
- runCommandNoCC = runCommand' stdenvNoCC;
- runCommandCC = runCommand' stdenv;
+ runCommandLocal = runCommandNoCCLocal;
+ runCommandNoCC = runCommand' false stdenvNoCC;
+ runCommandNoCCLocal = runCommand' true stdenvNoCC;
+
+ runCommandCC = runCommand' false stdenv;
+ # `runCommandCCLocal` left out on purpose.
+ # We shouldn’t force the user to have a cc in scope.
/* Writes a text file to the nix store.
* The contents of text is added to the file in the store.
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 48ee2713d1f..309241c36de 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -20,8 +20,7 @@ let
'';
in {
- runInWindowsVM = drv: let
- in pkgs.lib.overrideDerivation drv (attrs: let
+ runInWindowsVM = drv: pkgs.lib.overrideDerivation drv (attrs: let
bootstrap = bootstrapper attrs.windowsImage;
in {
requiredSystemFeatures = [ "kvm" ];
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 4403d690a16..4c3459d0f11 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec {
description = "Default typeface used in the user interface of GNOME since version 3.0";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.ofl;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index 2511f05c4ea..9f7b0e478e1 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Generates static DBus bindings for Golang and QML at build-time";
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index 36a1d050cb8..c4082ce454c 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -113,7 +113,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Go-lang bindings for dde-daemon";
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 3d4800a7510..5460a932962 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -37,7 +37,7 @@ mkDerivation rec {
-e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Calendar for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
index 0aaacee2ba4..97e44c6c36e 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -99,7 +99,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Control panel of Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 31451dca91a..b5460029f78 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -121,7 +121,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Daemon for handling Deepin Desktop Environment session settings";
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index afa245eefe9..7b44b69d5b7 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -68,7 +68,7 @@ unwrapped = mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Dock for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
index ba7505b5b2f..62b4da71dd6 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -240,7 +240,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "File manager and desktop module for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
index ca5fa6d0906..f5e5f23cc2c 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -63,7 +63,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Desktop Environment launcher module";
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index 0c8e7e8d137..778481fc651 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -41,7 +41,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin network utils";
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index 533b0a0fdea..7aaddf53872 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "PolicyKit agent for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index cdbefb406ad..ba237bcf755 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt DBus interface library for Deepin software";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index e71262cc8e9..699403567b7 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -113,7 +113,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin desktop-environment - Session UI module";
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index 38ebe664b85..184153a3981 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -51,7 +51,7 @@ mkDerivation rec {
searchHardCodedPaths $modsrc # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin file search tool";
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
index 201316638a8..26f2b99612e 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Easy to use calculator for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index 7ffba88d153..0ca42a88761 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Base assets and definitions for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index 745b2992c5f..579ceb442be 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GSettings deepin desktop-wide schemas";
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index 67fcc36bcef..915cb8c6ac7 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Internationalization utilities";
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 8e2469a2c78..7c10e873209 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin GTK Theme";
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index 51b67e05554..f8258a1d8cd 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Icons for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index bf9d1db2120..aa13eb76055 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -41,7 +41,7 @@ mkDerivation rec {
-e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Image Viewer for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 9aef8a15eb9..b23a7491aaf 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin menu service";
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 0c14ddff178..b3930c8e399 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -58,7 +58,7 @@ mkDerivation rec {
--replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie"
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin movie player";
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 0e0db458aca..374af8be2be 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -48,7 +48,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Easy-to-use screenshot tool for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index 217dbc2b0db..a8d143ff8b0 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Pop-up shortcut viewer for Deepin applications";
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index e61e91fc87c..378945ac1dd 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin sound theme";
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 7a4d0662bbb..049c856419d 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
"-DVERSION=${version}"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Default terminal emulator for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index 299db533674..3aa6003592b 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "A daemon that helps to launch applications faster";
diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
index e822cf6269d..6baee0eda11 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
$out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Wallpapers for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix
index 37140d84191..3ce2adba098 100644
--- a/pkgs/desktops/deepin/disomaster/default.nix
+++ b/pkgs/desktops/deepin/disomaster/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
libdisomaster/libdisomaster.pro
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "A libisoburn wrapper for Qt";
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index 394bdd52b3d..ed01cd92c7c 100644
--- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GNOME keyring extension for dde-polkit-agent";
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 3d9dd33772b..8ae1c6f0952 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -43,7 +43,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin tool kit core library";
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 2e0cfef036a..751fe02562f 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -40,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index 0251f8097d5..ead96fe2533 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -37,7 +37,7 @@ mkDerivation rec {
"LIB_INSTALL_DIR=${outRef}/lib"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index d302cc3417f..0b7c6cfdc91 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GoLang DBus factory for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index d564f2c8875..fed8b6f2c6a 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"GOCACHE=$(TMPDIR)/go-cache"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Convert dbus interfaces to go-lang or qml wrapper code";
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 2f431bd941b..5a10efa1932 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"GOCACHE=$(TMPDIR)/go-cache"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Generate static golang bindings for GObject";
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index f5ed22f2f8e..730412a58f3 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
rm -r $out/share/go/src/pkg.deepin.io/lib/debian
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Go bindings for Deepin Desktop Environment development";
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index b43d74d15c7..38ca4f3b676 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -90,7 +90,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt5 binding of Chromium Embedded Framework";
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index f382e605bac..6b1f212716c 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -43,7 +43,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt platform theme integration plugin for DDE";
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 0ffa3d006bc..5de46f8a1dd 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -40,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt platform theme integration plugins for DDE";
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index 1809f191838..7972d8f9a3f 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "UDisks2 D-Bus interfaces binding for Qt5";
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index db674f4fb7e..adba0b43008 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0xsxm0qgmnljd4s8m6xajzsjp9skpsa8wwlwqmc5yx34diad7zag";
+ sha256 = "18l0kbm778728rksifslnaw2arnpr92sk24nw26k1zvs4prz5i7j";
};
passthru = {
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 52fb926cdc6..73c7e4708d5 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index cdbcb8e1aed..f285e271c62 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 95bbab3cb3e..6872cea4e2a 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0e73f81fbab..8d22c0a674b 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation (rec {
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
# and more generally have a faster linker.
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 1e9b77cfb79..adfde05e658 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
let
- rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83";
+ rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d";
in stdenv.mkDerivation {
pname = "manticore";
- version = "2019.09.20";
+ version = "2019.12.03";
src = fetchFromGitHub {
owner = "ManticoreProject";
repo = "manticore";
- sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz";
+ sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2";
inherit rev;
};
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 4540a301610..987c86ba264 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
# under the 3-clause BSD license. The rest is 2-clause BSD license.
license = with licenses; [ bsd3 bsd2 ];
platforms = platforms.unix;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 3856ced250e..99519c53fcd 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "rgbds";
- version = "0.3.8";
+ version = "0.3.9";
src = fetchFromGitHub {
owner = "rednex";
repo = "rgbds";
rev = "v${version}";
- sha256 = "0db37z886026svhj6qnc3wk56sndbnz1vi41gn2k3bl6ppbnjlpk";
+ sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv";
};
nativeBuildInputs = [ bison flex pkg-config libpng ];
installFlags = "PREFIX=\${out}";
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 89912ac9ad6..a79c9a702c4 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,32 +1,47 @@
{ stdenv, fetchurl }:
let
- version = "110.91";
+ version = "110.95";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
+ isArch64 = stdenv.system == "x86_64-linux";
+
+ arch = if isArch64
+ then "64"
+ else "32";
+
+ boot32 = { url = "${baseurl}/boot.x86-unix.tgz";
+ sha256 = "07bcrvjphyin1ygjbymcqhd1mbfk4hff82wmxcllh77lr28l5dxf"; };
+ boot64 = { url = "${baseurl}/boot.amd64-unix.tgz";
+ sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; };
+
+ bootBinary = if isArch64
+ then boot64
+ else boot32;
+
sources = map fetchurl [
- { url = "${baseurl}/config.tgz"; sha256 = "00vbg2kpwgkf272m697p5hd35pawficbrifchn7dnd519wpdx436"; }
- { url = "${baseurl}/cm.tgz"; sha256 = "0wxb0s2fwh7lbb3z2pfvmvhk5v0gm75kchkv7gg9f895ahyvm6yd"; }
- { url = "${baseurl}/compiler.tgz"; sha256 = "0iq06ycivy562i59vvbma9zi575zw1djhdfkcy0bn7m9kfzzbgkh"; }
- { url = "${baseurl}/runtime.tgz"; sha256 = "0km8p4vmy3m38xv0rl8d3mh2nlk2mvx010npm34gs374bmmzc7z9"; }
- { url = "${baseurl}/system.tgz"; sha256 = "16d5vs1rn7ly6jxjm08222cj0sry73pr57xpc9d6k286b1v0910b"; }
- { url = "${baseurl}/MLRISC.tgz"; sha256 = "1c9sw8zm90ykas5nwbhk2wic7sxkjrylb610x37v46m5ips1wlma"; }
- { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "09ka20ym7ahrpj4r6vc5phflc8y57dj09qvwk8ambfwb2p2274sw"; }
- { url = "${baseurl}/old-basis.tgz"; sha256 = "1bhq9fv6p8diz489h9571g0xrsi8yx7h6gh9410255klxjrw964h"; }
- { url = "${baseurl}/ckit.tgz"; sha256 = "1lq9ljai0shc6hszx5v6bqmkz16a3f295mfg7q622apzgzark3vd"; }
- { url = "${baseurl}/nlffi.tgz"; sha256 = "1xjmlwiclgckj73z5hz3hnqlavp3ax9sfvgc0rvj3xpy3i3n6axj"; }
- { url = "${baseurl}/cml.tgz"; sha256 = "1sjzipxnvr9dgcg16bllfk3b46ac9f8h353nh1ccykwwq4whi9bf"; }
- { url = "${baseurl}/eXene.tgz"; sha256 = "04clbchrlqx5v35gkbydbfnpl720i4nqijkshiwn0v592n4xfdf4"; }
- { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0max073nzwv7vx13caj7zmlhslvxlgg8rj52278g7f6fqcrwp5cf"; }
- { url = "${baseurl}/ml-lex.tgz"; sha256 = "0x2mbg45l71049sgvvkl6bnqc5svz70vh1m1rbf3xk41z5bapcgr"; }
- { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0a1pbwpw1y6d1xn9yjarqpmybrxqwp5snp28by36745h1jvb1p1b"; }
- { url = "${baseurl}/ml-burg.tgz"; sha256 = "119mq5jrbkn9vf9fgb0wyz483hf26al9hwb91xpmlmfx5qqnfzik"; }
- { url = "${baseurl}/pgraph.tgz"; sha256 = "1s7jmh3q88rz29bk02y3gzdqrgvk484j5ji8bn7s6fc78m50nqp8"; }
- { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1gzf1pbmw2cn5w6f5qfdm3d6n6069n1nnzz6z4v7mr07x54c6mdv"; }
- { url = "${baseurl}/heap2asm.tgz"; sha256 = "09cgj568a9x017awysjdx35mlp5zkdmc2fs67fvnm5ifl7ivfs8j"; }
- { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1g4xhcxychs9q25x7a5lvqfamq52c5ljlx84bc5cazvpkhixyg04"; }
- { url = "${baseurl}/doc.tgz"; sha256 = "1l0x91dscizk2pyj1lw595r84h1h0shxh0x5hva891717a1hfa51"; }
- { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0f6x4nfhrgm1z4dx862df2yaffdh1sd6zx2lyb2vph5mhp7x9n58"; }
- { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
+ bootBinary
+ { url = "${baseurl}/config.tgz"; sha256 = "09srqxkxl86iaz6l6dz83c1apsac0pxpfq6b74i6l0nfl261jibw"; }
+ { url = "${baseurl}/cm.tgz"; sha256 = "0gh8inrb07z597axw8qipwyx52m8nac5d5r0rvgzvdnnjg9nr9zy"; }
+ { url = "${baseurl}/compiler.tgz"; sha256 = "1kk6jwzyc261l5nii3n8rwccmgvcj1mg5fgycfsfsiyyy1v8xfx7"; }
+ { url = "${baseurl}/runtime.tgz"; sha256 = "17i069h5cv411sgzx3ynlf4v3wlrxiba9bwy1b0x0cyhs879kppc"; }
+ { url = "${baseurl}/system.tgz"; sha256 = "0s8ij3wfxpjrmrwxrgrirfxjj8vkda6l32j88al5q1ic3ncwc58s"; }
+ { url = "${baseurl}/MLRISC.tgz"; sha256 = "1v2d3gjxrcgc95x5glqcw0nfp13aapkcw03fyi70m3k1yc61izmz"; }
+ { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "04i11ki8v9s7yz3lg6b0djhi03zzkzav0b5cr81ypxlkmf4hh6bp"; }
+ { url = "${baseurl}/old-basis.tgz"; sha256 = "1ryqpy0n7c9gd995ndmjvaci74f95nr8n1jjgm28yd1sn7hnavhi"; }
+ { url = "${baseurl}/ckit.tgz"; sha256 = "18mcs3j8c5gq9cmck7r175am60blaznqmhzyir622yfc8fpw1map"; }
+ { url = "${baseurl}/nlffi.tgz"; sha256 = "16mrl5aqbgsgljxa3z8kj5max9drddml34bq7rn1i78594jfvkwk"; }
+ { url = "${baseurl}/cml.tgz"; sha256 = "00x784nv1pi6534k3vva26i9qx84cvw242vgwbs5020zkm6gvrmn"; }
+ { url = "${baseurl}/eXene.tgz"; sha256 = "143825h36v6z77kwvrvpszgwnhmjs3yldb18i9z4lwkqfb4kn7f7"; }
+ { url = "${baseurl}/ml-lpt.tgz"; sha256 = "17ly9h9ry8r94dx6lkas6w2cxknwkpma4z9pj8rgzmd3w6qm7j1z"; }
+ { url = "${baseurl}/ml-lex.tgz"; sha256 = "1ja3l2kiq17754c58mwdiqi25f7ax0cji2wk0vq4872iwwxc22px"; }
+ { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1m48nkwvw87yg39sjihlw8na5m34bzz3d4zpfbjaj2f75fkjy3jf"; }
+ { url = "${baseurl}/ml-burg.tgz"; sha256 = "13nbvbah7bn8gjm4gi41m412vpl69wd6d3x3wzbb6xpia9vm4z4j"; }
+ { url = "${baseurl}/pgraph.tgz"; sha256 = "1aizkl8avz01kx221xy5z7a1a1b5xqn2hrk66wr8d0iav2nh5c98"; }
+ { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1c80xgck9sb2rm554nfg4f5mpjkdbrwkcx88pj120056225l10vx"; }
+ { url = "${baseurl}/heap2asm.tgz"; sha256 = "1n68drd7as5dy20ccfvgd9cmnhfpfvz7g3f0gc8kpaqaz3vpy36g"; }
+ { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1b6svh2kk5211rq73fdwx3sf80d2rshf0dmkkrq5mw4852nzqz3p"; }
+ { url = "${baseurl}/doc.tgz"; sha256 = "021yzhy9maypq4ahz0d0qpr601spndg583fn9mapv6rl42kwhjq6"; }
+ { url = "${baseurl}/asdl.tgz"; sha256 = "0nqavqcbidwnphbbwjrxhpy8glbyad51wy0cpqimbsw3sgns0zkd"; }
];
in stdenv.mkDerivation {
pname = "smlnj";
@@ -37,6 +52,7 @@ in stdenv.mkDerivation {
patchPhase = ''
sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
+ patch --verbose config/_heap2exec ${./heap2exec.diff}
'';
unpackPhase = ''
@@ -50,7 +66,7 @@ in stdenv.mkDerivation {
'';
buildPhase = ''
- ./config/install.sh
+ ./config/install.sh -default ${arch}
'';
installPhase = ''
@@ -67,7 +83,7 @@ in stdenv.mkDerivation {
description = "Standard ML of New Jersey, a compiler";
homepage = http://smlnj.org;
license = licenses.bsd3;
- platforms = [ "i686-linux" ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ thoughtpolice ];
};
}
diff --git a/pkgs/development/compilers/smlnj/heap2exec.diff b/pkgs/development/compilers/smlnj/heap2exec.diff
new file mode 100644
index 00000000000..ef21a8e7f07
--- /dev/null
+++ b/pkgs/development/compilers/smlnj/heap2exec.diff
@@ -0,0 +1,9 @@
+@@ -35,7 +35,7 @@
+ BIN_DIR=${SMLNJ_HOME}/bin
+ fi
+
+-ARCH_N_OPSYS=`"$BIN_DIR/.arch-n-opsys $SIZE_OPT"`
++ARCH_N_OPSYS=`$BIN_DIR/.arch-n-opsys $SIZE_OPT`
+ if [ "$?" != "0" ]; then
+ die "unable to determine architecture/operating system"
+ fi
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 4778f08560d..a58025c42ac 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -4,7 +4,7 @@
, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
-, libzip, valgrind
+, libzip, valgrind, oniguruma
}:
with lib;
@@ -78,6 +78,7 @@ let
buildInputs = [ ]
++ optional (versionOlder version "7.3") pcre
++ optional (versionAtLeast version "7.3") pcre2
+ ++ optional (versionAtLeast version "7.4") oniguruma
++ optional withSystemd systemd
++ optionals imapSupport [ uwimap openssl pam ]
++ optionals curlSupport [ curl openssl ]
@@ -114,7 +115,8 @@ let
"--with-config-file-scan-dir=/etc/php.d"
]
++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
- ++ optional (versionAtLeast version "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
+ ++ optional (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
+ ++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ optional withSystemd "--with-fpm-systemd"
++ optionals imapSupport [
@@ -133,10 +135,11 @@ let
++ optional mhashSupport "--with-mhash"
++ optional curlSupport "--with-curl=${curl.dev}"
++ optional zlibSupport "--with-zlib=${zlib.dev}"
- ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
+ ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
++ optional (!libxml2Support) [
"--disable-dom"
"--disable-libxml"
+ (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
"--disable-simplexml"
"--disable-xml"
"--disable-xmlreader"
@@ -156,7 +159,12 @@ let
++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
++ optional bcmathSupport "--enable-bcmath"
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
- ++ optionals gdSupport [
+ ++ optionals (gdSupport && versionAtLeast version "7.4") [
+ "--enable-gd"
+ "--with-jpeg=${libjpeg.dev}"
+ "--with-freetype=${freetype.dev}"
+ "--enable-gd-jis-conv"
+ ] ++ optionals (gdSupport && versionOlder version "7.4") [
"--with-gd"
"--with-freetype-dir=${freetype.dev}"
"--with-png-dir=${libpng.dev}"
@@ -173,7 +181,7 @@ let
++ optional xslSupport "--with-xsl=${libxslt.dev}"
++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
++ optional bz2Support "--with-bz2=${bzip2.dev}"
- ++ optional zipSupport "--enable-zip"
+ ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
++ optional ftpSupport "--enable-ftp"
++ optional fpmSupport "--enable-fpm"
++ optional ztsSupport "--enable-maintainer-zts"
@@ -181,7 +189,7 @@ let
++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
++ optional tidySupport "--with-tidy=${html-tidy}"
++ optional argon2Support "--with-password-argon2=${libargon2}"
- ++ optional libzipSupport "--with-libzip=${libzip.dev}"
+ ++ optional (libzipSupport && (versionOlder version "7.4")) "--with-libzip=${libzip.dev}"
++ optional phpdbgSupport "--enable-phpdbg"
++ optional (!phpdbgSupport) "--disable-phpdbg"
++ optional (!cgiSupport) "--disable-cgi"
@@ -268,4 +276,9 @@ in {
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
};
+
+ php74 = generic {
+ version = "7.4.0";
+ sha256 = "1h01bahvcm9kgm5jqhm2j9k9d4q4rpfkkpqk00c47rirdblnn85z";
+ };
}
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 22b4d84f050..bf6050e04bd 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
inherit sha256;
}
)) {
- inherit ;name = "${pname}-${version}";
+ name = "${pname}-${version}";
sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
};
diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
index 6ab7455915c..62856157b4b 100644
--- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
+++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
description = "Sheaves in Agda";
license = stdenv.lib.licenses.cc-by-40;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true; # replaced by constructive-sheaf-semantics
};
})
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
index ac9ce9dd84f..344da00d04f 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -20,7 +20,7 @@ agda.mkDerivation (self: rec {
description = "A monadic parser combinator library which guarantees termination of parsing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
broken = true;
};
})
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix
index 146e44182ed..1bc9d0cb882 100644
--- a/pkgs/development/libraries/agda/agda-base/default.nix
+++ b/pkgs/development/libraries/agda/agda-base/default.nix
@@ -17,7 +17,7 @@ agda.mkDerivation (self: rec {
description = "Base library for HoTT in Agda";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true; # largely replaced by HoTT-Agda
};
})
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index e2d64841985..30a03980e44 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -22,6 +22,6 @@ agda.mkDerivation (self: rec {
description = "Agda standard library developed at Iowa";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
})
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index a57ee6e08ba..bcdad18bede 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -18,6 +18,6 @@ agda.mkDerivation (self: rec {
description = "Programming library for Agda";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ fuuzetsu mudri ];
+ maintainers = with maintainers; [ mudri ];
};
})
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 4d071251ee8..c39dc0f5790 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -24,6 +24,6 @@ agda.mkDerivation (self: rec {
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
broken = stdenv.isDarwin;
- maintainers = with maintainers; [ jwiegley fuuzetsu mudri ];
+ maintainers = with maintainers; [ jwiegley mudri ];
};
})
diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix
index 6306bb89b5c..c09702c48d7 100644
--- a/pkgs/development/libraries/agda/bitvector/default.nix
+++ b/pkgs/development/libraries/agda/bitvector/default.nix
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
description = "Sequences of bits and common operations on them";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true;
};
})
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix
index ea232f2853d..a58afd7e866 100644
--- a/pkgs/development/libraries/agda/categories/default.nix
+++ b/pkgs/development/libraries/agda/categories/default.nix
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
description = "Categories parametrized by morphism equality, in Agda";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true; # doesn't work due to new agdastdlib, see #9471
};
})
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix
index 0e4f1da6e14..ffae1f6f900 100644
--- a/pkgs/development/libraries/agda/pretty/default.nix
+++ b/pkgs/development/libraries/agda/pretty/default.nix
@@ -20,7 +20,7 @@ agda.mkDerivation (self: rec {
description = "Correct-by-Construction Pretty-Printing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
broken = true; # 2018-04-11
};
})
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index c0df404e60e..bf6260ca766 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
homepage = http://enet.bespin.org/;
description = "Simple and robust network communication layer on top of UDP";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 0a9fa64afe3..4af193014bb 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -466,6 +466,6 @@ stdenv.mkDerivation rec {
licenses.lgpl21Plus
);
platforms = platforms.all;
- maintainers = with maintainers; [ codyopel fuuzetsu ];
+ maintainers = with maintainers; [ codyopel ];
};
}
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index ba59b0c16e6..3424493c209 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -218,7 +218,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ codyopel fuuzetsu ];
+ maintainers = with maintainers; [ codyopel ];
inherit branch;
};
}
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index c404a12f3df..30fb94aa248 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/FFMS/ffms2/;
description = "Libav/ffmpeg based source library for easy frame accurate access";
license = licenses.mit;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index e047bdbb648..5d7b95136dd 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A library for reading and writing gif images";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
branch = "5.2";
};
}
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index e7d4c934db8..88b33601ee7 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
homepage = http://glm.g-truc.net/;
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 51e981a2a33..565ef85c1bf 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
description = "A portable high-level Jabber/XMPP library for C++";
homepage = http://camaya.net/gloox;
license = licenses.gpl3;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 26d5e9c88c7..63072273c2e 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
'';
license = with licenses; [ lgpl21Plus gpl3Plus ];
platforms = platforms.unix;
- maintainers = with maintainers; [ fuuzetsu primeos ];
+ maintainers = with maintainers; [ primeos ];
};
}
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 273b5b1e711..2fa76b2e085 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
version = "1.25.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "02nbmbk1xpibjzvbhi8xpazmwry46ki24vks1sh2p0aqwy4hv6yb";
fetchSubmodules = true;
};
+ patches = [
+ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
+ (fetchpatch {
+ url = "https://github.com/grpc/grpc/commit/ffb8a278389c8e3403b23a9897b65a7390c34645.patch";
+ sha256 = "1lc12a3gccg9wxqhnwgldlj3zmlm6lxg8dssvvj1x7hf655kw3w3";
+ })
+ ];
+
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 54b4b001d81..b68c814ad54 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "Word-processor-style highlighting GtkTextView widget";
license = licenses.gpl2Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index a8dcea0059a..f2f8cdcab20 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.all;
license = with licenses; [ gpl2 lgpl21 mpl11 ];
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 11b31d62b5d..87eeac4b4f5 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
homepage = http://www.namesys.com/;
description = "Support library for Reiser4";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index f67b3cee607..2d7edee4041 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://xiph.org/ao/;
license = licenses.gpl2;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index d7fb35897dc..69c236d7220 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -78,6 +78,6 @@ in stdenv.mkDerivation (rec {
license = licenses.lgpl2Plus;
platforms = platforms.all;
- maintainers = [ maintainers.fuuzetsu maintainers.vrthra ];
+ maintainers = [ maintainers.vrthra ];
};
} // genPosixLockObjOnlyAttrs)
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 674862d694c..c6d430e10fc 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
description = "ID3 tag manipulation library";
homepage = http://mad.sourceforge.net/;
license = licenses.gpl2;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index 4c886078aa8..321204a0c4f 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://libmpeg2.sourceforge.net/;
description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 6f59c94a56b..14ae1156087 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = licenses.libpng;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
branch = "1.2";
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 849f7d29ef6..95ef6201346 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -34,6 +34,6 @@ in stdenv.mkDerivation rec {
homepage = http://www.libpng.org/pub/png/libpng.html;
license = licenses.libpng2;
platforms = platforms.all;
- maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
+ maintainers = [ maintainers.vcunat ];
};
}
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
index 460be100b16..2d38d7e5394 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ stdenv, fetchFromGitHub, cmake, ninja
, secureBuild ? true
}:
@@ -6,32 +6,36 @@ let
soext = stdenv.hostPlatform.extensions.sharedLibrary;
in
stdenv.mkDerivation rec {
- name = "mimalloc-${version}";
+ pname = "mimalloc";
version = "1.1.0";
src = fetchFromGitHub {
owner = "microsoft";
- repo = "mimalloc";
+ repo = pname;
rev = "refs/tags/v${version}";
sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ninja ];
enableParallelBuilding = true;
-
cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
postInstall = ''
+ # first, install headers, that's easy
mkdir -p $dev
mv $out/lib/*/include $dev/include
- rm -f $out/lib/libmimalloc*${soext} # weird duplicate
+ # move everything else into place
+ mv $out/lib/mimalloc-1.0/libmimalloc*${soext}.1.0 $out/lib/libmimalloc${soext}
+ mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a
+ mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o
- mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
- mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a
- mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o
-
- rm -rf $out/lib/mimalloc-*
+ # remote duplicate dir. FIXME: try to fix the .cmake file distribution
+ # so we can re-use it for dependencies...
+ rm -rf $out/lib/mimalloc-1.0
+ '' + stdenv.lib.optionalString secureBuild ''
+ # fix a broken symlink for the -secure alias
+ ln -sfv $out/lib/libmimalloc.so $out/lib/libmimalloc-secure.so
'';
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 8a1e1d37c1d..e9041993657 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kkos/oniguruma;
description = "Regular expressions library";
license = licenses.bsd2;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix
index 26f8ca13341..7e89463aad6 100644
--- a/pkgs/development/libraries/protobuf/3.11.nix
+++ b/pkgs/development/libraries/protobuf/3.11.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
- version = "3.11.0";
- sha256 = "1b0kf02aw1yvpwdax3865057dzrlrdc7dgam05znwq8id5q76ckr";
+ version = "3.11.1";
+ sha256 = "1mq8dp94mlp72ri27bgvc2i370r8kfig87wfai7vxjdnh3vng0y1";
}
diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix
index a36e9e0fd0d..f1eb3ae51f3 100644
--- a/pkgs/development/libraries/protolock/default.nix
+++ b/pkgs/development/libraries/protolock/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protolock";
- version = "0.14.1";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "nilslice";
repo = "protolock";
rev = "v${version}";
- sha256 = "0assk7hp9s3m7zm5i1v0pggz00a54yf2w3y0b8mlq5v51y2h8h2z";
+ sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw";
};
- modSha256 = "079hbv0f8k5lljrb1cr9568wq8sb9yry9smgbrji19yavd9fzcmh";
+ modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg";
postInstall = ''
rm $out/bin/plugin*
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index ae5d016c99f..bb535b8a0c0 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -5,11 +5,11 @@ Subject: [PATCH 01/12] qtbase-mkspecs-mac
---
mkspecs/common/mac.conf | 2 +-
- mkspecs/features/mac/default_post.prf | 201 --------------------------
- mkspecs/features/mac/default_pre.prf | 58 --------
- mkspecs/features/mac/sdk.mk | 25 ----
- mkspecs/features/mac/sdk.prf | 61 --------
- 5 files changed, 1 insertion(+), 346 deletions(-)
+ mkspecs/features/mac/default_post.prf | 202 ----------------------------------
+ mkspecs/features/mac/default_pre.prf | 58 ----------
+ mkspecs/features/mac/sdk.mk | 25 -----
+ mkspecs/features/mac/sdk.prf | 61 ----------
+ 5 files changed, 1 insertion(+), 347 deletions(-)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec9b..470c38e772 100644
@@ -25,10 +25,10 @@ index b77494ec9b..470c38e772 100644
QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 26bd3e2e98..b80ec1e801 100644
+index 993f4d56a9..b80ec1e801 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
-@@ -68,207 +68,6 @@ qt {
+@@ -68,208 +68,6 @@ qt {
}
}
@@ -61,21 +61,22 @@ index 26bd3e2e98..b80ec1e801 100644
- qmake_pkginfo_typeinfo.value = "????"
- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo
-
-- !isEmpty(VERSION) {
-- l = $$split(VERSION, '.') 0 0 # make sure there are at least three
-- VER_MAJ = $$member(l, 0, 0)
-- VER_MIN = $$member(l, 1, 1)
-- VER_PAT = $$member(l, 2, 2)
-- unset(l)
+- bundle_version = $$VERSION
+- isEmpty(bundle_version): bundle_version = 1.0.0
-
-- qmake_full_version.name = QMAKE_FULL_VERSION
-- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
-- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
+- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three
+- VER_MAJ = $$member(l, 0, 0)
+- VER_MIN = $$member(l, 1, 1)
+- VER_PAT = $$member(l, 2, 2)
+- unset(l)
-
-- qmake_short_version.name = QMAKE_SHORT_VERSION
-- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
-- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
-- }
+- qmake_full_version.name = QMAKE_FULL_VERSION
+- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
+-
+- qmake_short_version.name = QMAKE_SHORT_VERSION
+- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
+- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
-
- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
- debug_information_format.name = DEBUG_INFORMATION_FORMAT
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index d4333146406..69ccbfc26b4 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
A C++ library for Quadratic Programming which implements the
Goldfarb-Idnani active-set dual method.
'';
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 224f4239a22..15aea5803bf 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
description = ''
Google's software suite for combinatorial optimization.
'';
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index f868f6bd494..d1cafbce117 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "A multi-platform programmer's library designed to allow a developer to create robust software";
homepage = http://www.jedsoft.org/slang/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 57c3ae40fd9..3e4d64c47ad 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (rec {
homepage = http://cmusphinx.sourceforge.net;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
} // (stdenv.lib.optionalAttrs multipleOutputs {
diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
new file mode 100644
index 00000000000..893b667f836
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchurl, buildDunePackage, alcotest, fmt }:
+
+buildDunePackage rec {
+ pname = "metrics";
+ version = "0.1.0";
+
+ minimumOCamlVersion = "4.04";
+
+ src = fetchurl {
+ url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
+ sha256 = "0jy88anrx3rh19046rrbrjmx922zvz3wlqkk8asilqv9pbvpnp1a";
+ };
+
+ propagatedBuildInputs = [ fmt ];
+
+ checkInputs = lib.optional doCheck alcotest;
+
+ doCheck = true;
+
+ meta = {
+ description = "Metrics infrastructure for OCaml";
+ homepage = "https://github.com/mirage/metrics";
+ license = lib.licenses.isc;
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/pkgs/development/ocaml-modules/metrics/lwt.nix
new file mode 100644
index 00000000000..47b91e430c6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/lwt.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, ocaml_lwt, metrics }:
+
+buildDunePackage {
+ pname = "metrics-lwt";
+
+ inherit (metrics) version src;
+
+ propagatedBuildInputs = [ ocaml_lwt metrics ];
+
+ meta = metrics.meta // {
+ description = "Lwt backend for the Metrics library";
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix
new file mode 100644
index 00000000000..45a92f10803
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -0,0 +1,19 @@
+{ lib, buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
+
+buildDunePackage rec {
+
+ pname = "metrics-unix";
+
+ inherit (metrics) version src;
+
+ propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
+
+ checkInputs = lib.optional doCheck metrics-lwt;
+
+ doCheck = true;
+
+ meta = metrics.meta // {
+ description = "Unix backend for the Metrics library";
+ };
+
+}
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index 52ba0346159..9585004a89a 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -1,18 +1,26 @@
-{ stdenv, lib
-, buildPythonPackage, fetchPypi, isPy3k
-, filelock, protobuf, numpy, pytest, mock
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, filelock, protobuf, numpy, pytest, mock, typing-extensions
, cupy, cudaSupport ? false
}:
buildPythonPackage rec {
pname = "chainer";
- version = "6.4.0";
+ version = "6.5.0";
+ disabled = !isPy3k; # python2.7 abandoned upstream
- src = fetchPypi {
- inherit pname version;
- sha256 = "dacbcaa361cebdfbf6f212d138570333611b8f5de553093b1752c578b022a774";
+ # no tests in Pypi tarball
+ src = fetchFromGitHub {
+ owner = "chainer";
+ repo = "chainer";
+ rev = "v${version}";
+ sha256 = "0ha9fbl6sa3fbnsz3y1pg335iiskdbxw838m5j06zgzy156zna1x";
};
+ # remove on 7.0 or 6.6 release
+ postPatch = ''
+ sed -i '/typing/d' setup.py
+ '';
+
checkInputs = [
pytest
mock
@@ -22,12 +30,15 @@ buildPythonPackage rec {
filelock
protobuf
numpy
+ typing-extensions
] ++ lib.optionals cudaSupport [ cupy ];
- # In python3, test was failed...
- doCheck = !isPy3k;
+ # avoid gpu tests
+ checkPhase = ''
+ pytest tests/chainer_tests/utils_tests -k 'not gpu and not cupy'
+ '';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A flexible framework of neural networks for deep learning";
homepage = https://chainer.org/;
license = licenses.mit;
diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix
index aaf93be8b97..22204bf5ff0 100644
--- a/pkgs/development/python-modules/django/2_2.nix
+++ b/pkgs/development/python-modules/django/2_2.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.2.7";
+ version = "2.2.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86";
+ sha256 = "183wmqgkspb9vk1dc42h5s2h31gjpw68vv6ywbvpljvakiplzbd4";
};
patches = stdenv.lib.optional withGdal
diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix
new file mode 100644
index 00000000000..051b83d1c3d
--- /dev/null
+++ b/pkgs/development/python-modules/flask-httpauth/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, flask }:
+
+buildPythonPackage rec {
+ pname = "Flask-HTTPAuth";
+ version = "3.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1fb1kr1iw6inkwfv160rpjx54vv1q9b90psdyyghyy1f6dhvgy3f";
+ };
+
+ propagatedBuildInputs = [ flask ];
+
+ meta = with lib; {
+ description = "Extension that provides HTTP authentication for Flask routes";
+ homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth";
+ license = licenses.mit;
+ maintainers = with maintainers; [ geistesk ];
+ };
+}
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
index 7bf8b13cd0f..f5a9341e2cc 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -1,8 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, requests
+, protobuf
+, pycryptodome
+}:
buildPythonPackage rec {
version = "0.4.4";
pname = "gpapi";
+ disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3
src = fetchPypi {
inherit version pname;
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index 0c7fa8db01c..2edb41571d9 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "gplaycli";
- version = "3.25";
+ version = "3.26";
src = fetchFromGitHub {
owner = "matlink";
repo = "gplaycli";
rev = version;
- sha256 = "1rygx5cg4b1vwpkiaq6jcpbc1ly7cspslv3sy7x8n8ba61ryq6h4";
+ sha256 = "188237d40q35dp5xs7hg4ybhvsyxi0bsqx5dk4ws9007n596in5f";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix
index a316edaf80a..fb8f74d7219 100644
--- a/pkgs/development/python-modules/livestreamer/default.nix
+++ b/pkgs/development/python-modules/livestreamer/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
services and pipes them into a video player of choice.
'';
license = licenses.bsd2;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
new file mode 100644
index 00000000000..e215feac44f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, execnet
+, glob2
+, Mako
+, mock
+, parse
+, parse-type
+, py
+, pytest
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-bdd";
+ version = "3.2.1";
+
+ # tests are not included in pypi tarball
+ src = fetchFromGitHub {
+ owner = "pytest-dev";
+ repo = pname;
+ rev = version;
+ sha256 = "02y28l5h1m9grj54p681qvv7nrhd7ly9jkqdchyw4p0lnmcmnsrd";
+ };
+
+ propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ];
+
+ # Tests require extra dependencies
+ checkInputs = [ execnet mock pytest ];
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with stdenv.lib; {
+ description = "BDD library for the py.test runner";
+ homepage = https://github.com/pytest-dev/pytest-bdd;
+ license = licenses.mit;
+ maintainers = with maintainers; [ jm2dev ];
+ };
+}
diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix
new file mode 100644
index 00000000000..5895be0208b
--- /dev/null
+++ b/pkgs/development/tools/analysis/nix-linter/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, parallel-io
+, fixplate
+, pandoc
+, tasty
+, tasty-hunit
+, tasty-th
+, streamly
+, mtl
+, path-io
+, path
+, pretty-terminal
+, text
+, base
+, aeson
+, cmdargs
+, containers
+, hnix
+, bytestring
+}:
+
+mkDerivation rec {
+ pname = "nix-linter-unstable";
+ version = "2019-04-26";
+
+ src = fetchFromGitHub {
+ owner = "Synthetica9";
+ repo = "nix-linter";
+ rev = "4aaf60195cd2d9f9e2345fbdf4aac48e1451292c";
+ sha256 = "0c7rcjaxd8z0grwambsw46snv7cg66h3pszw3549z4xz0i60yq87";
+ };
+
+ isLibrary = false;
+ isExecutable = true;
+ libraryHaskellDepends = [ parallel-io fixplate pandoc ];
+ executableHaskellDepends = [ streamly mtl path-io path pretty-terminal text base aeson cmdargs containers hnix bytestring ];
+ testHaskellDepends = [ tasty tasty-hunit tasty-th ];
+
+ description = "Linter for Nix(pkgs), based on hnix";
+ homepage = "https://github.com/Synthetica9/nix-linter";
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.marsam ];
+}
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 74a4ff4a3da..aef94073219 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -19,6 +19,8 @@
, enableNixHacks ? false
, gcc-unwrapped
, autoPatchelfHook
+, file
+, substituteAll
}:
let
@@ -91,7 +93,7 @@ let
# ],
# )
#
- [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
+ [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ];
# Java toolchain used for the build and tests
javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
@@ -145,6 +147,17 @@ stdenv.mkDerivation rec {
# This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string.
./trim-last-argument-to-gcc-if-empty.patch
+
+ # --experimental_strict_action_env (which may one day become the default
+ # see bazelbuild/bazel#2574) hardcodes the default
+ # action environment to a non hermetic value (e.g. "/usr/local/bin").
+ # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
+ # So we are replacing this bazel paths by defaultShellPath,
+ # improving hermeticity and making it work in nixos.
+ (substituteAll {
+ src = ./strict_action_env.patch;
+ strictActionEnvPatch = defaultShellPath;
+ })
] ++ lib.optional enableNixHacks ./nix-hacks.patch;
@@ -390,14 +403,6 @@ stdenv.mkDerivation rec {
-e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
-i scripts/bootstrap/compile.sh
- # --experimental_strict_action_env (which will soon become the
- # default, see bazelbuild/bazel#2574) hardcodes the default
- # action environment to a value that on NixOS at least is bogus.
- # So we hardcode it to something useful.
- substituteInPlace \
- src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
- --replace /bin:/usr/bin ${defaultShellPath}
-
# This is necessary to avoid:
# "error: no visible @interface for 'NSDictionary' declares the selector
# 'initWithContentsOfURL:error:'"
diff --git a/pkgs/development/tools/build-managers/bazel/strict_action_env.patch b/pkgs/development/tools/build-managers/bazel/strict_action_env.patch
new file mode 100644
index 00000000000..1402c20f6bd
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/strict_action_env.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+index a70b5559bc..10bdffe961 100644
+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+@@ -466,7 +466,7 @@ public class BazelRuleClassProvider {
+ // Note that --action_env does not propagate to the host config, so it is not a viable
+ // workaround when a genrule is itself built in the host config (e.g. nested genrules). See
+ // #8536.
+- return "/bin:/usr/bin:/usr/local/bin";
++ return "@strictActionEnvPatch@";
+ }
+
+ String newPath = "";
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 17dbcc7ff1f..ae35170cd19 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,24 +2,22 @@
buildGoModule rec {
pname = "conftest";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "instrumenta";
repo = "conftest";
rev = "v${version}";
- sha256 = "0fjz6ad8rnznlp1kiyb3c6anhjs6v6acgziw4hmyz0xva4jnspsh";
+ sha256 = "0lb644fj80r4igxbslbd5pksirnyf6slz4yn0mznyx8i2bd1g4ic";
};
- modSha256 = "1xwqlqx5794hsi14h5gqg69gjcqcma24ha0fxn0vffqgqs2cz1d1";
+ modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn";
buildFlagsArray = ''
-ldflags=
-X main.version=${version}
'';
- subPackages = [ "cmd" ];
-
meta = with lib; {
description = "Write tests against structured configuration data";
homepage = https://github.com/instrumenta/conftest;
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index edad5d6276b..2aead3940ad 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -4,8 +4,8 @@ buildGoPackage rec {
pname = "doctl";
version = "${major}.${minor}.${patch}";
major = "1";
- minor = "31";
- patch = "2";
+ minor = "35";
+ patch = "0";
goPackagePath = "github.com/digitalocean/doctl";
excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -21,7 +21,7 @@ buildGoPackage rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "1q71kfjiav8xfw1bb3dziik1d0jr84hl83d3sx3cak0nd9nmakgs";
+ sha256 = "1blg4xd01vvr8smpii60jlk7rg1cg64115azixw9q022f7cnfiyw";
};
meta = {
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index b02ae3c544f..e856c1f718a 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Tool that aims at generating automatically execution trace from HPC programs";
license = stdenv.lib.licenses.cecill-b;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index e5b23f14517..a7d9057d9f0 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,9 +4,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
- version = "2.2.5";
+ version = "2.2.6";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
- sha256 = "0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1";
+ sha256 = "0nssq2i4riif0q72h5qp7dlxd4shqcyvm1bx9adppcacb77gpnhv";
deps = bundlerEnv rec {
name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index ad3422d8b59..f9aebbe6996 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -10,6 +10,8 @@
version = "1.0.1";
};
builder = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
@@ -19,6 +21,8 @@
};
childprocess = {
dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv";
@@ -36,14 +40,6 @@
};
version = "1.1.5";
};
- diff-lcs = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
- type = "gem";
- };
- version = "1.3";
- };
domain_name = {
dependencies = ["unf"];
groups = ["default"];
@@ -56,6 +52,8 @@
version = "0.5.20190701";
};
ed25519 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
@@ -63,7 +61,19 @@
};
version = "1.2.4";
};
+ erubi = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+ type = "gem";
+ };
+ version = "1.9.0";
+ };
erubis = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
@@ -94,6 +104,8 @@
};
gyoku = {
dependencies = ["builder"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
@@ -102,6 +114,8 @@
version = "1.3.1";
};
hashicorp-checkpoint = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd";
@@ -111,6 +125,8 @@
};
http-cookie = {
dependencies = ["domain_name"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
@@ -119,6 +135,8 @@
version = "1.0.3";
};
httpclient = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@@ -128,6 +146,8 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7";
@@ -137,6 +157,8 @@
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
@@ -145,6 +167,8 @@
version = "3.1.5";
};
little-plugger = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
@@ -153,6 +177,8 @@
version = "1.1.4";
};
log4r = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv";
@@ -162,6 +188,8 @@
};
logging = {
dependencies = ["little-plugger" "multi_json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
@@ -171,33 +199,39 @@
};
mime-types = {
dependencies = ["mime-types-data"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+ sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
type = "gem";
};
- version = "3.2.2";
+ version = "3.3";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+ sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
type = "gem";
};
- version = "3.2019.0331";
+ version = "3.2019.1009";
};
multi_json = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
type = "gem";
};
- version = "1.13.1";
+ version = "1.14.1";
};
net-scp = {
dependencies = ["net-ssh"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
@@ -207,6 +241,8 @@
};
net-sftp = {
dependencies = ["net-ssh"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
@@ -215,6 +251,8 @@
version = "2.1.2";
};
net-ssh = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n";
@@ -223,6 +261,8 @@
version = "5.1.0";
};
netrc = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
@@ -231,6 +271,8 @@
version = "0.11.0";
};
nori = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
@@ -239,6 +281,8 @@
version = "2.6.0";
};
rb-fsevent = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
@@ -248,6 +292,8 @@
};
rb-inotify = {
dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
@@ -257,6 +303,8 @@
};
rb-kqueue = {
dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14mhzrhs2j43vj36i1qq4z29nd860shrslfik015f4kf1jiaqcrw";
@@ -266,6 +314,8 @@
};
rest-client = {
dependencies = ["http-cookie" "mime-types" "netrc"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
@@ -273,51 +323,9 @@
};
version = "2.0.2";
};
- rspec = {
- dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
- type = "gem";
- };
- version = "3.5.0";
- };
- rspec-core = {
- dependencies = ["rspec-support"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i";
- type = "gem";
- };
- version = "3.5.4";
- };
- rspec-expectations = {
- dependencies = ["diff-lcs" "rspec-support"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
- type = "gem";
- };
- version = "3.5.0";
- };
- rspec-mocks = {
- dependencies = ["diff-lcs" "rspec-support"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
- type = "gem";
- };
- version = "3.5.0";
- };
- rspec-support = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
- type = "gem";
- };
- version = "3.5.0";
- };
ruby_dep = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v0qznxz999lx4vs76mr590r90i0cm5m76wwvgis7sq4y21l308l";
@@ -326,6 +334,8 @@
version = "1.3.1";
};
rubyntlm = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
@@ -338,21 +348,15 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
+ sha256 = "0i5dhyiavmk2yc7xyfwzp3m476f7d9mhigibsw37jqpdq4vmi4cv";
type = "gem";
};
- version = "1.2.3";
- };
- thor = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
- type = "gem";
- };
- version = "0.18.1";
+ version = "1.2.4";
};
unf = {
dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -370,27 +374,20 @@
};
version = "0.0.7.6";
};
- vagrant-spec = {
- dependencies = ["childprocess" "log4r" "rspec" "thor"];
- source = {
- fetchSubmodules = false;
- rev = "abfc34474d122235d56e4c6b6fb5d3e35bedfa90";
- sha256 = "08xy2c82lrxkwjlvrbx1v32968a6psni3952y3knriqgygv2kzbn";
- type = "git";
- url = "https://github.com/hashicorp/vagrant-spec.git";
- };
- version = "0.0.1";
- };
vagrant_cloud = {
dependencies = ["rest-client"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0451x3ab869hbycffcq656dm7mmjwmnxcyhv6g7dpdv3acg64783";
+ sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs";
type = "gem";
};
- version = "2.0.2";
+ version = "2.0.3";
};
wdm = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18";
@@ -399,32 +396,36 @@
version = "0.1.1";
};
winrm = {
- dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
+ dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2";
+ sha256 = "1sl14qdshkmficdsy9z57xmdp5z9riv7jc5lv005n0h04mg7d47b";
type = "gem";
};
- version = "2.3.2";
+ version = "2.3.3";
};
winrm-elevated = {
- dependencies = ["winrm" "winrm-fs"];
+ dependencies = ["erubi" "winrm" "winrm-fs"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1saqc3ffh075y6fdkc7iqmn0v3pnidvfw0sh09w9cn6jvpsdxizk";
+ sha256 = "13d0pjzffbqicg08fsx4dsl6ibsqda5vx5d9f6hsds2z6mdilrab";
type = "gem";
};
- version = "1.1.1";
+ version = "1.1.2";
};
winrm-fs = {
- dependencies = ["erubis" "logging" "rubyzip" "winrm"];
+ dependencies = ["erubi" "logging" "rubyzip" "winrm"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3";
+ sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6";
type = "gem";
};
- version = "1.3.2";
+ version = "1.3.3";
};
}
\ No newline at end of file
diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index ee5d384f200..f5e9952233b 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,8 +5,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "13.2.0";
- sha256 = "0r0bbwnp77njhdmby7cs2g6yxfprri684s8h3gqq95ks7vgwgvhx";
+ version = "13.3.0";
+ sha256 = "0j36jf0ybq470w91kzg28bcmxlml7ccl4swwklb6x1ibkz697np7";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
}
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index 63a527005f7..c7c618c0c18 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://sourceforge.net/projects/extremetuxracer/;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 8eceea06243..2db49165c5f 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
'';
homepage = https://supertuxkart.net/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ pyrolagus fuuzetsu peterhoeg ];
+ maintainers = with maintainers; [ pyrolagus peterhoeg ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 4033835e3f9..1482b58a7b0 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
homepage = http://tibia.com;
license = stdenv.lib.licenses.unfree;
platforms = ["i686-linux"];
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index 1ed279d2998..8ca83c2c93d 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
homepage = https://pingus.seul.org/~grumbel/xboxdrv/;
description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace";
license = licenses.gpl3Plus;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
platforms = platforms.linux;
};
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index 3cb0f787ce7..74e35379137 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = "Atari ST/STE/TT/Falcon emulator";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 1e75230a139..98ea02cd897 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -39,7 +39,7 @@ mkDerivation rec {
homepage = https://www.ppsspp.org/;
description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ fuuzetsu AndersonTorres ];
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
};
}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 77ad13c2c00..c3f283fb160 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,11 +61,11 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2019-11-27";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "d8195e9276c27caabf173a268450a3420b53181a";
+ rev = "5f84325cd811ec179b7f3642652438c6a45b174d";
sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2";
};
};
@@ -204,23 +204,23 @@ let
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar-vim";
- version = "2019-11-29";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
- rev = "ff2149d6f022ffdd51c1fa5dbf9b653800f2298b";
- sha256 = "1396p6hvv9dyi91n9y7h5ik4l44xfr9xqhah0mbcg4v7dghrdsdx";
+ rev = "335e67e32865259c8a1f27a08fd1260a8cb1897b";
+ sha256 = "1n35sf4v1piww31kqzg88s4xb5gdsxqgjvfmlif16na1kdvyjwd5";
};
};
camelcasemotion = buildVimPluginFrom2Nix {
pname = "camelcasemotion";
- version = "2019-06-28";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "bkad";
repo = "camelcasemotion";
- rev = "406368dea50303884aa321d2cdff714e010f951e";
- sha256 = "0a1grafg05cb9mpk69j2y433ifm27ksy29wzlxlm5798dmb473mw";
+ rev = "de439d7c06cffd0839a29045a103fe4b44b15cdc";
+ sha256 = "0yfsb0d9ly8abmc95nqcmr8r8ylif80zdjppib7g1qj1wapdhc69";
};
};
@@ -303,12 +303,12 @@ let
coc-emmet = buildVimPluginFrom2Nix {
pname = "coc-emmet";
- version = "2019-08-22";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-emmet";
- rev = "0fd6e93dcab3507240962a480b42e08e818d1fa9";
- sha256 = "196cvnynkm34sa90gznp81l2l3wl2sxfishqzwr8xxlk2cdcshxn";
+ rev = "1e65237f65b94bd5f9376023f557a26c14c9d35a";
+ sha256 = "16f3gdnprxw939zwdy7lzksj1qwlwfs174vk0nzf1d8yb04a7y2g";
};
};
@@ -435,23 +435,23 @@ let
coc-pairs = buildVimPluginFrom2Nix {
pname = "coc-pairs";
- version = "2019-09-10";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-pairs";
- rev = "26b1be159c2f24d74c6f175e91b6a8fbd3868e9a";
- sha256 = "16g2wz87l1pskn6ri71sdm1j5r4h8z1vjdg3ksqs6mz9x2vzy2zz";
+ rev = "97a757cadecabd5a1bf0ed0eb831535d7011ecbd";
+ sha256 = "0ygsiplb4slw7vf72njiy3cxslflnihr3qfi9i802dc9p02w4sl8";
};
};
coc-prettier = buildVimPluginFrom2Nix {
pname = "coc-prettier";
- version = "2019-11-28";
+ version = "2019-11-29";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-prettier";
- rev = "5304a1087e454bb9da7d58e383837f4c3e356e6a";
- sha256 = "1vbyr1cxckdgxns86aknckhgqzp8x0kkk77y0c8my1qinhrmj8cl";
+ rev = "f2c5959b0e8a5658017c9dcb57f03d86c3a7c484";
+ sha256 = "1c2vvjvji5wkmxlm5mi5q4px2x9fslkqsw4vii3kjc7cz2w4fnhk";
};
};
@@ -655,12 +655,12 @@ let
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2019-08-02";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "02a22d27e1c4671db32b0ded1fa2bb861c16d14c";
- sha256 = "0aj9lnrd0v4296c8rwy4bp73dah0lx298yi6ybz3rma2gx9xss6c";
+ rev = "9bdc2e1585419640129a48c646bbf8459f96951b";
+ sha256 = "0iim0lhib6fiainyb48ibl2qzgv8cmn9yinmd1k6i2y5y26wlhfy";
fetchSubmodules = true;
};
};
@@ -788,12 +788,12 @@ let
dart-vim-plugin = buildVimPluginFrom2Nix {
pname = "dart-vim-plugin";
- version = "2019-11-28";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "dart-lang";
repo = "dart-vim-plugin";
- rev = "1dca4e12299e26bf4277992fd9b8b22bcc2f4e56";
- sha256 = "11zjcp48c7n13pqmwg1s6fk8i0z2iyv5nmyl642xxdyg0h43v5hf";
+ rev = "917d0fe8670a5f3fcbd3ac12fbe5c10c8390ebd0";
+ sha256 = "17fhq8vinmb0fxlyj45d2yyj39wapfy4cb4smmzzvx5hyhz3kj4x";
};
};
@@ -843,12 +843,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2019-11-27";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "41aa8302dc5ae8b27370bfcbf1124559c2f953de";
- sha256 = "1bbnz9d8qayrr40kxikcgjv28y109b0ksys9pnb27l9az8sx64bz";
+ rev = "31591499e27176c04b1605878755a121a0ff6fb6";
+ sha256 = "0sf0a1wabq2f566nrwyapmz88m2bi2irprj5cyxlmlfypmgd4dhk";
};
};
@@ -899,12 +899,12 @@ let
deoplete-go = buildVimPluginFrom2Nix {
pname = "deoplete-go";
- version = "2019-11-10";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "zchee";
repo = "deoplete-go";
- rev = "b82273104b3383ce8fc239243007865f308034ca";
- sha256 = "1mnx20paalb4aa1h79fp3q99djcj4qkswkdl1qvzkpj1wxdqwxix";
+ rev = "45ab448ad0bdd19a6f13ce691a5ce3c0c381ee9e";
+ sha256 = "132wkvh62zhpiv37576k0a8akm90x40dq0sr7rc9q24cq5lym7rx";
fetchSubmodules = true;
};
};
@@ -934,12 +934,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
- version = "2019-11-25";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
- rev = "37a307b1b4e922df0ff2695658602f1c34973db6";
- sha256 = "10rdk35bljzi705b2760n7f4hlsikaz366a62wsh09npbw63sdzb";
+ rev = "dbac6111ae250e845070075f63a3d81fd6320815";
+ sha256 = "1p55jk21l6qd16vh0yh0zilxqz8dpksis1w7ildjwhd5f8b8ach0";
};
};
@@ -978,12 +978,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2019-11-26";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "41ab306416a951be661622d7b0d174fe74f84f7e";
- sha256 = "0sa6bzywlnpw4hrgnls0cs90ilykrbf9jblbq811di9d7rvn52zn";
+ rev = "f478a7b587dc2cb676fa1845d517aa0e7ccb8867";
+ sha256 = "1wh6s18sn8rpc51zfn8yhz8fzkyz50b9h8k9limrqvlm538c72ys";
};
};
@@ -1609,12 +1609,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2019-11-25";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "a150fd6af763f9ec1d0785f8a3ba350d8f27d908";
- sha256 = "0l70gkzv279sv756yng7nq3m1pkw2bvjybl6xvjifm19rx8vmlsg";
+ rev = "83a7693d7d078163d7959b279981aa59922452bd";
+ sha256 = "1ks32izmibrkrsxnqc2ds961l5f3s06avr2vfp0q7433hbzm68hl";
};
};
@@ -1708,12 +1708,12 @@ let
ncm2 = buildVimPluginFrom2Nix {
pname = "ncm2";
- version = "2019-07-29";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "ncm2";
repo = "ncm2";
- rev = "160e2e33d515f67154840844d8304722b679df90";
- sha256 = "1jyssh84n3rv8lmmjligf5f6jjzmgjv1gc78fv5x2z79j9cg98jc";
+ rev = "a6ab1a4d17a295dae5446382a45c9ea3b2936f1e";
+ sha256 = "1abxy7p0b6y2zvi7lmdhgkyl1ws281n3dsfk15lkg9j0sk51j06l";
};
};
@@ -1840,12 +1840,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2019-11-17";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "33f7dfb231382998df77cf9fc8cef39778ec9449";
- sha256 = "1784p1lbhndpa7nr9771jx6kbmfnfx9bvrrmin9hxskffs8vr1k5";
+ rev = "b4f7ad5ebb759f56c598527ab671aecace114ed5";
+ sha256 = "0xq0vxq86am6xj4sxsnj131d54fds532pikabzsz2l8gnikb4b2r";
};
};
@@ -2401,12 +2401,12 @@ let
semshi = buildVimPluginFrom2Nix {
pname = "semshi";
- version = "2019-11-27";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "numirias";
repo = "semshi";
- rev = "816b8d22adf59260f4355aab31c1cdc99db8f438";
- sha256 = "01s46f0gclbz3v73z75zmcy7xh9xvzjn067xiyhbf7m6jlzic0aq";
+ rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279";
+ sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx";
};
};
@@ -2674,6 +2674,17 @@ let
};
};
+ thesaurus_query-vim = buildVimPluginFrom2Nix {
+ pname = "thesaurus_query-vim";
+ version = "2019-11-09";
+ src = fetchFromGitHub {
+ owner = "ron89";
+ repo = "thesaurus_query.vim";
+ rev = "830a20ec77780ebfe8d2a7e8c740ca4abb079f89";
+ sha256 = "0kfqpjwashwf084cbz6dmhirk42a4n8d1zj17i086by17nx7qn1g";
+ };
+ };
+
thumbnail-vim = buildVimPluginFrom2Nix {
pname = "thumbnail-vim";
version = "2017-04-24";
@@ -3084,23 +3095,23 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2019-11-29";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "ce932f3825f59258f814d4b66174283875348a95";
- sha256 = "0mwvmxy5x03crp7nkbnjl9h6gmjwlhwiw8i62x95nl8yf5zi8gdl";
+ rev = "2daef1bcb8b240c303ef34c3348ee1af071963b4";
+ sha256 = "1q806acihhv4yshd8pna7gs383yxs7mw2rnqm4c016sqhb20ba1i";
};
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
- version = "2019-11-27";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
- rev = "f4ba787e9c5455a6a88c6d04e61b189826375763";
- sha256 = "1w15r4c7qwlbjjc5mbdcmg4qv4skw9n5qcn543zmiws8hxfqhf6m";
+ rev = "fe89bb50a15492c76a9fc55e0cff410f3d5f8b0f";
+ sha256 = "01qplr1md3vzwrd7as2dkm8f4qvx4qcpgaw3q9i7s2i4yv80qnn8";
};
};
@@ -3689,12 +3700,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-11-27";
+ version = "2019-11-30";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "67efbf66e0fcfd25e617d22892a7e9768bfd0f92";
- sha256 = "0ga8qi26yfc3k5ynw75ai4a9605s8x2pk9i9vb79hddciwh02ia1";
+ rev = "671a85dabaed7e21aa7e435adfdad9b9461cb7d8";
+ sha256 = "1k5qhdfnj84m8v3c2hm3ddqrdh2l3fs8hzk36qb83cjil24iz53w";
};
};
@@ -3733,12 +3744,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2019-11-25";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "c31581c25b4896ccb6418137c70a3a3c37326c89";
- sha256 = "1drjj5d50s3hsd8sh4cvh8ah785chi5fyzq5cy01vpxf8cfghljg";
+ rev = "1c53af9a0d3b622af5a62d69ddfc141c841a28c1";
+ sha256 = "0269cjkcx4arq7phyqv80ziafg5p1in5ci7207svixbfdg5hlmfs";
};
};
@@ -3766,12 +3777,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-11-20";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "d4a9cc72469927202fadf14600253a35240c993e";
- sha256 = "061qzzldh796lagnk1blpkvx5f55rc8h7vgzgffxg9dhc73my5a3";
+ rev = "d27aa72b206363ef5a2415c3eddbab6fbbcbd2c1";
+ sha256 = "04p30ljbpz51hjf61nc3ixgvbndk9nzhck60bhd79js3s7sd35qn";
};
};
@@ -4337,14 +4348,25 @@ let
};
};
+ vim-move = buildVimPluginFrom2Nix {
+ pname = "vim-move";
+ version = "2019-11-23";
+ src = fetchFromGitHub {
+ owner = "matze";
+ repo = "vim-move";
+ rev = "58049562efb0e6e077416d897b760c4dc9bb25c4";
+ sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq";
+ };
+ };
+
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
- version = "2019-11-17";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
- rev = "8964f852a5990c79c55571aef8d137a5e90c9e7c";
- sha256 = "08mixa8frla5djcmka9sard4bzwjcrs3pb68si75mmrv9i9n0pd8";
+ rev = "92f0206dae54439bec6503c649263e38167011a9";
+ sha256 = "1ygsb16ha7kxns1f1km7j3br9c0ylf8pan5z46bnmixcbvia53gb";
};
};
@@ -4493,12 +4515,12 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2019-11-22";
+ version = "2019-12-03";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "524d05885d0fdd176d3da06fd2befff9a22353e2";
- sha256 = "1ngsqyjcsav3k2dcr4anhdm5ycnlfiwykqx3v15ds3j2prsn9hkd";
+ rev = "10d5ac88f4f6e98268b0fe999fd93bbf4cf6d778";
+ sha256 = "13i2lhzsvwr7qbq53xjxg1khklsbbisizgvjllap1cmbxbmnxq49";
};
};
@@ -4581,12 +4603,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
- version = "2019-11-04";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
- rev = "68fef9c2fd9d4a21b500cc2249b6711a71c6fb9f";
- sha256 = "0azmnxq82frs375k5b9yjdvsjfmzjv92ifqnmniar19d96yh6swa";
+ rev = "93b702512d07bcad4c0d47913db587febe8cc054";
+ sha256 = "0qfxrs3g45m7z36l6sad4yg6jfq60j9qknmmz4f2g40bs0vm1kdd";
};
};
@@ -4922,12 +4944,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2019-11-24";
+ version = "2019-12-01";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "c1d1cdce4f34d861cedebc948ef9cdecf633ae0a";
- sha256 = "1lnpv54mnn99yz4z4jr3al0bf1jxiz45rpqk8jvv5xz70zmfbrrg";
+ rev = "a7a7d4d2dd252b71b904d362ba74572c660da67f";
+ sha256 = "0ys0sczmjpc219hv2wwgcrkyiys21vk66i174axm147h33m3cm4f";
};
};
@@ -5008,6 +5030,17 @@ let
};
};
+ vim-subversive = buildVimPluginFrom2Nix {
+ pname = "vim-subversive";
+ version = "2019-07-28";
+ src = fetchFromGitHub {
+ owner = "svermeulen";
+ repo = "vim-subversive";
+ rev = "5837cb38f656f120e7a04ae73f749303d78b9191";
+ sha256 = "0n04mxdq80xkjgi75n1c2gg2s6am5kns8rj7pz6dvvlqr4vxyrjf";
+ };
+ };
+
vim-surround = buildVimPluginFrom2Nix {
pname = "vim-surround";
version = "2019-11-28";
@@ -5197,12 +5230,12 @@ let
vim-tmux-navigator = buildVimPluginFrom2Nix {
pname = "vim-tmux-navigator";
- version = "2019-01-29";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "christoomey";
repo = "vim-tmux-navigator";
- rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42";
- sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv";
+ rev = "b5ae5805db294a72380f77ee82592cd99246272b";
+ sha256 = "0w8fn92k1p99wmhq4dv5w2fb97l0p8ay00qyzydm9lq87w06a939";
};
};
@@ -5296,12 +5329,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2019-11-27";
+ version = "2019-11-29";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "fb6895c5c39862e495644e2cc0d300ad00bdeed2";
- sha256 = "14mcrwfkwjlqh7r6h2qmcxm8a4c6lldrk549c9bwnrpzmvjw5daw";
+ rev = "7c1934f91b33f64836d0e0d27e08481849831266";
+ sha256 = "1ga0skivc5p09d29k4gx2gdisalcl9514062ckddphynqn69ghi9";
};
};
@@ -5505,12 +5538,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2019-11-23";
+ version = "2019-12-02";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "0647bb8991a490f92de173ca67e9b49a3f1fddcd";
- sha256 = "142wh5b2zl3s8jjlc6hnd1z8ysfiz4xllax84f6ddyny72z3di42";
+ rev = "02829dee17a3d70889b5a0151a2f747754a0e2c4";
+ sha256 = "0kkm18mi1am1ww3lb3xqr9v11s057drkv8wpq0l5vqr550iviail";
};
};
@@ -5648,24 +5681,24 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
- version = "2019-11-15";
+ version = "2019-11-30";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
- rev = "c134c9e7595597684609fe2344076a66bbe82a17";
- sha256 = "1g77j1pbnndyyi9s4yiia5bzd20n7x2fj3m9p7k173hv2n9kf93f";
+ rev = "e9d8813c02b8bdb81b63aeb576b9eaadf0dd4445";
+ sha256 = "1x5950ca4nmsf1129sjd12kcncpv8jf4x80s0y3gwwgr3p7x1m22";
fetchSubmodules = true;
};
};
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2019-11-23";
+ version = "2019-11-30";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "8099995959e7e533306a2cadd38a2f83d2ea9ed9";
- sha256 = "1824jphq8mrswc594p032h459gn51mynfa5k8nnxkjws9c9myc4b";
+ rev = "1386c6b3fba94d93576cd344a1cd296c53ad7926";
+ sha256 = "0y4ics5msz1lq3pzqspgf5zgzpqkimngvpzk0zpybs6idgxi05jz";
fetchSubmodules = true;
};
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 263f2d2b5dd..17245014844 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -240,6 +240,7 @@ mattn/calendar-vim as mattn-calendar-vim
mattn/emmet-vim
mattn/gist-vim
mattn/webapi-vim
+matze/vim-move
maximbaz/lightline-ale
MaxMEllon/vim-jsx-pretty
mbbill/undotree
@@ -355,6 +356,7 @@ rhysd/vim-grammarous
rhysd/vim-operator-surround
Rip-Rip/clang_complete
rodjek/vim-puppet
+ron89/thesaurus_query.vim
roxma/nvim-cm-racer
roxma/nvim-completion-manager
roxma/nvim-yarp
@@ -400,6 +402,7 @@ slashmili/alchemist.vim
sonph/onehalf
stefandtw/quickfix-reflector.vim
stephpy/vim-yaml
+svermeulen/vim-subversive
t9md/vim-choosewin
t9md/vim-smalls
takac/vim-hardtime
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 4a569e1e1c3..dab95049643 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
homepage = https://people.redhat.com/sgrubb/audit/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index 02a46e5a776..9eb9c53b8dd 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "iovisor";
repo = "bpftrace";
rev = "refs/tags/v${version}";
- sha256 = "19lblnhx3p0qk8s3qgxrx9wl0d6dgz5dfp4gw6a6cvhhyn78cldm";
+ sha256 = "1qkfbmksdssmm1qxcvcwdql1pz8cqy233195n9i9q5dhk876f75v";
};
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index 542d99eeabe..2aa928e8119 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
homepage = https://sourceforge.net/projects/hdparm/;
platforms = platforms.linux;
license = licenses.bsd2;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 2ee5629451e..2d9554a4894 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
- version = "1.1";
+ version = "1.2";
src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
- sha256 = "1rvsr5i79wpdicghplrxamb4qbkdm5cpgw3mk0rsqzwwj6d6l0vs";
+ sha256 = "10fwi31ym6hvn0vvh9fy0swzs3mfnpcwg95np4i5ksmw8k0kj0hf";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index fef7a3236b3..090bf6a566a 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://lse.sourceforge.net/io/aio.html;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl21;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 157bd02a06c..fd57fa6e37c 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -3,9 +3,7 @@
, gtk2, which, withGtk ? false
}:
-let
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "pktgen";
version = "3.7.2";
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index d787acae61b..ab7f65925ee 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -52,12 +52,14 @@ stdenv.mkDerivation {
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemdutildir=${placeholder "out"}/lib/systemd"
"--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
+ "--sysconfdir=/etc"
];
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
installFlags = [
"historydir=$(TMPDIR)/foo"
+ "sysconfdir=${placeholder "out"}/etc"
];
meta = with stdenv.lib; {
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 3fe8499a58c..d996d646d22 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: ''
unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
- version = "4.2.2";
+ version = "4.3.0";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
- sha256 = "03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458";
+ sha256 = "0ca0f171ae2b2d76830967a5150eb0fa496b48b2a48f41b2be65d3743aaece25";
};
# https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
diff --git a/pkgs/servers/mautrix-whatsapp/0001-Add-missing-go-dependencies-to-go.sum.patch b/pkgs/servers/mautrix-whatsapp/0001-Add-missing-go-dependencies-to-go.sum.patch
new file mode 100644
index 00000000000..e1fd5f4725b
--- /dev/null
+++ b/pkgs/servers/mautrix-whatsapp/0001-Add-missing-go-dependencies-to-go.sum.patch
@@ -0,0 +1,46 @@
+From e9b9d97074ab811747792ef86f3d195709b65751 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Fri, 29 Nov 2019 16:27:15 +0100
+Subject: [PATCH] Add missing go dependencies to go.sum
+
+Generated by running `go build` locally. Otherwise some dependencies are
+missing when building with `buildGoModule` in Nix as it tries to fetch
+the packages during compilation and fails with the following error:
+
+```
+verifying maunium.net/go/mautrix-appservice@v0.1.0-alpha.3.0.20191110192030-cd699619a163: maunium.net/go/mautrix-appservice@v0.1.0-alpha.3.0.20191110192030-cd699619a163: Get https://sum.golang.org/lookup/maunium.net/go/mautrix-appservice@v0.1.0-alpha.3.0.20191110192030-cd699619a163: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:44681->[::1]:53: read: connection refused
+builder for '/nix/store/qxpy80j6y4gl1h6hplsznml1ffrca6az-mautrix-whatsapp-unstable-2019-11-17.drv' failed with exit code 1
+```
+---
+ go.sum | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/go.sum b/go.sum
+index f638f9a..ab7e907 100644
+--- a/go.sum
++++ b/go.sum
+@@ -45,6 +45,7 @@ github.com/tulir/go-whatsapp v0.0.2-0.20190830212741-33ca6ee47cf5 h1:0pUczFGOo4s
+ github.com/tulir/go-whatsapp v0.0.2-0.20190830212741-33ca6ee47cf5/go.mod h1:u3Hdptbz3iB5y/NEoSKgsp9hBzUlm0A5OrLMVdENAX8=
+ github.com/tulir/go-whatsapp v0.0.2-0.20190903182221-4e1a838ff3ba h1:exEcedSHn0qEZ1iwNwFF5brEuflhMScjFyyzmxUA+og=
+ github.com/tulir/go-whatsapp v0.0.2-0.20190903182221-4e1a838ff3ba/go.mod h1:u3Hdptbz3iB5y/NEoSKgsp9hBzUlm0A5OrLMVdENAX8=
++github.com/tulir/go-whatsapp v0.0.2-0.20191109203156-c477dae1c7e9 h1:WyLOadcpkAvoyaGfUvBgj/mTHetzliBGFioEEtM+Ac8=
+ github.com/tulir/go-whatsapp v0.0.2-0.20191109203156-c477dae1c7e9/go.mod h1:ustkccVUt0hOuKikjFb6b4Eray6At5djkcKYYu4+Lco=
+ golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
+@@ -73,6 +74,7 @@ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190622085722-6406f15cb8e3 h1:oVabjOi2r
+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190622085722-6406f15cb8e3/go.mod h1:O+QWJP3H7BZEzIBSrECKpnpRnEKBwaoWVEu/yZwVwxg=
+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190825132810-9d870654e9d2 h1:0iVxLLAOSBqtJqhIjW9EbblMsaSYoCJRo5mHPZnytUk=
+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20190825132810-9d870654e9d2/go.mod h1:O+QWJP3H7BZEzIBSrECKpnpRnEKBwaoWVEu/yZwVwxg=
++maunium.net/go/mautrix v0.1.0-alpha.3.0.20191110191816-178ce1f1561d h1:lfEHd6diaoKLdZvVNcmBF9kD667xWw+x7iXlvfpEd00=
+ maunium.net/go/mautrix v0.1.0-alpha.3.0.20191110191816-178ce1f1561d/go.mod h1:O+QWJP3H7BZEzIBSrECKpnpRnEKBwaoWVEu/yZwVwxg=
+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190618052224-6e6c9bb47548 h1:ni1nqs+2AOO+g1ND6f2W0pMcb6sIDVqzerXosO+pI2g=
+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190618052224-6e6c9bb47548/go.mod h1:yVWU0gvIHIXClgyVnShiufiDksFbFrBqHG9lDAYcmGI=
+@@ -86,4 +88,5 @@ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190830063827-e7dcd7e42e7c h
+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190830063827-e7dcd7e42e7c/go.mod h1:FJRRpH5+p3wCfEt6u/3kMeu9aGX/pk2PqtvjRDRW74w=
+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190901152202-40639f5932be h1:sSBx9AGR4iYHRFwljqNwxXFtbY2bKLJHgI9B4whAU8I=
+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20190901152202-40639f5932be/go.mod h1:FJRRpH5+p3wCfEt6u/3kMeu9aGX/pk2PqtvjRDRW74w=
++maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20191110192030-cd699619a163 h1:+tWThOHlyIW2VITR4A05wuhixu0AH8iZZ/Ha7AwkAys=
+ maunium.net/go/mautrix-appservice v0.1.0-alpha.3.0.20191110192030-cd699619a163/go.mod h1:ST7YYCoHtFC4c7/Iga8W5wwKXyxjwVh4DlsnyIU6rYw=
+--
+2.23.0
+
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index cdce369bbf9..892f797a00e 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,17 +1,19 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule {
- pname = "mautrix-unstable";
- version = "2019-09-03";
+ pname = "mautrix-whatsapp-unstable";
+ version = "2019-11-17";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
- rev = "22fb5c125db1a0a3a8be8e8e09e92bb38718e6bf";
- sha256 = "03wd6mn9jr1hr3qxg1r707ibi1s9511y97bfrmzka4mrsymgamxa";
+ rev = "0fba1db6aa88a95ff567f44aa9be7ce6ef24787f";
+ sha256 = "07cgpvicr6n897myx86mlnx7bydsxnf51lnjbv9dl5yyii73f957";
};
- modSha256 = "14bqxx2hcr8yhcd5hi087pyc1hzqmr13p2fqb3nnsx12j7n07gww";
+ patches = [ ./0001-Add-missing-go-dependencies-to-go.sum.patch ];
+
+ modSha256 = "0y0im3dz5z3rcsmnxkk0l6xqwcyxb0bi9h4arw7zblfy16iw6vrr";
meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 0fc87556542..7b92fc98e28 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,19 +2,25 @@
rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter";
- version = "3.2.1";
+ version = "3.2.2";
src = fetchFromGitHub {
owner = "MindFlavor";
repo = "prometheus_wireguard_exporter";
rev = version;
- sha256 = "1hyqvk3sxirm91lasf1z1wkzaql1g52my9a9q42z1h0hq66bc6nk";
+ sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc";
};
- cargoSha256 = "0wdyvl58h66xjcnl2kf3f7gnn4nc4vzpl870jc5x0qrkz28jppxz";
+ cargoSha256 = "1bi9nr1dhyv322pq6fjrhs12h3wdak53mvwkbyim1hmrp62vky4m";
buildInputs = lib.optional stdenv.isDarwin Security;
+ # Commonly used hack in nixpkgs to allow unstable features on a stable rustc. This is needed
+ # since `prometheus_exporter_base` uses `#!feature[]` to enable async which
+ # is actually not needed as `async` is part of rustc 1.39.0-stable. This can be removed
+ # as soon as https://github.com/MindFlavor/prometheus_exporter_base/pull/15 is merged.
+ RUSTC_BOOTSTRAP = 1;
+
meta = with lib; {
description = "A Prometheus exporter for WireGuard, written in Rust.";
license = licenses.mit;
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index c16a1f6659e..2364043c868 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -132,7 +132,7 @@ let
description = "A flexible, powerful daemon for playing music";
homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
license = licenses.gpl2;
- maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz tobim ];
+ maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
platforms = platforms.unix;
longDescription = ''
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index 590d46b430e..ddefaea1549 100644
--- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "tds_fdw";
- version = "1.0.8";
+ version = "2.0.1";
buildInputs = [ postgresql freetds ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "tds-fdw";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "0dlv1imiy773yplqqpl26xka65bc566k2x81wkrbvwqagnwvcai2";
+ sha256 = "1zpcrx30bvaf72782hgz2s19i5ndwvi7z87fanl1lnymznrk9lzg";
};
installPhase = ''
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 335de9ea153..821515caa09 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -24,12 +24,12 @@ let
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
in stdenv.mkDerivation rec {
- version = "19.08";
+ version = "19.09.1";
pname = "ejabberd";
src = fetchurl {
url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
- sha256 = "0ivkw31civcznv9k645hvrzn1yc6a4qsrsywjrakniwaaxlsnj8w";
+ sha256 = "1lj0zahsdg6naq007h8wp5p8ksdfwam3as7wiagvbj9gy8dgdp8q";
};
nativeBuildInputs = [ fakegit ];
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "0h1amqp2x6ir29bdh9x8bm0abj67k81nmkqi8gidwccsa5z94s2c";
+ outputHash = "097c84qp00dq8x7ngfqcrv9fa0wm0k94grashmi1fxlasgbvxh18";
};
configureFlags =
@@ -115,7 +115,7 @@ in stdenv.mkDerivation rec {
license = licenses.gpl2;
homepage = https://www.ejabberd.im;
platforms = platforms.linux;
- maintainers = with maintainers; [ sander abbradar ];
+ maintainers = with maintainers; [ sander abbradar ajs124 ];
broken = withElixir;
};
}
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 58569dcd59c..b5350ebecf7 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = https://www.gnu.org/software/xnee/;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
};
}
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index b7208d7b867..7af60ab33b4 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.10.2";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "0j1kzll23rj87nabzjjhxydg95cnxlwbkqp3qivf96bv1xlby75k";
+ sha256 = "0dh2fa60w5jbxkrn4j4nf6dn4ljcfpl2xf8vx0j49k36dirfp8y3";
};
- modSha256 = "18n4aimf9diy9w7f2k08cd7xr8jay6pid5mwrc24y2pqkjhgpyp7";
+ modSha256 = "04ba3dyfwlf0m6kn7yp7qyp3h2qdwp17y1f9pa79y3c6sd2nadk2";
subPackages = [ "cmd/eksctl" ];
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index d13dfbe8f43..0dbdcd7d25a 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -1,31 +1,55 @@
-{ stdenv, fetchurl, autoreconfHook, intltool
-, pythonPackages
+{ stdenv
+, autoreconfHook
+, fetchFromGitHub
+, glib
+, gobject-introspection
+, intltool
+, libnotify
+, python3
+, wrapGAppsHook
}:
-stdenv.mkDerivation rec {
+python3.pkgs.buildPythonApplication rec {
pname = "mpDris2";
version = "0.8";
+ format = "other";
+ strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
- src = fetchurl {
- url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz";
- sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn";
+ src = fetchFromGitHub {
+ owner = "eonpatapon";
+ repo = pname;
+ rev = version;
+ sha256 = "048b8acsd1b8kcxzd9fsh5p9g2an9c4rznicfcpyrsjz5syv894h";
};
preConfigure = ''
intltoolize -f
'';
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ intltool pythonPackages.wrapPython ];
- propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ];
- pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ];
- postInstall = "wrapPythonPrograms";
+ nativeBuildInputs = [
+ autoreconfHook
+ gobject-introspection
+ intltool
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ libnotify
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ dbus-python
+ mpd2
+ mutagen
+ pygobject3
+ ];
meta = with stdenv.lib; {
description = "MPRIS 2 support for mpd";
homepage = https://github.com/eonpatapon/mpDris2/;
license = licenses.gpl3;
+ maintainers = with maintainers; [];
platforms = platforms.unix;
- maintainers = with maintainers; [ pjones ];
};
}
diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix
new file mode 100644
index 00000000000..d289febe1f0
--- /dev/null
+++ b/pkgs/tools/backup/hpe-ltfs/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }:
+
+stdenv.mkDerivation rec {
+ version = "3.4.2_Z7550-02501";
+ pname = "hpe-ltfs";
+
+ src = fetchFromGitHub {
+ rev = version;
+ owner = "nix-community";
+ repo = "hpe-ltfs";
+ sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s";
+ };
+
+ sourceRoot = "source/ltfs";
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [
+ fuse icu libxml2 libuuid
+ ];
+
+ meta = with stdenv.lib; {
+ description = "HPE's implementation of the open-source tape filesystem standard ltfs";
+ homepage = https://support.hpe.com/hpesc/public/km/product/1009214665/Product;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.redvers ];
+ platforms = platforms.linux;
+ downloadPage = https://github.com/nix-community/hpe-ltfs;
+ };
+}
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 7d2323c6d48..79b2708cb2b 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
homepage = https://www.lcdf.org/gifsicle/;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.all;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu zimbatm ];
+ maintainers = with stdenv.lib.maintainers; [ zimbatm ];
};
}
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 39370e6754e..6d567f6119a 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/AlDanial/cloc;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu rycee ];
+ maintainers = with stdenv.lib.maintainers; [ rycee ];
};
}
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index aa0af61c61c..ff21d701d80 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.55";
+ version = "0.2.56";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
- sha256 = "0z0wa12vnzj07q54nr1zr81vjr1kac60nys26bbi8s6nh46n93wv";
+ sha256 = "12ymy2f7nd7w4qm1w8kd6p5dk8prnzsmynmh434x0pzh3cg4fhji";
};
- cargoSha256 = "14brb11nb17dykh37y099bhmk85a7z8fld2pivmywfgvz1x3i141";
+ cargoSha256 = "08xqvrsyxy131702d6l6klznp6vijik910k65k6sgxqdw6r7ah9a";
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]
@@ -55,7 +55,7 @@ buildRustPackage rec {
'';
homepage = https://gitlab.com/timvisee/ffsend;
license = licenses.gpl3;
- maintainers = [ maintainers.lilyball ];
+ maintainers = [ maintainers.lilyball maintainers.equirosa];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 66da4f53099..7207d8dbfed 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fzf";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
- sha256 = "0pwpr4fpw56yzzkcabzzgbgwraaxmp7xzzmap7w1xsrkbj7dl2xl";
+ sha256 = "192ci09yi2hps02skcnbfwyjbf7pl0wb6q2zshb58cid5zgla8bx";
};
- modSha256 = "0xc4166d74ix5nzjphrq4rgw7qpskz05ymzl77i2qh2nhbdb53p0";
+ modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143";
outputs = [ "out" "man" ];
@@ -60,6 +60,7 @@ buildGoModule rec {
homepage = "https://github.com/junegunn/fzf";
description = "A command-line fuzzy finder written in Go";
license = licenses.mit;
+ maintainers = with maintainers; [ filalex77 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 99d9fc72681..0913b9afbf5 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "licensor";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "raftario";
repo = pname;
rev = "v${version}";
- sha256 = "0bb6q3jpzdygjcs3apl38zzmgkn22ya5wxlqgmlp0cybqbhpi20s";
+ sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p";
};
- cargoSha256 = "1cvwyj2043vi5905n5126ikwbs3flfgzqkzjnzha0h8in8p3skv1";
+ cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139";
meta = with lib; {
description = "Write licenses to stdout";
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index af5bfedf203..96df0707153 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/hanslub42/rlwrap;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 552327c3303..2c6c1e55e19 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,17 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.26.5";
+ version = "0.27.0";
src = fetchFromGitHub {
owner = "starship";
- repo = "starship";
+ repo = pname;
rev = "v${version}";
- sha256 = "0a2jx82cwnxr0751qz2zp3chl0ndxf4wmjnar1y7s63syy9i6s52";
+ sha256 = "1bps40rzljxihl87hbbdlas5v9lphhsjzgaqz2y0haqwjj1vjpm9";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+ postPatch = ''
+ substituteInPlace src/utils.rs \
+ --replace "/bin/echo" "echo"
+ '';
+
cargoSha256 = "110ajwgdshakcqxfnqi30yy0miikp2qx86flwfkd78jawfll2krp";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
@@ -20,7 +25,7 @@ rustPlatform.buildRustPackage rec {
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
homepage = "https://starship.rs";
license = licenses.isc;
- maintainers = with maintainers; [ bbigras davidtwco ];
+ maintainers = with maintainers; [ bbigras davidtwco filalex77 ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 35075495fbf..7ca9f18d30a 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
'';
license = licenses.publicDomain;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz enzime ];
+ maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ];
};
}
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 2ff127f3e68..5fccd9c0ebc 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/;
description = "Loop-avoiding distance-vector routing protocol";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ];
+ maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix
index 0cb32ca415f..d17729c691d 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman/connman-notify/default.nix
@@ -1,38 +1,34 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
+{ stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
-stdenv.mkDerivation {
+python3Packages.buildPythonApplication {
pname = "connman-notify";
- version = "2014-06-23";
+ version = "2019-10-05";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
owner = "wavexx";
repo = "connman-notify";
- rev = "0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d";
- sha256 = "0lhk417fdg3qxs1marpqp277bdxhwnbyrld9xj224bfk5v7xi4bg";
+ rev = "24b10a51721b54d932f4cd61ef2756423768c015";
+ sha256 = "1k5b5y6114yna2cm0cq82xilicran63hrhlklgv7k3p89057xh8j";
};
- nativeBuildInputs = [ makeWrapper ];
+ format = "other";
- buildInputs = [
- pythonPackages.python
- pythonPackages.dbus-python
- pythonPackages.pygobject2
- pythonPackages.pygtk
- pythonPackages.notify
- ];
+ nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
+
+ buildInputs = [ glib ];
+
+ pythonPath = with python3Packages; [ dbus-python pygobject3 ];
+
+ strictDeps = false;
installPhase = ''
- mkdir -p $out/bin
- cp -vai connman-notify $out/bin/
+ install -D -t $out/bin connman-notify
+ install -D -t $out/share/doc README.rst
'';
- preFixup = ''
- wrapProgram $out/bin/connman-notify --prefix PYTHONPATH : "$PYTHONPATH"
- '';
-
meta = with stdenv.lib; {
description = "Desktop notification integration for connman";
- homepage = https://github.com/wavexx/connman-notify;
+ homepage = https://gitlab.com/wavexx/connman-notify;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index de664fe0b7d..828d61ca43c 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "croc";
- version = "6.4.1";
+ version = "6.4.6";
goPackagePath = "github.com/schollz/croc";
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "0sil1gxml4p4yysm8x6bpv5m0hvw4ss27b4c9wdag06lav0g4am0";
+ sha256 = "13sgjyrabr34a6sz8lzc21zvv5wc5lkgwbx0ar8afmikkrpdypln";
};
modSha256 = "1w84xqnn9fnkakak6j069app4ybbxpwq79g8qypwvmqg5bhvzywg";
@@ -20,7 +20,7 @@ buildGoModule rec {
description = "Easily and securely send things from one computer to another";
homepage = https://github.com/schollz/croc;
license = licenses.mit;
- maintainers = with maintainers; [ hugoreeves ];
+ maintainers = with maintainers; [ hugoreeves equirosa ];
longDescription = ''
Croc is a command line tool written in Go that allows any two computers to
diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix
new file mode 100644
index 00000000000..5d0c5cccded
--- /dev/null
+++ b/pkgs/tools/networking/pmacct/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, autoreconfHook
+, libtool
+, libpcap
+
+# Optional Dependencies
+, zlib ? null
+, withJansson ? true, jansson ? null
+, withNflog ? true, libnetfilter_log ? null
+, withSQLite ? true, sqlite ? null
+, withPgSQL ? true, postgresql ? null
+, withMysql ? true, libmysqlclient ? null }:
+
+assert withJansson -> jansson != null;
+assert withNflog -> libnetfilter_log != null;
+assert withSQLite -> sqlite != null;
+assert withPgSQL -> postgresql != null;
+assert withMysql -> libmysqlclient != null;
+
+let inherit (stdenv.lib) optional; in
+
+stdenv.mkDerivation rec {
+ version = "1.7.3";
+ pname = "pmacct";
+
+ src = fetchFromGitHub {
+ owner = "pmacct";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0j5qmkya67q7jvaddcj00blmaac37bkir1zb3m1xmm95gm5lf2p5";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+ buildInputs = [ libpcap ]
+ ++ optional withJansson jansson
+ ++ optional withNflog libnetfilter_log
+ ++ optional withSQLite sqlite
+ ++ optional withPgSQL postgresql
+ ++ optional withMysql [ libmysqlclient zlib ];
+
+ configureFlags = [
+ "--with-pcap-includes=${libpcap}/include"
+ ] ++ optional withJansson "--enable-jansson"
+ ++ optional withNflog "--enable-nflog"
+ ++ optional withSQLite "--enable-sqlite3"
+ ++ optional withPgSQL "--enable-pgsql"
+ ++ optional withMysql "--enable-mysql";
+
+ meta = with stdenv.lib; {
+ description = "pmacct is a small set of multi-purpose passive network monitoring tools";
+ longDescription = ''
+ pmacct is a small set of multi-purpose passive network monitoring tools
+ [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
+ '';
+ homepage = "http://www.pmacct.net/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ "0x4A6F" ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix
index 4630ed66bd2..d9e0630e6ff 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/pkgs/tools/package-management/cargo-deb/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
- version = "1.21.1";
+ version = "1.23.0";
src = fetchFromGitHub {
owner = "mmstick";
repo = "cargo-deb";
rev = "v${version}";
- sha256 = "10b25a0cnrd2bhf38yqc32l06vp6sdlfcpa6n9718yipp7b60cq2";
+ sha256 = "0jjhbs48f0rprzxnfgav6mjbyvcqnr7xq1qgyjxwd61z8g3m8hx8";
};
buildInputs = with stdenv; lib.optionals isDarwin [ Security ];
- cargoSha256 = "182ayprs2awmz7lzqkhawrmpfjla3jcj58q8g8c908gchkh05kns";
+ cargoSha256 = "03z9hq873jfsbssnd3kr5vz9lx9mvhb1navb2glm6kkw1k2zm4d2";
meta = with stdenv.lib; {
description = "Generate Debian packages from information in Cargo.toml";
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 8ddb8eb231b..1cdcffd2e7b 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -4,21 +4,31 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
- version = "0.3.3";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
- sha256 = "05b64bm9441crw74xlywjg2y3psljk2kf9xsrixaqwbnnahi0mm5";
+ sha256 = "087l8qdwfnnklw6zyjwflxh7hyhh4r7wala36cc4lrj7lag2xm9n";
};
- cargoSha256 = "1hjjw3i35vqr6nxsv2m3izq4x8c2a6wvl5c2kjlpg6shy9j2mjaa";
+ cargoSha256 = "1ih1p9jdwr1ymq2p6ipz6rybi17f3qn65kn4bqkgzx36afvpnd5l";
nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
buildInputs = lib.optional (!stdenv.isDarwin) openssl;
propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+ patches = [
+ # https://github.com/killercup/cargo-edit/pull/362
+ ./no_upgrade_index_in_tests.patch
+ ];
+
+ # The default `/build` will fail the test (seems) due to permission problem.
+ preCheck = ''
+ export TMPDIR="/tmp"
+ '';
+
meta = with lib; {
description = "A utility for managing cargo dependencies from the command line";
homepage = https://github.com/killercup/cargo-edit;
diff --git a/pkgs/tools/package-management/cargo-edit/no_upgrade_index_in_tests.patch b/pkgs/tools/package-management/cargo-edit/no_upgrade_index_in_tests.patch
new file mode 100644
index 00000000000..56b216e7baa
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-edit/no_upgrade_index_in_tests.patch
@@ -0,0 +1,123 @@
+diff --git a/src/bin/add/main.rs b/src/bin/add/main.rs
+index 41cde585..848612b3 100644
+--- a/src/bin/add/main.rs
++++ b/src/bin/add/main.rs
+@@ -87,7 +87,7 @@ fn handle_add(args: &Args) -> Result<()> {
+ let mut manifest = Manifest::open(manifest_path)?;
+ let deps = &args.parse_dependencies()?;
+
+- if !args.offline {
++ if !args.offline && std::env::var("CARGO_IS_TEST").is_err() {
+ let url = registry_url(
+ &find(&manifest_path)?,
+ args.registry.as_ref().map(String::as_ref),
+diff --git a/src/bin/upgrade/main.rs b/src/bin/upgrade/main.rs
+index cf2414da..c066e6f4 100644
+--- a/src/bin/upgrade/main.rs
++++ b/src/bin/upgrade/main.rs
+@@ -409,7 +409,7 @@ fn process(args: Args) -> Result<()> {
+ ..
+ } = args;
+
+- if !args.offline && !to_lockfile {
++ if !args.offline && !to_lockfile && std::env::var("CARGO_IS_TEST").is_err() {
+ let url = registry_url(&find(&manifest_path)?, None)?;
+ update_registry_index(&url)?;
+ }
+@@ -427,7 +427,7 @@ fn process(args: Args) -> Result<()> {
+
+ // Update indices for any alternative registries, unless
+ // we're offline.
+- if !args.offline {
++ if !args.offline && std::env::var("CARGO_IS_TEST").is_err() {
+ for registry_url in existing_dependencies
+ .0
+ .values()
+diff --git a/tests/cargo-add.rs b/tests/cargo-add.rs
+index fbdbf4e2..612ffa78 100644
+--- a/tests/cargo-add.rs
++++ b/tests/cargo-add.rs
+@@ -1184,6 +1184,7 @@ fn add_prints_message() {
+ "--vers=0.6.0",
+ &format!("--manifest-path={}", manifest),
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .succeeds()
+ .and()
+ .stdout()
+@@ -1204,6 +1205,7 @@ fn add_prints_message_with_section() {
+ "--vers=0.1.0",
+ &format!("--manifest-path={}", manifest),
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .succeeds()
+ .and()
+ .stdout()
+@@ -1224,6 +1226,7 @@ fn add_prints_message_for_dev_deps() {
+ "0.8.0",
+ &format!("--manifest-path={}", manifest),
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .succeeds()
+ .and()
+ .stdout()
+@@ -1244,6 +1247,7 @@ fn add_prints_message_for_build_deps() {
+ "0.1.0",
+ &format!("--manifest-path={}", manifest),
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .succeeds()
+ .and()
+ .stdout()
+diff --git a/tests/cargo-upgrade.rs b/tests/cargo-upgrade.rs
+index b11a88dc..cf117940 100644
+--- a/tests/cargo-upgrade.rs
++++ b/tests/cargo-upgrade.rs
+@@ -385,6 +385,7 @@ fn upgrade_workspace() {
+
+ /// Detect if attempting to run against a workspace root and give a helpful warning.
+ #[test]
++#[cfg(feature = "test-external-apis")]
+ fn detect_workspace() {
+ let (_tmpdir, root_manifest, _workspace_manifests) = copy_workspace_test();
+
+@@ -414,6 +415,7 @@ fn invalid_manifest() {
+ "--manifest-path",
+ &manifest,
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .fails_with(1)
+ .and()
+ .stderr()
+@@ -442,6 +444,7 @@ fn invalid_root_manifest() {
+ "--manifest-path",
+ &manifest,
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .fails_with(1)
+ .and()
+ .stderr()
+@@ -457,6 +460,7 @@ fn unknown_flags() {
+ "foo",
+ "--flag",
+ ])
++ .with_env(&[("CARGO_IS_TEST", "1")])
+ .fails_with(1)
+ .and()
+ .stderr()
+@@ -473,6 +477,7 @@ For more information try --help ",
+
+ // Verify that an upgraded Cargo.toml matches what we expect.
+ #[test]
++#[cfg(feature = "test-external-apis")]
+ fn upgrade_to_lockfile() {
+ let (tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.lockfile_source");
+ fs::copy(
+@@ -489,6 +494,7 @@ fn upgrade_to_lockfile() {
+ }
+
+ #[test]
++#[cfg(feature = "test-external-apis")]
+ fn upgrade_workspace_to_lockfile() {
+ let (tmpdir, root_manifest, _workspace_manifests) = copy_workspace_test();
+
\ No newline at end of file
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 9fd0ea05510..3353704cb36 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
-zlib, bzip2, lzma, curl, runtimeShell }:
+{ stdenv, lib, fetchurl, pkgconfig, perl, libarchive, openssl, zlib, bzip2,
+lzma, curl, runtimeShell }:
stdenv.mkDerivation rec {
pname = "pacman";
- version = "5.1.3";
+ version = "5.2.1";
src = fetchurl {
- url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz";
- sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
+ url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "04pkb8qvkldrayfns8cx4fljl4lyys1dqvlf7b5kkl2z4q3w8c0r";
};
enableParallelBuilding = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
postFixup = ''
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 5aa4ad47d42..6d2b5569a0d 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -36,6 +36,6 @@ python3Packages.buildPythonApplication {
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ];
+ maintainers = with stdenv.lib.maintainers; [ kierdavis ];
};
}
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index 38fc884de48..d6375bee649 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Software Token for Linux/UNIX";
homepage = https://github.com/cernekee/stoken;
license = licenses.lgpl21Plus;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 7c3b9d015db..8fb155da755 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -178,7 +178,7 @@ core = stdenv.mkDerivation rec {
'' + cleanBrokenLinks;
# needed for poppler and xpdf
- CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+ CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)
passthru = { inherit version buildInputs; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19c3e965180..488fdb046cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -915,6 +915,8 @@ in
glyr = callPackage ../tools/audio/glyr { };
+ hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
+
httperf = callPackage ../tools/networking/httperf { };
ili2c = callPackage ../tools/misc/ili2c { };
@@ -5783,6 +5785,8 @@ in
pastebinit = callPackage ../tools/misc/pastebinit { };
+ pmacct = callPackage ../tools/networking/pmacct { };
+
polygraph = callPackage ../tools/networking/polygraph { };
progress = callPackage ../tools/misc/progress { };
@@ -6938,6 +6942,11 @@ in
vifm = callPackage ../applications/misc/vifm { };
+ vifm-full = callPackage ../applications/misc/vifm {
+ mediaSupport = true;
+ inherit lib udisks2 python3;
+ };
+
viking = callPackage ../applications/misc/viking {
inherit (gnome2) scrollkeeper;
};
@@ -8730,9 +8739,7 @@ in
shmig = callPackage ../development/tools/database/shmig { };
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
- smlnj = if stdenv.isDarwin
- then callPackage ../development/compilers/smlnj { }
- else pkgsi686Linux.callPackage ../development/compilers/smlnj { };
+ smlnj = callPackage ../development/compilers/smlnj { };
solc = callPackage ../development/compilers/solc { };
@@ -9091,6 +9098,10 @@ in
php = php73;
});
+ php74Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
+ php = php74;
+ });
+
phpPackages-unit = php72Packages-unit;
php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
@@ -9101,11 +9112,16 @@ in
php = php73-unit;
});
+ php74Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
+ php = php74-unit;
+ });
+
inherit (callPackages ../development/interpreters/php {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
})
- php72
- php73;
+ php74
+ php73
+ php72;
php-embed = php73-embed;
@@ -9119,6 +9135,11 @@ in
config.php.apxs2 = false;
};
+ php74-embed = php74.override {
+ config.php.embed = true;
+ config.php.apxs2 = false;
+ };
+
php-unit = php73-unit;
php72-unit = php72.override {
@@ -9139,6 +9160,15 @@ in
config.php.fpm = false;
};
+ php74-unit = php74.override {
+ config.php.embed = true;
+ config.php.apxs2 = false;
+ config.php.systemd = false;
+ config.php.phpdbg = false;
+ config.php.cgi = false;
+ config.php.fpm = false;
+ };
+
picoc = callPackage ../development/interpreters/picoc {};
picolisp = callPackage ../development/interpreters/picolisp {};
@@ -17809,6 +17839,8 @@ in
airwave = callPackage ../applications/audio/airwave { };
+ akira-unstable = callPackage ../applications/graphics/akira { };
+
alembic = callPackage ../development/libraries/alembic {};
alchemy = callPackage ../applications/graphics/alchemy { };
@@ -19180,6 +19212,10 @@ in
gv = callPackage ../applications/misc/gv { };
+ gvisor = callPackage ../applications/virtualization/gvisor { };
+
+ gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };
+
guvcview = callPackage ../os-specific/linux/guvcview { };
gxmessage = callPackage ../applications/misc/gxmessage { };
@@ -22333,7 +22369,11 @@ in
clightning = callPackage ../applications/blockchains/clightning.nix { };
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
- bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; };
+ bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix {
+ boost = boost165;
+ mkDerivation = stdenv.mkDerivation;
+ withGui = false;
+ };
bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix {
inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
@@ -24756,6 +24796,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
+ nix-linter = haskellPackages.callPackage ../development/tools/analysis/nix-linter { };
+
nix-pin = callPackage ../tools/package-management/nix-pin { };
nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7e5aa6598c1..ddd13784b5d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -464,6 +464,12 @@ let
merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
+ metrics = callPackage ../development/ocaml-modules/metrics { };
+
+ metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
+
+ metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { };
+
mezzo = callPackage ../development/compilers/mezzo { };
minisat = callPackage ../development/ocaml-modules/minisat { };
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index cdb1c19bce5..41db7109d9f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -14,12 +14,13 @@ let
});
isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
+ isPhp74 = pkgs.lib.versionAtLeast php.version "7.4";
apcu = buildPecl {
- version = "5.1.17";
+ version = "5.1.18";
pname = "apcu";
- sha256 = "14y7alvj5q17q1b544bxidavkn6i40cjbq2nv1m0k70ai5vv84bb";
+ sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl";
buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
doCheck = true;
@@ -140,6 +141,8 @@ let
AC_MSG_WARN([Cannot find igbinary.h])
'')
];
+
+ meta.broken = isPhp74; # Build error
};
event = buildPecl {
@@ -259,6 +262,8 @@ let
pname = "pcs";
sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
+
+ meta.broken = isPhp74; # Build error
};
pdo_sqlsrv = buildPecl {
@@ -268,6 +273,8 @@ let
sha256 = "02ill1iqffa5fha9iz4y91823scml24ikfk8pn90jyycfwv07x6a";
buildInputs = [ pkgs.unixODBC ];
+
+ meta.broken = isPhp74; # Build error
};
php-cs-fixer = mkDerivation rec {
@@ -492,6 +499,7 @@ let
'';
license = licenses.bsd3;
homepage = "https://developers.google.com/protocol-buffers/";
+ broken = isPhp74; # Build error
};
};
@@ -592,6 +600,8 @@ let
sha256 = "0ial621zxn9zvjh7k1h755sm2lc9aafc389yxksqcxcmm7kqmd0a";
buildInputs = [ pkgs.unixODBC ];
+
+ meta.broken = isPhp74; # Build error
};
v8 = buildPecl {
@@ -617,10 +627,10 @@ let
};
xdebug = buildPecl {
- version = "2.7.1";
+ version = "2.8.0";
pname = "xdebug";
- sha256 = "1hr4gy87a3gp682ggwp831xk1fxasil9wan8cxv23q3m752x3sdp";
+ sha256 = "0r62501fdp63zz81scz2x1pq3qzpjafya96g12j0jx7crdz127fb";
doCheck = true;
checkTarget = "test";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef1928cb87c..db57b33dfd0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1138,6 +1138,8 @@ in {
pytesseract = callPackage ../development/python-modules/pytesseract { };
+ pytest-bdd = callPackage ../development/python-modules/pytest-bdd { };
+
pytest-black = callPackage ../development/python-modules/pytest-black { };
pytest-click = callPackage ../development/python-modules/pytest-click { };
@@ -3274,6 +3276,8 @@ in {
flask_elastic = callPackage ../development/python-modules/flask-elastic { };
+ flask-httpauth = callPackage ../development/python-modules/flask-httpauth { };
+
flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { };
flask-limiter = callPackage ../development/python-modules/flask-limiter { };