diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 31fddc59e20e..812521ce6d1c 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -487,7 +487,7 @@ rec {
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
*/
getOutput = output: pkg:
- if pkg.outputUnspecified or false
+ if ! pkg ? outputSpecified || ! pkg.outputSpecified
then pkg.${output} or pkg.out or pkg
else pkg;
diff --git a/lib/customisation.nix b/lib/customisation.nix
index a794b673d70c..234a528527d3 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -145,14 +145,14 @@ rec {
let
outputs = drv.outputs or [ "out" ];
- commonAttrs = (removeAttrs drv [ "outputUnspecified" ]) //
- (builtins.listToAttrs outputsList) //
+ commonAttrs = drv // (builtins.listToAttrs outputsList) //
({ all = map (x: x.value) outputsList; }) // passthru;
outputToAttrListElement = outputName:
{ name = outputName;
value = commonAttrs // {
inherit (drv.${outputName}) type outputName;
+ outputSpecified = true;
drvPath = assert condition; drv.${outputName}.drvPath;
outPath = assert condition; drv.${outputName}.outPath;
};
@@ -160,7 +160,6 @@ rec {
outputsList = map outputToAttrListElement outputs;
in commonAttrs // {
- outputUnspecified = true;
drvPath = assert condition; drv.drvPath;
outPath = assert condition; drv.outPath;
};
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 22116f0b23c1..1484e0156d56 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8249,6 +8249,12 @@
githubId = 810877;
name = "Tom Doggett";
};
+ noisersup = {
+ email = "patryk@kwiatek.xyz";
+ github = "noisersup";
+ githubId = 42322511;
+ name = "Patryk Kwiatek";
+ };
nomeata = {
email = "mail@joachim-breitner.de";
github = "nomeata";
@@ -12054,6 +12060,16 @@
githubId = 9002575;
name = "Weihua Lu";
};
+ welteki = {
+ email = "welteki@pm.me";
+ github = "welteki";
+ githubId = 16267532;
+ name = "Han Verstraete";
+ keys = [{
+ longkeyid = "rsa4096/0x11F7BAEA856743FF";
+ fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF";
+ }];
+ };
wheelsandmetal = {
email = "jakob@schmutz.co.uk";
github = "wheelsandmetal";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 1e80f635f067..4bbd46428524 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1129,6 +1129,15 @@ Superuser created successfully.
would be parsed as 3 parameters.
+
+
+ The coursier package’s binary was renamed
+ from coursier to cs.
+ Completions which haven’t worked for a while should now work
+ with the renamed binary. To keep using
+ coursier, you can create a shell alias.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index a598257f36c0..36d03fd0b59b 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -349,6 +349,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters.
+- The `coursier` package's binary was renamed from `coursier` to `cs`. Completions which haven't worked for a while should now work with the renamed binary. To keep using `coursier`, you can create a shell alias.
+
## Other Notable Changes {#sec-release-21.11-notable-changes}
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index e659b0c04f50..3ee8b3227c61 100755
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -6,7 +6,7 @@ from xml.sax.saxutils import XMLGenerator
from colorama import Style
import queue
import io
-import _thread
+import threading
import argparse
import atexit
import base64
@@ -405,13 +405,14 @@ class Machine:
keep_vm_state: bool
allow_reboot: bool
- process: Optional[subprocess.Popen] = None
- pid: Optional[int] = None
- monitor: Optional[socket.socket] = None
- shell: Optional[socket.socket] = None
+ process: Optional[subprocess.Popen]
+ pid: Optional[int]
+ monitor: Optional[socket.socket]
+ shell: Optional[socket.socket]
+ serial_thread: Optional[threading.Thread]
- booted: bool = False
- connected: bool = False
+ booted: bool
+ connected: bool
# Store last serial console lines for use
# of wait_for_console_text
last_lines: Queue = Queue()
@@ -444,6 +445,15 @@ class Machine:
self.cleanup_statedir()
self.state_dir.mkdir(mode=0o700, exist_ok=True)
+ self.process = None
+ self.pid = None
+ self.monitor = None
+ self.shell = None
+ self.serial_thread = None
+
+ self.booted = False
+ self.connected = False
+
@staticmethod
def create_startcommand(args: Dict[str, str]) -> StartCommand:
rootlog.warning(
@@ -921,7 +931,8 @@ class Machine:
self.last_lines.put(line)
self.log_serial(line)
- _thread.start_new_thread(process_serial_output, ())
+ self.serial_thread = threading.Thread(target=process_serial_output)
+ self.serial_thread.start()
self.wait_for_monitor_prompt()
@@ -1021,9 +1032,12 @@ class Machine:
assert self.process
assert self.shell
assert self.monitor
+ assert self.serial_thread
+
self.process.terminate()
self.shell.close()
self.monitor.close()
+ self.serial_thread.join()
class VLan:
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
index 450d77618148..e57296b38e47 100644
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -68,7 +68,7 @@ mount --rbind /sys "$mountPoint/sys"
fi
# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
- LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" 1>&2 || true
+ LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true
# Create /tmp
chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true
diff --git a/nixos/modules/services/development/blackfire.nix b/nixos/modules/services/development/blackfire.nix
index 6fd948cce38d..8564aabc6a37 100644
--- a/nixos/modules/services/development/blackfire.nix
+++ b/nixos/modules/services/development/blackfire.nix
@@ -19,7 +19,7 @@ in {
enable = lib.mkEnableOption "Blackfire profiler agent";
settings = lib.mkOption {
description = ''
- See https://blackfire.io/docs/configuration/agent
+ See https://blackfire.io/docs/up-and-running/configuration/agent
'';
type = lib.types.submodule {
freeformType = with lib.types; attrsOf str;
@@ -53,13 +53,8 @@ in {
services.blackfire-agent.settings.socket = "unix:///run/${agentSock}";
- systemd.services.blackfire-agent = {
- description = "Blackfire agent";
-
- serviceConfig = {
- ExecStart = "${pkgs.blackfire}/bin/blackfire-agent";
- RuntimeDirectory = "blackfire";
- };
- };
+ systemd.packages = [
+ pkgs.blackfire
+ ];
};
}
diff --git a/nixos/modules/services/development/blackfire.xml b/nixos/modules/services/development/blackfire.xml
index ad4af35788db..cecd249dda48 100644
--- a/nixos/modules/services/development/blackfire.xml
+++ b/nixos/modules/services/development/blackfire.xml
@@ -28,13 +28,14 @@ in {
enable = true;
settings = {
# You will need to get credentials at https://blackfire.io/my/settings/credentials
- # You can also use other options described in https://blackfire.io/docs/configuration/agent
+ # You can also use other options described in https://blackfire.io/docs/up-and-running/configuration/agent
server-id = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX";
server-token = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
};
};
# Make the agent run on start-up.
+ # (WantedBy= from the upstream unit not respected: https://github.com/NixOS/nixpkgs/issues/81138)
# Alternately, you can start it manually with `systemctl start blackfire-agent`.
systemd.services.blackfire-agent.wantedBy = [ "phpfpm-foo.service" ];
}
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index b8cfcf391215..a6ff467914a1 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -7,15 +7,20 @@ let
inherit (config.environment) etc;
apparmor = config.security.apparmor;
rootDir = "/run/transmission";
- homeDir = "/var/lib/transmission";
settingsDir = ".config/transmission-daemon";
downloadsDir = "Downloads";
incompleteDir = ".incomplete";
watchDir = "watchdir";
- # TODO: switch to configGen.json once RFC0042 is implemented
- settingsFile = pkgs.writeText "settings.json" (builtins.toJSON cfg.settings);
+ settingsFormat = pkgs.formats.json {};
+ settingsFile = settingsFormat.generate "settings.json" cfg.settings;
in
{
+ imports = [
+ (mkRenamedOptionModule ["services" "transmission" "port"]
+ ["services" "transmission" "settings" "rpc-port"])
+ (mkAliasOptionModule ["services" "transmission" "openFirewall"]
+ ["services" "transmission" "openPeerPorts"])
+ ];
options = {
services.transmission = {
enable = mkEnableOption ''the headless Transmission BitTorrent daemon.
@@ -24,48 +29,141 @@ in
transmission-remote, the WebUI (http://127.0.0.1:9091/ by default),
or other clients like stig or tremc.
- Torrents are downloaded to ${homeDir}/${downloadsDir} by default and are
+ Torrents are downloaded to /${downloadsDir} by default and are
accessible to users in the "transmission" group'';
- settings = mkOption rec {
- # TODO: switch to types.config.json as prescribed by RFC0042 once it's implemented
- type = types.attrs;
- apply = recursiveUpdate default;
- default =
- {
- download-dir = "${cfg.home}/${downloadsDir}";
- incomplete-dir = "${cfg.home}/${incompleteDir}";
- incomplete-dir-enabled = true;
- watch-dir = "${cfg.home}/${watchDir}";
- watch-dir-enabled = false;
- message-level = 1;
- peer-port = 51413;
- peer-port-random-high = 65535;
- peer-port-random-low = 49152;
- peer-port-random-on-start = false;
- rpc-bind-address = "127.0.0.1";
- rpc-port = 9091;
- script-torrent-done-enabled = false;
- script-torrent-done-filename = "";
- umask = 2; # 0o002 in decimal as expected by Transmission
- utp-enabled = true;
- };
- example =
- {
- download-dir = "/srv/torrents/";
- incomplete-dir = "/srv/torrents/.incomplete/";
- incomplete-dir-enabled = true;
- rpc-whitelist = "127.0.0.1,192.168.*.*";
- };
+ settings = mkOption {
description = ''
- Attribute set whose fields overwrites fields in
+ Settings whose options overwrite fields in
.config/transmission-daemon/settings.json
- (each time the service starts). String values must be quoted, integer and
- boolean values must not.
+ (each time the service starts).
See Transmission's Wiki
- for documentation.
+ for documentation of settings not explicitely covered by this module.
'';
+ default = {};
+ type = types.submodule {
+ freeformType = settingsFormat.type;
+ options.download-dir = mkOption {
+ type = types.path;
+ default = "${cfg.home}/${downloadsDir}";
+ description = "Directory where to download torrents.";
+ };
+ options.incomplete-dir = mkOption {
+ type = types.path;
+ default = "${cfg.home}/${incompleteDir}";
+ description = ''
+ When enabled with
+ services.transmission.home
+ ,
+ new torrents will download the files to this directory.
+ When complete, the files will be moved to download-dir
+ .
+ '';
+ };
+ options.incomplete-dir-enabled = mkOption {
+ type = types.bool;
+ default = true;
+ description = "";
+ };
+ options.message-level = mkOption {
+ type = types.ints.between 0 2;
+ default = 2;
+ description = "Set verbosity of transmission messages.";
+ };
+ options.peer-port = mkOption {
+ type = types.port;
+ default = 51413;
+ description = "The peer port to listen for incoming connections.";
+ };
+ options.peer-port-random-high = mkOption {
+ type = types.port;
+ default = 65535;
+ description = ''
+ The maximum peer port to listen to for incoming connections
+ when is enabled.
+ '';
+ };
+ options.peer-port-random-low = mkOption {
+ type = types.port;
+ default = 65535;
+ description = ''
+ The minimal peer port to listen to for incoming connections
+ when is enabled.
+ '';
+ };
+ options.peer-port-random-on-start = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Randomize the peer port.";
+ };
+ options.rpc-bind-address = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ example = "0.0.0.0";
+ description = ''
+ Where to listen for RPC connections.
+ Use \"0.0.0.0\" to listen on all interfaces.
+ '';
+ };
+ options.rpc-port = mkOption {
+ type = types.port;
+ default = 9091;
+ description = "The RPC port to listen to.";
+ };
+ options.script-torrent-done-enabled = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to run
+
+ at torrent completion.
+ '';
+ };
+ options.script-torrent-done-filename = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "Executable to be run at torrent completion.";
+ };
+ options.umask = mkOption {
+ type = types.int;
+ default = 2;
+ description = ''
+ Sets transmission's file mode creation mask.
+ See the umask(2) manpage for more information.
+ Users who want their saved torrents to be world-writable
+ may want to set this value to 0.
+ Bear in mind that the json markup language only accepts numbers in base 10,
+ so the standard umask(2) octal notation "022" is written in settings.json as 18.
+ '';
+ };
+ options.utp-enabled = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable Micro Transport Protocol (µTP).
+ '';
+ };
+ options.watch-dir = mkOption {
+ type = types.path;
+ default = "${cfg.home}/${watchDir}";
+ description = "Watch a directory for torrent files and add them to transmission.";
+ };
+ options.watch-dir-enabled = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''Whether to enable the
+ .
+ '';
+ };
+ options.trash-original-torrent-files = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''Whether to delete torrents added from the
+ .
+ '';
+ };
+ };
};
downloadDirPermissions = mkOption {
@@ -74,31 +172,22 @@ in
example = "775";
description = ''
The permissions set by systemd.activationScripts.transmission-daemon
- on the directories settings.download-dir
- and settings.incomplete-dir.
+ on the directories
+ and .
Note that you may also want to change
- settings.umask.
- '';
- };
-
- port = mkOption {
- type = types.port;
- description = ''
- TCP port number to run the RPC/web interface.
-
- If instead you want to change the peer port,
- use settings.peer-port
- or settings.peer-port-random-on-start.
+ .
'';
};
home = mkOption {
type = types.path;
- default = homeDir;
+ default = "/var/lib/transmission";
description = ''
The directory where Transmission will create ${settingsDir}.
- as well as ${downloadsDir}/ unless settings.download-dir is changed,
- and ${incompleteDir}/ unless settings.incomplete-dir is changed.
+ as well as ${downloadsDir}/ unless
+ is changed,
+ and ${incompleteDir}/ unless
+ is changed.
'';
};
@@ -119,19 +208,30 @@ in
description = ''
Path to a JSON file to be merged with the settings.
Useful to merge a file which is better kept out of the Nix store
- because it contains sensible data like settings.rpc-password.
+ to set secret config parameters like rpc-password.
'';
default = "/dev/null";
example = "/var/lib/secrets/transmission/settings.json";
};
- openFirewall = mkEnableOption "opening of the peer port(s) in the firewall";
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "--log-debug" ];
+ description = ''
+ Extra flags passed to the transmission command in the service definition.
+ '';
+ };
+
+ openPeerPorts = mkEnableOption "opening of the peer port(s) in the firewall";
+
+ openRPCPort = mkEnableOption "opening of the RPC port in the firewall";
performanceNetParameters = mkEnableOption ''tweaking of kernel parameters
to open many more connections at the same time.
Note that you may also want to increase
- settings.peer-limit-global.
+ peer-limit-global".
And be aware that these settings are quite aggressive
and might not suite your regular desktop use.
For instance, SSH sessions may time out more easily'';
@@ -156,34 +256,6 @@ in
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}'
'';
- assertions = [
- { assertion = builtins.match "^/.*" cfg.home != null;
- message = "`services.transmission.home' must be an absolute path.";
- }
- { assertion = types.path.check cfg.settings.download-dir;
- message = "`services.transmission.settings.download-dir' must be an absolute path.";
- }
- { assertion = types.path.check cfg.settings.incomplete-dir;
- message = "`services.transmission.settings.incomplete-dir' must be an absolute path.";
- }
- { assertion = types.path.check cfg.settings.watch-dir;
- message = "`services.transmission.settings.watch-dir' must be an absolute path.";
- }
- { assertion = cfg.settings.script-torrent-done-filename == "" || types.path.check cfg.settings.script-torrent-done-filename;
- message = "`services.transmission.settings.script-torrent-done-filename' must be an absolute path.";
- }
- { assertion = types.port.check cfg.settings.rpc-port;
- message = "${toString cfg.settings.rpc-port} is not a valid port number for `services.transmission.settings.rpc-port`.";
- }
- # In case both port and settings.rpc-port are explicitely defined: they must be the same.
- { assertion = !options.services.transmission.port.isDefined || cfg.port == cfg.settings.rpc-port;
- message = "`services.transmission.port' is not equal to `services.transmission.settings.rpc-port'";
- }
- ];
-
- services.transmission.settings =
- optionalAttrs options.services.transmission.port.isDefined { rpc-port = cfg.port; };
-
systemd.services.transmission = {
description = "Transmission BitTorrent Service";
after = [ "network.target" ] ++ optional apparmor.enable "apparmor.service";
@@ -199,15 +271,13 @@ in
install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \
'${cfg.home}/${settingsDir}/settings.json'
'')];
- ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir}";
+ ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = cfg.user;
Group = cfg.group;
# Create rootDir in the host's mount namespace.
RuntimeDirectory = [(baseNameOf rootDir)];
RuntimeDirectoryMode = "755";
- # Avoid mounting rootDir in the own rootDir of ExecStart='s mount namespace.
- InaccessiblePaths = ["-+${rootDir}"];
# This is for BindPaths= and BindReadOnlyPaths=
# to allow traversal of directories they create in RootDirectory=.
UMask = "0066";
@@ -228,11 +298,9 @@ in
cfg.settings.download-dir
] ++
optional cfg.settings.incomplete-dir-enabled
- cfg.settings.incomplete-dir
- ++
- optional cfg.settings.watch-dir-enabled
- cfg.settings.watch-dir
- ;
+ cfg.settings.incomplete-dir ++
+ optional (cfg.settings.watch-dir-enabled && cfg.settings.trash-original-torrent-files)
+ cfg.settings.watch-dir;
BindReadOnlyPaths = [
# No confinement done of /nix/store here like in systemd-confinement.nix,
# an AppArmor profile is provided to get a confinement based upon paths and rights.
@@ -241,8 +309,10 @@ in
"/run"
] ++
optional (cfg.settings.script-torrent-done-enabled &&
- cfg.settings.script-torrent-done-filename != "")
- cfg.settings.script-torrent-done-filename;
+ cfg.settings.script-torrent-done-filename != null)
+ cfg.settings.script-torrent-done-filename ++
+ optional (cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files)
+ cfg.settings.watch-dir;
# The following options are only for optimizing:
# systemd-analyze security transmission
AmbientCapabilities = "";
@@ -287,7 +357,6 @@ in
"quotactl"
];
SystemCallArchitectures = "native";
- SystemCallErrorNumber = "EPERM";
};
};
@@ -309,25 +378,28 @@ in
};
});
- networking.firewall = mkIf cfg.openFirewall (
- if cfg.settings.peer-port-random-on-start
- then
- { allowedTCPPortRanges =
- [ { from = cfg.settings.peer-port-random-low;
- to = cfg.settings.peer-port-random-high;
- }
- ];
- allowedUDPPortRanges =
- [ { from = cfg.settings.peer-port-random-low;
- to = cfg.settings.peer-port-random-high;
- }
- ];
- }
- else
- { allowedTCPPorts = [ cfg.settings.peer-port ];
- allowedUDPPorts = [ cfg.settings.peer-port ];
- }
- );
+ networking.firewall = mkMerge [
+ (mkIf cfg.openPeerPorts (
+ if cfg.settings.peer-port-random-on-start
+ then
+ { allowedTCPPortRanges =
+ [ { from = cfg.settings.peer-port-random-low;
+ to = cfg.settings.peer-port-random-high;
+ }
+ ];
+ allowedUDPPortRanges =
+ [ { from = cfg.settings.peer-port-random-low;
+ to = cfg.settings.peer-port-random-high;
+ }
+ ];
+ }
+ else
+ { allowedTCPPorts = [ cfg.settings.peer-port ];
+ allowedUDPPorts = [ cfg.settings.peer-port ];
+ }
+ ))
+ (mkIf cfg.openRPCPort { allowedTCPPorts = [ cfg.settings.rpc-port ]; })
+ ];
boot.kernel.sysctl = mkMerge [
# Transmission uses a single UDP socket in order to implement multiple uTP sockets,
@@ -342,21 +414,21 @@ in
# Increase the number of available source (local) TCP and UDP ports to 49151.
# Usual default is 32768 60999, ie. 28231 ports.
# Find out your current usage with: ss -s
- "net.ipv4.ip_local_port_range" = "16384 65535";
+ "net.ipv4.ip_local_port_range" = mkDefault "16384 65535";
# Timeout faster generic TCP states.
# Usual default is 600.
# Find out your current usage with: watch -n 1 netstat -nptuo
- "net.netfilter.nf_conntrack_generic_timeout" = 60;
+ "net.netfilter.nf_conntrack_generic_timeout" = mkDefault 60;
# Timeout faster established but inactive connections.
# Usual default is 432000.
- "net.netfilter.nf_conntrack_tcp_timeout_established" = 600;
+ "net.netfilter.nf_conntrack_tcp_timeout_established" = mkDefault 600;
# Clear immediately TCP states after timeout.
# Usual default is 120.
- "net.netfilter.nf_conntrack_tcp_timeout_time_wait" = 1;
+ "net.netfilter.nf_conntrack_tcp_timeout_time_wait" = mkDefault 1;
# Increase the number of trackable connections.
# Usual default is 262144.
# Find out your current usage with: conntrack -C
- "net.netfilter.nf_conntrack_max" = 1048576;
+ "net.netfilter.nf_conntrack_max" = mkDefault 1048576;
})
];
@@ -372,7 +444,7 @@ in
rw ${cfg.settings.incomplete-dir}/**,
''}
${optionalString cfg.settings.watch-dir-enabled ''
- rw ${cfg.settings.watch-dir}/**,
+ r${optionalString cfg.settings.trash-original-torrent-files "w"} ${cfg.settings.watch-dir}/**,
''}
profile dirs {
rw ${cfg.settings.download-dir}/**,
@@ -380,12 +452,12 @@ in
rw ${cfg.settings.incomplete-dir}/**,
''}
${optionalString cfg.settings.watch-dir-enabled ''
- rw ${cfg.settings.watch-dir}/**,
+ r${optionalString cfg.settings.trash-original-torrent-files "w"} ${cfg.settings.watch-dir}/**,
''}
}
${optionalString (cfg.settings.script-torrent-done-enabled &&
- cfg.settings.script-torrent-done-filename != "") ''
+ cfg.settings.script-torrent-done-filename != null) ''
# Stack transmission_directories profile on top of
# any existing profile for script-torrent-done-filename
# FIXME: to be tested as I'm not sure it works well with NoNewPrivileges=
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index 419f5055d8be..1ab61953e735 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -38,5 +38,11 @@ in
"/share"
];
+ security.wrappers.lumina-checkpass-wrapped = {
+ source = "${pkgs.lumina.lumina}/bin/lumina-checkpass";
+ owner = "root";
+ group = "root";
+ };
+
};
}
diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix
index b49335298e01..4b7b760db355 100644
--- a/pkgs/applications/audio/giada/default.nix
+++ b/pkgs/applications/audio/giada/default.nix
@@ -1,8 +1,9 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
-, autoreconfHook
+, cmake
+, pkg-config
, fltk
-, jansson
, rtmidi
, libsamplerate
, libsndfile
@@ -10,51 +11,65 @@
, alsa-lib
, libpulseaudio
, libXpm
-, libXinerama
-, libXcursor
-, catch2
-, nlohmann_json
+, flac
+, libogg
+, libvorbis
+, libopus
}:
stdenv.mkDerivation rec {
pname = "giada";
- version = "0.16.4";
+ version = "unstable-2021-09-24";
src = fetchFromGitHub {
owner = "monocasual";
repo = pname;
- rev = "v${version}";
- sha256 = "0qyx0bvivlvly0vj5nnnbiks22xh13sqlw4mfgplq2lbbpgisigp";
+ # Using master with https://github.com/monocasual/giada/pull/509 till a new release is done.
+ rev = "f117a8b8eef08d904ef1ab22c45f0e1fad6b8a56";
+ sha256 = "01hb981lrsyk870zs8xph5fm0z7bbffpkxgw04hq487r804mkx9j";
+ fetchSubmodules = true;
};
- configureFlags = [
- "--target=linux"
- "--enable-system-catch"
+ NIX_CFLAGS_COMPILE = [
+ "-w"
+ "-Wno-error"
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_BINDIR=bin"
+ "-DCMAKE_BUILD_TYPE=Release"
];
nativeBuildInputs = [
- autoreconfHook
+ cmake
+ pkg-config
];
buildInputs = [
+ rtmidi
fltk
libsndfile
libsamplerate
- jansson
- rtmidi
- libXpm
- jack2
alsa-lib
+ libXpm
libpulseaudio
- libXinerama
- libXcursor
- catch2
- nlohmann_json
+ jack2
+ flac
+ libogg
+ libvorbis
+ libopus
];
postPatch = ''
- sed -i 's:"deps/json/single_include/nlohmann/json\.hpp"::' \
- src/core/{conf,init,midiMapConf,patch}.cpp
+ local fixup_list=(
+ src/core/kernelMidi.cpp
+ src/gui/elems/config/tabMidi.cpp
+ src/utils/ver.cpp
+ )
+ for f in "''${fixup_list[@]}"; do
+ substituteInPlace "$f" \
+ --replace "" "<${rtmidi.src}/RtMidi.h>"
+ done
'';
meta = with lib; {
@@ -63,6 +78,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ petabyteboy ];
platforms = platforms.all;
- broken = stdenv.hostPlatform.isAarch64; # produces build failure on aarch64-linux
};
}
diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix
index 39c8a3b3184c..757b83cd4d57 100644
--- a/pkgs/applications/audio/helvum/default.nix
+++ b/pkgs/applications/audio/helvum/default.nix
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "helvum";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "ryuukyu";
repo = pname;
rev = version;
- sha256 = "sha256-AlHCK4pWaoNjR0eflxHBsuVaaily/RvCbgJv/ByQZK4=";
+ sha256 = "sha256-f6+6Qicg5J6oWcafG4DF0HovTmF4r6yfw6p/3dJHmB4=";
};
- cargoSha256 = "sha256-mAhh12rGvQjs2xtm+OrtVv0fgG6qni/QM/oRYoFR7U8=";
+ cargoSha256 = "sha256-zGa6nAmOOrpiMr865J06Ez3L6lPL0j18/lW8lw1jPyU=";
nativeBuildInputs = [ clang copyDesktopItems pkg-config ];
buildInputs = [ glib gtk4 pipewire ];
diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix
index 2c3a8fb1390f..4bad49603373 100644
--- a/pkgs/applications/audio/orca-c/default.nix
+++ b/pkgs/applications/audio/orca-c/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ netcrns ];
+ mainProgram = "orca";
};
}
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index 6abc120379d6..606f80d1e41e 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.34";
+ version = "1.36";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "sha256-JT3I06qm3oljsySIgK5xP2RC3KAb5QBrNVdip0ds4KE=";
+ sha256 = "sha256-QyhBoWCkj7iYXAFsyVH6+XH2P/MQEXZQfAcUDu4Rtco=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 48e6a85f5d25..c25276ff6e19 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.68.628.geb44bd66";
+ version = "1.1.68.632.g2b11de83";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "52";
+ rev = "53";
deps = [
alsa-lib
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "be6f1cb650924eb9e244497374d1dfe6136d28056dbecc7000a03341a4bb4c6ab2c83ec6c707bd6f57afde95262230eafbde08e9c7a7dfcacdf660eb10499f3a";
+ sha512 = "ed991691c99fe97ed9ff5d0f5cc9a8883c176fa3b3054293c37d545abbb895c6260afdf1c8c0828d62c36ea7ab384e166b6151effb4614c93e4fa712319a08a3";
};
nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index eecf8caee379..b0e9e9bde9d0 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "synthv1";
- version = "0.9.15";
+ version = "0.9.23";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
- sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix";
+ sha256 = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
};
buildInputs = [ qtbase qttools libjack2 alsa-lib liblo lv2 ];
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 89e0a9291d1a..a1ce67abf9ae 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.33.1";
+ version = "2.34.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "1k1h37fbpsib9h8867m2dsfacdjs78gdm61gvrin5gpw1zj10syz";
+ sha256 = "07r7gfn44c4bdcq9rgs6v4frrl2g004lh9lcsrj6rbqy6949r9j2";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix
index a40ff76eea34..c2a696cd425b 100644
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@@ -17,6 +17,8 @@
, makeFontsConf
, libglvnd
, libxkbcommon
+, stdenv
+, enableWayland ? stdenv.isLinux
, wayland
, xorg
}:
@@ -96,9 +98,18 @@ rustPlatform.buildRustPackage rec {
}))
];
- postFixup = ''
+ postFixup = let
+ libPath = lib.makeLibraryPath ([
+ libglvnd
+ libxkbcommon
+ xorg.libXcursor
+ xorg.libXext
+ xorg.libXrandr
+ xorg.libXi
+ ] ++ lib.optionals enableWayland [ wayland ]);
+ in ''
wrapProgram $out/bin/neovide \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd libxkbcommon wayland xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]}
+ --prefix LD_LIBRARY_PATH : ${libPath}
'';
postInstall = ''
@@ -115,7 +126,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Kethku/neovide";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ck3d ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
mainProgram = "neovide";
};
}
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 8f4ea3df18d0..9e9e5c28e5ef 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -2,24 +2,27 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "1.11.2";
+ version = "1.12.2";
src =
- if stdenv.isLinux then fetchzip {
- url = {
- "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
- "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
- "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
- }.${stdenv.hostPlatform.system};
- sha256 = {
- "i686-linux" = "0rh5bakj9qd43cf6wj5v46a3h98kcwqyc0f1yw72wvcacvjycyjz";
- "x86_64-linux" = "00nf0cb8cxk1pvzr1wq778wvikzrlzy38r3rzkq44whdpdj50jzx";
- "aarch64-linux" = "1gv282z49bj3ln5na4wb1z5455a64cyd54fp5i96k8shaxd0apxf";
- }.${stdenv.hostPlatform.system};
- stripRoot = false;
- } else fetchurl {
- url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg";
- sha256 = "1pqdjr6d23j9fpwgahb0s1ni1bpjv9jajs1hapgq5kdrww2w7nhm";
- };
+ if stdenv.isLinux then
+ fetchzip
+ {
+ url = {
+ "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
+ "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
+ "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
+ }.${stdenv.hostPlatform.system};
+ sha256 = {
+ "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg=";
+ "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4=";
+ "aarch64-linux" = "vWoA/0ZfdwVniHmxC4nH1QIc6bjdb00+SwlkIWc9BPs=";
+ }.${stdenv.hostPlatform.system};
+ stripRoot = false;
+ } else
+ fetchurl {
+ url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg";
+ sha256 = "xG/6YZdkJxr5Py90rkIyG4mK40yFTmNSfih9jO2uF+4=";
+ };
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
@@ -43,11 +46,11 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "1Password command-line tool";
- homepage = "https://support.1password.com/command-line/";
+ description = "1Password command-line tool";
+ homepage = "https://support.1password.com/command-line/";
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
- maintainers = with maintainers; [ joelburget marsam ];
- license = licenses.unfree;
- platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+ maintainers = with maintainers; [ joelburget marsam ];
+ license = licenses.unfree;
+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
};
}
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 1cab19808a19..d8c94c88383d 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
- version = "1.21.1";
+ version = "1.21.2";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-M63KFQ+g4b0HiWlv1Kym0ulqZcCMdfU9SoLhpaI4q/o=";
+ sha256 = "sha256-HHeO8mbvD+PLMKjeacjIBNEVeOYjeHjXJHhTkbMMOG4=";
};
vendorSha256 = "sha256-yP4iF3403WWgWAmBHiuOpDsIAUx4+KR8uKPfjy3qXt8=";
diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/applications/misc/geek-life/default.nix
new file mode 100644
index 000000000000..653c940024a6
--- /dev/null
+++ b/pkgs/applications/misc/geek-life/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "geek-life";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "ajaxray";
+ repo = "geek-life";
+ rev = "v${version}";
+ sha256 = "083y2kv5vb217ghy9g2qylqgdgbjjggjj3cq454csnn3cjgq9zfh";
+ };
+
+ vendorSha256 = "05fcnmg2rygccf65r8js6kbijx740vfnvbrc035bjs1jvdw29h9j";
+
+ postInstall = ''
+ mv $out/bin/app $out/bin/geek-life
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/ajaxray/geek-life";
+ description = "The Todo List / Task Manager for Geeks in command line";
+ maintainers = with maintainers; [ noisersup ];
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 5b4444b19851..f293cc60d2a7 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -31,11 +31,11 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.12.15";
+ version = "0.12.19";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
- sha256 = "sha256-0pAwTkx89B6S0GPes2XXSRNdByIc+DwiI5HXoUqs/QE=";
+ sha256 = "sha256-M9U67+mCL/CziTprCAhfrZTWl6i7HRfH24l/xqUqkIg=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 53c4145cee26..18de4811af79 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -92,11 +92,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.30.89";
+ version = "1.31.87";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "2fu6Nk/eMLQ9nYy1aZDpjnRg16YosQPqdKtJ2VAYBrw=";
+ sha256 = "lfkTB8oXxZqgbO7d8cdktSd6ivQc3g5kiAYZKyrrLpw=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a9331041ddde..e88c1fa1b94a 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -87,9 +87,7 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
- gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [
- "zlib"
- ] ++ [
+ gnSystemLibraries = [
# TODO:
# "ffmpeg"
# "snappy"
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 6e890ccb6c37..e48539aab5bb 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,22 +18,22 @@
}
},
"beta": {
- "version": "95.0.4638.54",
- "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
- "sha256bin64": "06d0kjnrv8z74icc6nahllxbwn3xxwn0vgc7ss47402zrqig8lch",
+ "version": "96.0.4664.18",
+ "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf",
+ "sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi",
"deps": {
"gn": {
- "version": "2021-08-11",
+ "version": "2021-09-24",
"url": "https://gn.googlesource.com/gn",
- "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263",
- "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
+ "rev": "0153d369bbccc908f4da4993b1ba82728055926a",
+ "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
}
}
},
"dev": {
- "version": "96.0.4664.9",
- "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39",
- "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3",
+ "version": "96.0.4664.18",
+ "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf",
+ "sha256bin64": "0y09aginw5qg7apm9wvxny7y8nxhsq7gnxp1jmghfjhv5xq7pdn9",
"deps": {
"gn": {
"version": "2021-09-24",
@@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
- "version": "94.0.4606.81",
- "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh",
- "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz",
+ "version": "95.0.4638.54",
+ "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
+ "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a",
"deps": {
"gn": {
"version": "2021-08-11",
@@ -55,8 +55,8 @@
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
},
"ungoogled-patches": {
- "rev": "94.0.4606.81-1",
- "sha256": "113abybh8kkw9a92lj6jww6dl6rc1sv5x7a7a1gjwsihzd2r0cik"
+ "rev": "95.0.4638.54-1",
+ "sha256": "01jkkz5224aaj5cgdmqknf8v73fyaw4q8bzbqa520a0lvl7hwbg5"
}
}
}
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index c46c6ed26301..5efee961b424 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,10 +1,8 @@
-{ lib, buildGoPackage, fetchFromGitHub, ... }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
-let version = "0.21.0"; in
-
-buildGoPackage {
+buildGoPackage rec {
pname = "kubecfg";
- inherit version;
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "bitnami";
@@ -17,6 +15,14 @@ buildGoPackage {
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installShellCompletion --cmd kubecfg \
+ --bash <($out/bin/kubecfg completion --shell=bash) \
+ --zsh <($out/bin/kubecfg completion --shell=zsh)
+ '';
+
meta = {
description = "A tool for managing Kubernetes resources as code";
homepage = "https://github.com/bitnami/kubecfg";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7be9c9cc742b..65b6e421164b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -727,10 +727,10 @@
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/oci",
"repo": "terraform-provider-oci",
- "rev": "v4.35.0",
- "sha256": "12acy39cr6pxq8gk483b6i78x463ml9pk10qp9jpz0dr05zcyhqw",
+ "rev": "v4.49.0",
+ "sha256": "1s1gfnj3pi3q11jrdc2qxz9ccdk549nki0qkcnd0s7lxac8xzyfh",
"vendorSha256": null,
- "version": "4.35.0"
+ "version": "4.49.0"
},
"okta": {
"owner": "terraform-providers",
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index 1267340c0985..52935267cf2e 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "teams";
- version = "1.4.00.13653";
+ version = "1.4.00.26453";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
- sha256 = "1kx4j837fd344zy90nl0j3r8cdvihy6i6gf56wd5n56zngx1fhjv";
+ sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ];
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 7fffc5abc5b1..57997ce7e223 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
- version = "1.5.0";
+ version = "1.5.1";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
- sha256 = "sha256-JY7AkTnrH/92IfUx/ujK7jMF3zwLsnEE9+/At4UnTNw=";
+ sha256 = "sha256-LtKFdNX2/wSs9Hxplu7rz6rc1hoijCGgCKyLjlcRQoI=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 312023566b02..7f48ad2d3b48 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -106,7 +106,6 @@ in stdenv.mkDerivation {
r @{PROC}/@{pid}/environ,
r @{PROC}/@{pid}/mounts,
rwk /tmp/tr_session_id_*,
- r /run/systemd/resolve/stub-resolv.conf,
r $out/share/transmission/web/**,
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 4b1150159a4e..261a99698726 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,16 +4,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
- version = "1.18.2";
+ version = "1.18.3";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "1r5vd501p3ydi6rr2k4cqdl3pixdr79lfwpnc90xmd1i6mlyxrma";
+ sha256 = "sha256-wc4+j2kTSwZsxIdJHmznkNIq436p0yNrskchuEJtL5E=";
};
- vendorSha256 = "1v8hdr2na7bndx6q1kk0dkg1v9149gbhxcva1wq075xjl0kw21ip";
+ vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M=";
doCheck = false;
diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix
index 2f34d8b8c18b..c983787d23e5 100644
--- a/pkgs/applications/office/jameica/default.nix
+++ b/pkgs/applications/office/jameica/default.nix
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
let
- _version = "2.8.6";
- _build = "455";
+ _version = "2.10.0";
+ _build = "480";
version = "${_version}-${_build}";
name = "jameica-${version}";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "willuhn";
repo = "jameica";
rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
- sha256 = "1pndklxsvixy6zyblqr62ki3pqaq8lfrzgasrvhclqxxh76gjlss";
+ sha256 = "0rzhbskzzvr9aan6fwxd2kmzg79ranx7aym5yn1i37z3ra67d1nz";
};
# there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries
diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix
index 2b3ee7ddc23e..90608dceba5c 100644
--- a/pkgs/applications/office/super-productivity/default.nix
+++ b/pkgs/applications/office/super-productivity/default.nix
@@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation rec {
pname = "super-productivity";
- version = "7.5.1";
+ version = "7.6.0";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
- sha256 = "sha256-ezJN/t0iNk0haMLPioEQSNXU4ugVeJe44GNVGd+cOF4=";
+ sha256 = "f02a451a44f48a8e85a0c1269625d89fb1e0b8a75b7e217d96352064e6464ae5";
name = "${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index 14ceb53f9bb0..3d752b7d7b93 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abella";
- version = "2.0.6";
+ version = "2.0.7";
src = fetchurl {
url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz";
- sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi";
+ sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc=";
};
buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index d53947d806d1..76bbc90773b4 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
networkx
ipykernel
ipywidgets
- jupyter_client
+ jupyter-client
]);
unpackPhase = ''
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 14b318abab45..32126c7ce663 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
- version = "1.0.0-alpha.54";
+ version = "1.0.0-alpha.55";
src = fetchCrate {
inherit version pname;
- sha256 = "0b9494kwchfds8hk566k3fkwdvcskpgw0ajlrdry9lmmvx3vj7dc";
+ sha256 = "sha256-1nnn0cdDe+WOetGtRe7dMEyuCcbfRHdJWFxQ4bTXebQ=";
};
- cargoSha256 = "0rgd6mfxbxgzpj2nj2y315kgvxiayr9xbma4j014bc61ms7cnys7";
+ cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs=";
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 93c3b2203b75..12ca0dfe4cb6 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -112,6 +112,15 @@ in stdenv.mkDerivation rec {
url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch";
sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx";
})
+ # TOREMOVE when > 0.33.1
+ # youtube-dl has been abandonned and is now unusable w/
+ # youtube.com. Mpv migrated to yt-dlp since the 0.33.1 but did not
+ # cut a new release yet. See
+ # https://github.com/mpv-player/mpv/pull/9209
+ (fetchpatch {
+ url = "https://github.com/mpv-player/mpv/commit/d1c92bfd79ef81ac804fcc20aee2ed24e8d587aa.patch";
+ sha256 = "1dwxzng3gsrx0gjljm5jmfcjz3pzdss9z2l0n25rmmb4nbcrcx1f";
+ })
];
postPatch = ''
diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix
index 5225197772c7..984623ed7780 100644
--- a/pkgs/applications/video/mpv/wrapper.nix
+++ b/pkgs/applications/video/mpv/wrapper.nix
@@ -3,7 +3,7 @@
, lib
, symlinkJoin
, makeWrapper
-, youtube-dl
+, yt-dlp
}:
# the unwrapped mpv derivation - 1st argument to `wrapMpv`
@@ -25,7 +25,7 @@ let
binPath = lib.makeBinPath ([
mpv.luaEnv
] ++ lib.optionals youtubeSupport [
- youtube-dl
+ yt-dlp
] ++ lib.optionals mpv.vapoursynthSupport [
mpv.vapoursynth.python3
]);
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index a945b2c79d79..705e5b5d6111 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -17,13 +17,13 @@
buildGoModule rec {
pname = "podman";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
- sha256 = "sha256-AeddndkKyUs9i0bg0XO5QCmYgqgWREnHWsmce6VM7Oo=";
+ sha256 = "sha256-+6ALwm1Hc76rYwlQN0r8zX2n+nxBk5iW4AHWBlzAIOc=";
};
vendorSha256 = null;
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index c2186cf6bfa0..006fc2aff923 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -62,7 +62,7 @@ runCommand name
# and otherwise use `meta.outputsToInstall`. The attribute is guaranteed
# to exist in mkDerivation-created cases. The other cases (e.g. runCommand)
# aren't expected to have multiple outputs.
- (if drv.outputUnspecified or false
+ (if (! drv ? outputSpecified || ! drv.outputSpecified)
&& drv.meta.outputsToInstall or null != null
then map (outName: drv.${outName}) drv.meta.outputsToInstall
else [ drv ])
diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index 5b9dbd71c595..9ee0b3ca3686 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, fetchzip, lib }:
# gitlab example
-{ owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null
+{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null
, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false
, ... # For hash agility
} @ args:
@@ -17,10 +17,10 @@ let
fetcherArgs = (if useFetchGit then {
inherit rev deepClone fetchSubmodules leaveDotGit;
- url = "https://${domain}/${slug}.git";
+ url = "${protocol}://${domain}/${slug}.git";
} else {
- url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
+ url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
}) // passthruAttrs // { inherit name; };
in
-fetcher fetcherArgs // { meta.homepage = "https://${domain}/${slug}/"; inherit rev; }
+fetcher fetcherArgs // { meta.homepage = "${protocol}://${domain}/${slug}/"; inherit rev; }
diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/data/fonts/atkinson-hyperlegible/default.nix
new file mode 100644
index 000000000000..ef7425e12e49
--- /dev/null
+++ b/pkgs/data/fonts/atkinson-hyperlegible/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub }:
+
+let
+ pname = "atkinson-hyperlegible";
+ version = "unstable-2021-04-29";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+
+ owner = "googlefonts";
+ repo = "atkinson-hyperlegible";
+ rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46";
+ sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks=";
+
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -Dm644 -t $out/share/fonts/opentype fonts/otf/*
+ '';
+
+ meta = with lib; {
+ description = "Typeface designed to offer greater legibility and readability for low vision readers";
+ homepage = "https://brailleinstitute.org/freefont";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index c223f9366af1..b6a1a7a2c174 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "2106.17";
+ version = "2108.26";
in
fetchzip {
name = "cascadia-code-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
- sha256 = "sha256-EsXD6gY3q3KIk37vYPz731lLz5989cd+s5fz5rKIn2k=";
+ sha256 = "1dvwn5rs4ss4rwd64namy8ccz8dagkk84qjg13sxxqizyd5y08h1";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index c9518b78a65a..eaf82d412a1d 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,21 +1,21 @@
{ lib, fetchzip }:
let
- version = "2.030";
+ version = "2.038";
in fetchzip {
name = "source-code-pro-${version}";
- url = "https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip";
+ url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
- sha256 = "0d8qwzjgnz264wlm4qim048z3236z4hbblvc6yplw13f6b65j6fv";
+ sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368";
meta = {
- description = "A set of monospaced OpenType fonts designed for coding environments";
+ description = "Monospaced font family for user interface and coding environments";
maintainers = with lib.maintainers; [ relrod ];
platforms = with lib.platforms; all;
homepage = "https://adobe-fonts.github.io/source-code-pro/";
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans/default.nix
similarity index 55%
rename from pkgs/data/fonts/source-sans-pro/default.nix
rename to pkgs/data/fonts/source-sans/default.nix
index 7d5c7679ad8c..c16d0d2b8b4f 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
- version = "3.006";
+ version = "3.046";
in fetchzip {
- name = "source-sans-pro-${version}";
+ name = "source-sans-${version}";
- url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/${version}R/source-sans-pro-${version}R.zip";
+ url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip";
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
@@ -14,11 +14,11 @@ in fetchzip {
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
- sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr";
+ sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94";
meta = with lib; {
- homepage = "https://adobe-fonts.github.io/source-sans-pro/";
- description = "A set of OpenType fonts designed by Adobe for UIs";
+ homepage = "https://adobe-fonts.github.io/source-sans/";
+ description = "Sans serif font family for user interface environments";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
deleted file mode 100644
index 86a45b80efd7..000000000000
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, fetchzip }:
-
-let
- version = "3.000";
-in fetchzip {
- name = "source-serif-pro-${version}";
-
- url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R/source-serif-pro-${version}R.zip";
-
- postFetch = ''
- mkdir -p $out/share/fonts/{opentype,truetype,variable}
- unzip -j $downloadedFile "OTF/*.otf" -d $out/share/fonts/opentype
- unzip -j $downloadedFile "TTF/*.ttf" -d $out/share/fonts/truetype
- unzip -j $downloadedFile "VAR/*.otf" -d $out/share/fonts/variable
- '';
-
- sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz";
-
- meta = with lib; {
- homepage = "https://adobe-fonts.github.io/source-serif-pro/";
- description = "A set of OpenType fonts to complement Source Sans Pro";
- license = licenses.ofl;
- platforms = platforms.all;
- maintainers = with maintainers; [ ttuegel ];
- };
-}
-
diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/data/fonts/source-serif/default.nix
new file mode 100644
index 000000000000..855fe7e6e9e9
--- /dev/null
+++ b/pkgs/data/fonts/source-serif/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchzip }:
+
+let
+ version = "4.004";
+in fetchzip {
+ name = "source-serif-${version}";
+
+ url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip";
+
+ postFetch = ''
+ mkdir -p $out/share/fonts/{opentype,truetype,variable}
+ unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
+ unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
+ unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
+ '';
+
+ sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h";
+
+ meta = with lib; {
+ homepage = "https://adobe-fonts.github.io/source-serif/";
+ description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ttuegel ];
+ };
+}
diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix
index e36f567b5f80..1b6a9025eef8 100644
--- a/pkgs/data/themes/dracula-theme/default.nix
+++ b/pkgs/data/themes/dracula-theme/default.nix
@@ -22,7 +22,14 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/${themeName}
- cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,kde,metacity-1,unity,xfwm4} $out/share/themes/${themeName}
+ cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/${themeName}
+
+ cp -a kde/{color-schemes,plasma} $out/share/
+ cp -a kde/kvantum $out/share/Kvantum
+ mkdir -p $out/share/aurorae/themes
+ cp -a kde/aurorae/* $out/share/aurorae/themes/
+ mkdir -p $out/share/sddm/themes
+ cp -a kde/sddm/* $out/share/sddm/themes/
runHook postInstall
'';
@@ -31,6 +38,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/dracula/gtk";
license = licenses.gpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ alexarice vonfry ];
+ maintainers = with maintainers; [ alexarice ];
};
}
diff --git a/pkgs/data/themes/kde-gruvbox/default.nix b/pkgs/data/themes/kde-gruvbox/default.nix
new file mode 100644
index 000000000000..e0f478a53cbe
--- /dev/null
+++ b/pkgs/data/themes/kde-gruvbox/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "kde-gruvbox";
+ version = "unstable-2015-08-09";
+
+ src = fetchFromGitHub {
+ owner = "printesoi";
+ repo = pname;
+ rev = "2dd95283076d7194345a460edb3630cfd020759c";
+ sha256 = "sha256-ppAeEfwoHZg7XEj3zGc+uq4Z6hUgJNM2EjuDsc8pFQo=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/{plasma/desktoptheme,yakuake/kns_skins}
+ cp -R color-schemes konsole $out/share
+ cp -R plasma5/gruvbox $out/share/plasma/desktoptheme
+ cp -R yakuake/breeze-gruvbox-dark $out/share/yakuake/kns_skins
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A suite of themes for KDE applications that match the retro gruvbox colorscheme";
+ homepage = "https://github.com/printesoi/kde-gruvbox";
+ license = licenses.mit;
+ maintainers = [ maintainers.ymarkus ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix
index 1eb6a5f39e6d..be107047799f 100644
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
- version = "11.2";
+ version = "11.2.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- sha256 = "1krfjk76yjyzsxkhymc1dpy3y7ykawdxzwb282wgbb480dpg8s05";
+ sha256 = "1bc9pj5k0zwc5fspp7b2i2sfrd6qbbi4kyxggc8kxrgv1sdgw3ff";
};
buildInputs = [
diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix
index 83764e3c8bca..46594e4f5e17 100644
--- a/pkgs/data/themes/whitesur/default.nix
+++ b/pkgs/data/themes/whitesur/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "whitesur-gtk-theme";
- version = "2021-09-24";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "12dwmgq0kadjfky5bjm62vwgdlw3nmrrhqqs5iw15w0pn3mbmd5c";
+ sha256 = "1rbwf6z2bda647kw00q2fp349gjzvdc4gyk986fkjli0nr0jh8hp";
};
nativeBuildInputs = [
@@ -33,7 +33,9 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do patchShebangs "$file"; done
+ find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do
+ patchShebangs "$file"
+ done
# Do not provide `sudo`, as it is not needed in our use case of the install script
substituteInPlace lib-core.sh --replace '$(which sudo)' false
diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix
index cfa77fadb79d..e486279508c8 100644
--- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
sha256 = "1r94880d4khbjhhfnhaba3y3d4hv2bri82rzfzxn27s5iybpqras";
};
+ patches = [
+ # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667
+ (fetchpatch {
+ url = "https://cgit.freebsd.org/ports/patch/?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
+ sha256 = "sha256-IMBfqtrqBw3DdmJG0qchZFR6Am1PICMnM5P6BcS8oqI=";
+ })
+ ];
+
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
index 814878d57140..89a49e4cecb3 100644
--- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; };
};
+ patches = [
+ # Makes the database point to stable paths in /run/current-system/sw/share, which don't decay whenever this package's hash changes.
+ # This assumes a nixos + gnome system, where this package is installed in environment.systemPackages,
+ # and /share outputs are included in environment.pathsToLink.
+ ./stable-dir.patch
+ ];
+
nativeBuildInputs = [ meson ninja pkg-config gettext ];
meta = with lib; {
diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch b/pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch
new file mode 100644
index 000000000000..cbc55e8a5c01
--- /dev/null
+++ b/pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch
@@ -0,0 +1,9 @@
+diff --git a/backgrounds/meson.build b/backgrounds/meson.build
+index 2175a16..cf521df 100644
+--- a/backgrounds/meson.build
++++ b/backgrounds/meson.build
+@@ -1,5 +1,5 @@
+ dataconf = configuration_data()
+-dataconf.set('BACKGROUNDDIR', backgrounddir)
++dataconf.set('BACKGROUNDDIR', '/run/current-system/sw/share/backgrounds/gnome')
+ dataconf.set('datadir', datadir)
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index d31f16e235ad..b56e9c4bc2f8 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, fluxbox
, libarchive
+, linux-pam
, numlockx
, qmake
, qtbase
@@ -17,13 +18,13 @@
mkDerivation rec {
pname = "lumina";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "lumina-desktop";
repo = pname;
rev = "v${version}";
- sha256 = "0bvs12c9pkc6fnkfcr7rrxc8jfbzbslch4nlfjrzwi203fcv4avw";
+ sha256 = "0wc8frhw1yv07n05r33c4zilq5lgn5gw07a9n37g6nyn5sgrbp4f";
};
nativeBuildInputs = [
@@ -35,6 +36,7 @@ mkDerivation rec {
buildInputs = [
fluxbox # window manager for Lumina DE
libarchive # make `bsdtar` available for lumina-archiver
+ linux-pam
numlockx # required for changing state of numlock at login
qtbase
qtmultimedia
@@ -49,7 +51,6 @@ mkDerivation rec {
];
patches = [
- ./avoid-absolute-path-on-sessdir.patch
./LuminaOS-NixOS.cpp.patch
];
@@ -60,6 +61,14 @@ mkDerivation rec {
'';
postPatch = ''
+ # Avoid absolute path on sessdir
+ substituteInPlace src-qt5/OS-detect.pri \
+ --replace L_SESSDIR=/usr/share/xsessions '#L_SESSDIR=/usr/share/xsessions'
+
+ # Do not set special permission
+ substituteInPlace src-qt5/core/lumina-checkpass/lumina-checkpass.pro \
+ --replace "chmod 4555" "chmod 555"
+
# Fix plugin dir
substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix
index 38c2fae60347..3080873bb96a 100644
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -21,17 +21,16 @@ let
"dotnet-runtime"
else
"dotnet-sdk";
- platform = if stdenv.isDarwin then "osx" else "linux";
- suffix = {
- x86_64-linux = "x64";
- aarch64-linux = "arm64";
- x86_64-darwin = "x64";
- }."${stdenv.hostPlatform.system}" or (throw
- "Unsupported system: ${stdenv.hostPlatform.system}");
+ platform = {
+ x86_64-linux = "linux-x64";
+ aarch64-linux = "linux-arm64";
+ x86_64-darwin = "osx-x64";
+ aarch64-darwin = "osx-arm64";
+ }.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
urls = {
- aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz";
- runtime = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz";
- sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz";
+ aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-${platform}.tar.gz";
+ runtime = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}.tar.gz";
+ sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-${platform}.tar.gz";
};
descriptions = {
aspnetcore = "ASP.NET Core Runtime ${version}";
@@ -85,7 +84,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://dotnet.github.io/";
description = builtins.getAttr type descriptions;
- platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+ platforms = builtins.attrNames sha512;
maintainers = with maintainers; [ kuznero ];
license = licenses.mit;
};
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 5b4740c22e51..1b34a5953c89 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -78,4 +78,36 @@ rec {
x86_64-darwin = "eca773f407314123fd5b2017f68520c0647651f53e546583c4145b596c230c42898b3e56355cd5ace76b793df4aca3cd7ff9142718c86eedeabbabb70b393d0e";
};
};
+
+ # v6.0 (RC)
+
+ aspnetcore_6_0 = buildAspNetCore {
+ version = "6.0.0-rc.2.21480.10";
+ sha512 = {
+ x86_64-linux = "d48895237644a3999663b2e16baa2303d8b77f66385a04d8edb5601fdffacce18b1b1318827d09f74f6b133ff2c179ef659bd21cf8460289b5f81f404fa8b326";
+ aarch64-linux = "3a92e93a8cb0c186f1c4a822d46a37604bc470599dbcbe05a7f1ea7c7d1dd9c0e6571de524de8729d19d237078742a0b4e3a1daa11b5eb5f8cce74b69710ada4";
+ x86_64-darwin = "ed1cad94acf207d0f18201af1e0e6c386466f94b8fd0474dc8d59f47d8f3c456f3a55de392dda126e0e1f4f934249b0e17b7b86f6bc7c510dc475324ee1395f0";
+ aarch64-darwin = "688879db73aa6b7556da70907920f3e443dff54bf8624030352ed5ba3896cceda69040ef359dacf55d50cc52fc2c75057d259a1cc11a2258d4446ebbd2200820";
+ };
+ };
+
+ runtime_6_0 = buildNetRuntime {
+ version = "6.0.0-rc.2.21480.5";
+ sha512 = {
+ x86_64-linux = "45062417c6111af4d635868927e8f69d43f66c9e0f111cb71c1861eaf5ceda4aefa99d97c6ce3b13fac2bc7c57c435e6f8b2d43c51a3bb3304b42081d98f7047";
+ aarch64-linux = "b0f8128d994b0de0c72b9dd8083a7350218adfafedc643c59b497fa605420602004d9e21e8acb488d92bc498f9783a3240cfcafa77443eb6f08b66aadc4f5b65";
+ x86_64-darwin = "0f702645719af5a4f1e720c0f2a0c67c7a4a84fac525b3ac6ce6357ca6d44405aeca674d04d8a976a7338ddf8782350debd53dce85e614c837106ffadf84cfb9";
+ aarch64-darwin = "747abb8eaad53e0ca7e5b2908b620076fa68a75c5e822361483ed13f7544e31def26bbf67bb85f47633e2dddde9cb095503bf70d1a4b0b2f33c6ef6f887d95fa";
+ };
+ };
+
+ sdk_6_0 = buildNetSdk {
+ version = "6.0.100-rc.2.21505.57";
+ sha512 = {
+ x86_64-linux = "0a8f85a2757f61ca7f9b8c546af4554c2aac9cdb06f6d62879a60de6f2a3d37ea7136f48896c9c85828a2d55df354e7b9b5b4dc22896c927f0c6370a5ade1b9c";
+ aarch64-linux = "14aa96f47f7f3520075e41753c705bdbf7f84fd7cff7cc2add1095a13e3e3c44eaaf2d822551902f05a6ad0c9acd7f7424190b7c09c397004c632eddc8acd5ac";
+ x86_64-darwin = "6a896f2d1e8e2d00b52641e8b1aee88888a2b30e0f18e499b1eaf4ae7dbdaa24ea5af0dbd4a6a1cee715738e6e91cecdbc02c2c7d3d4c71d4c9af3e04f1b4fc9";
+ aarch64-darwin = "c96c8a86e36ca16a0e10f635250472d5c8eda290dc505ed8eb4bd6a68b8e6ae6b2770236f5bda1573bc3124229531b3ed7dd71f60a821e39aaaa6697a82fdf8a";
+ };
+ };
}
diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index f9bba06d6336..8908c6afceba 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -124,7 +124,6 @@ stdenv.mkDerivation rec {
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
- '' + lib.optionalString stdenv.isLinux ''
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix
index acd04c24a3be..433d3f9af7a3 100644
--- a/pkgs/development/compilers/go/1.16.nix
+++ b/pkgs/development/compilers/go/1.16.nix
@@ -126,7 +126,6 @@ stdenv.mkDerivation rec {
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
- '' + lib.optionalString stdenv.isLinux ''
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix
index 2f62c450c2e0..279be309427a 100644
--- a/pkgs/development/compilers/go/1.17.nix
+++ b/pkgs/development/compilers/go/1.17.nix
@@ -125,7 +125,6 @@ stdenv.mkDerivation rec {
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
- '' + lib.optionalString stdenv.isLinux ''
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix
index 26c855e4ddb7..9e4e446b1231 100644
--- a/pkgs/development/compilers/koka/default.nix
+++ b/pkgs/development/compilers/koka/default.nix
@@ -4,12 +4,12 @@
, parsec, process, regex-compat, text, time }:
let
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
- sha256 = "18f4hsqgc6c0cnayabj311n438fjhf217j1kjaysa8w4k4pxl58z";
+ sha256 = "sha256-+w99Jvsd1tccUUYaP2TRgCNyGnMINWamuNRumHGzFWA=";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
index 657a465a3fe7..d74aa519b769 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
@@ -58,8 +58,7 @@ stdenv.mkDerivation {
./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
./gnu-install-dirs.patch
../../common/compiler-rt/libsanitizer-no-cyclades-11.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
+ ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/10/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/10/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 690328b26ae2..8bd7e937e7d7 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -63,14 +63,14 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
# disabled until recommonmark supports sphinx 3
#Llvm-manpages = lowPrio (tools.libllvm.override {
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
index 1111f14f9bea..4968c8bcfbd8 100644
--- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
@@ -59,8 +59,7 @@ stdenv.mkDerivation {
# extra `/`.
./normalize-var.patch
../../common/compiler-rt/libsanitizer-no-cyclades-11.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
+ ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/11/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/11/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
index 9834ce30cdd2..ebd0dc672aa3 100644
--- a/pkgs/development/compilers/llvm/11/default.nix
+++ b/pkgs/development/compilers/llvm/11/default.nix
@@ -65,21 +65,21 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libllvm-polly = callPackage ./llvm {
inherit llvm_meta;
enablePolly = true;
};
- llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
+ llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
clang-polly-unwrapped = callPackage ./clang {
inherit llvm_meta;
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
index 5f2cf9fd3fbd..13c611ca8cc6 100644
--- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
@@ -58,8 +58,7 @@ stdenv.mkDerivation {
# ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
# extra `/`.
./normalize-var.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
+ ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 388c7d95f69c..e68522faea06 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -66,14 +66,14 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
# disabled until recommonmark supports sphinx 3
#Llvm-manpages = lowPrio (tools.libllvm.override {
diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix
index 403924547bfa..e30db5fcd954 100644
--- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix
@@ -60,8 +60,7 @@ stdenv.mkDerivation {
# ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
# extra `/`.
./normalize-var.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- # Prevent a compilation error on darwin
+ ] # Prevent a compilation error on darwin
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix
index 9fd4cd98901d..13be73967143 100644
--- a/pkgs/development/compilers/llvm/13/default.nix
+++ b/pkgs/development/compilers/llvm/13/default.nix
@@ -68,14 +68,14 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
llvm-manpages = lowPrio (tools.libllvm.override {
enableManpages = true;
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
index c684437cefdb..874540dd8c3b 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
@@ -55,10 +55,10 @@ stdenv.mkDerivation {
# https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
../../common/compiler-rt/glibc.patch
./gnu-install-dirs.patch
- ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./sys-ustat.patch
- ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch
- ++ [ ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ];
+
+ ./sys-ustat.patch
+ ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch
+ ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/5/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index c9ddfe45c898..000000000000
--- a/pkgs/development/compilers/llvm/5/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From 3e1fcb7d4909db8f0f7dd0109b2eee20115c8be3 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt"
-Date: Sat, 9 Sep 2017 08:31:15 -0500
-Subject: [PATCH] Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +--
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +--
- lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++----
- lib/sanitizer_common/sanitizer_platform.h | 7 ++++
- .../sanitizer_platform_interceptors.h | 2 +-
- .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++---------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 11 files changed, 47 insertions(+), 32 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 6d47ba432..c58dd4864 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -39,7 +39,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #else
-@@ -86,7 +86,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 6e908ac01..76c1688ce 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- return real == wrapper;
- }
-
--#if !defined(__ANDROID__) // android does not have dlvsym
-+#if !defined(__ANDROID__) && defined(__GLIBC__) // android does not have dlvsym
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 27a66c882..f60c38991 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & (func), \
- (::__interception::uptr) & WRAP(func))
-
--#if !defined(__ANDROID__) // android does not have dlvsym
-+#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 0a687f620..0852d97d7 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX
-+#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU
-
- #include "msan.h"
- #include "msan_thread.h"
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 4ed9afedf..64f584e93 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -100,7 +100,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -361,7 +361,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 52196db12..045d9331f 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -148,7 +148,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
-+#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -176,11 +176,11 @@ void InitTlsSize() {
- }
- #else
- void InitTlsSize() { }
--#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
-+#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
-
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
- || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
-- || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
-+ || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t kThreadDescriptorSize;
-
-@@ -335,7 +335,7 @@ uptr ThreadSelf() {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -362,7 +362,7 @@ static void GetTls(uptr *addr, uptr *size) {
- *addr = (uptr) dtv[2];
- *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
- }
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #else
-@@ -373,7 +373,7 @@ static void GetTls(uptr *addr, uptr *size) {
-
- #if !SANITIZER_GO
- uptr GetTlsSize() {
--#if SANITIZER_FREEBSD || SANITIZER_ANDROID
-+#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index 396f7c934..5af6f1ed5 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -175,6 +175,13 @@
- # define SANITIZER_ARM 0
- #endif
-
-+
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- // By default we allow to use SizeClassAllocator64 on 64-bit platform.
- // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
- // does not work well and we need to fallback to SizeClassAllocator32.
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index 0380cee92..0a39abbd0 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -31,7 +31,7 @@
- # define SI_POSIX 0
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 83f4fd22f..fa8c1b8bd 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
- # include
- #endif
- #include
--#include
-+// #include
-+#include
- #include
- #include
- #include
-@@ -251,7 +257,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ustat_sz = sizeof(struct ustat);
- unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
- unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
-@@ -309,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -403,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -453,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -821,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -976,7 +982,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1010,6 +1016,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1023,6 +1030,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
- CHECK_SIZE_AND_OFFSET(dirent, d_ino);
-@@ -1125,7 +1133,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1186,7 +1194,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1236,7 +1244,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1255,7 +1263,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index ead1e5704..2c020e3fe 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -284,7 +284,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.16.2
-
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 8205c67da77a..4593580b72fd 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -39,21 +39,21 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libllvm-polly = callPackage ./llvm {
inherit llvm_meta;
enablePolly = true;
};
- llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
+ llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
llvm-manpages = lowPrio (tools.libllvm.override {
enableManpages = true;
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
index 74c17fd3e647..41442a2f1838 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
@@ -56,8 +56,7 @@ stdenv.mkDerivation {
../../common/compiler-rt/glibc.patch
./gnu-install-dirs.patch
../../common/compiler-rt/libsanitizer-no-cyclades-9.patch
- ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
+ ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 6266eb1958d1..000000000000
--- a/pkgs/development/compilers/llvm/6/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,413 +0,0 @@
-From 7b4b3333a2718628b1d510ec1d8438ad67308299 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Fri, 29 Jun 2018 09:48:59 -0500
-Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 3 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 35 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index c991550a4..2b706418b 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 98fe51b85..c13302b98 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & (func), \
- (::__interception::uptr) & WRAP(func))
-
--// Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 4e6321fcb..4d50feb82 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_thread.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index fc4f7a75a..76cf4f769 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -23,7 +23,7 @@ namespace __sanitizer {
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 24e7548a5..20259b1d6 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -102,7 +102,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -363,7 +363,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 6c83e8db4..542c4fe64 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -522,13 +522,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
- char *buff;
-@@ -569,6 +569,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *argv = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 56fdfc870..a932d5db1 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -207,7 +207,7 @@ void InitTlsSize() { }
-
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
- || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
-- || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
-+ || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t kThreadDescriptorSize;
-
-@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) {
- *addr = (uptr)tcb->tcb_dtv[1];
- }
- }
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_SOLARIS
-+ SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index 334903c26..fc2afac2c 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -195,6 +195,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- // By default we allow to use SizeClassAllocator64 on 64-bit platform.
- // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
- // does not work well and we need to fallback to SizeClassAllocator32.
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index b99ac4480..628d226a1 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -38,7 +38,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -291,7 +291,7 @@
- (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
-- (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index feb7bad6f..4e89ab2a6 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
- CHECK_SIZE_AND_OFFSET(dirent, d_ino);
-@@ -1138,7 +1145,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1199,7 +1206,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1249,7 +1256,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1268,7 +1275,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index e14d5f575..389a3bc88 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -285,7 +285,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.18.0
-
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 7651b5ab13dc..9b1caf410bc2 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -39,21 +39,21 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libllvm-polly = callPackage ./llvm {
inherit llvm_meta;
enablePolly = true;
};
- llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
+ llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
llvm-manpages = lowPrio (tools.libllvm.override {
enableManpages = true;
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
index 6ea1280a4033..4937577c7b1b 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation {
./gnu-install-dirs.patch
../../common/compiler-rt/libsanitizer-no-cyclades-9.patch
] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
- ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/7/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/7/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 6864353424f1..d014c043a80d 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -63,21 +63,21 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libllvm-polly = callPackage ./llvm {
inherit llvm_meta;
enablePolly = true;
};
- llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
+ llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
clang-polly-unwrapped = callPackage ./clang {
inherit llvm_meta;
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
index 62672b336fff..9ff81a32dbc6 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
@@ -58,8 +58,7 @@ stdenv.mkDerivation {
./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
./gnu-install-dirs.patch
../../common/compiler-rt/libsanitizer-no-cyclades-9.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
+ ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/8/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/8/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index 34f204be3315..7252b75a3397 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -63,21 +63,21 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libllvm-polly = callPackage ./llvm {
inherit llvm_meta;
enablePolly = true;
};
- llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
+ llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
clang-polly-unwrapped = callPackage ./clang {
inherit llvm_meta;
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
index 83a75f516a05..7e13b7f6216c 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
@@ -58,8 +58,7 @@ stdenv.mkDerivation {
./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
./gnu-install-dirs.patch
../../common/compiler-rt/libsanitizer-no-cyclades-9.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
+ ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/9/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/9/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 8468fc363818..9126a614b106 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -63,21 +63,21 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libllvm-polly = callPackage ./llvm {
inherit llvm_meta;
enablePolly = true;
};
- llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
+ llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit clang-tools-extra_src llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
clang-polly-unwrapped = callPackage ./clang {
inherit llvm_meta;
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
index 9557f9d2d808..5874a91e03c8 100644
--- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
@@ -59,8 +59,7 @@ stdenv.mkDerivation {
# ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
# extra `/`.
./normalize-var.patch
- ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- # Prevent a compilation error on darwin
+ ] # Prevent a compilation error on darwin
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/git/compiler-rt/sanitizers-nongnu.patch
deleted file mode 100644
index 1f2ac97818eb..000000000000
--- a/pkgs/development/compilers/llvm/git/compiler-rt/sanitizers-nongnu.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Mon, 24 Sep 2018 11:17:25 -0500
-Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
-
-------
-Ported to compiler-rt-sanitizers-5.0.0. Taken from
-
-https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
-Signed-off-by: Jory A. Pratt
-
-Taken from gentoo-musl project, with a few additional minor fixes.
----
- lib/asan/asan_linux.cc | 4 +-
- lib/interception/interception_linux.cc | 2 +-
- lib/interception/interception_linux.h | 2 +-
- lib/msan/msan_linux.cc | 2 +-
- lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
- .../sanitizer_common_interceptors_ioctl.inc | 4 +-
- .../sanitizer_common_syscalls.inc | 2 +-
- lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
- .../sanitizer_linux_libcdep.cc | 10 ++---
- lib/sanitizer_common/sanitizer_platform.h | 6 +++
- .../sanitizer_platform_interceptors.h | 4 +-
- .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
- lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
- 13 files changed, 51 insertions(+), 34 deletions(-)
-
-diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
-index 625f32d40..73cf77aca 100644
---- a/lib/asan/asan_linux.cc
-+++ b/lib/asan/asan_linux.cc
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
-+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- #include
- extern "C" void* _DYNAMIC;
- #elif SANITIZER_NETBSD
-@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
- UNIMPLEMENTED();
- }
-
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID || SANITIZER_NONGNU
- // FIXME: should we do anything for Android?
- void AsanCheckDynamicRTPrereqs() {}
- void AsanCheckIncompatibleRT() {}
-diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index 26bfcd8f6..529b234f7 100644
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- }
-
- // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
- return dlvsym(RTLD_NEXT, func_name, ver);
- }
-diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 942c25609..24a4d5080 100644
---- a/lib/interception/interception_linux.h
-+++ b/lib/interception/interception_linux.h
-@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
- (::__interception::uptr) & WRAP(func))
-
- // Android, Solaris and OpenBSD do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- (::__interception::real_##func = (func##_f)( \
- unsigned long)::__interception::GetFuncAddrVer(#func, symver))
-diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 385a650c4..6e30a8ce9 100644
---- a/lib/msan/msan_linux.cc
-+++ b/lib/msan/msan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-+#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
-
- #include "msan.h"
- #include "msan_report.h"
-diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index 6bfd5e5ee..048f6154f 100644
---- a/lib/sanitizer_common/sanitizer_allocator.cc
-+++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
-
- // ThreadSanitizer for Go uses libc malloc/free.
- #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
--# if SANITIZER_LINUX && !SANITIZER_ANDROID
-+# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- extern "C" void *__libc_malloc(uptr size);
- # if !SANITIZER_GO
- extern "C" void *__libc_memalign(uptr alignment, uptr size);
-diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 2d633c173..b6eb23116 100644
---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
- _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- // Conflicting request ids.
- // _(CDROMAUDIOBUFSIZ, NONE, 0);
- // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
- _(VT_WAITACTIVE, NONE, 0);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-index 469c8eb7e..24f87867d 100644
---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
-+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
-@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
- }
- }
-
--#if !SANITIZER_ANDROID
-+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
- PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
- void *old_rlim) {
- if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
-diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 96d6c1eff..9e2b7fb9d 100644
---- a/lib/sanitizer_common/sanitizer_linux.cc
-+++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
- extern "C" {
- SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
- }
- #endif
-
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
- !SANITIZER_OPENBSD
- static void ReadNullSepFileToArray(const char *path, char ***arr,
- int arr_size) {
-@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
- #elif SANITIZER_NETBSD
- *argv = __ps_strings->ps_argvstr;
- *envp = __ps_strings->ps_envstr;
-+#elif SANITIZER_NONGNU
-+ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
-+ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
-+ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else // SANITIZER_FREEBSD
- #if !SANITIZER_GO
- if (&__libc_stack_end) {
-diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 4962ff832..438f94dbe 100644
---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
- }
-
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
-+ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -261,7 +261,7 @@ void InitTlsSize() { }
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
- defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
- defined(__arm__)) && \
-- SANITIZER_LINUX && !SANITIZER_ANDROID
-+ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t thread_descriptor_size;
-
-@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
-
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
- *addr = ThreadSelf();
- *size = GetTlsSize();
-@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #elif SANITIZER_OPENBSD
- *addr = 0;
- *size = 0;
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NONGNU
- *addr = 0;
- *size = 0;
- #elif SANITIZER_SOLARIS
-@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
- #if !SANITIZER_GO
- uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
-- SANITIZER_OPENBSD || SANITIZER_SOLARIS
-+ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
-diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index d81e25580..e10680ac8 100644
---- a/lib/sanitizer_common/sanitizer_platform.h
-+++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -208,6 +208,12 @@
- # define SANITIZER_SOLARIS32 0
- #endif
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+# define SANITIZER_NONGNU 1
-+#else
-+# define SANITIZER_NONGNU 0
-+#endif
-+
- #if defined(__myriad2__)
- # define SANITIZER_MYRIAD2 1
- #else
-diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index f95539a73..6c53b3415 100644
---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
-+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -39,7 +39,7 @@
- # include "sanitizer_platform_limits_solaris.h"
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- # define SI_LINUX_NOT_ANDROID 1
- #else
- # define SI_LINUX_NOT_ANDROID 0
-@@ -322,7 +322,7 @@
- #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL \
- (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
-- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
- SANITIZER_WORDSIZE == 64)) // NOLINT
- #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 54da635d7..2f6ff69c3 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -14,6 +14,9 @@
-
- #include "sanitizer_platform.h"
-
-+// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
-+#define _LINUX_SYSINFO_H
-+
- #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
- // Tests in this file assume that off_t-dependent data structures match the
- // libc ABI. For example, struct dirent here is what readdir() function (as
-@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- #include
--#include
-+# if !SANITIZER_NONGNU
-+# include
-+# endif
- #include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
- #if HAVE_RPC_XDR_H
- # include
- #elif HAVE_TIRPC_RPC_XDR_H
-@@ -251,7 +256,7 @@ namespace __sanitizer {
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- // Use pre-computed size of struct ustat to avoid which
- // has been removed from glibc 2.28.
- #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
- unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int glob_nomatch = GLOB_NOMATCH;
- int glob_altdirfunc = GLOB_ALTDIRFUNC;
- #endif
-@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_termios_sz = sizeof(struct termios);
- unsigned struct_winsize_sz = sizeof(struct winsize);
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- unsigned struct_arpreq_sz = sizeof(struct arpreq);
- unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
- unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
-@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
-@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
- CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(glob_t);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
- CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
- CHECK_SIZE_AND_OFFSET(iovec, iov_base);
- CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-
-+#if !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(msghdr);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
- CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
- CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+#endif
-
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(x, y) 0
-@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
-
- CHECK_TYPE_SIZE(ether_addr);
-
--#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- CHECK_TYPE_SIZE(ipc_perm);
- # if SANITIZER_FREEBSD
- CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
- CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
- #endif
-
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
- #endif
-
-@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
- COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
- CHECK_SIZE_AND_OFFSET(FILE, _flags);
- CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
- CHECK_SIZE_AND_OFFSET(FILE, _fileno);
- #endif
-
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
- CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index de989b780..51a97b554 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -294,7 +294,7 @@ void InitializePlatform() {
- // This is required to properly "close" the fds, because we do not see internal
- // closes within glibc. The code is a pure hack.
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
--#if SANITIZER_LINUX && !SANITIZER_ANDROID
-+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
- int cnt = 0;
- struct __res_state *statp = (struct __res_state*)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
---
-2.19.0
-
diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix
index 300de57b696e..fb2baf0e29a3 100644
--- a/pkgs/development/compilers/llvm/git/default.nix
+++ b/pkgs/development/compilers/llvm/git/default.nix
@@ -68,14 +68,14 @@ let
};
# `llvm` historically had the binaries. When choosing an output explicitly,
- # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
- llvm = tools.libllvm.out // { outputUnspecified = true; };
+ # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
+ llvm = tools.libllvm.out // { outputSpecified = false; };
libclang = callPackage ./clang {
inherit llvm_meta;
};
- clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
+ clang-unwrapped = tools.libclang.out // { outputSpecified = false; };
llvm-manpages = lowPrio (tools.libllvm.override {
enableManpages = true;
diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix
index 34b45f49ec67..cc36a7b50b62 100644
--- a/pkgs/development/compilers/lobster/default.nix
+++ b/pkgs/development/compilers/lobster/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lobster";
- version = "unstable-2021-06-18";
+ version = "2021.3";
src = fetchFromGitHub {
owner = "aardappel";
- repo = pname;
- rev = "a785316e44b1690da56a3646f90971a72f470a49";
- sha256 = "eY/8mhJ4SUH5QYWqykl0u+8W7AU0FVVya3GNTEUSOP4=";
+ repo = "lobster";
+ rev = "v${version}";
+ sha256 = "sha256-ENs2Jy2l6fogZdCSaIyfV9wQm57qaZfx5HVHOnQBrRk=";
};
nativeBuildInputs = [ cmake ];
@@ -44,17 +44,14 @@ stdenv.mkDerivation rec {
xorg.libXext
];
- preConfigure = "cd dev";
+ preConfigure = ''
+ cd dev
+ '';
- passthru = {
- tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {};
- updateScript = unstableGitUpdater {
- url = "https://github.com/aardappel/lobster";
- };
- };
+ passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {};
meta = with lib; {
- homepage = "http://strlen.com/lobster";
+ homepage = "https://strlen.com/lobster/";
description = "The Lobster programming language";
longDescription = ''
Lobster is a programming language that tries to combine the advantages of
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
new file mode 100644
index 000000000000..857f7c75c1d2
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -0,0 +1,162 @@
+{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
+, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
+, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
+, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap
+, setJavaClassPath
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
+, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+}:
+
+let
+ version = {
+ feature = "17";
+ interim = ".0.1";
+ build = "12";
+ };
+
+ openjdk = stdenv.mkDerivation {
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "${version.feature}${version.interim}+${version.build}";
+
+ src = fetchFromGitHub {
+ owner = "openjdk";
+ repo = "jdk${version.feature}u";
+ rev = "jdk-${version.feature}${version.interim}+${version.build}";
+ sha256 = "1l1jgbz8q7zq66npfg88r0l5xga427vrz35iys09j44b6qllrldd";
+ };
+
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
+ buildInputs = [
+ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
+ libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+ libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap
+ ] ++ lib.optionals (!headless && enableGnome2) [
+ gtk3 gnome_vfs GConf glib
+ ];
+
+ patches = [
+ ./fix-java-home-jdk10.patch
+ ./read-truststore-from-env-jdk10.patch
+ ./currency-date-range-jdk10.patch
+ ./increase-javadoc-heap-jdk13.patch
+ ./ignore-LegalNoticeFilePlugin.patch
+
+ # -Wformat etc. are stricter in newer gccs, per
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
+ # so grab the work-around from
+ # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
+ (fetchurl {
+ url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
+ sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
+ })
+ ] ++ lib.optionals (!headless && enableGnome2) [
+ ./swing-use-gtk-jdk13.patch
+ ];
+
+ postPatch = ''
+ chmod +x configure
+ patchShebangs --build configure
+ '';
+
+ configureFlags = [
+ "--with-boot-jdk=${openjdk17-bootstrap.home}"
+ "--with-version-build=${version.build}"
+ "--with-version-opt=nixos"
+ "--with-version-pre="
+ "--enable-unlimited-crypto"
+ "--with-native-debug-symbols=internal"
+ "--with-libjpeg=system"
+ "--with-giflib=system"
+ "--with-libpng=system"
+ "--with-zlib=system"
+ "--with-lcms=system"
+ "--with-stdc++lib=dynamic"
+ ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+ ++ lib.optional headless "--enable-headless-only"
+ ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+ separateDebugInfo = true;
+
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+
+ NIX_LDFLAGS = toString (lib.optionals (!headless) [
+ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+ ] ++ lib.optionals (!headless && enableGnome2) [
+ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+ ]);
+
+ buildFlags = [ "images" ];
+
+ installPhase = ''
+ mkdir -p $out/lib
+
+ mv build/*/images/jdk $out/lib/openjdk
+
+ # Remove some broken manpages.
+ rm -rf $out/lib/openjdk/man/ja*
+
+ # Mirror some stuff in top-level.
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
+
+ # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
+ ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
+
+ # jni.h expects jni_md.h to be in the header search path.
+ ln -s $out/include/linux/*_md.h $out/include/
+
+ # Remove crap from the installation.
+ rm -rf $out/lib/openjdk/demo
+ ${lib.optionalString headless ''
+ rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+ ''}
+
+ ln -s $out/lib/openjdk/bin $out/bin
+ '';
+
+ preFixup = ''
+ # Propagate the setJavaClassPath setup hook so that any package
+ # that depends on the JDK has $CLASSPATH set up properly.
+ mkdir -p $out/nix-support
+ #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+ echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+
+ # Set JAVA_HOME automatically.
+ mkdir -p $out/nix-support
+ cat < $out/nix-support/setup-hook
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ EOF
+ '';
+
+ postFixup = ''
+ # Build the set of output library directories to rpath against
+ LIBDIRS=""
+ for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
+ LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
+ done
+ # Add the local library paths to remove dependencies on the bootstrap
+ for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
+ OUTPUTDIR=$(eval echo \$$output)
+ BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+ echo "$BINLIBS" | while read i; do
+ patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+ patchelf --shrink-rpath "$i" || true
+ done
+ done
+ '';
+
+ disallowedReferences = [ openjdk17-bootstrap ];
+
+ meta = import ./meta.nix lib;
+
+ passthru = {
+ architecture = "";
+ home = "${openjdk}/lib/openjdk";
+ inherit gtk3;
+ };
+ };
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin.patch b/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin.patch
new file mode 100644
index 000000000000..3bb610ee35c0
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin.patch
@@ -0,0 +1,21 @@
+--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
++++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
+@@ -112,18 +112,6 @@
+ .filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes()))
+ .findFirst();
+ if (!otarget.isPresent()) {
+- if (errorIfNotSameContent) {
+- // all legal notices of the same file name are expected
+- // to contain the same content
+- Optional ores =
+- entries.stream().filter(e -> e.linkedTarget() == null)
+- .findAny();
+-
+- if (ores.isPresent()) {
+- throw new PluginException(ores.get().path() + " " +
+- entry.path() + " contain different content");
+- }
+- }
+ entries.add(entry);
+ } else {
+ entries.add(ResourcePoolEntry.createSymLink(entry.path(),
diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix
index f2ddacf2e308..929d23c81869 100644
--- a/pkgs/development/coq-modules/addition-chains/default.nix
+++ b/pkgs/development/coq-modules/addition-chains/default.nix
@@ -6,12 +6,14 @@ mkCoqDerivation {
pname = "addition-chains";
repo = "hydra-battles";
- release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
+ release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
+ release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = isGe "8.11"; out = "0.4"; }
+ { case = range "8.13" "8.14"; out = "0.5"; }
+ { case = range "8.11" "8.12"; out = "0.4"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ];
diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix
new file mode 100644
index 000000000000..5f5723870938
--- /dev/null
+++ b/pkgs/development/coq-modules/deriving/default.nix
@@ -0,0 +1,29 @@
+{ lib, mkCoqDerivation, coq, version ? null
+, ssreflect
+}:
+with lib;
+
+mkCoqDerivation {
+ pname = "deriving";
+ owner = "arthuraa";
+
+ inherit version;
+ defaultVersion = with versions; switch coq.coq-version [
+ { case = range "8.11" "8.14"; out = "0.1.0"; }
+ ] null;
+
+ releaseRev = v: "v${v}";
+
+ release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh";
+
+ propagatedBuildInputs = [ ssreflect ];
+
+ mlPlugin = true;
+
+ meta = {
+ description = "Generic instances of MathComp classes";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
+ };
+
+}
diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix
new file mode 100644
index 000000000000..c34fa76f6e05
--- /dev/null
+++ b/pkgs/development/coq-modules/extructures/default.nix
@@ -0,0 +1,33 @@
+{ lib, mkCoqDerivation, coq, version ? null
+, ssreflect
+, deriving
+}:
+with lib;
+
+(mkCoqDerivation {
+ pname = "extructures";
+ owner = "arthuraa";
+
+ inherit version;
+ defaultVersion = with versions; switch coq.coq-version [
+ { case = range "8.11" "8.14"; out = "0.3.0"; }
+ { case = range "8.10" "8.12"; out = "0.2.2"; }
+ ] null;
+
+ releaseRev = v: "v${v}";
+
+ release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38";
+ release."0.2.2".sha256 = "sha256:1clzza73gccy6p6l95n6gs0adkqd3h4wgl4qg5l0qm4q140grvm7";
+
+ propagatedBuildInputs = [ ssreflect ];
+
+ meta = {
+ description = "Finite data structures with extensional reasoning";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
+ };
+
+}).overrideAttrs (o: {
+ propagatedBuildInputs = o.propagatedBuildInputs
+ ++ optional (versionAtLeast o.version "0.3.0") deriving;
+})
diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix
new file mode 100644
index 000000000000..c20c503d73ba
--- /dev/null
+++ b/pkgs/development/coq-modules/gaia-hydras/default.nix
@@ -0,0 +1,33 @@
+{ lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, version ? null }:
+
+with lib; mkCoqDerivation rec {
+ pname = "gaia-hydras";
+ repo = "hydra-battles";
+
+ release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
+ releaseRev = (v: "v${v}");
+
+ inherit version;
+ defaultVersion = with versions; switch coq.coq-version [
+ { case = range "8.13" "8.14"; out = "0.5"; }
+ ] null;
+
+ propagatedBuildInputs = [
+ hydra-battles
+ gaia
+ mathcomp-zify
+ ];
+
+ useDune2 = true;
+
+ meta = {
+ description = "Comparison between ordinals in Gaia and Hydra battles";
+ longDescription = ''
+ The Gaia and Hydra battles projects develop different notions of ordinals.
+ This development bridges the different notions.
+ '';
+ maintainers = with maintainers; [ Zimmi48 ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix
index 6c3c9d88e0cb..faec5d3e330c 100644
--- a/pkgs/development/coq-modules/hydra-battles/default.nix
+++ b/pkgs/development/coq-modules/hydra-battles/default.nix
@@ -5,12 +5,14 @@ mkCoqDerivation {
pname = "hydra-battles";
owner = "coq-community";
- release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
+ release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
+ release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = isGe "8.11"; out = "0.4"; }
+ { case = range "8.13" "8.14"; out = "0.5"; }
+ { case = range "8.11" "8.12"; out = "0.4"; }
] null;
propagatedBuildInputs = [ equations ];
diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix
index e39fdc25eab6..d73d14c84a0c 100644
--- a/pkgs/development/coq-modules/paramcoq/default.nix
+++ b/pkgs/development/coq-modules/paramcoq/default.nix
@@ -4,12 +4,15 @@ with lib; mkCoqDerivation {
pname = "paramcoq";
inherit version;
defaultVersion = with versions; switch coq.version [
- { case = range "8.13" "8.14"; out = "1.1.3+coq${coq.coq-version}"; }
+ { case = range "8.10" "8.14"; out = "1.1.3+coq${coq.coq-version}"; }
{ case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; }
] null;
displayVersion = { paramcoq = "..."; };
release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71";
release."1.1.3+coq8.13".sha256 = "06ndly736k4pmdn4baqa7fblp6lx7a9pxm9gvz1vzd6ic51825wp";
+ release."1.1.3+coq8.12".sha256 = "sha256:10j23ws8ymqpxhapni75sxbzz0dl4n9sgasrx618i7s7b705y2rh";
+ release."1.1.3+coq8.11".sha256 = "sha256:1wbvcmkr7q106418bvvc2rj2d7s03wdhhxar0hicy1rr267w2bs6";
+ release."1.1.3+coq8.10".sha256 = "sha256:0kv3k3y2fck1qz83pqmihyh98swicnpx0n6fzkis1n2g39qjfz91";
release."1.1.2+coq8.13".sha256 = "02vnf8p04ynf3qk8myvjzsbga15395235mpdpj54pvxis3h5qq22";
release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i";
release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa";
diff --git a/pkgs/development/coq-modules/serapi/8.10.0+0.7.2.patch b/pkgs/development/coq-modules/serapi/8.10.0+0.7.2.patch
new file mode 100644
index 000000000000..c3434f697ff4
--- /dev/null
+++ b/pkgs/development/coq-modules/serapi/8.10.0+0.7.2.patch
@@ -0,0 +1,34 @@
+diff --git a/serapi/serapi_paths.ml b/serapi/serapi_paths.ml
+index 17cbb98..1fd85a0 100644
+--- a/serapi/serapi_paths.ml
++++ b/serapi/serapi_paths.ml
+@@ -23,10 +23,10 @@
+ let coq_loadpath_default ~implicit ~coq_path =
+ let open Mltop in
+ let mk_path prefix = coq_path ^ "/" ^ prefix in
+- let mk_lp ~ml ~root ~dir ~implicit =
++ let mk_lp ~ml ~root ~dir ~implicit ~absolute =
+ { recursive = true;
+ path_spec = VoPath {
+- unix_path = mk_path dir;
++ unix_path = if absolute then dir else mk_path dir;
+ coq_path = root;
+ has_ml = ml;
+ implicit;
+@@ -35,10 +35,12 @@ let coq_loadpath_default ~implicit ~coq_path =
+ (* in 8.8 we can use Libnames.default_* *)
+ let coq_root = Names.DirPath.make [Libnames.coq_root] in
+ let default_root = Libnames.default_root_prefix in
+- [mk_lp ~ml:AddRecML ~root:coq_root ~implicit ~dir:"plugins";
+- mk_lp ~ml:AddNoML ~root:coq_root ~implicit ~dir:"theories";
+- mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir:"user-contrib";
+- ]
++ [mk_lp ~ml:AddRecML ~root:coq_root ~implicit ~dir:"plugins" ~absolute:false;
++ mk_lp ~ml:AddNoML ~root:coq_root ~implicit ~dir:"theories" ~absolute:false;
++ mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir:"user-contrib" ~absolute:false;
++ ] @
++ List.map (fun dir -> mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir ~absolute:true)
++ Envars.coqpath
+
+ (******************************************************************************)
+ (* Generate a module name given a file *)
diff --git a/pkgs/development/coq-modules/serapi/8.11.0+0.11.1.patch b/pkgs/development/coq-modules/serapi/8.11.0+0.11.1.patch
new file mode 100644
index 000000000000..c10bf5c3142a
--- /dev/null
+++ b/pkgs/development/coq-modules/serapi/8.11.0+0.11.1.patch
@@ -0,0 +1,33 @@
+diff --git a/serapi/serapi_paths.ml b/serapi/serapi_paths.ml
+index a9c5074..eed92e3 100644
+--- a/serapi/serapi_paths.ml
++++ b/serapi/serapi_paths.ml
+@@ -23,10 +23,10 @@
+ let coq_loadpath_default ~implicit ~coq_path =
+ let open Loadpath in
+ let mk_path prefix = coq_path ^ "/" ^ prefix in
+- let mk_lp ~ml ~root ~dir ~implicit =
++ let mk_lp ~ml ~root ~dir ~implicit ~absolute =
+ { recursive = true;
+ path_spec = VoPath {
+- unix_path = mk_path dir;
++ unix_path = if absolute then dir else mk_path dir;
+ coq_path = root;
+ has_ml = ml;
+ implicit;
+@@ -35,11 +35,11 @@ let coq_loadpath_default ~implicit ~coq_path =
+ (* in 8.8 we can use Libnames.default_* *)
+ let coq_root = Names.DirPath.make [Libnames.coq_root] in
+ let default_root = Libnames.default_root_prefix in
+- [mk_lp ~ml:AddRecML ~root:coq_root ~implicit ~dir:"plugins";
+- mk_lp ~ml:AddNoML ~root:coq_root ~implicit ~dir:"theories";
+- mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir:"user-contrib";
++ [mk_lp ~ml:AddRecML ~root:coq_root ~implicit ~dir:"plugins" ~absolute:false;
++ mk_lp ~ml:AddNoML ~root:coq_root ~implicit ~dir:"theories" ~absolute:false;
++ mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir:"user-contrib" ~absolute:false;
+ ] @
+- List.map (fun dir -> mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir)
++ List.map (fun dir -> mk_lp ~ml:AddRecML ~root:default_root ~implicit:false ~dir ~absolute:true)
+ Envars.coqpath
+
+ (******************************************************************************)
diff --git a/pkgs/development/coq-modules/serapi/8.12.0+0.12.1.patch b/pkgs/development/coq-modules/serapi/8.12.0+0.12.1.patch
new file mode 100644
index 000000000000..9eb70b670a18
--- /dev/null
+++ b/pkgs/development/coq-modules/serapi/8.12.0+0.12.1.patch
@@ -0,0 +1,29 @@
+diff --git a/serapi/serapi_paths.ml b/serapi/serapi_paths.ml
+index b71fa60..0bec8c2 100644
+--- a/serapi/serapi_paths.ml
++++ b/serapi/serapi_paths.ml
+@@ -24,8 +24,8 @@ let coq_loadpath_default ~implicit ~coq_path =
+ let open Loadpath in
+ let mk_path prefix = coq_path ^ "/" ^ prefix in
+ (* let mk_ml = () in *)
+- let mk_vo ~has_ml ~coq_path ~dir ~implicit =
+- { unix_path = mk_path dir
++ let mk_vo ~has_ml ~coq_path ~dir ~implicit ~absolute =
++ { unix_path = if absolute then dir else mk_path dir
+ ; coq_path
+ ; has_ml
+ ; recursive = true
+@@ -40,10 +40,10 @@ let coq_loadpath_default ~implicit ~coq_path =
+ List.map fst plugins_dirs
+ in
+ ml_paths ,
+- [ mk_vo ~has_ml:false ~coq_path:coq_root ~implicit ~dir:"theories"
+- ; mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir:"user-contrib";
++ [ mk_vo ~has_ml:false ~coq_path:coq_root ~implicit ~dir:"theories" ~absolute:false
++ ; mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir:"user-contrib" ~absolute:false;
+ ] @
+- List.map (fun dir -> mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir)
++ List.map (fun dir -> mk_vo ~has_ml:true ~coq_path:default_root ~implicit:false ~dir ~absolute:true)
+ Envars.coqpath
+
+ (******************************************************************************)
diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix
index 1f6e995703cb..01954dff6554 100644
--- a/pkgs/development/coq-modules/serapi/default.nix
+++ b/pkgs/development/coq-modules/serapi/default.nix
@@ -75,4 +75,19 @@ in
}.tbz";
sha256 = release."${version}".sha256;
};
+
+ patches =
+ if version == "8.10.0+0.7.2"
+ then [
+ ./8.10.0+0.7.2.patch
+ ]
+ else if version == "8.11.0+0.11.1"
+ then [
+ ./8.11.0+0.11.1.patch
+ ]
+ else if version == "8.12.0+0.12.1" || version == "8.13.0+0.13.0"
+ then [
+ ./8.12.0+0.12.1.patch
+ ]
+ else [];
})
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index 169ff4cd5a86..aa495abda555 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -9,54 +9,23 @@
let
python = python3.override {
packageOverrides = self: super: {
- aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
- pname = "aiofiles";
- version = "0.6.0";
+ asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec {
+ version = "3.4.1";
src = fetchFromGitHub {
- owner = "Tinche";
- repo = pname;
- rev = "v${version}";
- sha256 = "0w23d88q65m06884pfcps661clr11w9wm701ihx6kfxjwga6fkzf";
- };
- doCheck = false;
- });
-
- ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec {
- pname = "ajsonrpc";
- version = "1.1.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw=";
- };
- });
-
- click = super.click.overridePythonAttrs (oldAttrs: rec {
- version = "7.1.2";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
- };
- });
-
- starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
- pname = "starlette";
- version = "0.14.2";
- src = fetchFromGitHub {
- owner = "encode";
- repo = pname;
+ owner = "django";
+ repo = "asgiref";
rev = version;
- sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js=";
+ sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39";
};
- doCheck = false;
});
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
- version = "0.13.2";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "encode";
repo = "uvicorn";
rev = version;
- sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
+ sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r";
};
});
};
@@ -67,6 +36,7 @@ with python.pkgs; buildPythonApplication rec {
inherit version src;
propagatedBuildInputs = [
+ aiofiles
ajsonrpc
bottle
click
diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix
index 312c2d1044be..35615a4de1f4 100644
--- a/pkgs/development/embedded/platformio/default.nix
+++ b/pkgs/development/embedded/platformio/default.nix
@@ -4,14 +4,14 @@
let
callPackage = newScope self;
- version = "5.1.1";
+ version = "5.2.1";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
- sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00";
+ sha256 = "1kmwr21djcz1qnpbsk0za244rp6rkh0vp6wss1vjks4waambiqnl";
};
self = {
diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
index e0016adcf7df..156600595f9f 100644
--- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
@@ -6,7 +6,7 @@ index addc4c5..514b0ad 100644
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
-- version = "3.12"
+- version = "3.14"
- spdx_data_url = (
- "https://raw.githubusercontent.com/spdx/license-list-data/"
- "v%s/json/licenses.json" % version
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index df75a233fff4..7d7a216b2fb7 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }:
+{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales, writeScript }:
stdenv.mkDerivation rec {
pname = "babashka";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
- sha256 = "sha256-s0fZzx/sEAUwXY2cx2ODDhwIrJb5LykFgHBcscsZQO0=";
+ sha256 = "sha256-exNOdm17Xg4HVpjX2avoftww/flejL4mB7kSIAJUSco=";
};
dontUnpack = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
- # https://github.com/babashka/babashka/blob/v0.6.1/script/compile#L41-L52
+ # https://github.com/babashka/babashka/blob/v0.6.2/script/compile#L41-L52
args=("-jar" "$BABASHKA_JAR"
"-H:CLibraryPath=${graalvm11-ce.lib}/lib"
# Required to build babashka on darwin. Do not remove.
@@ -58,6 +58,21 @@ stdenv.mkDerivation rec {
$out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]'
'';
+ passthru.updateScript = writeScript "update-babashka" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl common-updater-scripts jq
+
+ set -euo pipefail
+
+ readonly latest_version="$(curl \
+ ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
+ -s "https://api.github.com/repos/babashka/babashka/releases/latest" \
+ | jq -r '.tag_name')"
+
+ # v0.6.2 -> 0.6.2
+ update-source-version babashka "''${latest_version/v/}"
+ '';
+
meta = with lib; {
description = "A Clojure babushka for the grey areas of Bash";
longDescription = ''
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 4ce8cacb845a..371700bd3636 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
+{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }:
stdenv.mkDerivation rec {
pname = "clojure";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
- sha256 = "1xhfp186mk9h3jdl9bpkigqrrrgdhgij7ba65j6783nh11llpa3x";
+ sha256 = "fahLaQjQDnSMLEatI+OD7eWc8YvzrkSbHDDNalC4DvY=";
};
nativeBuildInputs = [
@@ -48,12 +48,29 @@ stdenv.mkDerivation rec {
'';
doInstallCheck = true;
+
installCheckPhase = ''
CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
-Spath \
-Sverbose \
-Scp $out/libexec/clojure-tools-${version}.jar
'';
+
+ passthru.updateScript = writeScript "update-clojure" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl common-updater-scripts jq
+
+ set -euo pipefail
+
+ # `jq -r '.[0].name'` results in `v0.0`
+ readonly latest_version="$(curl \
+ ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
+ -s "https://api.github.com/repos/clojure/brew-install/tags" \
+ | jq -r '.[1].name')"
+
+ update-source-version clojure "$latest_version"
+ '';
+
meta = with lib; {
description = "A Lisp dialect for the JVM";
homepage = "https://clojure.org/";
diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/development/interpreters/ngn-k/default.nix
new file mode 100644
index 000000000000..e70ac2992146
--- /dev/null
+++ b/pkgs/development/interpreters/ngn-k/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, stdenv
+, stdenvNoLibs
+, fetchFromGitea
+, runtimeShell
+, doCheck ? stdenv.hostPlatform == stdenv.buildPlatform
+}:
+
+let
+ # k itself is compiled with -ffreestanding, but tests require a libc
+ useStdenv = if doCheck then stdenv else stdenvNoLibs;
+in
+
+useStdenv.mkDerivation {
+ pname = "ngn-k";
+ version = "unstable-2021-08-30";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "ngn";
+ repo = "k";
+ rev = "3e2bcb81c723e268015818570f2805547114b5dd";
+ sha256 = "0b16971xgf0sgx7qf41dilrpz02jnas61gfwkyvbxv18874w5vap";
+ };
+
+ patches = [
+ ./repl-license-path.patch
+ ];
+
+ postPatch = ''
+ # make self-reference for LICENSE
+ substituteAllInPlace repl.k
+
+ # don't use hardcoded /bin/sh
+ for f in repl.k m.c;do
+ substituteInPlace "$f" --replace "/bin/sh" "${runtimeShell}"
+ done
+ '';
+
+ makeFlags = [ "-e" ];
+ buildFlags = [ "k" ];
+ checkTarget = "t";
+ inherit doCheck;
+
+ installPhase = ''
+ runHook preInstall
+ install -Dm755 k "$out/bin/k"
+ install -Dm755 repl.k "$out/bin/k-repl"
+ install -Dm644 LICENSE -t "$out/share/ngn-k"
+ substituteInPlace "$out/bin/k-repl" --replace "#!k" "#!$out/bin/k"
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "A simple fast vector programming language";
+ homepage = "https://codeberg.org/ngn/k";
+ license = lib.licenses.agpl3Only;
+ maintainers = [ lib.maintainers.sternenseemann ];
+ platforms = [ "x86_64-linux" "x86_64-freebsd" ];
+ };
+}
diff --git a/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/pkgs/development/interpreters/ngn-k/repl-license-path.patch
new file mode 100644
index 000000000000..1b0ce708f0c3
--- /dev/null
+++ b/pkgs/development/interpreters/ngn-k/repl-license-path.patch
@@ -0,0 +1,14 @@
+diff --git a/repl.k b/repl.k
+index e4071e6..70ae276 100755
+--- a/repl.k
++++ b/repl.k
+@@ -3,8 +3,7 @@ repl.banner:"ngn/k, (c) 2019-2021 ngn, GNU AGPLv3. type \\ for more info\n"
+ repl.prompt:," "
+ repl.cmds:""!()
+ repl.cmds["vf"]:{` 0:($!h),'":",'`k'. h:(&(x~"v")=^`o`p`q`r`u`v`w?@'h)#h:``repl_.:0#`}
+-repl.cmds["a"]:{` 1:1:repl.basename[`argv 0],"/LICENSE";}
+-repl.basename:{$[#x:"/"/-1_"/"\x;x;,"."]}
++repl.cmds["a"]:{` 1:1:"@out@/share/ngn-k/LICENSE";}
+ repl.fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]}
+ repl.line:{$[#x;;:0];x:-1_x;$[(3>#x)&("\\"=*x)&~^(!repl.cmds)?x 1;repl.cmds[x 1]x 1;.[` 1:repl.fmt@.:;,x;`epr@]];` 1:repl.prompt;1}
+ {repl.cmds[x[1]1]:{y;` 0:x}2_x}'{(&x~\:80#"-")_x:(1+*&x~\:,"/")_-1_x}@0:`argv 1;
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 73d1eea988de..0474fd3bc487 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -1,17 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python3 }:
+{ lib, stdenv, fetchFromGitHub, asio, boost, cmake, hwloc, gperftools, ninja
+, pkg-config, python3 }:
stdenv.mkDerivation rec {
pname = "hpx";
- version = "1.6.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
- sha256 = "sha256-Fkntfk5AaWtS1x0fXfLSWW/9tvKcCBi1COqgNxurPmk=";
+ sha256 = "1knx7kr8iw4b7nh116ygd00y68y84jjb4fj58jkay7n5qlrxh604";
};
- buildInputs = [ boost hwloc gperftools ];
+ buildInputs = [ asio boost hwloc gperftools ];
nativeBuildInputs = [ cmake pkg-config python3 ];
strictDeps = true;
diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix
index 57a9095dc56e..03ca9b0d11b3 100644
--- a/pkgs/development/libraries/libvmaf/default.nix
+++ b/pkgs/development/libraries/libvmaf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libvmaf";
- version = "2.2.1";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "netflix";
repo = "vmaf";
rev = "v${version}";
- sha256 = "sha256-t1dK4UnperX9YtvmTwIo/03Dxq/Pl+K6kZIL0uX1OcE=";
+ sha256 = "12mwl7vxc3xi0qar386mkhkpah9zzgjb74mzc2qqsgz9zzxp16dm";
};
sourceRoot = "source/libvmaf";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/Netflix/vmaf";
description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
- changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md";
+ changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md";
platforms = platforms.unix;
license = licenses.bsd2Patent;
maintainers = [ maintainers.cfsmp3 maintainers.marsam ];
diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index 6f9356a6ad88..e9c0e3c7f44f 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "wpebackend-fdo";
- version = "1.7.1";
+ version = "1.10.0";
src = fetchurl {
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
- sha256 = "1xf6akagvpyh0nyxkfijrx5avp6ravnivy28dhk64dsfx9rhm64v";
+ sha256 = "sha256-uJ39NQCk3scREyzXv/clmeZ9VqQZ0ABzDhS7mVR1Ccw=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index e7642e16c955..252bebd9eff5 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "olm";
- version = "3.2.4";
+ version = "3.2.6";
src = fetchFromGitLab {
domain = "gitlab.matrix.org";
owner = "matrix-org";
repo = pname;
rev = version;
- sha256 = "1rl7j26li1irb1lqnnkzan7jrj38kvmdn69rlwbbp390v3z15lvh";
+ sha256 = "1srmw36nxi0z2y5d9adks09p950qm0fscbnrq1fl37fdypvjl1sk";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index b71ad69a46bf..4b3ecb1a0f0a 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
quicklispdist = pkgs.fetchurl {
# Will usually be replaced with a fresh version anyway, but needs to be
# a valid distinfo.txt
- url = "http://beta.quicklisp.org/dist/quicklisp/2021-08-07/distinfo.txt";
- sha256 = "sha256:05hby6rbsxk3pisjzr9gqjw0cdk2rq8hc4j544hqf11y6451k37v";
+ url = "http://beta.quicklisp.org/dist/quicklisp/2021-10-21/distinfo.txt";
+ sha256 = "sha256:0ihi3p6fvagzfzkkyzs6b3jrz5yidj4f5dcgnh73qas19mk345ai";
};
buildPhase = "true; ";
postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 2142081704c6..ad02d8c1baaf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-ansi-text";
- version = "20210124-git";
+ version = "20211020-git";
description = "ANSI control string characters, focused on color";
deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-01-24/cl-ansi-text-20210124-git.tgz";
- sha256 = "1l7slqk26xznfyn0zpp5l32v6xfpj4qj42h4x4ds5s1yncq306cm";
+ url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz";
+ sha256 = "1lmxmdf4sm7apkczp0y07rlsayc5adyv2i85r6p7s60w6sianjr6";
};
packageName = "cl-ansi-text";
@@ -20,11 +20,11 @@ rec {
}
/* (SYSTEM cl-ansi-text DESCRIPTION
ANSI control string characters, focused on color SHA256
- 1l7slqk26xznfyn0zpp5l32v6xfpj4qj42h4x4ds5s1yncq306cm URL
- http://beta.quicklisp.org/archive/cl-ansi-text/2021-01-24/cl-ansi-text-20210124-git.tgz
- MD5 76f54998b056919978737815468e31b6 NAME cl-ansi-text FILENAME
+ 1lmxmdf4sm7apkczp0y07rlsayc5adyv2i85r6p7s60w6sianjr6 URL
+ http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz
+ MD5 5411766beeb4180218b449454b67837f NAME cl-ansi-text FILENAME
cl-ansi-text DEPS
((NAME alexandria FILENAME alexandria)
(NAME cl-colors2 FILENAME cl-colors2) (NAME cl-ppcre FILENAME cl-ppcre))
- DEPENDENCIES (alexandria cl-colors2 cl-ppcre) VERSION 20210124-git SIBLINGS
+ DEPENDENCIES (alexandria cl-colors2 cl-ppcre) VERSION 20211020-git SIBLINGS
(cl-ansi-text.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 00345eb2d633..c250b53675a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-async-repl";
- version = "cl-async-20210531-git";
+ version = "cl-async-20211020-git";
description = "REPL integration for CL-ASYNC.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz";
- sha256 = "0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw";
+ url = "http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz";
+ sha256 = "1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0";
};
packageName = "cl-async-repl";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
- 0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw URL
- http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz
- MD5 bf2b1337e09df5ecca329c3e92622376 NAME cl-async-repl FILENAME
+ 1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0 URL
+ http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz
+ MD5 0e0cd11758e93a91b39ad726fb1051cc NAME cl-async-repl FILENAME
cl-async-repl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20210531-git SIBLINGS
+ VERSION cl-async-20211020-git SIBLINGS
(cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 5a6c9052beb8..14430f53695f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-async-ssl";
- version = "cl-async-20210531-git";
+ version = "cl-async-20211020-git";
description = "SSL Wrapper around cl-async socket implementation.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz";
- sha256 = "0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw";
+ url = "http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz";
+ sha256 = "1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0";
};
packageName = "cl-async-ssl";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM cl-async-ssl DESCRIPTION
SSL Wrapper around cl-async socket implementation. SHA256
- 0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw URL
- http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz
- MD5 bf2b1337e09df5ecca329c3e92622376 NAME cl-async-ssl FILENAME
+ 1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0 URL
+ http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz
+ MD5 0e0cd11758e93a91b39ad726fb1051cc NAME cl-async-ssl FILENAME
cl-async-ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -41,5 +41,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20210531-git SIBLINGS
+ VERSION cl-async-20211020-git SIBLINGS
(cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 0ef548039743..ff57643ed562 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-async";
- version = "20210531-git";
+ version = "20211020-git";
parasites = [ "cl-async-base" "cl-async-util" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz";
- sha256 = "0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw";
+ url = "http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz";
+ sha256 = "1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0";
};
packageName = "cl-async";
@@ -21,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
- 0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw URL
- http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz
- MD5 bf2b1337e09df5ecca329c3e92622376 NAME cl-async FILENAME cl-async DEPS
+ 1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0 URL
+ http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz
+ MD5 0e0cd11758e93a91b39ad726fb1051cc NAME cl-async FILENAME cl-async DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -38,5 +38,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
vom)
- VERSION 20210531-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+ VERSION 20211020-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
index a354c564be06..b9a55128d912 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
@@ -2,15 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-colors2";
- version = "20210630-git";
+ version = "20211020-git";
+
+ parasites = [ "cl-colors2/tests" ];
description = "Simple color library for Common Lisp";
- deps = [ args."alexandria" args."cl-ppcre" ];
+ deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-colors2/2021-06-30/cl-colors2-20210630-git.tgz";
- sha256 = "00mb239p4r30fm7b0qwfg1vfyp83h2h87igk3hqqgvadp6infi7g";
+ url = "http://beta.quicklisp.org/archive/cl-colors2/2021-10-20/cl-colors2-20211020-git.tgz";
+ sha256 = "1vkhcyflp173szwnd1xg7hk0h1f3144qzwnsdv6a16rlxjz9h804";
};
packageName = "cl-colors2";
@@ -19,10 +21,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256
- 00mb239p4r30fm7b0qwfg1vfyp83h2h87igk3hqqgvadp6infi7g URL
- http://beta.quicklisp.org/archive/cl-colors2/2021-06-30/cl-colors2-20210630-git.tgz
- MD5 50a5885e2b55239d5904b0a0134e0be3 NAME cl-colors2 FILENAME cl-colors2
+ 1vkhcyflp173szwnd1xg7hk0h1f3144qzwnsdv6a16rlxjz9h804 URL
+ http://beta.quicklisp.org/archive/cl-colors2/2021-10-20/cl-colors2-20211020-git.tgz
+ MD5 13fd422daa03328c909d1578d65f6222 NAME cl-colors2 FILENAME cl-colors2
DEPS
- ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre))
- DEPENDENCIES (alexandria cl-ppcre) VERSION 20210630-git SIBLINGS NIL
- PARASITES NIL) */
+ ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME clunit2 FILENAME clunit2))
+ DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20211020-git SIBLINGS
+ NIL PARASITES (cl-colors2/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index a691ed2ba545..9185445b3595 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-dbi";
- version = "20210228-git";
+ version = "20211020-git";
description = "System lacks description";
deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz";
- sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk";
+ url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz";
+ sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr";
};
packageName = "cl-dbi";
@@ -19,13 +19,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
- 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
- http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
- MD5 7cfb5ad172bc30906ae32ca620099a1f NAME cl-dbi FILENAME cl-dbi DEPS
+ 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz
+ MD5 565a1f32b2d924ad59876afcdc5cf263 NAME cl-dbi FILENAME cl-dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
(NAME split-sequence FILENAME split-sequence))
DEPENDENCIES (alexandria bordeaux-threads closer-mop dbi split-sequence)
- VERSION 20210228-git SIBLINGS
+ VERSION 20211020-git SIBLINGS
(dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-digraph.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-digraph.nix
index 513d4537c127..e1fda552afdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-digraph.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-digraph.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-digraph";
- version = "20210411-hg";
+ version = "20211020-hg";
description = "Simple directed graphs for Common Lisp.";
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-digraph/2021-04-11/cl-digraph-20210411-hg.tgz";
- sha256 = "1g9l3dzw4ykvprl3id7xv4brpzz86jk70z4wfw5lkq8vpxv397fi";
+ url = "http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz";
+ sha256 = "0iqzqy322xywmal7y7vhn1myhdglr78fj89maiwfx6yjppcyd1i1";
};
packageName = "cl-digraph";
@@ -19,8 +19,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-digraph DESCRIPTION Simple directed graphs for Common Lisp.
- SHA256 1g9l3dzw4ykvprl3id7xv4brpzz86jk70z4wfw5lkq8vpxv397fi URL
- http://beta.quicklisp.org/archive/cl-digraph/2021-04-11/cl-digraph-20210411-hg.tgz
- MD5 c7c947fb7471213b24505bff1e9287de NAME cl-digraph FILENAME cl-digraph
- DEPS NIL DEPENDENCIES NIL VERSION 20210411-hg SIBLINGS
+ SHA256 0iqzqy322xywmal7y7vhn1myhdglr78fj89maiwfx6yjppcyd1i1 URL
+ http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz
+ MD5 737c3640b4b079ce0ee730525aa8b6de NAME cl-digraph FILENAME cl-digraph
+ DEPS NIL DEPENDENCIES NIL VERSION 20211020-hg SIBLINGS
(cl-digraph.dot cl-digraph.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix
index 223da7f670f6..5638404470d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-environments";
- version = "20210807-git";
+ version = "20211020-git";
parasites = [ "cl-environments/test" ];
@@ -13,8 +13,8 @@ rec {
deps = [ args."alexandria" args."anaphora" args."closer-mop" args."collectors" args."fiveam" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-environments/2021-08-07/cl-environments-20210807-git.tgz";
- sha256 = "1i544zz9v49b0mdv96sr17ivnz4s84lgw4vypq9v9w6cmhz5v8am";
+ url = "http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz";
+ sha256 = "0aryb40nmmw34xl6h0fp8i43d2x7zlwysim365c171mcyxh3w9lr";
};
packageName = "cl-environments";
@@ -26,9 +26,9 @@ rec {
Implements the CLTL2 environment access functionality
for implementations which do not provide the
functionality to the programmer.
- SHA256 1i544zz9v49b0mdv96sr17ivnz4s84lgw4vypq9v9w6cmhz5v8am URL
- http://beta.quicklisp.org/archive/cl-environments/2021-08-07/cl-environments-20210807-git.tgz
- MD5 6884f21f315c5082fd6db7233497497d NAME cl-environments FILENAME
+ SHA256 0aryb40nmmw34xl6h0fp8i43d2x7zlwysim365c171mcyxh3w9lr URL
+ http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz
+ MD5 a796decf21a5b595ff591ffca378994a NAME cl-environments FILENAME
cl-environments DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME closer-mop FILENAME closer-mop)
@@ -39,4 +39,4 @@ rec {
DEPENDENCIES
(alexandria anaphora closer-mop collectors fiveam iterate optima
parse-declarations-1.0 symbol-munger)
- VERSION 20210807-git SIBLINGS NIL PARASITES (cl-environments/test)) */
+ VERSION 20211020-git SIBLINGS NIL PARASITES (cl-environments/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-form-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-form-types.nix
index b2cb1243e613..24ba2fecf0c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-form-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-form-types.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-form-types";
- version = "20210807-git";
+ version = "20211020-git";
parasites = [ "cl-form-types/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."closer-mop" args."collectors" args."fiveam" args."introspect-environment" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-form-types/2021-08-07/cl-form-types-20210807-git.tgz";
- sha256 = "1hv78ygnzf67f8ww22bmc2nx2gmw3lg7qc3navmd541jivx6v0lp";
+ url = "http://beta.quicklisp.org/archive/cl-form-types/2021-10-20/cl-form-types-20211020-git.tgz";
+ sha256 = "1f5wni1jrd5jbra2z2smw4vdw4k3bkbas8n676y3g3yv10lhddg8";
};
packageName = "cl-form-types";
@@ -22,9 +22,9 @@ rec {
}
/* (SYSTEM cl-form-types DESCRIPTION
Library for determining types of Common Lisp forms. SHA256
- 1hv78ygnzf67f8ww22bmc2nx2gmw3lg7qc3navmd541jivx6v0lp URL
- http://beta.quicklisp.org/archive/cl-form-types/2021-08-07/cl-form-types-20210807-git.tgz
- MD5 1b1415794a4e9cd6716ee3b5eb0f658a NAME cl-form-types FILENAME
+ 1f5wni1jrd5jbra2z2smw4vdw4k3bkbas8n676y3g3yv10lhddg8 URL
+ http://beta.quicklisp.org/archive/cl-form-types/2021-10-20/cl-form-types-20211020-git.tgz
+ MD5 53e67d9fd55ac6a382635b119aeb5431 NAME cl-form-types FILENAME
cl-form-types DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -39,4 +39,4 @@ rec {
(agutil alexandria anaphora arrows cl-environments closer-mop collectors
fiveam introspect-environment iterate optima parse-declarations-1.0
symbol-munger)
- VERSION 20210807-git SIBLINGS NIL PARASITES (cl-form-types/test)) */
+ VERSION 20211020-git SIBLINGS NIL PARASITES (cl-form-types/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index 7a697402f22d..16da7b56b312 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-pdf";
- version = "20210531-git";
+ version = "20211020-git";
description = "Common Lisp PDF Generation Library";
deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-pdf/2021-05-31/cl-pdf-20210531-git.tgz";
- sha256 = "0f5flqci615ck0ncq4f7x67x31m9715750r0wg3gx6qrdpi0k1cx";
+ url = "http://beta.quicklisp.org/archive/cl-pdf/2021-10-20/cl-pdf-20211020-git.tgz";
+ sha256 = "0wyh7iv86sqzdn5xj5crrip8iri5a64qzc6cczgbj1gkv65i28bk";
};
packageName = "cl-pdf";
@@ -19,10 +19,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
- 0f5flqci615ck0ncq4f7x67x31m9715750r0wg3gx6qrdpi0k1cx URL
- http://beta.quicklisp.org/archive/cl-pdf/2021-05-31/cl-pdf-20210531-git.tgz
- MD5 675d3498976f4cb118dc72fa71829f5c NAME cl-pdf FILENAME cl-pdf DEPS
+ 0wyh7iv86sqzdn5xj5crrip8iri5a64qzc6cczgbj1gkv65i28bk URL
+ http://beta.quicklisp.org/archive/cl-pdf/2021-10-20/cl-pdf-20211020-git.tgz
+ MD5 c8a9cfd5d65eae217bd55d786d31dca9 NAME cl-pdf FILENAME cl-pdf DEPS
((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
(NAME zpb-ttf FILENAME zpb-ttf))
- DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20210531-git SIBLINGS
+ DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20211020-git SIBLINGS
(cl-pdf-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 1ba3f0f93cfb..729e6eeaba65 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-postgres";
- version = "postmodern-20210807-git";
+ version = "postmodern-20211020-git";
parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."uiop" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz";
- sha256 = "01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp";
+ url = "http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz";
+ sha256 = "0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6";
};
packageName = "cl-postgres";
@@ -21,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
- SHA256 01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp URL
- http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz
- MD5 aa951f2ad4ce59fce588a62afa34f3ec NAME cl-postgres FILENAME cl-postgres
+ SHA256 0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6 URL
+ http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz
+ MD5 84f4ad8ce7ac0f7f78cbfcf2f0bd3aa4 NAME cl-postgres FILENAME cl-postgres
DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5
simple-date simple-date/postgres-glue split-sequence uax-15 uiop usocket)
- VERSION postmodern-20210807-git SIBLINGS (postmodern s-sql simple-date)
+ VERSION postmodern-20211020-git SIBLINGS (postmodern s-sql simple-date)
PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smt-lib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smt-lib.nix
index 62d77dfa7c23..23a11c5176e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smt-lib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smt-lib.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-smt-lib";
- version = "20210630-git";
+ version = "20211020-git";
description = "SMT object supporting SMT-LIB communication over input and output streams";
deps = [ args."asdf-package-system" args."named-readtables" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-smt-lib/2021-06-30/cl-smt-lib-20210630-git.tgz";
- sha256 = "0vrqzp6im2nvq6yfv4ysq4zv3m80v33apggzqq8r8j1zvbjjzrvm";
+ url = "http://beta.quicklisp.org/archive/cl-smt-lib/2021-10-20/cl-smt-lib-20211020-git.tgz";
+ sha256 = "1x2d79xcc0c56cb02axly6c10y6dmvxcpr3f16qry02rpfqys3qm";
};
packageName = "cl-smt-lib";
@@ -20,12 +20,12 @@ rec {
}
/* (SYSTEM cl-smt-lib DESCRIPTION
SMT object supporting SMT-LIB communication over input and output streams
- SHA256 0vrqzp6im2nvq6yfv4ysq4zv3m80v33apggzqq8r8j1zvbjjzrvm URL
- http://beta.quicklisp.org/archive/cl-smt-lib/2021-06-30/cl-smt-lib-20210630-git.tgz
- MD5 a10f913b43ba0ca99ee87a66e2f508ac NAME cl-smt-lib FILENAME cl-smt-lib
+ SHA256 1x2d79xcc0c56cb02axly6c10y6dmvxcpr3f16qry02rpfqys3qm URL
+ http://beta.quicklisp.org/archive/cl-smt-lib/2021-10-20/cl-smt-lib-20211020-git.tgz
+ MD5 f22b48a87b78fb5b38b35d780d34cd77 NAME cl-smt-lib FILENAME cl-smt-lib
DEPS
((NAME asdf-package-system FILENAME asdf-package-system)
(NAME named-readtables FILENAME named-readtables)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES (asdf-package-system named-readtables trivial-gray-streams)
- VERSION 20210630-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
index de1f93a8f2f7..4ce813119b46 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-webkit2";
- version = "cl-webkit-20210807-git";
+ version = "cl-webkit-20211020-git";
description = "An FFI binding to WebKit2GTK+";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-webkit/2021-08-07/cl-webkit-20210807-git.tgz";
- sha256 = "12n2zjl8kpji5b24jj1jhnlw16ylkxw4czc1dynx3ligj17qf1an";
+ url = "http://beta.quicklisp.org/archive/cl-webkit/2021-10-20/cl-webkit-20211020-git.tgz";
+ sha256 = "0kx9mjk8zgzkm60g0469mp53mj2jzxdb2baqr7sj0rkijc609821";
};
packageName = "cl-webkit2";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256
- 12n2zjl8kpji5b24jj1jhnlw16ylkxw4czc1dynx3ligj17qf1an URL
- http://beta.quicklisp.org/archive/cl-webkit/2021-08-07/cl-webkit-20210807-git.tgz
- MD5 25b73593e97d7c075cb791a896e5b1d1 NAME cl-webkit2 FILENAME cl-webkit2
+ 0kx9mjk8zgzkm60g0469mp53mj2jzxdb2baqr7sj0rkijc609821 URL
+ http://beta.quicklisp.org/archive/cl-webkit/2021-10-20/cl-webkit-20211020-git.tgz
+ MD5 fc73d56d8289729e93dd8c4793ea82e4 NAME cl-webkit2 FILENAME cl-webkit2
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -41,4 +41,4 @@ rec {
cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib
cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features
trivial-garbage)
- VERSION cl-webkit-20210807-git SIBLINGS NIL PARASITES NIL) */
+ VERSION cl-webkit-20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index 4efee4ae452b..4520d367b38c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -2,15 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl_plus_ssl";
- version = "cl+ssl-20210807-git";
+ version = "cl+ssl-20211020-git";
+
+ parasites = [ "cl+ssl/config" ];
description = "Common Lisp interface to OpenSSL.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl+ssl/2021-08-07/cl+ssl-20210807-git.tgz";
- sha256 = "04kk392r7w5xq414vaf3wnkrlhczdn863x3jj3vmrp7ppr9cwy57";
+ url = "http://beta.quicklisp.org/archive/cl+ssl/2021-10-20/cl+ssl-20211020-git.tgz";
+ sha256 = "05yzc736lnsaniv76753flsbzvip0sma4jy3fl124r704gknsvsl";
};
packageName = "cl+ssl";
@@ -19,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
- 04kk392r7w5xq414vaf3wnkrlhczdn863x3jj3vmrp7ppr9cwy57 URL
- http://beta.quicklisp.org/archive/cl+ssl/2021-08-07/cl+ssl-20210807-git.tgz
- MD5 d2267b96fcd5ee4ad2f9fc11a7a3f0b2 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+ 05yzc736lnsaniv76753flsbzvip0sma4jy3fl124r704gknsvsl URL
+ http://beta.quicklisp.org/archive/cl+ssl/2021-10-20/cl+ssl-20211020-git.tgz
+ MD5 2122250563c6454ba1abdd36e9432f0c NAME cl+ssl FILENAME cl_plus_ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,4 +35,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi flexi-streams split-sequence
trivial-features trivial-garbage trivial-gray-streams uiop usocket)
- VERSION cl+ssl-20210807-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
+ VERSION cl+ssl-20211020-git SIBLINGS (cl+ssl.test) PARASITES
+ (cl+ssl/config)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 20986c1fdd3a..4df32e3cc2bc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "closer-mop";
- version = "20210807-git";
+ version = "20211020-git";
description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.";
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/closer-mop/2021-08-07/closer-mop-20210807-git.tgz";
- sha256 = "1b3h6fw4wh11brmvi9p0j50zynbp7bgbhshcbngmd0ffdpinkh15";
+ url = "http://beta.quicklisp.org/archive/closer-mop/2021-10-20/closer-mop-20211020-git.tgz";
+ sha256 = "1m5ri5br262li2w4qljbplrgk6pm1w5vil5qa71bc1h7fbl0qh07";
};
packageName = "closer-mop";
@@ -20,7 +20,7 @@ rec {
}
/* (SYSTEM closer-mop DESCRIPTION
Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
- SHA256 1b3h6fw4wh11brmvi9p0j50zynbp7bgbhshcbngmd0ffdpinkh15 URL
- http://beta.quicklisp.org/archive/closer-mop/2021-08-07/closer-mop-20210807-git.tgz
- MD5 02b29c503d823ca9701b231c23bbd3cd NAME closer-mop FILENAME closer-mop
- DEPS NIL DEPENDENCIES NIL VERSION 20210807-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 1m5ri5br262li2w4qljbplrgk6pm1w5vil5qa71bc1h7fbl0qh07 URL
+ http://beta.quicklisp.org/archive/closer-mop/2021-10-20/closer-mop-20211020-git.tgz
+ MD5 09606b3803a2b3d727fb94cc59313bd8 NAME closer-mop FILENAME closer-mop
+ DEPS NIL DEPENDENCIES NIL VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
index 576b25062abf..2c1a1b392362 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "clunit2";
- version = "20210630-git";
+ version = "20211020-git";
description = "CLUnit is a Common Lisp unit testing framework.";
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clunit2/2021-06-30/clunit2-20210630-git.tgz";
- sha256 = "0vrjgf8rcdhvap9fvq4k543276ybjs5jqxj6zxbhrkfw2p26s445";
+ url = "http://beta.quicklisp.org/archive/clunit2/2021-10-20/clunit2-20211020-git.tgz";
+ sha256 = "0qly5gk1fn0bd0kx6spdhmnsf58gdg19py46w10p5vvs41vvriy3";
};
packageName = "clunit2";
@@ -19,7 +19,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM clunit2 DESCRIPTION CLUnit is a Common Lisp unit testing framework.
- SHA256 0vrjgf8rcdhvap9fvq4k543276ybjs5jqxj6zxbhrkfw2p26s445 URL
- http://beta.quicklisp.org/archive/clunit2/2021-06-30/clunit2-20210630-git.tgz
- MD5 d76550549dec0dca9207970919a8b952 NAME clunit2 FILENAME clunit2 DEPS NIL
- DEPENDENCIES NIL VERSION 20210630-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 0qly5gk1fn0bd0kx6spdhmnsf58gdg19py46w10p5vvs41vvriy3 URL
+ http://beta.quicklisp.org/archive/clunit2/2021-10-20/clunit2-20211020-git.tgz
+ MD5 0ee5b2d53c81e9640d3aa8c904b0b236 NAME clunit2 FILENAME clunit2 DEPS NIL
+ DEPENDENCIES NIL VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 24d2db0e7417..7518845bd112 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "clx";
- version = "20210630-git";
+ version = "20211020-git";
parasites = [ "clx/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."fiasco" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clx/2021-06-30/clx-20210630-git.tgz";
- sha256 = "0pr4majs7d6d14p52zapn5knvf7hhwm6s8abkn3xbfxgzi9np556";
+ url = "http://beta.quicklisp.org/archive/clx/2021-10-20/clx-20211020-git.tgz";
+ sha256 = "1mgqcqakbm8s4w2r9831xzhy9lyifcl2b3rhl5p76s5vpnjmp88k";
};
packageName = "clx";
@@ -22,8 +22,8 @@ rec {
}
/* (SYSTEM clx DESCRIPTION
An implementation of the X Window System protocol in Lisp. SHA256
- 0pr4majs7d6d14p52zapn5knvf7hhwm6s8abkn3xbfxgzi9np556 URL
- http://beta.quicklisp.org/archive/clx/2021-06-30/clx-20210630-git.tgz MD5
- 095657b0f48ff5602525faa2d4ff7a3e NAME clx FILENAME clx DEPS
- ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20210630-git
+ 1mgqcqakbm8s4w2r9831xzhy9lyifcl2b3rhl5p76s5vpnjmp88k URL
+ http://beta.quicklisp.org/archive/clx/2021-10-20/clx-20211020-git.tgz MD5
+ ac10db96a6426cf462f8d417a7797621 NAME clx FILENAME clx DEPS
+ ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20211020-git
SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 5dbcbd5c07b0..c3c80c73a0de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "dbd-mysql";
- version = "cl-dbi-20210228-git";
+ version = "cl-dbi-20211020-git";
description = "Database driver for MySQL.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz";
- sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk";
+ url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz";
+ sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr";
};
packageName = "dbd-mysql";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
- 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
- http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
- MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbd-mysql FILENAME dbd-mysql DEPS
+ 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz
+ MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbd-mysql FILENAME dbd-mysql DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl-mysql FILENAME cl-mysql)
@@ -31,5 +31,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cl-mysql closer-mop dbi
split-sequence trivial-features)
- VERSION cl-dbi-20210228-git SIBLINGS
+ VERSION cl-dbi-20211020-git SIBLINGS
(cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index c99fcc6a25cf..2ad35f6053bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "dbd-postgres";
- version = "cl-dbi-20210228-git";
+ version = "cl-dbi-20211020-git";
description = "Database driver for PostgreSQL.";
deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz";
- sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk";
+ url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz";
+ sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr";
};
packageName = "dbd-postgres";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
- 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
- http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
- MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbd-postgres FILENAME
+ 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz
+ MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbd-postgres FILENAME
dbd-postgres DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -35,5 +35,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-base64 cl-postgres cl-ppcre closer-mop dbi
ironclad md5 split-sequence trivial-garbage uax-15 usocket)
- VERSION cl-dbi-20210228-git SIBLINGS
+ VERSION cl-dbi-20211020-git SIBLINGS
(cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index c006de4305f9..05f939e608ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "dbd-sqlite3";
- version = "cl-dbi-20210228-git";
+ version = "cl-dbi-20211020-git";
description = "Database driver for SQLite3.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz";
- sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk";
+ url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz";
+ sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr";
};
packageName = "dbd-sqlite3";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
- 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
- http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
- MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbd-sqlite3 FILENAME dbd-sqlite3
+ 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz
+ MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbd-sqlite3 FILENAME dbd-sqlite3
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -34,5 +34,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi closer-mop dbi iterate
split-sequence sqlite trivial-features trivial-garbage)
- VERSION cl-dbi-20210228-git SIBLINGS
+ VERSION cl-dbi-20211020-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
index 6d945d61815c..8c06ed915fb9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "dbi-test";
- version = "cl-dbi-20210228-git";
+ version = "cl-dbi-20211020-git";
description = "System lacks description";
deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz";
- sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk";
+ url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz";
+ sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr";
};
packageName = "dbi-test";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbi-test DESCRIPTION System lacks description SHA256
- 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
- http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
- MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbi-test FILENAME dbi-test DEPS
+ 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz
+ MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbi-test FILENAME dbi-test DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads closer-mop dbi dissect rove split-sequence
trivial-gray-streams trivial-types)
- VERSION cl-dbi-20210228-git SIBLINGS
+ VERSION cl-dbi-20211020-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 381fd8e70257..98346b51b908 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "dbi";
- version = "cl-20210228-git";
+ version = "cl-20211020-git";
parasites = [ "dbi/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz";
- sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk";
+ url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz";
+ sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr";
};
packageName = "dbi";
@@ -21,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
- SHA256 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
- http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
- MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbi FILENAME dbi DEPS
+ SHA256 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz
+ MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbi FILENAME dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-mysql FILENAME cl-mysql) (NAME cl-postgres FILENAME cl-postgres)
@@ -38,5 +38,5 @@ rec {
(alexandria bordeaux-threads cl-mysql cl-postgres closer-mop dbd-mysql
dbd-postgres dbd-sqlite3 dbi-test rove split-sequence sqlite
trivial-garbage trivial-types)
- VERSION cl-20210228-git SIBLINGS
+ VERSION cl-20211020-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES (dbi/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
index 40d89b3769c6..a39f49899221 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "dbus";
- version = "20200610-git";
+ version = "20211020-git";
description = "A D-BUS client library for Common Lisp";
- deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
+ deps = [ args."alexandria" args."asdf-package-system" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-ppcre" args."cl-xmlspam" args."closure-common" args."cxml" args."flexi-streams" args."idna" args."ieee-floats" args."iolib" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."ironclad" args."puri" args."split-sequence" args."swap-bytes" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz";
- sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79";
+ url = "http://beta.quicklisp.org/archive/dbus/2021-10-20/dbus-20211020-git.tgz";
+ sha256 = "1h0qa609qplq3grjf3n31h1bcdj154ww2dn29mjxlkm76n5asz14";
};
packageName = "dbus";
@@ -19,17 +19,33 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256
- 1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79 URL
- http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz MD5
- 421fb481812b2da62fa5ee424f607b12 NAME dbus FILENAME dbus DEPS
+ 1h0qa609qplq3grjf3n31h1bcdj154ww2dn29mjxlkm76n5asz14 URL
+ http://beta.quicklisp.org/archive/dbus/2021-10-20/dbus-20211020-git.tgz MD5
+ f3fb2ad37c197d99d9c446f556a12bdb NAME dbus FILENAME dbus DEPS
((NAME alexandria FILENAME alexandria)
(NAME asdf-package-system FILENAME asdf-package-system)
- (NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam)
- (NAME flexi-streams FILENAME flexi-streams)
+ (NAME babel FILENAME babel)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+ (NAME cffi-toolchain FILENAME cffi-toolchain)
+ (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-xmlspam FILENAME cl-xmlspam)
+ (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+ (NAME flexi-streams FILENAME flexi-streams) (NAME idna FILENAME idna)
(NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib)
- (NAME ironclad FILENAME ironclad)
- (NAME trivial-garbage FILENAME trivial-garbage))
+ (NAME iolib.asdf FILENAME iolib_dot_asdf)
+ (NAME iolib.base FILENAME iolib_dot_base)
+ (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp)
+ (NAME iolib.conf FILENAME iolib_dot_conf)
+ (NAME ironclad FILENAME ironclad) (NAME puri FILENAME puri)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME swap-bytes FILENAME swap-bytes)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-garbage FILENAME trivial-garbage)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
- (alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats
- iolib ironclad trivial-garbage)
- VERSION 20200610-git SIBLINGS NIL PARASITES NIL) */
+ (alexandria asdf-package-system babel bordeaux-threads cffi cffi-grovel
+ cffi-toolchain cl-ppcre cl-xmlspam closure-common cxml flexi-streams idna
+ ieee-floats iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf
+ ironclad puri split-sequence swap-bytes trivial-features trivial-garbage
+ trivial-gray-streams)
+ VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
index 34ffaccf1651..59c249bcc455 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "djula";
- version = "20210630-git";
+ version = "20211020-git";
description = "An implementation of Django templates for Common Lisp.";
deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/djula/2021-06-30/djula-20210630-git.tgz";
- sha256 = "083psy8x9ni2d5pzmz46pcp0z3kysr8wbnankd656p4ilvajcgbj";
+ url = "http://beta.quicklisp.org/archive/djula/2021-10-20/djula-20211020-git.tgz";
+ sha256 = "1izz1bl5yjcfx7hldj2scdwwr6fybxrw2h4wwkpkwisadh42b648";
};
packageName = "djula";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM djula DESCRIPTION
An implementation of Django templates for Common Lisp. SHA256
- 083psy8x9ni2d5pzmz46pcp0z3kysr8wbnankd656p4ilvajcgbj URL
- http://beta.quicklisp.org/archive/djula/2021-06-30/djula-20210630-git.tgz
- MD5 ec46616b626ece388bba77671d2aa321 NAME djula FILENAME djula DEPS
+ 1izz1bl5yjcfx7hldj2scdwwr6fybxrw2h4wwkpkwisadh42b648 URL
+ http://beta.quicklisp.org/archive/djula/2021-10-20/djula-20211020-git.tgz
+ MD5 0b6464f786f65c14d71499fc0114733d NAME djula FILENAME djula DEPS
((NAME access FILENAME access) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arnesi FILENAME arnesi)
(NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot)
@@ -51,4 +51,4 @@ rec {
named-readtables parser-combinators split-sequence symbol-munger
trivial-backtrace trivial-features trivial-gray-streams trivial-types
yacc)
- VERSION 20210630-git SIBLINGS (djula-demo djula-test) PARASITES NIL) */
+ VERSION 20211020-git SIBLINGS (djula-demo djula-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 4b1590182756..933d116b507f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "esrap";
- version = "20201220-git";
+ version = "20211020-git";
parasites = [ "esrap/tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."fiveam" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/esrap/2020-12-20/esrap-20201220-git.tgz";
- sha256 = "0yhi4ay98i81nqv9yjlj321azwmiylsw0afdd6y1c1zflfcrzkrk";
+ url = "http://beta.quicklisp.org/archive/esrap/2021-10-20/esrap-20211020-git.tgz";
+ sha256 = "06cqvalqsid82an8c4acbf13y65gw8nb4pckm8gv8fknvh4k1x7h";
};
packageName = "esrap";
@@ -22,11 +22,11 @@ rec {
}
/* (SYSTEM esrap DESCRIPTION
A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
- 0yhi4ay98i81nqv9yjlj321azwmiylsw0afdd6y1c1zflfcrzkrk URL
- http://beta.quicklisp.org/archive/esrap/2020-12-20/esrap-20201220-git.tgz
- MD5 cc33cc8dbc236403f6b285c8eae0ce3b NAME esrap FILENAME esrap DEPS
+ 06cqvalqsid82an8c4acbf13y65gw8nb4pckm8gv8fknvh4k1x7h URL
+ http://beta.quicklisp.org/archive/esrap/2021-10-20/esrap-20211020-git.tgz
+ MD5 9657755b3fe896c1252dc7fdd22320b7 NAME esrap FILENAME esrap DEPS
((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)
(NAME trivial-with-current-source-form FILENAME
trivial-with-current-source-form))
DEPENDENCIES (alexandria fiveam trivial-with-current-source-form) VERSION
- 20201220-git SIBLINGS NIL PARASITES (esrap/tests)) */
+ 20211020-git SIBLINGS NIL PARASITES (esrap/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix
index 3ae2bf9a995f..62232d465458 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl";
- version = "20210807-git";
+ version = "20211020-git";
parasites = [ "generic-cl/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."fiveam" args."generic-cl_dot_arithmetic" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_lazy-seq" args."generic-cl_dot_map" args."generic-cl_dot_math" args."generic-cl_dot_object" args."generic-cl_dot_sequence" args."generic-cl_dot_set" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl";
@@ -22,9 +22,9 @@ rec {
}
/* (SYSTEM generic-cl DESCRIPTION
Standard Common Lisp functions implemented using generic functions. SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl FILENAME generic-cl
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl FILENAME generic-cl
DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -68,7 +68,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION 20210807-git SIBLINGS
+ VERSION 20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl.collector generic-cl.comparison
generic-cl.container generic-cl.internal generic-cl.iterator
generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix
index deb7281460ca..a4d00c345c9d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_arithmetic";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic arithmetic function interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.arithmetic";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM generic-cl.arithmetic DESCRIPTION
Generic arithmetic function interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.arithmetic FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.arithmetic FILENAME
generic-cl_dot_arithmetic DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -52,7 +52,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl generic-cl.collector generic-cl.comparison generic-cl.container
generic-cl.internal generic-cl.iterator generic-cl.lazy-seq generic-cl.map
generic-cl.math generic-cl.object generic-cl.sequence generic-cl.set
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_collector.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_collector.nix
index 483483d30373..cfbe247641a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_collector.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_collector.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_collector";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic collector interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.collector";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.collector DESCRIPTION Generic collector interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.collector FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.collector FILENAME
generic-cl_dot_collector DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -54,7 +54,7 @@ rec {
lisp-namespace optima parse-declarations-1.0 static-dispatch symbol-munger
trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.comparison
generic-cl.container generic-cl.internal generic-cl.iterator
generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_comparison.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_comparison.nix
index 5e95d58a91ed..b73000b48c0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_comparison.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_comparison.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_comparison";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic comparison interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.comparison";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.comparison DESCRIPTION Generic comparison interface
- SHA256 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.comparison FILENAME
+ SHA256 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.comparison FILENAME
generic-cl_dot_comparison DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -49,7 +49,7 @@ rec {
lisp-namespace optima parse-declarations-1.0 static-dispatch symbol-munger
trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector generic-cl.container
generic-cl.internal generic-cl.iterator generic-cl.lazy-seq generic-cl.map
generic-cl.math generic-cl.object generic-cl.sequence generic-cl.set
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_container.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_container.nix
index 32e0a827783e..9a74523c5812 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_container.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_container.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_container";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic container interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.container";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.container DESCRIPTION Generic container interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.container FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.container FILENAME
generic-cl_dot_container DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -52,7 +52,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.internal generic-cl.iterator
generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_internal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_internal.nix
index c80b7d495009..dd1a3a6e18ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_internal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_internal.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_internal";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Utilities used internally by generic-cl";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.internal";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM generic-cl.internal DESCRIPTION
Utilities used internally by generic-cl SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.internal FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.internal FILENAME
generic-cl_dot_internal DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -49,7 +49,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.iterator
generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_iterator.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_iterator.nix
index 9d53f30f3415..1640b13e8a43 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_iterator.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_iterator.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_iterator";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic iterator interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.iterator";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.iterator DESCRIPTION Generic iterator interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.iterator FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.iterator FILENAME
generic-cl_dot_iterator DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -53,7 +53,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix
index b757a5414056..383de5cce3c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_lazy-seq";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Lazy sequences";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_map" args."generic-cl_dot_object" args."generic-cl_dot_sequence" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.lazy-seq";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.lazy-seq DESCRIPTION Lazy sequences SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.lazy-seq FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.lazy-seq FILENAME
generic-cl_dot_lazy-seq DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -60,7 +60,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.iterator generic-cl.map generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_map.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_map.nix
index 2b908dc7f045..d44389239c71 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_map.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_map.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_map";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic map and hash-table interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.map";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.map DESCRIPTION Generic map and hash-table interface
- SHA256 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.map FILENAME
+ SHA256 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.map FILENAME
generic-cl_dot_map DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -57,7 +57,7 @@ rec {
lisp-namespace optima parse-declarations-1.0 static-dispatch symbol-munger
trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.iterator generic-cl.lazy-seq generic-cl.math generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_math.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_math.nix
index 5b03f096f907..f834513f085a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_math.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_math.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_math";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic math function interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_arithmetic" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.math";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.math DESCRIPTION Generic math function interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.math FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.math FILENAME
generic-cl_dot_math DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -52,7 +52,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.object
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_object.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_object.nix
index 08bbce0d51ef..98991384829e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_object.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_object.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_object";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic object copying and type conversion interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.object";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM generic-cl.object DESCRIPTION
Generic object copying and type conversion interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.object FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.object FILENAME
generic-cl_dot_object DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -52,7 +52,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.math
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_sequence.nix
index a4f5e8f2f143..3aae58b2ff4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_sequence.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_sequence";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic sequence operations";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_map" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.sequence";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.sequence DESCRIPTION Generic sequence operations SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.sequence FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.sequence FILENAME
generic-cl_dot_sequence DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -59,7 +59,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.math
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_set.nix
index 38c26661f3af..27b3fdf2f63e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl_dot_set.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl_dot_set";
- version = "generic-cl-20210807-git";
+ version = "generic-cl-20211020-git";
description = "Generic set interface";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_arithmetic" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_map" args."generic-cl_dot_object" args."generic-cl_dot_sequence" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz";
- sha256 = "0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b";
+ url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz";
+ sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa";
};
packageName = "generic-cl.set";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM generic-cl.set DESCRIPTION Generic set interface SHA256
- 0jn1hw0m3906iyyg337kb6dfnmyj95l7s9lx1glvgcas450wkk0b URL
- http://beta.quicklisp.org/archive/generic-cl/2021-08-07/generic-cl-20210807-git.tgz
- MD5 38e30f287963d66f4d56b48918f71568 NAME generic-cl.set FILENAME
+ 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL
+ http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz
+ MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.set FILENAME
generic-cl_dot_set DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -61,7 +61,7 @@ rec {
parse-declarations-1.0 static-dispatch symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION generic-cl-20210807-git SIBLINGS
+ VERSION generic-cl-20211020-git SIBLINGS
(generic-cl.arithmetic generic-cl generic-cl.collector
generic-cl.comparison generic-cl.container generic-cl.internal
generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.math
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchensocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchensocket.nix
new file mode 100644
index 000000000000..7aa4f50c57d1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchensocket.nix
@@ -0,0 +1,48 @@
+/* Generated file. */
+args @ { fetchurl, ... }:
+rec {
+ baseName = "hunchensocket";
+ version = "20180711-git";
+
+ parasites = [ "hunchensocket-tests" ];
+
+ description = "WebSockets for Hunchentoot";
+
+ deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."fiasco" args."flexi-streams" args."hunchentoot" args."ironclad" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."usocket" ];
+
+ src = fetchurl {
+ url = "http://beta.quicklisp.org/archive/hunchensocket/2018-07-11/hunchensocket-20180711-git.tgz";
+ sha256 = "03igrp8svb4gkwhhhgmxwrnp5vq5ndp15mxqsafyi065xj3ppw48";
+ };
+
+ packageName = "hunchensocket";
+
+ asdFilesToKeep = ["hunchensocket.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM hunchensocket DESCRIPTION WebSockets for Hunchentoot SHA256
+ 03igrp8svb4gkwhhhgmxwrnp5vq5ndp15mxqsafyi065xj3ppw48 URL
+ http://beta.quicklisp.org/archive/hunchensocket/2018-07-11/hunchensocket-20180711-git.tgz
+ MD5 bf6cd52c13e3b1f464c8a45a8bac85b8 NAME hunchensocket FILENAME
+ hunchensocket DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga)
+ (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64)
+ (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME fiasco FILENAME fiasco) (NAME flexi-streams FILENAME flexi-streams)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
+ (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-backtrace FILENAME trivial-backtrace)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-garbage FILENAME trivial-garbage)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+ (NAME trivial-utf-8 FILENAME trivial-utf-8)
+ (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad
+ cl-ppcre fiasco flexi-streams hunchentoot ironclad md5 rfc2388
+ split-sequence trivial-backtrace trivial-features trivial-garbage
+ trivial-gray-streams trivial-utf-8 usocket)
+ VERSION 20180711-git SIBLINGS NIL PARASITES (hunchensocket-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index b6f602387e16..66d3614a9c09 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -2,17 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "ironclad";
- version = "v0.55";
+ version = "v0.56";
- parasites = [ "ironclad/tests" ];
+ parasites = [ "ironclad/aead/eax" "ironclad/aead/etm" "ironclad/aead/gcm" "ironclad/aeads" "ironclad/cipher/aes" "ironclad/cipher/arcfour" "ironclad/cipher/aria" "ironclad/cipher/blowfish" "ironclad/cipher/camellia" "ironclad/cipher/cast5" "ironclad/cipher/chacha" "ironclad/cipher/des" "ironclad/cipher/idea" "ironclad/cipher/kalyna" "ironclad/cipher/keystream" "ironclad/cipher/kuznyechik" "ironclad/cipher/misty1" "ironclad/cipher/rc2" "ironclad/cipher/rc5" "ironclad/cipher/rc6" "ironclad/cipher/salsa20" "ironclad/cipher/seed" "ironclad/cipher/serpent" "ironclad/cipher/sm4" "ironclad/cipher/sosemanuk" "ironclad/cipher/square" "ironclad/cipher/tea" "ironclad/cipher/threefish" "ironclad/cipher/twofish" "ironclad/cipher/xchacha" "ironclad/cipher/xor" "ironclad/cipher/xsalsa20" "ironclad/cipher/xtea" "ironclad/ciphers" "ironclad/core" "ironclad/digest/adler32" "ironclad/digest/blake2" "ironclad/digest/blake2s" "ironclad/digest/crc24" "ironclad/digest/crc32" "ironclad/digest/groestl" "ironclad/digest/jh" "ironclad/digest/kupyna" "ironclad/digest/md2" "ironclad/digest/md4" "ironclad/digest/md5" "ironclad/digest/ripemd-128" "ironclad/digest/ripemd-160" "ironclad/digest/sha1" "ironclad/digest/sha256" "ironclad/digest/sha3" "ironclad/digest/sha512" "ironclad/digest/skein" "ironclad/digest/sm3" "ironclad/digest/streebog" "ironclad/digest/tiger" "ironclad/digest/tree-hash" "ironclad/digest/whirlpool" "ironclad/digests" "ironclad/kdf/argon2" "ironclad/kdf/bcrypt" "ironclad/kdf/hmac" "ironclad/kdf/password-hash" "ironclad/kdf/pkcs5" "ironclad/kdf/scrypt" "ironclad/kdfs" "ironclad/mac/blake2-mac" "ironclad/mac/blake2s-mac" "ironclad/mac/cmac" "ironclad/mac/gmac" "ironclad/mac/hmac" "ironclad/mac/poly1305" "ironclad/mac/siphash" "ironclad/mac/skein-mac" "ironclad/macs" "ironclad/prng/fortuna" "ironclad/prngs" "ironclad/public-key/curve25519" "ironclad/public-key/curve448" "ironclad/public-key/dsa" "ironclad/public-key/ed25519" "ironclad/public-key/ed448" "ironclad/public-key/elgamal" "ironclad/public-key/rsa" "ironclad/public-key/secp256k1" "ironclad/public-key/secp256r1" "ironclad/public-key/secp384r1" "ironclad/public-key/secp521r1" "ironclad/public-keys" "ironclad/tests" ];
- description = "A cryptographic toolkit written in pure Common Lisp";
+ description = "System lacks description";
deps = [ args."alexandria" args."bordeaux-threads" args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/ironclad/2021-04-11/ironclad-v0.55.tgz";
- sha256 = "0vdqaad9i3dkz6z2y1iqmh6m77kc9jy49xh9bysgywl0gfdyhnq6";
+ url = "http://beta.quicklisp.org/archive/ironclad/2021-10-20/ironclad-v0.56.tgz";
+ sha256 = "06jya7y8xlwak84akhp4qg9x6nyjrnnzqmzdigxc5a3c77mk3p6k";
};
packageName = "ironclad";
@@ -20,12 +20,43 @@ rec {
asdFilesToKeep = ["ironclad.asd"];
overrides = x: x;
}
-/* (SYSTEM ironclad DESCRIPTION
- A cryptographic toolkit written in pure Common Lisp SHA256
- 0vdqaad9i3dkz6z2y1iqmh6m77kc9jy49xh9bysgywl0gfdyhnq6 URL
- http://beta.quicklisp.org/archive/ironclad/2021-04-11/ironclad-v0.55.tgz
- MD5 c3c4a88e71ef37c9604662071069afcc NAME ironclad FILENAME ironclad DEPS
+/* (SYSTEM ironclad DESCRIPTION System lacks description SHA256
+ 06jya7y8xlwak84akhp4qg9x6nyjrnnzqmzdigxc5a3c77mk3p6k URL
+ http://beta.quicklisp.org/archive/ironclad/2021-10-20/ironclad-v0.56.tgz
+ MD5 3ea7bf7271864fd960d7e06a4e5aa9b7 NAME ironclad FILENAME ironclad DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads) (NAME rt FILENAME rt))
- DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.55 SIBLINGS
- (ironclad-text) PARASITES (ironclad/tests)) */
+ DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.56 SIBLINGS
+ (ironclad-text) PARASITES
+ (ironclad/aead/eax ironclad/aead/etm ironclad/aead/gcm ironclad/aeads
+ ironclad/cipher/aes ironclad/cipher/arcfour ironclad/cipher/aria
+ ironclad/cipher/blowfish ironclad/cipher/camellia ironclad/cipher/cast5
+ ironclad/cipher/chacha ironclad/cipher/des ironclad/cipher/idea
+ ironclad/cipher/kalyna ironclad/cipher/keystream
+ ironclad/cipher/kuznyechik ironclad/cipher/misty1 ironclad/cipher/rc2
+ ironclad/cipher/rc5 ironclad/cipher/rc6 ironclad/cipher/salsa20
+ ironclad/cipher/seed ironclad/cipher/serpent ironclad/cipher/sm4
+ ironclad/cipher/sosemanuk ironclad/cipher/square ironclad/cipher/tea
+ ironclad/cipher/threefish ironclad/cipher/twofish ironclad/cipher/xchacha
+ ironclad/cipher/xor ironclad/cipher/xsalsa20 ironclad/cipher/xtea
+ ironclad/ciphers ironclad/core ironclad/digest/adler32
+ ironclad/digest/blake2 ironclad/digest/blake2s ironclad/digest/crc24
+ ironclad/digest/crc32 ironclad/digest/groestl ironclad/digest/jh
+ ironclad/digest/kupyna ironclad/digest/md2 ironclad/digest/md4
+ ironclad/digest/md5 ironclad/digest/ripemd-128 ironclad/digest/ripemd-160
+ ironclad/digest/sha1 ironclad/digest/sha256 ironclad/digest/sha3
+ ironclad/digest/sha512 ironclad/digest/skein ironclad/digest/sm3
+ ironclad/digest/streebog ironclad/digest/tiger ironclad/digest/tree-hash
+ ironclad/digest/whirlpool ironclad/digests ironclad/kdf/argon2
+ ironclad/kdf/bcrypt ironclad/kdf/hmac ironclad/kdf/password-hash
+ ironclad/kdf/pkcs5 ironclad/kdf/scrypt ironclad/kdfs
+ ironclad/mac/blake2-mac ironclad/mac/blake2s-mac ironclad/mac/cmac
+ ironclad/mac/gmac ironclad/mac/hmac ironclad/mac/poly1305
+ ironclad/mac/siphash ironclad/mac/skein-mac ironclad/macs
+ ironclad/prng/fortuna ironclad/prngs ironclad/public-key/curve25519
+ ironclad/public-key/curve448 ironclad/public-key/dsa
+ ironclad/public-key/ed25519 ironclad/public-key/ed448
+ ironclad/public-key/elgamal ironclad/public-key/rsa
+ ironclad/public-key/secp256k1 ironclad/public-key/secp256r1
+ ironclad/public-key/secp384r1 ironclad/public-key/secp521r1
+ ironclad/public-keys ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 71becf9a4eed..04c0a45e859c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "lack-component";
- version = "lack-20210807-git";
+ version = "lack-20211020-git";
description = "System lacks description";
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz";
- sha256 = "0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn";
+ url = "http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz";
+ sha256 = "0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2";
};
packageName = "lack-component";
@@ -19,15 +19,15 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256
- 0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn URL
- http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz MD5
- 76b3ab979e6c3d7d33dd2fd3864692ca NAME lack-component FILENAME
- lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20210807-git SIBLINGS
- (lack-middleware-accesslog lack-middleware-auth-basic
- lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
- lack-middleware-session lack-middleware-static lack-request lack-response
- lack-session-store-dbi lack-session-store-redis lack-test
- lack-util-writer-stream lack-util lack t-lack-component
+ 0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2 URL
+ http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz MD5
+ 4a98955fb9cd5db45b796a0b269a57e1 NAME lack-component FILENAME
+ lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20211020-git SIBLINGS
+ (lack-app-directory lack-app-file lack-middleware-accesslog
+ lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf
+ lack-middleware-mount lack-middleware-session lack-middleware-static
+ lack-request lack-response lack-session-store-dbi lack-session-store-redis
+ lack-test lack-util-writer-stream lack-util lack t-lack-component
t-lack-middleware-accesslog t-lack-middleware-auth-basic
t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
t-lack-middleware-session t-lack-middleware-static t-lack-request
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 9048abebad95..ce8cea2192ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "lack-middleware-backtrace";
- version = "lack-20210807-git";
+ version = "lack-20211020-git";
description = "System lacks description";
deps = [ args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz";
- sha256 = "0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn";
+ url = "http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz";
+ sha256 = "0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2";
};
packageName = "lack-middleware-backtrace";
@@ -19,16 +19,17 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description
- SHA256 0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn URL
- http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz MD5
- 76b3ab979e6c3d7d33dd2fd3864692ca NAME lack-middleware-backtrace FILENAME
+ SHA256 0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2 URL
+ http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz MD5
+ 4a98955fb9cd5db45b796a0b269a57e1 NAME lack-middleware-backtrace FILENAME
lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
- (uiop) VERSION lack-20210807-git SIBLINGS
- (lack-component lack-middleware-accesslog lack-middleware-auth-basic
- lack-middleware-csrf lack-middleware-mount lack-middleware-session
- lack-middleware-static lack-request lack-response lack-session-store-dbi
- lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
- t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic
+ (uiop) VERSION lack-20211020-git SIBLINGS
+ (lack-app-directory lack-app-file lack-component lack-middleware-accesslog
+ lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount
+ lack-middleware-session lack-middleware-static lack-request lack-response
+ lack-session-store-dbi lack-session-store-redis lack-test
+ lack-util-writer-stream lack-util lack t-lack-component
+ t-lack-middleware-accesslog t-lack-middleware-auth-basic
t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
t-lack-middleware-session t-lack-middleware-static t-lack-request
t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 9cba066f75e0..377732c4d4ee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "lack-util";
- version = "lack-20210807-git";
+ version = "lack-20211020-git";
description = "System lacks description";
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz";
- sha256 = "0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn";
+ url = "http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz";
+ sha256 = "0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2";
};
packageName = "lack-util";
@@ -19,21 +19,21 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256
- 0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn URL
- http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz MD5
- 76b3ab979e6c3d7d33dd2fd3864692ca NAME lack-util FILENAME lack-util DEPS
+ 0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2 URL
+ http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz MD5
+ 4a98955fb9cd5db45b796a0b269a57e1 NAME lack-util FILENAME lack-util DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME ironclad FILENAME ironclad))
DEPENDENCIES (alexandria bordeaux-threads ironclad) VERSION
- lack-20210807-git SIBLINGS
- (lack-component lack-middleware-accesslog lack-middleware-auth-basic
- lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
- lack-middleware-session lack-middleware-static lack-request lack-response
- lack-session-store-dbi lack-session-store-redis lack-test
- lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog
- t-lack-middleware-auth-basic t-lack-middleware-backtrace
- t-lack-middleware-csrf t-lack-middleware-mount t-lack-middleware-session
- t-lack-middleware-static t-lack-request t-lack-session-store-dbi
- t-lack-session-store-redis t-lack-util t-lack)
+ lack-20211020-git SIBLINGS
+ (lack-app-directory lack-app-file lack-component lack-middleware-accesslog
+ lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf
+ lack-middleware-mount lack-middleware-session lack-middleware-static
+ lack-request lack-response lack-session-store-dbi lack-session-store-redis
+ lack-test lack-util-writer-stream lack t-lack-component
+ t-lack-middleware-accesslog t-lack-middleware-auth-basic
+ t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
+ t-lack-middleware-session t-lack-middleware-static t-lack-request
+ t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index eb81e9dba40d..7ecebef78610 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "lack";
- version = "20210807-git";
+ version = "20211020-git";
description = "A minimal Clack";
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz";
- sha256 = "0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn";
+ url = "http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz";
+ sha256 = "0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2";
};
packageName = "lack";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
- 0zyyr9wkncf03l4jf54mkjm4kaiswmwj5y198kp9v00x2ljjnkjn URL
- http://beta.quicklisp.org/archive/lack/2021-08-07/lack-20210807-git.tgz MD5
- 76b3ab979e6c3d7d33dd2fd3864692ca NAME lack FILENAME lack DEPS
+ 0ly7bdvrl5xsls9syybcf0qm2981m434rhr3gr756kvvk4s9mdn2 URL
+ http://beta.quicklisp.org/archive/lack/2021-10-20/lack-20211020-git.tgz MD5
+ 4a98955fb9cd5db45b796a0b269a57e1 NAME lack FILENAME lack DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME ironclad FILENAME ironclad)
@@ -29,12 +29,12 @@ rec {
(NAME lack-util FILENAME lack-util))
DEPENDENCIES
(alexandria bordeaux-threads ironclad lack-component lack-util) VERSION
- 20210807-git SIBLINGS
- (lack-component lack-middleware-accesslog lack-middleware-auth-basic
- lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
- lack-middleware-session lack-middleware-static lack-request lack-response
- lack-session-store-dbi lack-session-store-redis lack-test
- lack-util-writer-stream lack-util t-lack-component
+ 20211020-git SIBLINGS
+ (lack-app-directory lack-app-file lack-component lack-middleware-accesslog
+ lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf
+ lack-middleware-mount lack-middleware-session lack-middleware-static
+ lack-request lack-response lack-session-store-dbi lack-session-store-redis
+ lack-test lack-util-writer-stream lack-util t-lack-component
t-lack-middleware-accesslog t-lack-middleware-auth-basic
t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
t-lack-middleware-session t-lack-middleware-static t-lack-request
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index b2c7de33c0df..510bf4965b96 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "lisp-namespace";
- version = "20171130-git";
+ version = "20211020-git";
description = "Provides LISP-N --- extensible namespaces in Common Lisp.";
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz";
- sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j";
+ url = "http://beta.quicklisp.org/archive/lisp-namespace/2021-10-20/lisp-namespace-20211020-git.tgz";
+ sha256 = "1vw7zxzhlxqjnas3cxk0f58hxvlvki78vbqsabj6f3n1rq6yx7b7";
};
packageName = "lisp-namespace";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM lisp-namespace DESCRIPTION
Provides LISP-N --- extensible namespaces in Common Lisp. SHA256
- 0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j URL
- http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz
- MD5 d3052a13db167c6a53487f31753b7467 NAME lisp-namespace FILENAME
+ 1vw7zxzhlxqjnas3cxk0f58hxvlvki78vbqsabj6f3n1rq6yx7b7 URL
+ http://beta.quicklisp.org/archive/lisp-namespace/2021-10-20/lisp-namespace-20211020-git.tgz
+ MD5 71d02a1704c93281028316e96ecaead2 NAME lisp-namespace FILENAME
lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
- (alexandria) VERSION 20171130-git SIBLINGS (lisp-namespace.test) PARASITES
+ (alexandria) VERSION 20211020-git SIBLINGS (lisp-namespace.test) PARASITES
NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
index 17606d4d88cb..fc3d2caa38bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "log4cl";
- version = "20200925-git";
+ version = "20211020-git";
parasites = [ "log4cl/syslog" "log4cl/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz";
- sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf";
+ url = "http://beta.quicklisp.org/archive/log4cl/2021-10-20/log4cl-20211020-git.tgz";
+ sha256 = "1nqryqd5z4grg75hffqs2x6nzdf972cp4f41l1dr8wdf3fp0ifz8";
};
packageName = "log4cl";
@@ -21,11 +21,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256
- 1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf URL
- http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz
- MD5 80b347666af496142581e9e0c029d181 NAME log4cl FILENAME log4cl DEPS
+ 1nqryqd5z4grg75hffqs2x6nzdf972cp4f41l1dr8wdf3fp0ifz8 URL
+ http://beta.quicklisp.org/archive/log4cl/2021-10-20/log4cl-20211020-git.tgz
+ MD5 d4eb0d4c8a9bc2f2037d7a64d44292d4 NAME log4cl FILENAME log4cl DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME stefil FILENAME stefil))
- DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20200925-git
- SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */
+ DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20211020-git
+ SIBLINGS (log4cl-examples log4cl.log4slime log4cl.log4sly) PARASITES
+ (log4cl/syslog log4cl/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index e935d2b3d99d..8c1d9062ddc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "marshal";
- version = "cl-20210411-git";
+ version = "cl-20211020-git";
description = "marshal: Simple (de)serialization of Lisp datastructures.";
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-marshal/2021-04-11/cl-marshal-20210411-git.tgz";
- sha256 = "0wi4csgl5qxgl0si5mcg19xx4qlmw125qn0w1i2f3dvvrzp20qrp";
+ url = "http://beta.quicklisp.org/archive/cl-marshal/2021-10-20/cl-marshal-20211020-git.tgz";
+ sha256 = "0zv4bpj352frdrsk7r1yc67385h2n00cy19nz3b72sznsjynqvk8";
};
packageName = "marshal";
@@ -20,8 +20,8 @@ rec {
}
/* (SYSTEM marshal DESCRIPTION
marshal: Simple (de)serialization of Lisp datastructures. SHA256
- 0wi4csgl5qxgl0si5mcg19xx4qlmw125qn0w1i2f3dvvrzp20qrp URL
- http://beta.quicklisp.org/archive/cl-marshal/2021-04-11/cl-marshal-20210411-git.tgz
- MD5 2463314a6bcd1a18bea2690deb6bce55 NAME marshal FILENAME marshal DEPS NIL
- DEPENDENCIES NIL VERSION cl-20210411-git SIBLINGS (marshal-tests) PARASITES
+ 0zv4bpj352frdrsk7r1yc67385h2n00cy19nz3b72sznsjynqvk8 URL
+ http://beta.quicklisp.org/archive/cl-marshal/2021-10-20/cl-marshal-20211020-git.tgz
+ MD5 52eaad7da569610099d15c1d91020e17 NAME marshal FILENAME marshal DEPS NIL
+ DEPENDENCIES NIL VERSION cl-20211020-git SIBLINGS (marshal-tests) PARASITES
NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
index c22acbce4f0c..d1f9c4702c36 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
@@ -2,18 +2,18 @@
args @ { fetchurl, ... }:
rec {
baseName = "mgl-pax";
- version = "20210411-git";
+ version = "20211020-git";
- parasites = [ "mgl-pax/test" ];
+ parasites = [ "mgl-pax/full" ];
description = "Exploratory programming tool and documentation
generator.";
- deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" args."trivial-with-current-source-form" ];
+ deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."cl-fad" args."colorize" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."swank" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/mgl-pax/2021-04-11/mgl-pax-20210411-git.tgz";
- sha256 = "0dq5jkb6li0s1gqj6hfhifs6cd4kypavv2kjqg5zgs6zfs82sxh3";
+ url = "http://beta.quicklisp.org/archive/mgl-pax/2021-10-20/mgl-pax-20211020-git.tgz";
+ sha256 = "04vddyvyxja8dabksfqqr80xjnvdiiv61zidjvijlpkk8shwaw1g";
};
packageName = "mgl-pax";
@@ -23,25 +23,18 @@ rec {
}
/* (SYSTEM mgl-pax DESCRIPTION Exploratory programming tool and documentation
generator.
- SHA256 0dq5jkb6li0s1gqj6hfhifs6cd4kypavv2kjqg5zgs6zfs82sxh3 URL
- http://beta.quicklisp.org/archive/mgl-pax/2021-04-11/mgl-pax-20210411-git.tgz
- MD5 44cf1bd71e6c40c256a43a87efa2c2a1 NAME mgl-pax FILENAME mgl-pax DEPS
+ SHA256 04vddyvyxja8dabksfqqr80xjnvdiiv61zidjvijlpkk8shwaw1g URL
+ http://beta.quicklisp.org/archive/mgl-pax/2021-10-20/mgl-pax-20211020-git.tgz
+ MD5 2ad25d62d83b98e3e855b35414a5093d NAME mgl-pax FILENAME mgl-pax DEPS
((NAME 3bmd FILENAME _3bmd)
(NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks)
(NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
- (NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-fad FILENAME cl-fad) (NAME colorize FILENAME colorize)
- (NAME esrap FILENAME esrap) (NAME html-encode FILENAME html-encode)
(NAME ironclad FILENAME ironclad)
(NAME named-readtables FILENAME named-readtables)
(NAME pythonic-string-reader FILENAME pythonic-string-reader)
- (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
- (NAME trivial-features FILENAME trivial-features)
- (NAME trivial-with-current-source-form FILENAME
- trivial-with-current-source-form))
+ (NAME swank FILENAME swank))
DEPENDENCIES
- (3bmd 3bmd-ext-code-blocks alexandria babel bordeaux-threads cl-fad
- colorize esrap html-encode ironclad named-readtables
- pythonic-string-reader split-sequence swank trivial-features
- trivial-with-current-source-form)
- VERSION 20210411-git SIBLINGS NIL PARASITES (mgl-pax/test)) */
+ (3bmd 3bmd-ext-code-blocks alexandria babel cl-fad colorize ironclad
+ named-readtables pythonic-string-reader swank)
+ VERSION 20211020-git SIBLINGS NIL PARASITES (mgl-pax/full)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
index 3609e2304164..07d16b17c030 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "osicat";
- version = "20210228-git";
+ version = "20211020-git";
parasites = [ "osicat/tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/osicat/2021-02-28/osicat-20210228-git.tgz";
- sha256 = "0g9frahjr2i6fvwd3bzvcz9icx4n4mnwcmsz6gvg5s6wmq5ny6wb";
+ url = "http://beta.quicklisp.org/archive/osicat/2021-10-20/osicat-20211020-git.tgz";
+ sha256 = "0rb53m4hg8dllljjvj9a76mq4hn9cl7wp0lqg50gs0l6v2c7qlbw";
};
packageName = "osicat";
@@ -21,13 +21,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM osicat DESCRIPTION A lightweight operating system interface SHA256
- 0g9frahjr2i6fvwd3bzvcz9icx4n4mnwcmsz6gvg5s6wmq5ny6wb URL
- http://beta.quicklisp.org/archive/osicat/2021-02-28/osicat-20210228-git.tgz
- MD5 22c1b81abfe4fb30a2789877d2f85a86 NAME osicat FILENAME osicat DEPS
+ 0rb53m4hg8dllljjvj9a76mq4hn9cl7wp0lqg50gs0l6v2c7qlbw URL
+ http://beta.quicklisp.org/archive/osicat/2021-10-20/osicat-20211020-git.tgz
+ MD5 2cf6739bb39a2bf414de19037f867c87 NAME osicat FILENAME osicat DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
(NAME cffi-toolchain FILENAME cffi-toolchain) (NAME rt FILENAME rt)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES
(alexandria babel cffi cffi-grovel cffi-toolchain rt trivial-features)
- VERSION 20210228-git SIBLINGS NIL PARASITES (osicat/tests)) */
+ VERSION 20211020-git SIBLINGS NIL PARASITES (osicat/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parachute.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parachute.nix
index f355b4ba3e96..e32250d03f59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parachute.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parachute.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "parachute";
- version = "20210807-git";
+ version = "20211020-git";
description = "An extensible and cross-compatible testing framework.";
deps = [ args."documentation-utils" args."form-fiddle" args."trivial-indent" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/parachute/2021-08-07/parachute-20210807-git.tgz";
- sha256 = "0h20f73781qpylhs3v0gywzz3iwkxh1bksl7d674dxdl988ngzbs";
+ url = "http://beta.quicklisp.org/archive/parachute/2021-10-20/parachute-20211020-git.tgz";
+ sha256 = "1sc63a6z3zwdsc9h3w0dbx7yssvg2zzdyhh81kqc5cx17vcdqyk0";
};
packageName = "parachute";
@@ -20,12 +20,12 @@ rec {
}
/* (SYSTEM parachute DESCRIPTION
An extensible and cross-compatible testing framework. SHA256
- 0h20f73781qpylhs3v0gywzz3iwkxh1bksl7d674dxdl988ngzbs URL
- http://beta.quicklisp.org/archive/parachute/2021-08-07/parachute-20210807-git.tgz
- MD5 3a25227cffef9f2d9947750490d643ec NAME parachute FILENAME parachute DEPS
+ 1sc63a6z3zwdsc9h3w0dbx7yssvg2zzdyhh81kqc5cx17vcdqyk0 URL
+ http://beta.quicklisp.org/archive/parachute/2021-10-20/parachute-20211020-git.tgz
+ MD5 85eba816a1e7a43a154e6a1544e15e52 NAME parachute FILENAME parachute DEPS
((NAME documentation-utils FILENAME documentation-utils)
(NAME form-fiddle FILENAME form-fiddle)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (documentation-utils form-fiddle trivial-indent) VERSION
- 20210807-git SIBLINGS
+ 20211020-git SIBLINGS
(parachute-fiveam parachute-lisp-unit parachute-prove) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/physical-quantities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/physical-quantities.nix
index 0426f6770820..865d4f4791fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/physical-quantities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/physical-quantities.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "physical-quantities";
- version = "20201220-git";
+ version = "20211020-git";
parasites = [ "physical-quantities/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."parseq" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/physical-quantities/2020-12-20/physical-quantities-20201220-git.tgz";
- sha256 = "0731q6skgnl95jmw82pfkw6y3bdaw5givdlgbk93jql251wfvmf5";
+ url = "http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz";
+ sha256 = "1ix04gjcsjzry5rl1rqsrg1r3hw985gfvl1847va36y03qzbmhgx";
};
packageName = "physical-quantities";
@@ -22,9 +22,9 @@ rec {
}
/* (SYSTEM physical-quantities DESCRIPTION
A library that provides a numeric type with optional unit and/or uncertainty for computations with automatic error propagation.
- SHA256 0731q6skgnl95jmw82pfkw6y3bdaw5givdlgbk93jql251wfvmf5 URL
- http://beta.quicklisp.org/archive/physical-quantities/2020-12-20/physical-quantities-20201220-git.tgz
- MD5 428232d463c45259dd2c18fa8ff3dd6e NAME physical-quantities FILENAME
+ SHA256 1ix04gjcsjzry5rl1rqsrg1r3hw985gfvl1847va36y03qzbmhgx URL
+ http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz
+ MD5 a322db845056f78a237630a565b41490 NAME physical-quantities FILENAME
physical-quantities DEPS ((NAME parseq FILENAME parseq)) DEPENDENCIES
- (parseq) VERSION 20201220-git SIBLINGS NIL PARASITES
+ (parseq) VERSION 20211020-git SIBLINGS NIL PARASITES
(physical-quantities/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index 43658b6e089c..95de05fe0334 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -2,17 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "postmodern";
- version = "20210807-git";
+ version = "20211020-git";
parasites = [ "postmodern/tests" ];
description = "PostgreSQL programming API";
- deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."local-time" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."uiop" args."usocket" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" args."cl-postgres_slash_tests" args."cl-ppcre" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."local-time" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."uiop" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz";
- sha256 = "01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp";
+ url = "http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz";
+ sha256 = "0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6";
};
packageName = "postmodern";
@@ -21,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256
- 01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp URL
- http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz
- MD5 aa951f2ad4ce59fce588a62afa34f3ec NAME postmodern FILENAME postmodern
+ 0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6 URL
+ http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz
+ MD5 84f4ad8ce7ac0f7f78cbfcf2f0bd3aa4 NAME postmodern FILENAME postmodern
DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -31,12 +31,11 @@ rec {
(NAME cl-postgres FILENAME cl-postgres)
(NAME cl-postgres+local-time FILENAME cl-postgres_plus_local-time)
(NAME cl-postgres/tests FILENAME cl-postgres_slash_tests)
- (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
- (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
- (NAME flexi-streams FILENAME flexi-streams)
- (NAME global-vars FILENAME global-vars) (NAME ironclad FILENAME ironclad)
- (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
- (NAME s-sql FILENAME s-sql) (NAME s-sql/tests FILENAME s-sql_slash_tests)
+ (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop)
+ (NAME fiveam FILENAME fiveam) (NAME global-vars FILENAME global-vars)
+ (NAME ironclad FILENAME ironclad) (NAME local-time FILENAME local-time)
+ (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql)
+ (NAME s-sql/tests FILENAME s-sql_slash_tests)
(NAME simple-date FILENAME simple-date)
(NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
(NAME split-sequence FILENAME split-sequence)
@@ -44,8 +43,8 @@ rec {
(NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres+local-time
- cl-postgres/tests cl-ppcre cl-unicode closer-mop fiveam flexi-streams
- global-vars ironclad local-time md5 s-sql s-sql/tests simple-date
- simple-date/postgres-glue split-sequence uax-15 uiop usocket)
- VERSION 20210807-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES
+ cl-postgres/tests cl-ppcre closer-mop fiveam global-vars ironclad
+ local-time md5 s-sql s-sql/tests simple-date simple-date/postgres-glue
+ split-sequence uax-15 uiop usocket)
+ VERSION 20211020-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES
(postmodern/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
index 651c4d20d024..b5f42dd5d1e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "rove";
- version = "20210807-git";
+ version = "20211020-git";
description = "Yet another testing framework intended to be a successor of Prove";
- deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/rove/2021-08-07/rove-20210807-git.tgz";
- sha256 = "1zg9jch2q8946a1bsjykq0bw86zh9gqvvqbqa8k4njvqbc42kqn8";
+ url = "http://beta.quicklisp.org/archive/rove/2021-10-20/rove-20211020-git.tgz";
+ sha256 = "1p54dp4m2wnmff6dyfh2k4crk83n38nyix1g8csixvn8jkk2gi4b";
};
packageName = "rove";
@@ -20,11 +20,12 @@ rec {
}
/* (SYSTEM rove DESCRIPTION
Yet another testing framework intended to be a successor of Prove SHA256
- 1zg9jch2q8946a1bsjykq0bw86zh9gqvvqbqa8k4njvqbc42kqn8 URL
- http://beta.quicklisp.org/archive/rove/2021-08-07/rove-20210807-git.tgz MD5
- 502337a1120b19d1d70bb06191323ee0 NAME rove FILENAME rove DEPS
- ((NAME bordeaux-threads FILENAME bordeaux-threads)
+ 1p54dp4m2wnmff6dyfh2k4crk83n38nyix1g8csixvn8jkk2gi4b URL
+ http://beta.quicklisp.org/archive/rove/2021-10-20/rove-20211020-git.tgz MD5
+ 119a5c0f506db2b301eb19bfed7c403d NAME rove FILENAME rove DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME dissect FILENAME dissect)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
- DEPENDENCIES (bordeaux-threads dissect trivial-gray-streams) VERSION
- 20210807-git SIBLINGS NIL PARASITES NIL) */
+ DEPENDENCIES (alexandria bordeaux-threads dissect trivial-gray-streams)
+ VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index 5cbfb88a4ed0..6624f1b38e76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -2,17 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "s-sql";
- version = "postmodern-20210807-git";
+ version = "postmodern-20211020-git";
parasites = [ "s-sql/tests" ];
description = "Lispy DSL for SQL";
- deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz";
- sha256 = "01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp";
+ url = "http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz";
+ sha256 = "0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6";
};
packageName = "s-sql";
@@ -21,23 +21,23 @@ rec {
overrides = x: x;
}
/* (SYSTEM s-sql DESCRIPTION Lispy DSL for SQL SHA256
- 01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp URL
- http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz
- MD5 aa951f2ad4ce59fce588a62afa34f3ec NAME s-sql FILENAME s-sql DEPS
+ 0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6 URL
+ http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz
+ MD5 84f4ad8ce7ac0f7f78cbfcf2f0bd3aa4 NAME s-sql FILENAME s-sql DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-base64 FILENAME cl-base64)
(NAME cl-postgres FILENAME cl-postgres)
(NAME cl-postgres/tests FILENAME cl-postgres_slash_tests)
- (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
- (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
- (NAME global-vars FILENAME global-vars) (NAME ironclad FILENAME ironclad)
- (NAME md5 FILENAME md5) (NAME postmodern FILENAME postmodern)
+ (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop)
+ (NAME fiveam FILENAME fiveam) (NAME global-vars FILENAME global-vars)
+ (NAME ironclad FILENAME ironclad) (NAME md5 FILENAME md5)
+ (NAME postmodern FILENAME postmodern)
(NAME split-sequence FILENAME split-sequence)
(NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests
- cl-ppcre cl-unicode closer-mop fiveam global-vars ironclad md5 postmodern
+ cl-ppcre closer-mop fiveam global-vars ironclad md5 postmodern
split-sequence uax-15 usocket)
- VERSION postmodern-20210807-git SIBLINGS
+ VERSION postmodern-20211020-git SIBLINGS
(cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index d7b495a40e93..974597faedbe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -2,16 +2,18 @@
args @ { fetchurl, ... }:
rec {
baseName = "salza2";
- version = "2.0.9";
+ version = "2.1";
+
+ parasites = [ "salza2/test" ];
description = "Create compressed data in the ZLIB, DEFLATE, or GZIP
data formats";
- deps = [ ];
+ deps = [ args."chipz" args."flexi-streams" args."parachute" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz";
- sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va";
+ url = "http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz";
+ sha256 = "0ymx3bm2a9a3fwxbvcyzfy0cdfl5y0csyw5cybxy0whkwipgra0x";
};
packageName = "salza2";
@@ -22,7 +24,11 @@ rec {
/* (SYSTEM salza2 DESCRIPTION
Create compressed data in the ZLIB, DEFLATE, or GZIP
data formats
- SHA256 1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va URL
- http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz MD5
- e62383de435081c0f1f888ec363bb32c NAME salza2 FILENAME salza2 DEPS NIL
- DEPENDENCIES NIL VERSION 2.0.9 SIBLINGS NIL PARASITES NIL) */
+ SHA256 0ymx3bm2a9a3fwxbvcyzfy0cdfl5y0csyw5cybxy0whkwipgra0x URL
+ http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz MD5
+ 867f3e0543a7e34d1be802062cf4893d NAME salza2 FILENAME salza2 DEPS
+ ((NAME chipz FILENAME chipz) (NAME flexi-streams FILENAME flexi-streams)
+ (NAME parachute FILENAME parachute)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+ DEPENDENCIES (chipz flexi-streams parachute trivial-gray-streams) VERSION
+ 2.1 SIBLINGS NIL PARASITES (salza2/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
index 75bf3a1358ad..68e82317ffe2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "serapeum";
- version = "20210807-git";
+ version = "20211020-git";
description = "Utilities beyond Alexandria.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-features" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/serapeum/2021-08-07/serapeum-20210807-git.tgz";
- sha256 = "0ddkn6kfmfamnylfcmcix1z8knd7zj6x8x6a7aalk41f91phl93a";
+ url = "http://beta.quicklisp.org/archive/serapeum/2021-10-20/serapeum-20211020-git.tgz";
+ sha256 = "1lax10p8apgsm09wcnmxn1p52hgngwp8j6dsk5y8r2dj7h73529v";
};
packageName = "serapeum";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256
- 0ddkn6kfmfamnylfcmcix1z8knd7zj6x8x6a7aalk41f91phl93a URL
- http://beta.quicklisp.org/archive/serapeum/2021-08-07/serapeum-20210807-git.tgz
- MD5 7027ae4f769f0b64ab65afc30811f6ab NAME serapeum FILENAME serapeum DEPS
+ 1lax10p8apgsm09wcnmxn1p52hgngwp8j6dsk5y8r2dj7h73529v URL
+ http://beta.quicklisp.org/archive/serapeum/2021-10-20/serapeum-20211020-git.tgz
+ MD5 2f15c5635215fd23ddd43dba01647f82 NAME serapeum FILENAME serapeum DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME closer-mop FILENAME closer-mop)
@@ -60,4 +60,4 @@ rec {
trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2
trivial-features trivial-file-size trivial-garbage trivial-macroexpand-all
type-i uiop)
- VERSION 20210807-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 2d2774a2af36..b8b23ee17518 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "simple-date";
- version = "postmodern-20210807-git";
+ version = "postmodern-20211020-git";
parasites = [ "simple-date/tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz";
- sha256 = "01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp";
+ url = "http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz";
+ sha256 = "0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6";
};
packageName = "simple-date";
@@ -22,9 +22,9 @@ rec {
}
/* (SYSTEM simple-date DESCRIPTION
Simple date library that can be used with postmodern SHA256
- 01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp URL
- http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz
- MD5 aa951f2ad4ce59fce588a62afa34f3ec NAME simple-date FILENAME simple-date
+ 0iw0sbjra3g57ivfqgx3c97mlcdzlh2kgqp12d1r2i9pw8z0ckh6 URL
+ http://beta.quicklisp.org/archive/postmodern/2021-10-20/postmodern-20211020-git.tgz
+ MD5 84f4ad8ce7ac0f7f78cbfcf2f0bd3aa4 NAME simple-date FILENAME simple-date
DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION
- postmodern-20210807-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+ postmodern-20211020-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
(simple-date/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 822ea33cbcce..6f0a0cf369e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "smart-buffer";
- version = "20210630-git";
+ version = "20211020-git";
description = "Smart octets buffer";
deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/smart-buffer/2021-06-30/smart-buffer-20210630-git.tgz";
- sha256 = "1j90cig9nkh9bim1h0jmgi73q8j3sja6bnn18bb85lalng0p4c2p";
+ url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz";
+ sha256 = "0v25s4msnwi9vn0cwfv3kxamj0mr2xdwngwmxmhh93mr4fkqzdnv";
};
packageName = "smart-buffer";
@@ -19,12 +19,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256
- 1j90cig9nkh9bim1h0jmgi73q8j3sja6bnn18bb85lalng0p4c2p URL
- http://beta.quicklisp.org/archive/smart-buffer/2021-06-30/smart-buffer-20210630-git.tgz
- MD5 3533a4884c2c7852961377366627727a NAME smart-buffer FILENAME
+ 0v25s4msnwi9vn0cwfv3kxamj0mr2xdwngwmxmhh93mr4fkqzdnv URL
+ http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz
+ MD5 d09d02788667d987b3988b6de09d09c3 NAME smart-buffer FILENAME
smart-buffer DEPS
((NAME flexi-streams FILENAME flexi-streams)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME uiop FILENAME uiop) (NAME xsubseq FILENAME xsubseq))
DEPENDENCIES (flexi-streams trivial-gray-streams uiop xsubseq) VERSION
- 20210630-git SIBLINGS (smart-buffer-test) PARASITES NIL) */
+ 20211020-git SIBLINGS (smart-buffer-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix
index 5ef5c65e22f7..04e338d7f765 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "static-dispatch";
- version = "20210807-git";
+ version = "20211020-git";
parasites = [ "static-dispatch/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."fiveam" args."introspect-environment" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/static-dispatch/2021-08-07/static-dispatch-20210807-git.tgz";
- sha256 = "1r5sz45mng0dvl77dv771ji95b9csxc0784b7igrk9bcz8npwc2g";
+ url = "http://beta.quicklisp.org/archive/static-dispatch/2021-10-20/static-dispatch-20211020-git.tgz";
+ sha256 = "0zm8haaf65a6mw1jwkzf2fhlh19ixq1asjc2kiz1jhdy40qdkkfj";
};
packageName = "static-dispatch";
@@ -22,9 +22,9 @@ rec {
}
/* (SYSTEM static-dispatch DESCRIPTION
Static generic function dispatch for Common Lisp. SHA256
- 1r5sz45mng0dvl77dv771ji95b9csxc0784b7igrk9bcz8npwc2g URL
- http://beta.quicklisp.org/archive/static-dispatch/2021-08-07/static-dispatch-20210807-git.tgz
- MD5 b9724a680d9802ff690de24193583e20 NAME static-dispatch FILENAME
+ 0zm8haaf65a6mw1jwkzf2fhlh19ixq1asjc2kiz1jhdy40qdkkfj URL
+ http://beta.quicklisp.org/archive/static-dispatch/2021-10-20/static-dispatch-20211020-git.tgz
+ MD5 f26f461213b1c8b78ede26c692e00442 NAME static-dispatch FILENAME
static-dispatch DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
@@ -40,4 +40,4 @@ rec {
(agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop
collectors fiveam introspect-environment iterate optima
parse-declarations-1.0 symbol-munger)
- VERSION 20210807-git SIBLINGS NIL PARASITES (static-dispatch/test)) */
+ VERSION 20211020-git SIBLINGS NIL PARASITES (static-dispatch/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sycamore.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sycamore.nix
index 366c1cb0d436..c4b1a838e378 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sycamore.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sycamore.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "sycamore";
- version = "20200610-git";
+ version = "20211020-git";
description = "A fast, purely functional data structure library";
deps = [ args."alexandria" args."cl-fuzz" args."cl-ppcre" args."lisp-unit" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/sycamore/2020-06-10/sycamore-20200610-git.tgz";
- sha256 = "0dn4vmbyz1ix34hjnmzjw8imh2s1p52y6fvgx2ppyqr61vdzn34p";
+ url = "http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz";
+ sha256 = "1msh2kpd96s7jfm565snf71bbsmnjmsf8b31y1xg9vkk7xp01cf4";
};
packageName = "sycamore";
@@ -20,10 +20,10 @@ rec {
}
/* (SYSTEM sycamore DESCRIPTION
A fast, purely functional data structure library SHA256
- 0dn4vmbyz1ix34hjnmzjw8imh2s1p52y6fvgx2ppyqr61vdzn34p URL
- http://beta.quicklisp.org/archive/sycamore/2020-06-10/sycamore-20200610-git.tgz
- MD5 7e06bc7db251f8f60231ff966846c7d4 NAME sycamore FILENAME sycamore DEPS
+ 1msh2kpd96s7jfm565snf71bbsmnjmsf8b31y1xg9vkk7xp01cf4 URL
+ http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz
+ MD5 0a9f35519b5cb3e5f9467427632ff0f8 NAME sycamore FILENAME sycamore DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-fuzz FILENAME cl-fuzz)
(NAME cl-ppcre FILENAME cl-ppcre) (NAME lisp-unit FILENAME lisp-unit))
- DEPENDENCIES (alexandria cl-fuzz cl-ppcre lisp-unit) VERSION 20200610-git
+ DEPENDENCIES (alexandria cl-fuzz cl-ppcre lisp-unit) VERSION 20211020-git
SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
index 8be725accb94..fab5a9192b27 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia";
- version = "20210630-git";
+ version = "20211020-git";
description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM trivia DESCRIPTION
NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
- SHA256 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia FILENAME trivia DEPS
+ SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia FILENAME trivia DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop)
(NAME introspect-environment FILENAME introspect-environment)
@@ -38,7 +38,7 @@ rec {
(alexandria closer-mop introspect-environment iterate lisp-namespace
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
- VERSION 20210630-git SIBLINGS
+ VERSION 20211020-git SIBLINGS
(trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset trivia.level0
trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
index 511790bb4887..a4ccd03cf46e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia_dot_balland2006";
- version = "trivia-20210630-git";
+ version = "trivia-20211020-git";
description = "Optimizer for Trivia based on (Balland 2006)";
deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia.balland2006";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM trivia.balland2006 DESCRIPTION
Optimizer for Trivia based on (Balland 2006) SHA256
- 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia.balland2006 FILENAME
+ 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.balland2006 FILENAME
trivia_dot_balland2006 DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop)
@@ -38,7 +38,7 @@ rec {
(alexandria closer-mop introspect-environment iterate lisp-namespace
trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2
type-i)
- VERSION trivia-20210630-git SIBLINGS
+ VERSION trivia-20211020-git SIBLINGS
(trivia trivia.benchmark trivia.cffi trivia.fset trivia.level0
trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
index b642da9303ff..4011d4f86f75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia_dot_level0";
- version = "trivia-20210630-git";
+ version = "trivia-20211020-git";
description = "Bootstrapping Pattern Matching Library for implementing Trivia";
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia.level0";
@@ -20,11 +20,11 @@ rec {
}
/* (SYSTEM trivia.level0 DESCRIPTION
Bootstrapping Pattern Matching Library for implementing Trivia SHA256
- 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia.level0 FILENAME
+ 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.level0 FILENAME
trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
- (alexandria) VERSION trivia-20210630-git SIBLINGS
+ (alexandria) VERSION trivia-20211020-git SIBLINGS
(trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset
trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
index 8d410e676d3b..ad25070a81eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia_dot_level1";
- version = "trivia-20210630-git";
+ version = "trivia-20211020-git";
description = "Core patterns of Trivia";
deps = [ args."alexandria" args."trivia_dot_level0" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia.level1";
@@ -19,13 +19,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256
- 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia.level1 FILENAME
+ 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.level1 FILENAME
trivia_dot_level1 DEPS
((NAME alexandria FILENAME alexandria)
(NAME trivia.level0 FILENAME trivia_dot_level0))
- DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20210630-git
+ DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20211020-git
SIBLINGS
(trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset
trivia.level0 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
index e36e762d61e8..a552646736bc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia_dot_level2";
- version = "trivia-20210630-git";
+ version = "trivia-20211020-git";
description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia.level2";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM trivia.level2 DESCRIPTION
NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
- SHA256 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia.level2 FILENAME
+ SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.level2 FILENAME
trivia_dot_level2 DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop)
@@ -33,7 +33,7 @@ rec {
DEPENDENCIES
(alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
trivial-cltl2)
- VERSION trivia-20210630-git SIBLINGS
+ VERSION trivia-20211020-git SIBLINGS
(trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset
trivia.level0 trivia.level1 trivia.ppcre trivia.quasiquote trivia.test
trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
index b055ac59dc80..3ab15225d5c1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia_dot_quasiquote";
- version = "trivia-20210630-git";
+ version = "trivia-20211020-git";
description = "fare-quasiquote extension for trivia";
deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia.quasiquote";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia
- SHA256 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia.quasiquote FILENAME
+ SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.quasiquote FILENAME
trivia_dot_quasiquote DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop)
@@ -39,7 +39,7 @@ rec {
(alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils
lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2)
- VERSION trivia-20210630-git SIBLINGS
+ VERSION trivia-20211020-git SIBLINGS
(trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset
trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.test
trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
index 692a875406c2..736d0322d124 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivia_dot_trivial";
- version = "trivia-20210630-git";
+ version = "trivia-20211020-git";
description = "Base level system of Trivia with a trivial optimizer.
Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz";
- sha256 = "065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas";
+ url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz";
+ sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g";
};
packageName = "trivia.trivial";
@@ -24,9 +24,9 @@ rec {
Base level system of Trivia with a trivial optimizer.
Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
in order to avoid the circular dependency.
- SHA256 065bfypzahli8pvnbpiwsvxdp2i216gqr1a1algxkpikifrxkjas URL
- http://beta.quicklisp.org/archive/trivia/2021-06-30/trivia-20210630-git.tgz
- MD5 e048a0e20ca12904c032d933795c5e31 NAME trivia.trivial FILENAME
+ SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL
+ http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz
+ MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.trivial FILENAME
trivia_dot_trivial DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop)
@@ -38,7 +38,7 @@ rec {
DEPENDENCIES
(alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
trivia.level2 trivial-cltl2)
- VERSION trivia-20210630-git SIBLINGS
+ VERSION trivia-20211020-git SIBLINGS
(trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset
trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote
trivia.test)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix
index b90e9d10204a..5423ac293d64 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "trivial-with-current-source-form";
- version = "20210630-git";
+ version = "20211020-git";
description = "Helps macro writers produce better errors for macro users";
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-06-30/trivial-with-current-source-form-20210630-git.tgz";
- sha256 = "0xa4mmrrkqr8lg74wk04ccgx06r17jskhrfmw23ywpbi2yy1qyhp";
+ url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-10-20/trivial-with-current-source-form-20211020-git.tgz";
+ sha256 = "03x8yx5hqfydxbdy9nxpaqn6yfjv7hvw8idscx66ns4qcpw6p825";
};
packageName = "trivial-with-current-source-form";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM trivial-with-current-source-form DESCRIPTION
Helps macro writers produce better errors for macro users SHA256
- 0xa4mmrrkqr8lg74wk04ccgx06r17jskhrfmw23ywpbi2yy1qyhp URL
- http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-06-30/trivial-with-current-source-form-20210630-git.tgz
- MD5 0b4fe9e9a99e0729cc8ecf851df2a6c5 NAME trivial-with-current-source-form
+ 03x8yx5hqfydxbdy9nxpaqn6yfjv7hvw8idscx66ns4qcpw6p825 URL
+ http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-10-20/trivial-with-current-source-form-20211020-git.tgz
+ MD5 b4a3721cbef6101de1c43c540b446efc NAME trivial-with-current-source-form
FILENAME trivial-with-current-source-form DEPS
((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
- 20210630-git SIBLINGS NIL PARASITES NIL) */
+ 20211020-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
index 5e8dc318ca4a..b1c853cd39b0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
@@ -2,17 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "uax-15";
- version = "20210531-git";
+ version = "20211020-git";
parasites = [ "uax-15/tests" ];
description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)";
- deps = [ args."cl-ppcre" args."parachute" args."split-sequence" args."uiop" ];
+ deps = [ args."cl-ppcre" args."parachute" args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/uax-15/2021-05-31/uax-15-20210531-git.tgz";
- sha256 = "0yz4zi13iybpwa2bw5r6cjdbkw1njrbb6vgjwmm3msnl1paxr3wg";
+ url = "http://beta.quicklisp.org/archive/uax-15/2021-10-20/uax-15-20211020-git.tgz";
+ sha256 = "1g6mbwxv8cbv9gbpkj267lwdgq8k21qx0isy1gbrc158h0al7bp9";
};
packageName = "uax-15";
@@ -22,10 +22,10 @@ rec {
}
/* (SYSTEM uax-15 DESCRIPTION
Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)
- SHA256 0yz4zi13iybpwa2bw5r6cjdbkw1njrbb6vgjwmm3msnl1paxr3wg URL
- http://beta.quicklisp.org/archive/uax-15/2021-05-31/uax-15-20210531-git.tgz
- MD5 bceff07d037c7daccbdd5c84683fcddd NAME uax-15 FILENAME uax-15 DEPS
+ SHA256 1g6mbwxv8cbv9gbpkj267lwdgq8k21qx0isy1gbrc158h0al7bp9 URL
+ http://beta.quicklisp.org/archive/uax-15/2021-10-20/uax-15-20211020-git.tgz
+ MD5 27503fd1e91e494cc9ac10a985dbf95e NAME uax-15 FILENAME uax-15 DEPS
((NAME cl-ppcre FILENAME cl-ppcre) (NAME parachute FILENAME parachute)
- (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop))
- DEPENDENCIES (cl-ppcre parachute split-sequence uiop) VERSION 20210531-git
+ (NAME split-sequence FILENAME split-sequence))
+ DEPENDENCIES (cl-ppcre parachute split-sequence) VERSION 20211020-git
SIBLINGS NIL PARASITES (uax-15/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vecto.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vecto.nix
index 80e859877471..2ce2ac83403f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vecto.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vecto.nix
@@ -6,7 +6,7 @@ rec {
description = "Create vector graphics in PNG files.";
- deps = [ args."cl-aa" args."cl-paths" args."cl-vectors" args."salza2" args."zpb-ttf" args."zpng" ];
+ deps = [ args."cl-aa" args."cl-paths" args."cl-vectors" args."salza2" args."trivial-gray-streams" args."zpb-ttf" args."zpng" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/vecto/2017-12-27/vecto-1.5.tgz";
@@ -24,6 +24,8 @@ rec {
69e6b2f7fa10066d50f9134942afad73 NAME vecto FILENAME vecto DEPS
((NAME cl-aa FILENAME cl-aa) (NAME cl-paths FILENAME cl-paths)
(NAME cl-vectors FILENAME cl-vectors) (NAME salza2 FILENAME salza2)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME zpb-ttf FILENAME zpb-ttf) (NAME zpng FILENAME zpng))
- DEPENDENCIES (cl-aa cl-paths cl-vectors salza2 zpb-ttf zpng) VERSION 1.5
- SIBLINGS (vectometry) PARASITES NIL) */
+ DEPENDENCIES
+ (cl-aa cl-paths cl-vectors salza2 trivial-gray-streams zpb-ttf zpng)
+ VERSION 1.5 SIBLINGS (vectometry) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpng.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpng.nix
index b76721640dd9..5b62f74dd811 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpng.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpng.nix
@@ -6,7 +6,7 @@ rec {
description = "Create PNG files";
- deps = [ args."salza2" ];
+ deps = [ args."salza2" args."trivial-gray-streams" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz";
@@ -22,5 +22,7 @@ rec {
0932gq9wncibm1z81gbvdc3ip6n118wwzmjnpxaqdy9hk5bs2w1x URL
http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz MD5
0a208f4ce0087ef578d477341d5f4078 NAME zpng FILENAME zpng DEPS
- ((NAME salza2 FILENAME salza2)) DEPENDENCIES (salza2) VERSION 1.2.2
- SIBLINGS NIL PARASITES NIL) */
+ ((NAME salza2 FILENAME salza2)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+ DEPENDENCIES (salza2 trivial-gray-streams) VERSION 1.2.2 SIBLINGS NIL
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 157cf8302c82..b9054baab1d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -292,16 +292,14 @@ $out/lib/common-lisp/query-fs"
};
};
lla = addNativeLibs [ pkgs.openblas ];
- esrap = x: {
+ uax-15 = x: {
overrides = y: (x.overrides y) // {
postPatch = ''
patch -p1 < ${
- # Quicklisp 2021-08-07 packages an Esrap that doesn't build with SBCL 2.1.9.
- # Therefore we pull patches from the Esrap repo to fix this.
- # See https://github.com/scymtym/parser.common-rules/issues/1
pkgs.fetchurl {
- url = https://github.com/scymtym/esrap/compare/4034df872c2b1b8e91adbccab491645c8138253b...c99c33a33ff58ca85e8ba73912eba45d458eaa72.diff;
- sha256 = "sha256:1sg2mgzilmwj5kwlmx0s60wk2769c3mpqjl00ga2p74ra5hykvx8";
+ # https://github.com/sabracrolleton/uax-15/pull/12
+ url = https://github.com/nuddyco/uax-15/commit/d553181669f488636df03d60ad7f5bec64d566bf.diff;
+ sha256 = "sha256:1608jzw7giy18vlw7pz4pl8prwlprgif8zcl9hwa0wf5gdxwd7gn";
}}
'';
};
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 00a852b4b9b0..2e02fa02e42a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -142,6 +142,7 @@ heap
http-body
hu.dwim.asdf
hu.dwim.defclass-star
+hunchensocket
hunchentoot
idna
ieee-floats
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index ffde6fbb928a..8b75a94de6de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,11 +6,20 @@ let quicklisp-to-nix-packages = rec {
buildLispPackage = callPackage ./define-package.nix;
qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
+ "html-encode" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."html-encode" or (x: {}))
+ (import ./quicklisp-to-nix-output/html-encode.nix {
+ inherit fetchurl;
+ }));
+
+
"rove" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."rove" or (x: {}))
(import ./quicklisp-to-nix-output/rove.nix {
inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"dissect" = quicklisp-to-nix-packages."dissect";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
@@ -59,6 +68,7 @@ let quicklisp-to-nix-packages = rec {
(import ./quicklisp-to-nix-output/zpng.nix {
inherit fetchurl;
"salza2" = quicklisp-to-nix-packages."salza2";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
@@ -199,7 +209,6 @@ let quicklisp-to-nix-packages = rec {
"cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
"cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fiveam" = quicklisp-to-nix-packages."fiveam";
"global-vars" = quicklisp-to-nix-packages."global-vars";
@@ -242,14 +251,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "html-encode" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."html-encode" or (x: {}))
- (import ./quicklisp-to-nix-output/html-encode.nix {
- inherit fetchurl;
- }));
-
-
"colorize" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."colorize" or (x: {}))
@@ -305,49 +306,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "iolib_dot_conf" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_conf" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_conf.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- }));
-
-
- "iolib_dot_common-lisp" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_common-lisp" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
- }));
-
-
- "iolib_dot_base" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_base" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_base.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
- "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- }));
-
-
- "iolib_dot_asdf" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_asdf" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- }));
-
-
"trivia_dot_quasiquote" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivia_dot_quasiquote" or (x: {}))
@@ -1044,6 +1002,49 @@ let quicklisp-to-nix-packages = rec {
}));
+ "iolib_dot_conf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_conf" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_conf.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ }));
+
+
+ "iolib_dot_common-lisp" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_common-lisp" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+ }));
+
+
+ "iolib_dot_base" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_base" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_base.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
+ "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ }));
+
+
+ "iolib_dot_asdf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_asdf" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
"cl-xmlspam" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-xmlspam" or (x: {}))
@@ -1068,7 +1069,6 @@ let quicklisp-to-nix-packages = rec {
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"parachute" = quicklisp-to-nix-packages."parachute";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "uiop" = quicklisp-to-nix-packages."uiop";
}));
@@ -1566,6 +1566,7 @@ let quicklisp-to-nix-packages = rec {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "clunit2" = quicklisp-to-nix-packages."clunit2";
}));
@@ -1822,6 +1823,7 @@ let quicklisp-to-nix-packages = rec {
"cl-paths" = quicklisp-to-nix-packages."cl-paths";
"cl-vectors" = quicklisp-to-nix-packages."cl-vectors";
"salza2" = quicklisp-to-nix-packages."salza2";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
"zpng" = quicklisp-to-nix-packages."zpng";
}));
@@ -2247,6 +2249,10 @@ let quicklisp-to-nix-packages = rec {
(qlOverrides."salza2" or (x: {}))
(import ./quicklisp-to-nix-output/salza2.nix {
inherit fetchurl;
+ "chipz" = quicklisp-to-nix-packages."chipz";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "parachute" = quicklisp-to-nix-packages."parachute";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
@@ -2361,10 +2367,8 @@ let quicklisp-to-nix-packages = rec {
"cl-postgres_plus_local-time" = quicklisp-to-nix-packages."cl-postgres_plus_local-time";
"cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fiveam" = quicklisp-to-nix-packages."fiveam";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"global-vars" = quicklisp-to-nix-packages."global-vars";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"local-time" = quicklisp-to-nix-packages."local-time";
@@ -2579,18 +2583,12 @@ let quicklisp-to-nix-packages = rec {
"_3bmd-ext-code-blocks" = quicklisp-to-nix-packages."_3bmd-ext-code-blocks";
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cl-fad" = quicklisp-to-nix-packages."cl-fad";
"colorize" = quicklisp-to-nix-packages."colorize";
- "esrap" = quicklisp-to-nix-packages."esrap";
- "html-encode" = quicklisp-to-nix-packages."html-encode";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"pythonic-string-reader" = quicklisp-to-nix-packages."pythonic-string-reader";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
@@ -2950,6 +2948,36 @@ let quicklisp-to-nix-packages = rec {
}));
+ "hunchensocket" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."hunchensocket" or (x: {}))
+ (import ./quicklisp-to-nix-output/hunchensocket.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "fiasco" = quicklisp-to-nix-packages."fiasco";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"hu_dot_dwim_dot_defclass-star" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."hu_dot_dwim_dot_defclass-star" or (x: {}))
@@ -3361,12 +3389,29 @@ let quicklisp-to-nix-packages = rec {
"alexandria" = quicklisp-to-nix-packages."alexandria";
"asdf-package-system" = quicklisp-to-nix-packages."asdf-package-system";
"babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+ "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-xmlspam" = quicklisp-to-nix-packages."cl-xmlspam";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "cxml" = quicklisp-to-nix-packages."cxml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "idna" = quicklisp-to-nix-packages."idna";
"ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
"iolib" = quicklisp-to-nix-packages."iolib";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
+ "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
+ "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
"ironclad" = quicklisp-to-nix-packages."ironclad";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
}));
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 1d25bcae10ef..24db91ac9ccb 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.16.0";
+ version = "3.16.1";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- sha256 = "sha256-/60f++CemVbeUwRSzQ5dZpoQE4btRiRhnVHHDPIn3Xc=";
+ sha256 = "sha256-09EzoV+212Nj3abhfS82tRE+KDJQT/tujUtmuo2h2Wk=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 5b69a3326155..890d43b01ff5 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "10.0.0";
+ version = "10.0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZVexJt1CE7Q0j9QzrPFLYYSXzoWYtfw1BWwL/hnAkD0=";
+ sha256 = "sha256-9K67vmPaPSR6ODl3tpwwfRMY9DDD/2cCaDRRO38mHVU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix
new file mode 100644
index 000000000000..4b1401d61e57
--- /dev/null
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "apcaccess";
+ version = "0.0.13";
+
+ src = fetchFromGitHub {
+ owner = "flyte";
+ repo = "apcaccess";
+ rev = version;
+ sha256 = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "setup_requires='pytest-runner'," ""
+ '';
+
+ pythonImportsCheck = [
+ "apcaccess"
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Library offers programmatic access to the status information provided by apcupsd over its Network Information Server";
+ homepage = "https://github.com/flyte/apcaccess";
+ license = licenses.mit;
+ maintainers = with maintainers; [ uvnikita ];
+ };
+}
diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
index 5bd45d3609e6..0fe9ad0931ab 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-eventhub";
- version = "9.0.0";
+ version = "9.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "181f72adf9287741ded8e386c8934a722d08399d781ce1c452f0482aac1f019b";
+ sha256 = "0ba9f10e1e8d03247a316e777d6f27fabf268d596dda2af56ac079fcdf5e7afe";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix
index 34eab21bf5d0..e889fff9688a 100644
--- a/pkgs/development/python-modules/bc-python-hcl2/default.nix
+++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix
@@ -1,13 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi, nose }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
let
lark-parser = buildPythonPackage rec {
pname = "lark-parser";
- version = "0.7.8";
+ version = "0.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "JiFeuxV+b7LudDGapERbnzt+RW4mviFc4Z/aqpAcIKQ=";
+ sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2";
};
doCheck = true;
@@ -15,11 +19,11 @@ let
in
buildPythonPackage rec {
pname = "bc-python-hcl2";
- version = "0.3.11";
+ version = "0.3.24";
src = fetchPypi {
inherit pname version;
- sha256 = "VZhI1oJ2EDZGyz3iI6/KYvJq4BGafzR+rcSgHqlUDrA=";
+ sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ=";
};
# Nose is required during build process, so can not use `checkInputs`.
@@ -31,19 +35,23 @@ buildPythonPackage rec {
lark-parser
];
- pythonImportsCheck = [ "hcl2" ];
+ # This fork of python-hcl2 doesn't ship tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "hcl2"
+ ];
meta = with lib; {
- description = "A parser for HCL2 written in Python using Lark";
+ description = "Parser for HCL2 written in Python using Lark";
longDescription = ''
- A parser for HCL2 written in Python using Lark.
- This parser only supports HCL2 and isn't backwards compatible with HCL v1.
- It can be used to parse any HCL2 config file such as Terraform.
+ This parser only supports HCL2 and isn't backwards compatible with HCL v1.
+ It can be used to parse any HCL2 config file such as Terraform.
'';
# Although this is the main homepage from PyPi but it is also a homepage
# of another PyPi package (python-hcl2). But these two are different.
homepage = "https://github.com/amplify-education/python-hcl2";
license = licenses.mit;
- maintainers = [ maintainers.anhdle14 ];
+ maintainers = with maintainers; [ anhdle14 ];
};
}
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index ac2785fe332c..472e6a470779 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
- version = "0.7.20";
+ version = "0.7.21";
disabled = pythonOlder "3.5";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
- sha256 = "sha256-vcJYcxBX8wHH3FiU2Cg7IlK0iEQZ3SLVa0MryeAwPCA=";
+ sha256 = "sha256-98K7FRB//WyCu6NPG0x4ViA8UdMuiANDXshLjx/Yehg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix
index ca64d599534e..b5679978c2cc 100644
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -2,37 +2,43 @@
, buildPythonPackage
, fetchPypi
, frozendict
-, simplejson
-, six
-, isPy27
, pytestCheckHook
+, pythonOlder
+, simplejson
}:
buildPythonPackage rec {
pname = "canonicaljson";
- version = "1.4.0";
- disabled = isPy27;
+ version = "1.5.0";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "899b7604f5a6a8a92109115d9250142cdf0b1dfdcb62cdb21d8fb5bf37780631";
+ sha256 = "sha256-Xr3c10xbBm7mjsylZGUzjpsTgEZ+CpBvR5dpfJ+zgeI=";
};
propagatedBuildInputs = [
frozendict
simplejson
- six
];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
disabledTests = [
"test_frozen_dict"
];
+ pythonImportsCheck = [
+ "canonicaljson"
+ ];
+
meta = with lib; {
+ description = "Encodes objects and arrays as RFC 7159 JSON";
homepage = "https://github.com/matrix-org/python-canonicaljson";
- description = "Encodes objects and arrays as RFC 7159 JSON.";
license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix
new file mode 100644
index 000000000000..1dff0a121ffd
--- /dev/null
+++ b/pkgs/development/python-modules/cirq-aqt/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, cirq-core
+, pythonOlder
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "cirq-aqt";
+ inherit (cirq-core) version src meta;
+
+ sourceRoot = "source/${pname}";
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "requests~=2.18" "requests"
+ '';
+
+ propagatedBuildInputs = [
+ cirq-core
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # cirq's importlib hook doesn't work here
+ #pythonImportsCheck = [ "cirq_aqt" ];
+}
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 54e2fa1954df..f4ed369517ca 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
@@ -26,9 +26,10 @@
, freezegun
, pytest-asyncio
}:
+
buildPythonPackage rec {
pname = "cirq-core";
- version = "0.11.0";
+ version = "0.12.0";
disabled = pythonOlder "3.6";
@@ -36,7 +37,7 @@ buildPythonPackage rec {
owner = "quantumlib";
repo = "cirq";
rev = "v${version}";
- hash = "sha256-JaKTGnkYhzIFb35SGaho8DRupoT0JFYKA5+rJEq4oXw=";
+ sha256 = "sha256-NPaADiRoPL0KoLugtk0vsnTGuRDK85e4j9kHv9aO/Po=";
};
sourceRoot = "source/${pname}";
@@ -45,8 +46,7 @@ buildPythonPackage rec {
substituteInPlace requirements.txt \
--replace "matplotlib~=3.0" "matplotlib" \
--replace "networkx~=2.4" "networkx" \
- --replace "numpy~=1.16" "numpy" \
- --replace "requests~=2.18" "requests"
+ --replace "numpy~=1.16" "numpy"
'';
propagatedBuildInputs = [
@@ -89,10 +89,10 @@ buildPythonPackage rec {
];
meta = with lib; {
- description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.";
+ description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits";
homepage = "https://github.com/quantumlib/cirq";
changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}";
license = licenses.asl20;
- maintainers = with maintainers; [ drewrisinger ];
+ maintainers = with maintainers; [ drewrisinger fab ];
};
}
diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix
index 900189dc2edb..34c6c3f09df5 100644
--- a/pkgs/development/python-modules/cirq-google/default.nix
+++ b/pkgs/development/python-modules/cirq-google/default.nix
@@ -27,5 +27,8 @@ buildPythonPackage rec {
protobuf
];
- checkInputs = [ pytestCheckHook freezegun ];
+ checkInputs = [
+ freezegun
+ pytestCheckHook
+ ];
}
diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix
new file mode 100644
index 000000000000..28451bdbb9c3
--- /dev/null
+++ b/pkgs/development/python-modules/cirq-ionq/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, cirq-core
+, pythonOlder
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "cirq-ionq";
+ inherit (cirq-core) version src meta;
+
+ sourceRoot = "source/${pname}";
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "requests~=2.18" "requests"
+ '';
+
+ propagatedBuildInputs = [
+ cirq-core
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # cirq's importlib hook doesn't work here
+ #pythonImportsCheck = [ "cirq_ionq" ];
+}
diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix
new file mode 100644
index 000000000000..d51cd21ff1e5
--- /dev/null
+++ b/pkgs/development/python-modules/cirq-pasqal/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, cirq-core
+, pythonOlder
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "cirq-pasqal";
+ inherit (cirq-core) version src meta;
+
+ sourceRoot = "source/${pname}";
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "requests~=2.18" "requests"
+ '';
+
+ propagatedBuildInputs = [
+ cirq-core
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # cirq's importlib hook doesn't work here
+ #pythonImportsCheck = [ "cirq_pasqal" ];
+}
diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix
new file mode 100644
index 000000000000..781ce0eaa656
--- /dev/null
+++ b/pkgs/development/python-modules/cirq-rigetti/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, buildPythonPackage
+, cirq-core
+, pythonOlder
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+, attrs
+, certifi
+, h11
+, httpcore
+, idna
+, httpx
+, iso8601
+, pydantic
+, pyjwt
+, pyquil
+, python-dateutil
+, qcs-api-client
+, retrying
+, rfc3339
+, rfc3986
+, six
+, sniffio
+, toml
+}:
+
+buildPythonPackage rec {
+ pname = "cirq-rigetti";
+ inherit (cirq-core) version src meta;
+
+ sourceRoot = "source/${pname}";
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "attrs~=20.3.0" "attrs" \
+ --replace "h11~=0.9.0" "h11" \
+ --replace "httpcore~=0.11.1" "httpcore" \
+ --replace "httpx~=0.15.5" "httpx" \
+ --replace "idna~=2.10" "idna" \
+ --replace "requests~=2.18" "requests" \
+ --replace "pyjwt~=1.7.1" "pyjwt"
+ '';
+
+ propagatedBuildInputs = [
+ cirq-core
+ attrs
+ certifi
+ h11
+ httpcore
+ httpx
+ idna
+ iso8601
+ pydantic
+ pyjwt
+ pyquil
+ python-dateutil
+ qcs-api-client
+ retrying
+ rfc3339
+ rfc3986
+ six
+ sniffio
+ toml
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # cirq's importlib hook doesn't work here
+ #pythonImportsCheck = [ "cirq_rigetti" ];
+}
diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix
new file mode 100644
index 000000000000..551a799933f0
--- /dev/null
+++ b/pkgs/development/python-modules/cirq-web/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, cirq-core
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "cirq-web";
+ inherit (cirq-core) version src meta;
+
+ sourceRoot = "source/${pname}";
+
+ propagatedBuildInputs = [
+ cirq-core
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # cirq's importlib hook doesn't work here
+ #pythonImportsCheck = [ "cirq_web" ];
+}
diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix
index e964f2abaaa0..b140f8110a6d 100644
--- a/pkgs/development/python-modules/coconut/default.nix
+++ b/pkgs/development/python-modules/coconut/default.nix
@@ -5,6 +5,7 @@
, cpyparsing
, ipykernel
, mypy
+, pexpect
, pygments
, pytestCheckHook
, prompt-toolkit
@@ -14,34 +15,24 @@
buildPythonApplication rec {
pname = "coconut";
- version = "1.4.3";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "evhub";
repo = "coconut";
rev = "v${version}";
- sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";
+ sha256 = "1gc0fwqwzn1j6mcg1f6fw832w66pbaaq9mmi0r4kw3xn5f877icz";
};
- propagatedBuildInputs = [ cpyparsing pygments prompt-toolkit ipykernel mypy watchdog ];
+ propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ];
- patches = [
- (fetchpatch {
- name = "fix-setuptools-version-check.patch";
- url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
- sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
- })
- (fetchpatch {
- name = "support-python-3.9.patch";
- url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch";
- sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71";
- })
- ];
+ postPatch = ''
+ substituteInPlace coconut/kernel_installer.py \
+ --replace "fixpath(os.path.join(sys.exec_prefix, icoconut_custom_kernel_install_loc))" \
+ "fixpath(icoconut_custom_kernel_install_loc)"
+ '';
- checkInputs = [
- pytestCheckHook
- tkinter
- ];
+ checkInputs = [ pexpect pytestCheckHook tkinter ];
# Currently most tests do not work on Hydra due to external fetches.
pytestFlagsArray = [
diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix
index 66f173106e49..2cba79b4886e 100644
--- a/pkgs/development/python-modules/cpyparsing/default.nix
+++ b/pkgs/development/python-modules/cpyparsing/default.nix
@@ -1,18 +1,20 @@
-{ lib, buildPythonPackage, fetchFromGitHub, cython, python }:
+{ lib, buildPythonPackage, fetchFromGitHub, cython, pexpect, python }:
buildPythonPackage rec {
pname = "cpyparsing";
- version = "2.4.5.0.1.1";
+ version = "2.4.5.0.1.2";
src = fetchFromGitHub {
owner = "evhub";
repo = pname;
- rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo
- sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw";
+ rev = "38f2b323b99cee9a080106ae9951ffc5752599f0"; # No tags on repo
+ sha256 = "0wrm6vzwp968z7s0qhr23v39ivyxzvav3mv9i2n0iv9zl041kypv";
};
nativeBuildInputs = [ cython ];
+ checkInputs = [ pexpect ];
+
checkPhase = "${python.interpreter} tests/cPyparsing_test.py";
meta = with lib; {
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
new file mode 100644
index 000000000000..a2f4f47500e5
--- /dev/null
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, importlib-metadata
+, packageurl-python
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, requirements-parser
+, setuptools
+, toml
+, tox
+}:
+
+buildPythonPackage rec {
+ pname = "cyclonedx-python-lib";
+ version = "0.9.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "CycloneDX";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1jzklbypn927xslag2x56mb5cplvhqjcgj43hvww6qxcfr57ywam";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ importlib-metadata
+ packageurl-python
+ requirements-parser
+ setuptools
+ toml
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ tox
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'setuptools = "^50.3.2"' 'setuptools = "*"' \
+ --replace 'importlib-metadata = "^4.8.1"' 'importlib-metadata = "*"'
+ '';
+
+ pythonImportsCheck = [
+ "cyclonedx"
+ ];
+
+ meta = with lib; {
+ description = "Python library for generating CycloneDX SBOMs";
+ homepage = "https://github.com/CycloneDX/cyclonedx-python-lib";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index e9313447ec88..6f1ee21bf6d2 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "databricks-cli";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4d0fbe3cb9c86d7342d45357f1db2e01011c507659f21b7a8144709cf8fa9f96";
+ sha256 = "d8338597cec0f1d6d979a5ea2018cf6a134c8f991f6054656e82f995b6c6ab82";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index bbbf813557b5..bece30159537 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
- version = "4.0.0";
+ version = "4.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eza0bu4CcKvDMEq/8y6fW5qXtEFbeB5zk0w75+3Hx4Q=";
+ sha256 = "sha256-E1xXtvAcYIi2xxaX+3yMkkvRz+Gt6Nx0JRqV1nI/Ldo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 92ff2cdacaf6..e8cb1971f2e5 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
- preCheck = ''
+ preCheck = lib.optionalString doCheck ''
echo "nameserver 127.0.0.1" > resolv.conf
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
export LD_PRELOAD=${libredirect}/lib/libredirect.so
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index bb2cbe064af3..9d538214c4b4 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "fsspec";
- version = "2021.10.0";
+ version = "2021.10.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "intake";
repo = "filesystem_spec";
rev = version;
- sha256 = "sha256-zvOSenK63jFC9vMLsuZT8P9NCXGdkYAB5AxvptROKes=";
+ sha256 = "sha256-LgrOHBXKs2bEgtgrdHb1OEhOeQ5Rbgr6X5YtgiqiCH0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix
index 71945bfab412..c6e0dc18356b 100644
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@@ -5,6 +5,7 @@
, pythonOlder
, google-auth
, google-auth-oauthlib
+, google-cloud-storage
, requests
, decorator
, fsspec
@@ -17,14 +18,15 @@
buildPythonPackage rec {
pname = "gcsfs";
- version = "2021.10.0";
+ version = "2021.10.1";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
- sha256 = "sha256-GDVIENtNpo8cg7pplOgoDMVguZmxoUUSs860WNfhmfM=";
+ sha256 = "sha256-BME40kyxZHx9+XrMCqWYp8+q6tjeYwAw/zISMNpQxDU=";
};
propagatedBuildInputs = [
@@ -34,6 +36,7 @@ buildPythonPackage rec {
fsspec
google-auth
google-auth-oauthlib
+ google-cloud-storage
requests
ujson
];
@@ -49,12 +52,14 @@ buildPythonPackage rec {
"test_GoogleCredentials_None"
];
- pythonImportsCheck = [ "gcsfs" ];
+ pythonImportsCheck = [
+ "gcsfs"
+ ];
meta = with lib; {
description = "Convenient Filesystem interface over GCS";
homepage = "https://github.com/dask/gcsfs";
license = licenses.bsd3;
- maintainers = [ maintainers.nbren12 ];
+ maintainers = with maintainers; [ nbren12 ];
};
}
diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix
index 9e0086f3e202..78e02521f9e6 100644
--- a/pkgs/development/python-modules/greeclimate/default.nix
+++ b/pkgs/development/python-modules/greeclimate/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeclimate";
- version = "0.11.9";
+ version = "0.12.1";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = version;
- sha256 = "sha256-fyIx/w+jKIscPGbK6LqjMtjy43qJtzzITwtUeNurE+o=";
+ sha256 = "sha256-HO+JBlyRFkwijR3g75P7yOabK3LhNFFYevSn/aFStUE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix
index c1fb86b951c1..9031b7022d8e 100644
--- a/pkgs/development/python-modules/idasen/default.nix
+++ b/pkgs/development/python-modules/idasen/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "idasen";
- version = "0.8.0";
+ version = "0.8.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM";
repo = "idasen";
rev = "v${version}";
- sha256 = "09s1409ln1x6sxsls2ndqz3piapbwf880rrhmydfm6y7hqxlmzvy";
+ sha256 = "122bhbc3zqqm4x1x7a7mydvxxjrdssnqyxyqg0lbgxgn5rm8wbdd";
};
nativeBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python API and CLI for the ikea IDÅSEN desk";
homepage = "https://github.com/newAM/idasen";
+ changelog = "https://github.com/newAM/idasen/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ newam ];
};
diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix
index d408c1185dc7..7530b5552462 100644
--- a/pkgs/development/python-modules/ipykernel/4.nix
+++ b/pkgs/development/python-modules/ipykernel/4.nix
@@ -5,7 +5,7 @@
, isPy27
, mock
, ipython
-, jupyter_client
+, jupyter-client
, pexpect
, traitlets
, tornado
@@ -23,7 +23,7 @@ buildPythonPackage rec {
checkInputs = [ nose ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [
ipython
- jupyter_client
+ jupyter-client
pexpect
traitlets
tornado
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 041818900978..589168c4bc54 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -5,7 +5,7 @@
, fetchPypi
, debugpy
, ipython
-, jupyter_client
+, jupyter-client
, tornado
, traitlets
, pythonOlder
@@ -23,7 +23,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
debugpy
ipython
- jupyter_client
+ jupyter-client
tornado
traitlets
];
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index cc5957d29733..4c64fca34b76 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -7,7 +7,7 @@
, decorator
, pyzmq
, ipython
-, jupyter_client
+, jupyter-client
, ipykernel
, tornado
, isPy3k
@@ -25,7 +25,7 @@ buildPythonPackage rec {
buildInputs = [ nose ];
- propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+ propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado
] ++ lib.optionals (!isPy3k) [ futures ];
# Requires access to cluster
diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter-client/5.nix
similarity index 89%
rename from pkgs/development/python-modules/jupyter_client/5.nix
rename to pkgs/development/python-modules/jupyter-client/5.nix
index e4e77cf47510..0894744bf0b7 100644
--- a/pkgs/development/python-modules/jupyter_client/5.nix
+++ b/pkgs/development/python-modules/jupyter-client/5.nix
@@ -11,11 +11,12 @@
}:
buildPythonPackage rec {
- pname = "jupyter_client";
+ pname = "jupyter-client";
version = "5.3.5";
src = fetchPypi {
- inherit pname version;
+ pname = "jupyter_client";
+ inherit version;
sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25";
};
diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
similarity index 90%
rename from pkgs/development/python-modules/jupyter_client/default.nix
rename to pkgs/development/python-modules/jupyter-client/default.nix
index e30b3cb63a71..665b907a704e 100644
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -13,11 +13,12 @@
}:
buildPythonPackage rec {
- pname = "jupyter_client";
+ pname = "jupyter-client";
version = "7.0.2";
src = fetchPypi {
- inherit pname version;
+ pname = "jupyter_client";
+ inherit version;
sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c";
};
diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix
index 2072b24a3781..5e2436acc735 100644
--- a/pkgs/development/python-modules/jupyter_console/5.nix
+++ b/pkgs/development/python-modules/jupyter_console/5.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, nose
-, jupyter_client
+, jupyter-client
, ipython
, ipykernel
, prompt-toolkit
@@ -20,7 +20,7 @@ buildPythonPackage rec {
checkInputs = [ nose ];
propagatedBuildInputs = [
- jupyter_client
+ jupyter-client
ipython
ipykernel
prompt-toolkit
diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix
index 2858f008c2ce..9716fbe8e5d7 100644
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, nose
-, jupyter_client
+, jupyter-client
, ipython
, ipykernel
, prompt-toolkit
@@ -21,7 +21,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- jupyter_client
+ jupyter-client
ipython
ipykernel
prompt-toolkit
diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix
index 68c6492bfc4b..85ac49673795 100644
--- a/pkgs/development/python-modules/jupyter_server/default.nix
+++ b/pkgs/development/python-modules/jupyter_server/default.nix
@@ -12,7 +12,7 @@
, ipython_genutils
, traitlets
, jupyter_core
-, jupyter_client
+, jupyter-client
, nbformat
, nbconvert
, send2trash
@@ -42,7 +42,7 @@ buildPythonPackage rec {
ipython_genutils
traitlets
jupyter_core
- jupyter_client
+ jupyter-client
nbformat
nbconvert
send2trash
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index dbff1660b1cc..cd0ace249495 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -1,40 +1,76 @@
-{ lib, stdenv
+{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
-, pythonOlder
-, notebook
-, nbdime
, git
-, pytest
+, jupyter_server
+, jupyter-packaging
+, jupyterlab
+, nbdime
+, nbformat
+, pexpect
+, pytest-asyncio
+, pytest-tornasync
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
- pname = "jupyterlab_git";
- version = "0.32.2";
- disabled = pythonOlder "3.5";
+ pname = "jupyterlab-git";
+ version = "0.33.0";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
- inherit pname version;
- sha256 = "4c5743a05150ed7736e028aac15787a66735f160e9ae198dacc5a4bd1a727ce2";
+ pname = "jupyterlab_git";
+ inherit version;
+ sha256 = "0rbl472k66asfq9n9xqd2zpw8z7yrk6ka411vhvlvvszzb7g6w13";
};
- propagatedBuildInputs = [ notebook nbdime git ];
+ nativeBuildInputs = [
+ jupyter-packaging
+ ];
- # all Tests on darwin fail or are skipped due to sandbox
+ propagatedBuildInputs = [
+ jupyter_server
+ nbdime
+ git
+ nbformat
+ pexpect
+ ];
+
+ checkInputs = [
+ jupyterlab
+ pytest-asyncio
+ pytest-tornasync
+ pytestCheckHook
+ ];
+
+ # All Tests on darwin fail or are skipped due to sandbox
doCheck = !stdenv.isDarwin;
- checkInputs = [ pytest ];
+ disabledTestPaths = [
+ "jupyterlab_git/tests/test_handlers.py"
+ # PyPI doesn't ship all required files for the tests
+ "jupyterlab_git/tests/test_config.py"
+ "jupyterlab_git/tests/test_integrations.py"
+ "jupyterlab_git/tests/test_remote.py"
+ "jupyterlab_git/tests/test_settings.py"
+ ];
- checkPhase = ''
- pytest jupyterlab_git/ --ignore=jupyterlab_git/tests/test_handlers.py
- '';
+ disabledTests = [
+ "test_Git_get_nbdiff_file"
+ "test_Git_get_nbdiff_dict"
+ ];
- pythonImportsCheck = [ "jupyterlab_git" ];
+ pythonImportsCheck = [
+ "jupyterlab_git"
+ ];
meta = with lib; {
- description = "Jupyter lab extension for version control with Git.";
- license = with licenses; [ bsd3 ];
+ description = "Jupyter lab extension for version control with Git";
homepage = "https://github.com/jupyterlab/jupyterlab-git";
+ license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ chiroptical ];
};
}
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 0b893f7776a2..89d8c288a795 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -4,7 +4,7 @@
, pythonOlder
, GitPython
, jupyter-packaging
-, jupyter_client
+, jupyter-client
, jupyterlab
, markdown-it-py
, mdit-py-plugins
@@ -41,7 +41,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
GitPython
- jupyter_client
+ jupyter-client
notebook
];
# Tests that use a Jupyter notebook require $HOME to be writable.
diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index 7b550b2430e6..c235b5700fa2 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "lsassy";
- version = "3.0.0";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "Hackndo";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-75gs08QGjN5iUT4HQZZTSKi3vzNNKQvZR2JTObYNb7w=";
+ sha256 = "sha256-P68c2kQh2/3fUb1fsNujjpjvvXI5zN4WebaeR09N+lY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 054a21f539a1..0c3cb9635ae1 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "maestral";
- version = "1.5.0";
+ version = "1.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
- sha256 = "sha256-OMqCwJTsg4RMK138cKDYz+iQV0HvelGTZfE4m+UkSzE=";
+ sha256 = "sha256-R6zacpJkSWppodrb0SD4lglFmGVtPaloeDMBPL+ztuU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
index 8002909a9f9b..884e9865c6bf 100644
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
- version = "1.18.65";
+ version = "1.19.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c5bdd595e088512df229863872fb91e825ab59ddd89653db5ccc37d666fa01d8";
+ sha256 = "sha256-VCQmtpoemK91+tkPE6HrdFt3wPYrlPcR0CVn7uo2vp0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index 3b9986bae048..e47af565bdc3 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder,
- async_generator, traitlets, nbformat, nest-asyncio, jupyter_client,
+ async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,
pytest, xmltodict, nbconvert, ipywidgets
, doCheck ? true
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
inherit doCheck;
checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
- propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ];
+ propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
meta = with lib; {
homepage = "https://github.com/jupyter/nbclient";
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 67d08f9e50ff..331a9a8e497a 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -17,7 +17,7 @@
, ipykernel
, pandocfilters
, tornado
-, jupyter_client
+, jupyter-client
, defusedxml
}:
@@ -44,7 +44,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
entrypoints bleach mistune jinja2 pygments traitlets testpath
- jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client
+ jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
defusedxml
(nbclient.override { doCheck = false; }) # avoid infinite recursion
jupyterlab-pygments
diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix
index 86c5afd8c4a7..a7c5425963aa 100644
--- a/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/pkgs/development/python-modules/nbsmoke/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
-, jupyter_client
+, jupyter-client
, ipykernel
, holoviews
, nbformat
@@ -24,7 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pytest
holoviews
- jupyter_client
+ jupyter-client
ipykernel
nbformat
nbconvert
diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
index 176986492555..87544f1b0899 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, coverage
, ipykernel
-, jupyter_client
+, jupyter-client
, nbformat
, pytestCheckHook
, pytest
@@ -35,7 +35,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
coverage
ipykernel
- jupyter_client
+ jupyter-client
nbformat
pytest
six
diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix
index 179fd25beff9..aec27eab59a9 100644
--- a/pkgs/development/python-modules/notebook/2.nix
+++ b/pkgs/development/python-modules/notebook/2.nix
@@ -12,7 +12,7 @@
, ipython_genutils
, traitlets
, jupyter_core
-, jupyter_client
+, jupyter-client
, nbformat
, nbconvert
, ipykernel
@@ -39,7 +39,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
- jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
+ jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
prometheus-client
];
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index bc1296b8a50c..3574ff98e048 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -13,7 +13,7 @@
, ipython_genutils
, traitlets
, jupyter_core
-, jupyter_client
+, jupyter-client
, nbformat
, nbconvert
, ipykernel
@@ -42,7 +42,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
- jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
+ jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
prometheus-client argon2_cffi
];
diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index e8344e88f110..341ef8321835 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -1,30 +1,46 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, stdenv, pytest-runner, pytest, mock }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, pytestCheckHook
+, mock
+}:
buildPythonPackage rec {
pname = "paho-mqtt";
- version = "1.5.1";
+ version = "1.6.1";
- # No tests in PyPI tarball
src = fetchFromGitHub {
owner = "eclipse";
repo = "paho.mqtt.python";
rev = "v${version}";
- sha256 = "1y537i6zxkjkmi80w5rvd18npz1jm5246i2x8p3q7ycx94i8ixs0";
+ sha256 = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg=";
};
postPatch = ''
- substituteInPlace setup.py --replace "pylama" ""
- substituteInPlace setup.cfg --replace "--pylama" ""
+ substituteInPlace setup.py \
+ --replace "pylama" "" \
+ --replace "'pytest-runner'" ""
+ substituteInPlace setup.cfg \
+ --replace "--pylama" ""
'';
- checkInputs = [ pytest-runner pytest ] ++ lib.optional (!isPy3k) mock;
+ checkInputs = [
+ pytestCheckHook
+ ] ++ lib.optional (!isPy3k) [
+ mock
+ ];
doCheck = !stdenv.isDarwin;
+ pythonImportsCheck = [
+ "paho.mqtt"
+ ];
+
meta = with lib; {
- homepage = "https://eclipse.org/paho";
description = "MQTT version 3.1.1 client class";
+ homepage = "https://eclipse.org/paho";
license = licenses.epl10;
maintainers = with maintainers; [ mog dotlambda ];
};
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 5b9a6d8e968b..83e4a9f6f731 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -10,7 +10,7 @@
, nbclient
, six
, tqdm
-, jupyter_client
+, jupyter-client
, requests
, entrypoints
, tenacity
@@ -42,7 +42,7 @@ buildPythonPackage rec {
nbclient
six
tqdm
- jupyter_client
+ jupyter-client
requests
entrypoints
tenacity
diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix
index e4e427dfe7c2..a7cb6e7e838e 100644
--- a/pkgs/development/python-modules/phik/default.nix
+++ b/pkgs/development/python-modules/phik/default.nix
@@ -7,7 +7,7 @@
, pytest-pylint
, nbconvert
, joblib
-, jupyter_client
+, jupyter-client
, numpy
, scipy
, pandas
@@ -31,7 +31,7 @@ buildPythonPackage rec {
pytest
pytest-pylint
nbconvert
- jupyter_client
+ jupyter-client
];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyatome/default.nix b/pkgs/development/python-modules/pyatome/default.nix
new file mode 100644
index 000000000000..7db5b4fb15eb
--- /dev/null
+++ b/pkgs/development/python-modules/pyatome/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, simplejson
+, fake-useragent
+}:
+
+buildPythonPackage rec {
+ pname = "pyatome";
+ version = "0.1.1";
+
+ src = fetchPypi {
+ pname = "pyAtome";
+ inherit version;
+ sha256 = "7282e7ec258c69d4ddf2a5754ff07680a1ac92f9bfb478d601fd9e944fccd834";
+ };
+
+ propagatedBuildInputs = [ requests simplejson fake-useragent ];
+
+ # no tests in PyPI tarballs
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pyatome"
+ ];
+
+ meta = with lib; {
+ description = "Python module to get energy consumption data from Atome";
+ homepage = "https://github.com/baqs/pyAtome";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ uvnikita ];
+ };
+}
diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix
index 54219e75735b..44c33a2d2e2e 100644
--- a/pkgs/development/python-modules/pydeconz/default.nix
+++ b/pkgs/development/python-modules/pydeconz/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pydeconz";
- version = "84";
+ version = "85";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "v${version}";
- sha256 = "sha256-SVWz6r5UiAS7gCpkgN2Swy8dAon26XY9JZucV/eE0t8=";
+ sha256 = "sha256-6GTMG3BfHcfLMoyabFbhsJFVDHmEICuzf32603+jyZ4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index be947f4c2ac0..636ea1658fff 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyhomematic";
- version = "0.1.75";
+ version = "0.1.76";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "36b76d7269273888f61db085f3fb47e5516c4d1bd15b2b39a54305cdb6a9a8b8";
+ sha256 = "ea2496c920451ded4561e3758c8f77157fc00c40d1f75d8163e399fd3e0d795a";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix
index 3065fbc14587..179202da8dff 100644
--- a/pkgs/development/python-modules/pymazda/default.nix
+++ b/pkgs/development/python-modules/pymazda/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
- version = "0.2.1";
+ version = "0.2.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Dg7oVNEjKZB6zksm1We2JGBW+cGkOOQOP3bS4CNL4q8=";
+ sha256 = "sha256-nngYdoVY3rXfszoCpUWFtJ0U0Rjczxix/wJDOZD+2O4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix
new file mode 100644
index 000000000000..c9f71b6414db
--- /dev/null
+++ b/pkgs/development/python-modules/pyquil/default.nix
@@ -0,0 +1,93 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, importlib-metadata
+, ipython
+, lark-parser
+, networkx
+, numpy
+, poetry-core
+, pytest-asyncio
+, pytest-freezegun
+, pytest-httpx
+, pytest-mock
+, pytestCheckHook
+, pythonOlder
+, qcs-api-client
+, retry
+, rpcq
+, scipy
+}:
+
+buildPythonPackage rec {
+ pname = "pyquil";
+ version = "3.0.0";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "rigetti";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0070pslz6vvyavm5pm27q2bng2mfmkb41v5czzckz7m8db3b1r2x";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ lark-parser
+ networkx
+ numpy
+ qcs-api-client
+ retry
+ rpcq
+ scipy
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytest-freezegun
+ pytest-httpx
+ pytest-mock
+ pytestCheckHook
+ ipython
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"'
+ '';
+
+ disabledTestPaths = [
+ # Tests require network access
+ "test/e2e/"
+ "test/unit/test_api.py"
+ "test/unit/test_operator_estimation.py"
+ "test/unit/test_wavefunction_simulator.py"
+ "test/unit/test_compatibility_v2_operator_estimation.py"
+ "test/unit/test_compatibility_v2_quantum_computer.py"
+ "test/unit/test_compatibility_v2_qvm.py"
+ "test/unit/test_quantum_computer.py"
+ "test/unit/test_qvm.py"
+ "test/unit/test_reference_wavefunction.py"
+ ];
+
+ disabledTests = [
+ "test_compile_with_quilt_calibrations"
+ "test_sets_timeout_on_requests"
+ ];
+
+ pythonImportsCheck = [ "pyquil" ];
+
+ meta = with lib; {
+ description = "Python library for creating Quantum Instruction Language (Quil) programs";
+ homepage = "https://github.com/rigetti/pyquil";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
new file mode 100644
index 000000000000..1e5e254e4a87
--- /dev/null
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchPypi
+, httpx
+, iso8601
+, pydantic
+, pyjwt
+, pytest-asyncio
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, respx
+, retrying
+, rfc3339
+, toml
+}:
+
+buildPythonPackage rec {
+ pname = "qcs-api-client";
+ version = "0.8.0";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1c0g3aa2pk4zd40banap2j797080qivd42q7imla2yvv6cvq24b8";
+ };
+
+ propagatedBuildInputs = [
+ attrs
+ httpx
+ iso8601
+ pydantic
+ pyjwt
+ python-dateutil
+ retrying
+ rfc3339
+ toml
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ respx
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "attrs>=20.1.0,<21.0.0" "attrs" \
+ --replace "httpx>=0.15.0,<0.16.0" "httpx" \
+ --replace "pyjwt>=1.7.1,<2.0.0" "pyjwt"
+ '';
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "qcs_api_client" ];
+
+ meta = with lib; {
+ description = "Python library for accessing the Rigetti QCS API";
+ homepage = "https://pypi.org/project/qcs-api-client/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 5e63001013a5..9d6a483071be 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -6,7 +6,7 @@
, mock
, traitlets
, jupyter_core
-, jupyter_client
+, jupyter-client
, pygments
, ipykernel
, pyqt5
@@ -23,7 +23,7 @@ buildPythonPackage rec {
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
- propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy];
+ propagatedBuildInputs = [traitlets jupyter_core jupyter-client pygments ipykernel pyqt5 qtpy];
# : cannot connect to X server
doCheck = false;
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 3f26fa4a15dd..eb9f7f08454c 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
- version = "1.7.1";
+ version = "1.8.0";
disabled = pythonOlder "3.5";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
repo = "RapidFuzz";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-41Ga8BeqVMC9XI+R+ajonUcQ5R3wtizJFzHy9Rqm+DM=";
+ sha256 = "sha256-rInlaLWpPKmjihEp0iacg2nASxURGKxmJHH5jr+crM4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rfc3339/default.nix b/pkgs/development/python-modules/rfc3339/default.nix
new file mode 100644
index 000000000000..4b1355e511a8
--- /dev/null
+++ b/pkgs/development/python-modules/rfc3339/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "rfc3339";
+ version = "6.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1l6l1bh91i2r4dwcm86hlkx8cbh1xwgsk8hb4jvr5y5fxxg3ng6m";
+ };
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "rfc3339" ];
+
+ meta = with lib; {
+ description = "Format dates according to the RFC 3339";
+ homepage = "https://hg.sr.ht/~henryprecheur/rfc3339";
+ license = licenses.isc;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/rpcq/default.nix b/pkgs/development/python-modules/rpcq/default.nix
new file mode 100644
index 000000000000..671038c8b468
--- /dev/null
+++ b/pkgs/development/python-modules/rpcq/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, msgpack
+, numpy
+, pytest-asyncio
+, pytestCheckHook
+, python-rapidjson
+, pythonOlder
+, pyzmq
+, ruamel-yaml
+}:
+
+buildPythonPackage rec {
+ pname = "rpcq";
+ version = "3.9.2";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "rigetti";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1vvf6y7459f8aamhkcxx36ajiai143s2vwg751x0dl0lx7hp3yn5";
+ };
+
+ propagatedBuildInputs = [
+ msgpack
+ python-rapidjson
+ pyzmq
+ ruamel-yaml
+ ];
+
+ checkInputs = [
+ numpy
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "msgpack>=0.6,<1.0" "msgpack"
+ '';
+
+ pythonImportsCheck = [ "rpcq" ];
+
+ meta = with lib; {
+ description = "The RPC framework and message specification for rigetti Quantum Cloud services";
+ homepage = "https://github.com/rigetti/rpcq";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 2769e96a40ac..2ed6361b256e 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "s3fs";
- version = "2021.10.0";
+ version = "2021.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-mSdMmP5b6pu954GQxBrb0bEghyLLKtSGd6aPhHPwOV0=";
+ sha256 = "sha256-STriUFPlJiVSokep8cOiyPvNIPWQf85jp0kSa6WP4F4=";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index d7678941597e..b7349caa233f 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
# `socket.getprotobyname('tcp')`, which reads from this file). Normally
# this path isn't available in the sandbox. Therefore, use libredirect
# to make on eavailable from `iana-etc`. This is a test-only operation.
- preCheck = ''
+ preCheck = lib.optionalString doCheck ''
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols
export LD_PRELOAD=${libredirect}/lib/libredirect.so
'';
diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix
index 05825c6c9640..f1ca7cff6b3d 100644
--- a/pkgs/development/python-modules/smbprotocol/default.nix
+++ b/pkgs/development/python-modules/smbprotocol/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "smbprotocol";
- version = "1.7.0";
+ version = "1.8.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4nhgt9/LgoGucNehZkgs4XcneCq+fihWQHtwMbuSp2s=";
+ sha256 = "sha256-NY2eE6hacRd0v8Ij0P13Zw6SRiUNhhd0kMhsg5CRTeM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 3cb0e4b66318..036f91614b1b 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "sounddevice";
- version = "0.4.2";
+ version = "0.4.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1c9b07cff59c837d258002ed806ee134ed367ef11042bd7d283d6ce407bf889c";
+ sha256 = "f1667a7467b65fac4c4ebf668b4e9698eb7333fc3d32bc3c7ec9839ea7cb6c20";
};
propagatedBuildInputs = [ cffi numpy portaudio ];
diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
index cc5412fe42ff..94799dc6a4b8 100644
--- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
@@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "sphinxcontrib-tikz";
- version = "0.4.14";
+ version = "0.4.15";
src = fetchPypi {
inherit pname version;
- sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad";
+ sha256 = "27f9a7a6a64f1bf3ea4dd0e963b7da7c7778948856c8d557a71d64ace086519f";
};
postPatch = ''
substituteInPlace sphinxcontrib/tikz.py \
- --replace "config.latex_engine" "${texLive}/bin/pdflatex" \
+ --replace "config.latex_engine" "'${texLive}/bin/pdflatex'" \
--replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'"
'';
@@ -27,6 +27,8 @@ buildPythonPackage rec {
# no tests in package
doCheck = false;
+ pythonImportsCheck = [ "sphinxcontrib.tikz" ];
+
meta = with lib; {
description = "TikZ extension for Sphinx";
homepage = "https://bitbucket.org/philexander/tikz";
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 5ce41d8d7575..79c82a052155 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
- jupyter_client, pyzmq }:
+ jupyter-client, pyzmq }:
buildPythonPackage rec {
pname = "spyder-kernels";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
cloudpickle
ipykernel
wurlitzer
- jupyter_client
+ jupyter-client
pyzmq
];
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 1da8a14e43bf..79d25ccc3c50 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.9.31";
+ version = "3.9.32";
src = fetchPypi {
inherit pname version;
- sha256 = "cdb7e5b996a2ea180a53b283ac8fac4a8978ae31c860b55c14a205fc772144c2";
+ sha256 = "4e60f5230a4fd0cda5731f236c370d8e1950894b7dbe7a3222cd4051d3d4bb88";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix
index a0574f948f0d..102af56618b8 100644
--- a/pkgs/development/python-modules/unicode-slugify/default.nix
+++ b/pkgs/development/python-modules/unicode-slugify/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "unicode-slugify";
- version = "0.1.3";
+ version = "0.1.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0l7nphfdq9rgiczbl8n3mra9gx7pxap0xz540pkyz034zbz3mkrl";
+ sha256 = "25f424258317e4cb41093e2953374b3af1f23097297664731cdb3ae46f6bd6c3";
};
propagatedBuildInputs = [ six unidecode ];
diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix
index 17ed9f4eb02f..d829abeae0fa 100644
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
- version = "2021.10.2";
+ version = "2021.10.6";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
- sha256 = "sha256-zamFDlahHQGo5g0dlGF6uWG53K/IkEjP0dA8cWYrhtI=";
+ sha256 = "sha256-98V+skgLCMBt6cnEa9kNM5rOm9q6+QYf3TJ9P8eroM8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix
index fd52f141ff84..666fcd8dbb8d 100644
--- a/pkgs/development/python-modules/vispy/default.nix
+++ b/pkgs/development/python-modules/vispy/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "vispy";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "41a6836aa78462370fe15efaade94cbe3344586412f8d7f12689c49c299ff41b";
+ sha256 = "75e2923792b937fbb0eb817716430613b6a2b37331cffb13bf623913a76b1da1";
};
patches = [
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 0232092c4873..19667d833faa 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
- version = "1.8.0";
+ version = "1.8.1";
pname = "xmlschema";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
- sha256 = "1k41zzffg9srhgnvi1s1akaqpwz2z003xbvig8axwlkm7z0d4xiz";
+ sha256 = "0vs4d9bnms4krxvplzf2p69g673pdw31z8p5alzj3pqnaw83rg1z";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index 7a7a005efed0..917fbf34d0c9 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "yfinance";
- version = "0.1.63";
+ version = "0.1.64";
# GitHub source releases aren't tagged
src = fetchPypi {
inherit pname version;
- sha256 = "0k1saz0wknxv31vpqcfyi35mzi68c75hlqpw8lf83xqw9zllydhi";
+ sha256 = "bde7ff6c04b7179881c15753460c600c4bd877dc9f33cdc98da68e7e1ebbc5a2";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix
index 0855084b314e..137c966349ca 100644
--- a/pkgs/development/tools/analysis/actionlint/default.nix
+++ b/pkgs/development/tools/analysis/actionlint/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "actionlint";
- version = "1.6.5";
+ version = "1.6.6";
subPackages = [ "cmd/actionlint" ];
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
- sha256 = "12s9ijfvnmfbcvf5lxi2jm3j7vrn7rfkas2lib5jdih77hf9270k";
+ sha256 = "17c6952cjdpbl70lnn34pl3njrvpqmdbgnrm1q69kx94bni1slnz";
};
vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n";
diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock
index 13425cf9ee76..257d8a7fba1c 100644
--- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock
+++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- brakeman (5.0.4)
+ brakeman (5.1.1)
PLATFORMS
ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
brakeman
BUNDLED WITH
- 2.1.4
+ 2.2.24
diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix
index f37158353e00..ea241dbf6e70 100644
--- a/pkgs/development/tools/analysis/brakeman/gemset.nix
+++ b/pkgs/development/tools/analysis/brakeman/gemset.nix
@@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1czqmrqbli2cnw4vv4pzz8bk78c7lpcnnyba74cj632swv1za6jd";
+ sha256 = "0y71fqqd0azy5rn78fwiz9px0mql23zrl0ij0dzdkx22l4cscpb0";
type = "gem";
};
- version = "5.0.4";
+ version = "5.1.1";
};
}
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 8750b61c48fa..04b8095bfc48 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -1,75 +1,124 @@
-{ pkgs, lib, python3, fetchFromGitHub }:
-
+{ lib
+, fetchFromGitHub
+, python3
+}:
let
+ py = python3.override {
+ packageOverrides = self: super: {
+
+ boto3 = super.boto3.overridePythonAttrs (oldAttrs: rec {
+ version = "1.17.112";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "1byqrffbgpp1mq62gnn3w3hnm54dfar0cwgvmkl7mrgbwz5xmdh8";
+ };
+ });
+
+ botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
+ version = "1.20.112";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "1ksdjh3mwbzgqgfj58vyrhann23b9gqam8id2svmpdmmdq5vgffh";
+ };
+ });
+
+ s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
+ version = "0.4.2";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb";
+ };
+ });
+
+ dpath = super.dpath.overridePythonAttrs (oldAttrs: rec {
+ version = "1.5.0";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "06rn91n2izw7czncgql71w7acsa8wwni51njw0c6s8w4xas1arj9";
+ };
+ doCheck = false;
+ });
+
+ };
+ };
+in
+with py.pkgs;
+
+buildPythonApplication rec {
pname = "checkov";
- version = "1.0.674";
+ version = "2.0.505";
+
+ disabled = python3.pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- sha256 = "/S8ic5ZVxA2vd/rjRPX5gslbmnULL7BSx34vgWIsheQ=";
+ sha256 = "sha256-5udTx+aAC72R8wfn+lrWsZXgAyj/eN5nn/ly1JIkmCU=";
};
- disabled = pkgs.python3Packages.pythonOlder "3.7";
-
- # CheckOV only work with `dpath 1.5.0`
- dpath = pkgs.python3Packages.buildPythonPackage rec {
- pname = "dpath";
- version = "1.5.0";
-
- src = pkgs.python3Packages.fetchPypi {
- inherit pname version;
- sha256 = "SWYVtOqEI20Y4NKGEi3nSGmmDg+H4sfsZ4f/KGxINhs=";
- };
-
- doCheck = false;
- };
-in
-python3.pkgs.buildPythonPackage rec {
- inherit pname version disabled src;
-
- nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
-
- propagatedBuildInputs = with python3.pkgs; [
- pytest
- coverage
- bandit
- bc-python-hcl2
- deep_merge
- tabulate
- colorama
- termcolor
- junit-xml
- dpath
- pyyaml
- boto3
- GitPython
- six
- jmespath
- tqdm
- update_checker
- semantic-version
- packaging
+ nativeBuildInputs = with py.pkgs; [
+ setuptools-scm
];
- # Both of these tests are pulling from external srouces (https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml)
- preCheck = ''
- rm -rf integration_tests/*
- rm -rf tests/terraform/*
- '';
+ propagatedBuildInputs = with py.pkgs; [
+ bc-python-hcl2
+ boto3
+ cachetools
+ cloudsplaining
+ colorama
+ configargparse
+ cyclonedx-python-lib
+ deep_merge
+ detect-secrets
+ docker
+ dockerfile-parse
+ dpath
+ GitPython
+ jmespath
+ junit-xml
+ networkx
+ packaging
+ policyuniverse
+ pyyaml
+ semantic-version
+ tabulate
+ termcolor
+ tqdm
+ typing-extensions
+ update_checker
+ ];
- # Wrap the executable so that the python packages are available
- # it's just a shebang script which calls `python -m checkov "$@"`
- postFixup = ''
- wrapProgram $out/bin/checkov \
- --set PYTHONPATH $PYTHONPATH
- '';
+ checkInputs = with py.pkgs; [
+ jsonschema
+ pytest-xdist
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # No API key available
+ "api_key"
+ # Requires network access
+ "TestSarifReport"
+ ];
+
+ disabledTestPaths = [
+ # Tests are pulling from external sources
+ # https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml
+ "integration_tests/"
+ "tests/terraform/"
+ ];
+
+ pythonImportsCheck = [
+ "checkov"
+ ];
meta = with lib; {
- homepage = "https://github.com/bridgecrewio/checkov";
description = "Static code analysis tool for infrastructure-as-code";
+ homepage = "https://github.com/bridgecrewio/checkov";
longDescription = ''
- Prevent cloud misconfigurations during build-time for Terraform, Cloudformation, Kubernetes, Serverless framework and other infrastructure-as-code-languages with Checkov by Bridgecrew.
+ Prevent cloud misconfigurations during build-time for Terraform, Cloudformation,
+ Kubernetes, Serverless framework and other infrastructure-as-code-languages.
'';
license = licenses.asl20;
maintainers = with maintainers; [ anhdle14 ];
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 64c48b702cf1..85f7e603bbb0 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -25,12 +25,12 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
- install -Dm555 $src $out/bin/coursier
- patchShebangs $out/bin/coursier
- wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
+ install -Dm555 $src $out/bin/cs
+ patchShebangs $out/bin/cs
+ wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin
# copy zsh completion
- install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_coursier
+ install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_cs
'';
passthru.updateScript = writeScript "update.sh" ''
diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix
new file mode 100644
index 000000000000..868d3965c660
--- /dev/null
+++ b/pkgs/development/tools/ddosify/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "ddosify";
+ version = "0.4.1";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-z7jYnEZSHh/Omg5DMNFzuPhV1d8lZSy8I+8tM86O43s=";
+ };
+
+ vendorSha256 = "sha256-VWWik7oovVJq0J/tj/2Mm5QtvRkJLtMROJhRC2JFZdw=";
+
+ # triggers a different set of tests that seems to be interactive and fail (no url target defined)
+ ldflags = [
+ "-s -w"
+ "-X main.GitVersion=${version}"
+ ];
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/ddosify -version | grep ${version} > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "High-performance load testing tool, written in Golang";
+ homepage = "https://ddosify.com/";
+ changelog = "https://github.com/ddosify/ddosify/releases/tag/v${version}";
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ bryanasdev000 ];
+ };
+}
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 2134c8e033f7..c50f8ebc40d4 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -115,33 +115,33 @@ rec {
headers = "1fvqkw08pync38ixi5cq4f8a108k2ajxpm1w2f8sn2hjph9kpbsd";
};
- electron_13 = mkElectron "13.5.2" {
- armv7l-linux = "f325d48761ec222a2f9bbf0d0a3b995959266314b8375d4d6bb8e014bddd3a06";
- aarch64-linux = "6d89c41e53d8c14ae4a4b7f2f9d7b477055decad3074675e4cef745967829688";
- x86_64-linux = "6f9b9ad08f74ea8a2c214a7bafbc5b08e316674ff964b91a93f575e499d00464";
- i686-linux = "62d8766c1c921a95b24e2128bcee66e2e832491715df51554d9a12a16087d35c";
- x86_64-darwin = "d5f6262e89a986e3a453f37086ce27e389c9b3fab0f797d169c7a065aac80850";
- aarch64-darwin = "04213cc9303b2114b0db2db0e1a598427788118c125d306b68d1da6ee41a8d2f";
- headers = "1hpcpnkzs834fr5kqaiww4dpq44bpxhgbrrs6a2njkdfv4j3xmrk";
+ electron_13 = mkElectron "13.6.0" {
+ armv7l-linux = "03141d99268b1e71b64fd663c678591a02544c99475967d511041ab2c5de262c";
+ aarch64-linux = "309014cce9216e3b0a0015a7a31c33e39c63af0b7781e50d3e630fb1d7d3a4ee";
+ x86_64-linux = "b7f88baa69ea6c06ca16e215b01ad673cd922d3a0c9239868ddd0072af4e035e";
+ i686-linux = "b588e4fe82e6c37fe838a3cf592a2a4cf6166f26dad97dd7597818d7714ddc94";
+ x86_64-darwin = "250228bc5a186601d831f86faf394fba732436ddec86c1ef70e4d3d7ff9342c7";
+ aarch64-darwin = "fd3886830fa291db38cc770176ddb3167f8fb90065fcb124394b3ca32965108d";
+ headers = "1rmx0gvcsvba24fsjv14vmmd52h1nzscgmf1g9i46kzc13y0hn4z";
};
- electron_14 = mkElectron "14.1.1" {
- armv7l-linux = "56cbba7f15c8caeef06af50e249e26974f1a01ca7133f7b9baa35338454b4f73";
- aarch64-linux = "b9c1187d6116bd83c402b01215a2af3a6206f11de5609fa5eb5d0e75da6f8d26";
- x86_64-linux = "5bf136691dfdff9ef97f459db489dd5c4c9981e48780fb7a92ebb2e575c8dffb";
- i686-linux = "0a00bbea8a23a3d517fbdf9a8e82bc51a2276af57a1ee10793cffb8a2178a45f";
- x86_64-darwin = "388c88d3b7c7b69d524b143c26d1e13f08e5192aad1197bfa955f56ff38ce9b3";
- aarch64-darwin = "a3b17406a28553a04576199adb68b2c78a1c457e78985f5648231bbf9b367832";
- headers = "1pw67w9l63xgkwp78wmnxfjgyzlrmij27bapd2yjrvj6ag7j9xgy";
+ electron_14 = mkElectron "14.2.0" {
+ armv7l-linux = "a1357716ebda8d7856f233c86a8cbaeccad1c83f1d725d260b0a6510c47042a2";
+ aarch64-linux = "b1f4885c3ad816d89446f64a87b78d5139a27fecbf6317808479bede6fd94ae1";
+ x86_64-linux = "b2faec4744edb20e889c3c85af685c2a6aef90bfff58f55b90038a991cd7691f";
+ i686-linux = "9207af6e3a24dfcc76fded20f26512bcb20f6b652295a4ad3458dc10fd2d7d6e";
+ x86_64-darwin = "d647d658c8c2ec4a69c071e791cf7e823320860f987121bd7390978aecacb073";
+ aarch64-darwin = "f5a7e52b639b94cf9b2ec53969c8014c6d299437c65d98c33d8e5ca812fbfd48";
+ headers = "1y289vr8bws3z6gmhaj3avz95rdhc8gd3rc7bi40jv9j1pnlsd3m";
};
- electron_15 = mkElectron "15.2.0" {
- armv7l-linux = "b682f5adca133673c8a7488c0d7e0dab8bddf0028218a2b4b842c85c12393aea";
- aarch64-linux = "dea4ebd0583f149909acb6fe3168e225e4f6cb5470c1d0eb6c86cb58db0fb623";
- x86_64-linux = "35d1c7e02fde920664ca245ad694cae82e3acfdac0175a1d32345497eb455673";
- i686-linux = "52d48fbd6a6d8cae565a0d3f7574305c6313c42cac96bbdde39621b201df0082";
- x86_64-darwin = "32d3d4e5f7dbb8fe035a7b91dc64c042eb930461424784d4c450e06768e7162d";
- aarch64-darwin = "a7982607416ca2d30d7f48fbc3b16ab072c46170b117123a5e9763f85227a5cb";
- headers = "0l9hbvikkw5qd1zp4kwa5w1pj80m466skdlz6j474jzqk1qz2nzm";
+ electron_15 = mkElectron "15.3.0" {
+ armv7l-linux = "dfe2851ef94c17eb905cd8cf00b585be072e20a79a02c0c42585a0f51b8cdb20";
+ aarch64-linux = "e0bb8d663dfbe8b65b9e38d4af992a919adc639acfb8748d95ca5b9bbcd7a83c";
+ x86_64-linux = "7cb9c6c9c61848f7d82aaac47ca97bb78c6061e73b176fd3a323652c07335087";
+ i686-linux = "289ef7d53c440a576839a4ee092284009235d740404ea07e6bf82f33254ae8df";
+ x86_64-darwin = "667da0d56bab968d28c41c1f53b901fb685e56d1f56faf33912a240a0397bab5";
+ aarch64-darwin = "9cf5caafc7cbf0e91483e24d5a696b81618d293a5eccd4d122c57baaab88724c";
+ headers = "0jicbplni608cjxwhlrzxkxc9w9b4h6zqssilc9b0yr73jq1fyrd";
};
}
diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix
new file mode 100644
index 000000000000..d74e9b35a2b6
--- /dev/null
+++ b/pkgs/development/tools/faas-cli/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+let
+ faasPlatform = platform:
+ let cpuName = platform.parsed.cpu.name; in {
+ "aarch64" = "arm64";
+ "armv7l" = "armhf";
+ }.${cpuName} or cpuName;
+in
+buildGoModule rec {
+ pname = "faas-cli";
+ # When updating version change rev.
+ version = "0.13.13";
+ rev = "72816d486cf76c3089b915dfb0b66b85cf096634";
+ platform = faasPlatform stdenv.targetPlatform;
+
+ src = fetchFromGitHub {
+ owner = "openfaas";
+ repo = "faas-cli";
+ rev = version;
+ sha256 = "0mmrakyy2qmkldld7pxf5bx6whdadq2r52b68f9p9z7yqrdimix8";
+ };
+
+ CGO_ENABLED = 0;
+
+ vendorSha256 = null;
+
+ subPackages = [ "." ];
+
+ ldflags = [
+ "-s" "-w"
+ "-X github.com/openfaas/faas-cli/version.GitCommit=${rev}"
+ "-X github.com/openfaas/faas-cli/version.Version=${version}"
+ "-X github.com/openfaas/faas-cli/commands.Platform=${platform}"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/openfaas/faas-cli";
+ description = "Official CLI for OpenFaaS ";
+ license = licenses.mit;
+ maintainers = with maintainers; [ welteki ];
+ };
+}
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index fe4c2e8d4dfd..5ec826eecc78 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,24 +1,22 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "go-outline";
- version = "unstable-2018-11-22";
- rev = "7182a932836a71948db4a81991a494751eccfe77";
-
- goPackagePath = "github.com/ramya-rao-a/go-outline";
- goDeps = ./deps.nix;
+ version = "unstable-2021-06-08";
src = fetchFromGitHub {
- inherit rev;
owner = "ramya-rao-a";
repo = "go-outline";
- sha256 = "0p381yvwvff0i4i7mf5v1k2q1lb0rs2xkjgv67n1cw2573c613r1";
+ rev = "9736a4bde949f321d201e5eaa5ae2bcde011bf00";
+ sha256 = "sha256-5ns6n1UO9kRSw8iio4dmJDncsyvFeN01bjxHxQ9Fae4=";
};
- meta = {
+ vendorSha256 = "sha256-jYYtSXdJd2eUc80UfwRRMPcX6tFiXE3LbxV3NAdKVKE=";
+
+ meta = with lib; {
description = "Utility to extract JSON representation of declarations from a Go source file";
homepage = "https://github.com/ramya-rao-a/go-outline";
- maintainers = with lib.maintainers; [ vdemeester ];
- license = lib.licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 vdemeester ];
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/tools/go-outline/deps.nix b/pkgs/development/tools/go-outline/deps.nix
deleted file mode 100644
index 6a333b58bec6..000000000000
--- a/pkgs/development/tools/go-outline/deps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://github.com/golang/tools";
- rev = "96b5a5404f303f074e6117d832a9873c439508f0";
- sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42";
- };
- }
-]
diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix
index dfbc064e0d32..d3eab38627c5 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@@ -1,13 +1,13 @@
-{ lib, buildGoModule, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gopls";
version = "0.7.3";
- src = fetchgit {
- url = "https://go.googlesource.com/tools";
+ src = fetchFromGitHub {
+ owner = "golang";
+ repo = "tools";
rev = "gopls/v${version}";
- name = "gopls-source-${version}";
sha256 = "sha256-aaRaStQ35a/SK4YIR5rjvp8gPxvoNuhLh2AGbr0c6p4=";
};
diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/development/tools/gotest/default.nix
new file mode 100644
index 000000000000..455bf63b3f39
--- /dev/null
+++ b/pkgs/development/tools/gotest/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "gotest";
+ version = "0.0.6";
+
+ src = fetchFromGitHub {
+ owner = "rakyll";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1v11ccrjghq7nsz0f91r17di14yixsw28vs0m3dwzwqkh1a20img";
+ };
+
+ vendorSha256 = "sha256-pVq6H1HoKqCMRfJg7FftRf3vh+BWZQe6cQAX+TBzKqw=";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "go test with colors";
+ homepage = "https://github.com/rakyll/gotest";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix
new file mode 100644
index 000000000000..e1aacd306738
--- /dev/null
+++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix
@@ -0,0 +1,30 @@
+{ buildGoModule, lib, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "controller-tools";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "kubernetes-sigs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0hbai8pi59yhgsmmmxk3nghhy9hj3ma98jq2d1k46n46gr64a0q5";
+ };
+
+ vendorSha256 = "061qvq8z98d39vyk1gr46fw5ynxra154s90n3pb7k1q7q45rg76j";
+
+ doCheck = false;
+
+ subPackages = [
+ "cmd/controller-gen"
+ "cmd/type-scaffold"
+ "cmd/helpgen"
+ ];
+
+ meta = with lib; {
+ description = "Tools to use with the Kubernetes controller-runtime libraries";
+ homepage = "https://github.com/kubernetes-sigs/controller-tools";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ michojel ];
+ };
+}
diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix
index c6c8ff2a8a84..6ba1ba061079 100644
--- a/pkgs/development/tools/misc/blackfire/default.nix
+++ b/pkgs/development/tools/misc/blackfire/default.nix
@@ -10,12 +10,12 @@
}:
stdenv.mkDerivation rec {
- pname = "blackfire-agent";
- version = "1.49.4";
+ pname = "blackfire";
+ version = "2.5.1";
src = fetchurl {
- url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb";
- sha256 = "t1S54z3xTMTUBWz0jCFX1A7GJdWWsP/lTa9MMjo8t1A=";
+ url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
+ sha256 = "wak7LE5j6OKIHqCsEGrxSq1FAFzehMetYj6c/Zkr9dk=";
};
nativeBuildInputs = [
@@ -32,13 +32,26 @@ stdenv.mkDerivation rec {
mv $out/usr/* $out
rmdir $out/usr
+ # Fix ExecStart path and replace deprecated directory creation method,
+ # use dynamic user.
+ substituteInPlace "$out/lib/systemd/system/blackfire-agent.service" \
+ --replace '/usr/' "$out/" \
+ --replace 'ExecStartPre=/bin/mkdir -p /var/run/blackfire' 'RuntimeDirectory=blackfire' \
+ --replace 'ExecStartPre=/bin/chown blackfire: /var/run/blackfire' "" \
+ --replace 'User=blackfire' 'DynamicUser=yes' \
+ --replace 'PermissionsStartOnly=true' ""
+
+ # Modernize socket path.
+ substituteInPlace "$out/etc/blackfire/agent" \
+ --replace '/var/run' '/run'
+
runHook postInstall
'';
passthru = {
updateScript = writeShellScript "update-${pname}" ''
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
- update-source-version "$UPDATE_NIX_ATTR_PATH" "$(curl https://blackfire.io/api/v1/releases | jq .agent --raw-output)"
+ update-source-version "$UPDATE_NIX_ATTR_PATH" "$(curl https://blackfire.io/api/v1/releases | jq .cli --raw-output)"
'';
};
diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index ee181a665818..2cdcc5c185ad 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -18,11 +18,11 @@ let
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
in stdenv.mkDerivation rec {
pname = "php-blackfire";
- version = "1.66.0";
+ version = "1.67.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
- sha256 = "kfCIjsGSvaGCZtOIBdKcaeS+TJdVHICo7MSW8YxQ+/Y=";
+ sha256 = "KeTNdI+zCRAdXqvIX3tnAZtTbcH0WAKUcRIOiCJn2aE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index f48ba999d868..eb2e124a35e9 100644
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ bsd2 bsd3 ];
maintainers = with maintainers; [ dochang ];
platforms = platforms.unix;
+ mainProgram = "editorconfig";
};
}
diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix
index 6318dbb3ff63..57a513a63d80 100644
--- a/pkgs/development/tools/misc/saleae-logic-2/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix
@@ -1,10 +1,10 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }:
let
name = "saleae-logic-2";
- version = "2.3.37";
+ version = "2.3.38";
src = fetchurl {
url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
- sha256 = "0jclzd4s1r6h2p1r0vhmzz3jnwpp7d41g70lcamrsxidxrmm8d45";
+ sha256 = "0y3ys3q6gd9fxgaf36q5av0kgvy7jv5anyjxb4cva8d95l4k3ask";
};
desktopItem = makeDesktopItem {
inherit name;
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix
index ddf2a851b7d4..7e21d415c79b 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/pkgs/development/tools/mustache-go/default.nix
@@ -17,6 +17,7 @@ buildGoPackage rec {
homepage = "https://github.com/cbroglie/mustache";
description = "The mustache template language in Go";
license = [ licenses.mit ];
- maintainers = [ maintainers.Zimmi48 ];
+ maintainers = with maintainers; [ Zimmi48 ];
+ mainProgram = "mustache";
};
}
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index a1d0b76eb1ff..d47d8a5cc31c 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -4,7 +4,7 @@ let
in
stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ocp-build-${version}-beta";
+ name = "ocaml${ocaml.version}-ocp-build-${version}";
src = fetchFromGitHub {
owner = "OCamlPro";
@@ -24,9 +24,6 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib cmdliner re ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
- preConfigure = ''
- export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR"
- '';
meta = with lib; {
homepage = "https://www.typerex.org/ocp-build.html";
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 86332bf7b69c..7b88b0f8fd37 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -139,7 +139,7 @@ in
meta = {
description = "Event-driven I/O framework for the V8 JavaScript engine";
homepage = "https://nodejs.org";
- changelog = "https://github.com/nodejs/node/blob/v${version}/doc/changelogs/CHANGELOG_V${majorVersion}.md#${version}";
+ changelog = "https://github.com/nodejs/node/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu gilligan cko marsam ];
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index 698108a42b60..9cbe093c7a39 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "16.11.1";
- sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37";
+ version = "16.12.0";
+ sha256 = "1b3bschfa7946jwyqp3nmbdv7ap3rl4p7h50b9bac08981m0lqjz";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}
diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix
new file mode 100644
index 000000000000..e417582b16a9
--- /dev/null
+++ b/pkgs/development/web/nodejs/v17.nix
@@ -0,0 +1,13 @@
+{ callPackage, python3, enableNpm ? true }:
+
+let
+ buildNodejs = callPackage ./nodejs.nix {
+ python = python3;
+ };
+in
+buildNodejs {
+ inherit enableNpm;
+ version = "17.0.1";
+ sha256 = "071lhqbn103rnn8avqmqwnn2k4yqgcymx624f23k8z6bfbw81i3f";
+ patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
+}
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 05ebdde853e8..ede38c6fa040 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,9 +1,9 @@
-{ lib, stdenv, fetchurl
+{ lib, stdenv, fetchurl, makeWrapper
, pkg-config, intltool
, perl, gettext, libX11, libXext, libXi, libXt
, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle
, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam
-, systemd
+, systemd, coreutils
, forceInstallAllHacks ? false
, withSystemd ? stdenv.isLinux
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkg-config intltool
+ pkg-config intltool makeWrapper
];
buildInputs = [
@@ -37,7 +37,13 @@ stdenv.mkDerivation rec {
"--with-app-defaults=${placeholder "out"}/share/xscreensaver/app-defaults"
];
- postInstall = lib.optionalString forceInstallAllHacks ''
+ postInstall = ''
+ for bin in $out/bin/*; do
+ wrapProgram "$bin" \
+ --prefix PATH : "$out/libexec/xscreensaver" \
+ --prefix PATH : "${lib.makeBinPath [ coreutils ]}"
+ done
+ '' + lib.optionalString forceInstallAllHacks ''
make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
cat hacks/Makefile.in \
| grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 34cf4d4e9e90..18bd9510b61a 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -9211,6 +9211,18 @@ final: prev:
meta.homepage = "https://github.com/thinca/vim-prettyprint/";
};
+ vim-prisma = buildVimPluginFrom2Nix {
+ pname = "vim-prisma";
+ version = "2020-04-04";
+ src = fetchFromGitHub {
+ owner = "pantharshit00";
+ repo = "vim-prisma";
+ rev = "e91ac5011232e1bd8ea53204db8d01203d5d0f3c";
+ sha256 = "0pc203n70g1b0qfvrnfi5sxg2vr9zfw274s9lpgpxmribknpxi86";
+ };
+ meta.homepage = "https://github.com/pantharshit00/vim-prisma/";
+ };
+
vim-projectionist = buildVimPluginFrom2Nix {
pname = "vim-projectionist";
version = "2021-04-05";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 90ec235376e6..e4dbfb9f43e5 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -563,6 +563,7 @@ osyo-manga/vim-watchdogs
overcache/NeoSolarized
p00f/nvim-ts-rainbow
pangloss/vim-javascript
+pantharshit00/vim-prisma
parsonsmatt/intero-neovim
PaterJason/cmp-conjure
pearofducks/ansible-vim
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index c000bb71bdd9..7fc03228f60d 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -852,8 +852,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
- version = "0.0.213";
- sha256 = "0fj7vvaqdldhbzm9dqh2plqlhg34jv5khd690xd87h418sv8rk95";
+ version = "0.0.214";
+ sha256 = "0rwxjnrl44rnhx3183037k6435xs4772p58a37azl5cahsyav1hk";
};
meta = with lib; {
license = licenses.mit;
diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix
new file mode 100644
index 000000000000..b07dd8c731b1
--- /dev/null
+++ b/pkgs/misc/wiki-tui/default.nix
@@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchCrate, ncurses, openssl, pkg-config }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wiki-tui";
+ version = "0.3.4";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "sha256-H+C1AbZ2zUhw6TNlSPaNaNuY5iNf39JW4q2g6uolevM=";
+ };
+
+ buildInputs = [ ncurses openssl ];
+
+ nativeBuildInputs = [ pkg-config ];
+
+ cargoSha256 = "sha256-PIt592nGtNEREQMukqRl/6KSJ/P32fWucHEMyOOc7BA=";
+
+ meta = with lib; {
+ description = "A simple and easy to use Wikipedia Text User Interface";
+ homepage = "https://github.com/builditluc/wiki-tui";
+ license = licenses.mit;
+ maintainers = with maintainers; [ legendofmiracles ];
+ mainProgram = "wiki-tui";
+ };
+}
diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix
index ee3c12d251b2..f79921186388 100644
--- a/pkgs/os-specific/linux/cramfsswap/default.nix
+++ b/pkgs/os-specific/linux/cramfsswap/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
url = "mirror://debian/pool/main/c/cramfsswap/${pname}_${version}.tar.xz";
sha256 = "10mj45zx71inaa3l1d81g64f7yn1xcprvq4v4yzpdwbxqmqaikw1";
};
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996964
+ patches = [ ./parallel-make.patch ];
# Needed for cross-compilation
postPatch = ''
diff --git a/pkgs/os-specific/linux/cramfsswap/parallel-make.patch b/pkgs/os-specific/linux/cramfsswap/parallel-make.patch
new file mode 100644
index 000000000000..280c5286b79a
--- /dev/null
+++ b/pkgs/os-specific/linux/cramfsswap/parallel-make.patch
@@ -0,0 +1,14 @@
+Fix parallel build failure bya dding the dependency.
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996964
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ debian: cramfsswap
+ cramfsswap: cramfsswap.c
+ $(CC) -Wall -g -O $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o cramfsswap cramfsswap.c -lz
+
+-strip:
++strip: cramfsswap
+ strip cramfsswap
+
+ install: cramfsswap
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index 3a6f31fa5523..fa26f38941b9 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
buildInputs = [ lvm2 ];
+ # Hand-written Makefile does not have full dependencies to survive
+ # parallel build:
+ # tools/dmraid.c:12:10: fatal error: dmraid/dmraid.h: No such file
+ enableParallelBuilding = false;
+
meta = {
description = "Old-style RAID configuration utility";
longDescription = ''
diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 5c05ca6082e4..556bc2d89787 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -7,19 +7,22 @@
stdenv.mkDerivation rec {
pname = "i2c-tools";
- version = "4.2";
+ version = "4.3";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git";
rev = "v${version}";
- sha256 = "0vqrbp10klr7ylarr6cy1q7nafiqaky4iq5my5dqy101h93vg4pg";
+ sha256 = "sha256-HlmIocum+HZEKNiS5BUwEIswRfTMUhD1vCPibAuAK0Q=";
};
buildInputs = [ perl ];
postPatch = ''
- substituteInPlace eeprom/decode-edid --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
- substituteInPlace stub/i2c-stub-from-dump --replace "/sbin/" ""
+ substituteInPlace eeprom/decode-edid \
+ --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
+
+ substituteInPlace stub/i2c-stub-from-dump \
+ --replace "/sbin/" ""
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
@@ -27,7 +30,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
postInstall = ''
- rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers
+ rm -rf $out/include/linux/i2c-dev.h # conflics with kernel headers
'';
meta = with lib; {
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 717fdaee72a5..019a8698c088 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -246,6 +246,8 @@ let
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes;
FRAMEBUFFER_CONSOLE_ROTATION = yes;
FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes;
+ # On 5.14 this conflicts with FB_SIMPLE.
+ DRM_SIMPLEDRM = whenAtLeast "5.14" no;
};
video = {
diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index a0da293548d9..8c8b764a8812 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
- version = "5.14.11";
+ version = "5.14.14";
suffix = "lqx1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "sha256-4SSAcI1TwaKgz/bwma+YQtIBtodEAYxqdtUI3ESM7I8=";
+ sha256 = "sha256-gwWZNGHmbKQajMP4mu3XT2Xf93MkcNpAXW8h94O4pNM=";
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index fa5729baf73a..48f1a22475fc 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,24 +1,33 @@
-{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
+{ lib
+, fetchpatch
+, kernel
+, date ? "2021-07-08"
+, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"
+, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"
+, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
+, argsOverride ? {}
+, ...
+} @ args:
-buildLinux (args // {
- # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
- version = "5.13.0-2021.10.01";
- modDirVersion = "5.13.0";
+# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
+(kernel.override ( args // {
+ argsOverride = {
+ version = "${kernel.version}-bcachefs-unstable-${date}";
+ extraMeta = {
+ branch = "master";
+ maintainers = with lib.maintainers; [ davidak chiiruno ];
+ platforms = [ "x86_64-linux" ];
+ };
+ } // argsOverride;
- src = fetchFromGitHub {
- owner = "koverstreet";
- repo = "bcachefs";
- rev = "4114ced1db465b8f4e7f4d6a78aa11416a9ab5d9";
- sha256 = "sha256-viFC3HHIcjUTDPvloSKKsz9PuSLyvxfYnrtkVUB79mQ=";
- };
+ kernelPatches = [ {
+ name = "bcachefs-${commit}";
+ patch = fetchpatch {
+ name = "bcachefs-${commit}.diff";
+ url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}";
+ sha256 = diffHash;
+ };
+ extraConfig = "BCACHEFS_FS m";
+ } ] ++ kernelPatches;
- extraConfig = "BCACHEFS_FS m";
-
- extraMeta = {
- branch = "master";
- hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?
- maintainers = with lib.maintainers; [ davidak chiiruno ];
- platforms = [ "x86_64-linux" ];
- };
-
-} // (args.argsOverride or {}))
+})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })
diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index 08ed46bb0d43..c3ab1e6cb41c 100644
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,8 +1,8 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
- version = "5.14.12";
- release = "1";
+ version = "5.14.14";
+ release = "2";
suffix = "xanmod${release}-cacule";
in
buildLinux (args // rec {
@@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
- sha256 = "sha256-JVTi319BLHM4CgF7KaN3C/92N4uwh59po1AcOinNpww=";
+ sha256 = "sha256-zjFfxb/Q4fc7gE4+ZPErc2hoPXb1rGVftc9fy76BE/8=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index df740845b6ff..5b354bee7aad 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
- modDirVersion = "5.14.8-zen1";
+ modDirVersion = "5.14.14-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@@ -19,7 +19,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
- sha256 = "sha256-hquMBDjP4fBMNdjxxnJJKx/oVNd2DwBPmVpZQeEQvHQ=";
+ sha256 = "sha256-cW3i672F7dmU3tzR1cJCkrm8T6F9uYt4DyMFDL37Fpo=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index c863115afb7e..d27831402ec9 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -1,26 +1,49 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "headscale";
- version = "0.9.2";
+ version = "0.10.5";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "sha256-1YxcfSOGGdyUZyQdKSHUiK5/43Ki/QvHvIZ/Ai5Mq7E=";
+ sha256 = "sha256-cUDLqSMEw1SRMskHx3hhb/y7N7ZQEDEAZ40X5J53Bow=";
};
- vendorSha256 = "sha256-LJajQDk+r9Wt2t/kwNhsCoSlU+EjSNc1WT2vqtqg4LI=";
+ vendorSha256 = "sha256-t7S1jE76AFFIePrFtvrIQcId7hLeNIAm/eA9AVoFy5E=";
- # Ldflags are same as build target in the project's Makefile
- # https://github.com/juanfont/headscale/blob/main/Makefile
- ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
+ ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installShellCompletion --cmd headscale \
+ --bash <($out/bin/headscale completion bash) \
+ --fish <($out/bin/headscale completion fish) \
+ --zsh <($out/bin/headscale completion zsh)
+ '';
meta = with lib; {
- description = "An implementation of the Tailscale coordination server";
homepage = "https://github.com/juanfont/headscale";
+ description = "An open source, self-hosted implementation of the Tailscale control server";
+ longDescription = ''
+ Tailscale is a modern VPN built on top of Wireguard. It works like an
+ overlay network between the computers of your networks - using all kinds
+ of NAT traversal sorcery.
+
+ Everything in Tailscale is Open Source, except the GUI clients for
+ proprietary OS (Windows and macOS/iOS), and the
+ 'coordination/control server'.
+
+ The control server works as an exchange point of Wireguard public keys for
+ the nodes in the Tailscale network. It also assigns the IP addresses of
+ the clients, creates the boundaries between each user, enables sharing
+ machines between users, and exposes the advertised routes of your nodes.
+
+ Headscale implements this coordination server.
+ '';
license = licenses.bsd3;
- maintainers = with maintainers; [ nkje ];
+ maintainers = with maintainers; [ nkje jk ];
};
}
diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix
index f0f2009fad14..8bee6d5b0653 100644
--- a/pkgs/servers/heisenbridge/default.nix
+++ b/pkgs/servers/heisenbridge/default.nix
@@ -2,19 +2,20 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
- version = "1.2.1";
+ version = "1.3.0";
# Use the release tarball because it has the version set correctly using the
# version.txt file.
src = fetchurl {
url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz";
- sha256 = "sha256-w+8gsuPlnT1pl+jiZFBYcIAN4agIAcvwkmdysj3+RAQ=";
+ sha256 = "sha256-fj0eJS7c1zSrzHfnlEhJICVDZ+Mo9hKgxwaZ2gn5CsY=";
};
propagatedBuildInputs = with python3Packages; [
aiohttp
irc
mautrix
+ python-socks
pyyaml
];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 56e30167ad35..5cc4b49bacd4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -42,7 +42,7 @@
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
"anthemav" = ps: with ps; [ ]; # missing inputs: anthemav
"apache_kafka" = ps: with ps; [ aiokafka ];
- "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
+ "apcupsd" = ps: with ps; [ apcaccess ];
"api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ]; # missing inputs: apns2
"apple_tv" = ps: with ps; [ pyatv ];
@@ -62,7 +62,7 @@
"asuswrt" = ps: with ps; [ aioasuswrt ];
"atag" = ps: with ps; [ pyatag ];
"aten_pe" = ps: with ps; [ atenpdu ];
- "atome" = ps: with ps; [ ]; # missing inputs: pyatome
+ "atome" = ps: with ps; [ pyatome ];
"august" = ps: with ps; [ yalexs ];
"aurora" = ps: with ps; [ auroranoaa ];
"aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix
index 255cc2523eee..5940d033deba 100644
--- a/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "promscale";
- version = "0.6.0";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
- sha256 = "sha256-2zbvibnmYAUyl7zkwcRgJKP24mid8/IUIUwfy7yaCzM=";
+ sha256 = "sha256-YGT+VaHX6dqYdJz002fGZxRYE3gFqY8Q7VdhtSTPpjU=";
};
vendorSha256 = "sha256-o7vRSCEEqzhruHEnRPuxC1e4NzCl8Br4vvqg0pwGIgA=";
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 6358fa753916..9b07f299f729 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
let
- generic = { subPackages, pname, postInstall ? "" }:
+ generic = { subPackages, pname, postInstall ? "", mainProgram }:
buildGoModule rec {
inherit pname;
version = "6.4.1";
@@ -16,9 +16,9 @@ let
inherit subPackages postInstall;
- vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU=";
+ vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU=";
- doCheck = false;
+ doCheck = false;
ldflags = let
versionPkg = "github.com/sensu/sensu-go/version";
@@ -28,6 +28,7 @@ let
];
meta = {
+ inherit mainProgram;
homepage = "https://sensu.io";
description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
license = lib.licenses.mit;
@@ -54,15 +55,18 @@ in
) > ''${!outputBin}/share/zsh/site-functions/_sensuctl
'';
+ mainProgram = "sensuctl";
};
sensu-go-backend = generic {
pname = "sensu-go-backend";
subPackages = [ "cmd/sensu-backend" ];
+ mainProgram = "sensu-backend";
};
sensu-go-agent = generic {
pname = "sensu-go-agent";
subPackages = [ "cmd/sensu-agent" ];
+ mainProgram = "sensu-agent";
};
}
diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix
index 044852bdfefb..82bbe7b3a7b7 100644
--- a/pkgs/servers/pufferpanel/default.nix
+++ b/pkgs/servers/pufferpanel/default.nix
@@ -5,7 +5,7 @@
, pkgs
, stdenv
, fetchzip
-, openjdk16
+, jdk
, nodejs
, pathDeps ? [ ]
}:
diff --git a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock
index 4d5554b1173a..ff3a8eda88f6 100644
--- a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock
+++ b/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock
@@ -4,20 +4,20 @@ GEM
CFPropertyList (2.3.6)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
- aws-eventstream (1.1.1)
- aws-partitions (1.493.0)
- aws-sdk-core (3.119.1)
+ aws-eventstream (1.2.0)
+ aws-partitions (1.516.0)
+ aws-sdk-core (3.121.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.260.0)
- aws-sdk-core (~> 3, >= 3.119.0)
+ aws-sdk-ec2 (1.271.0)
+ aws-sdk-core (~> 3, >= 3.121.2)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.2.4)
+ aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
bindata (2.4.10)
- bolt (3.17.0)
+ bolt (3.19.0)
CFPropertyList (~> 2.2)
addressable (~> 2.5)
aws-sdk-ec2 (~> 1)
@@ -35,7 +35,7 @@ GEM
puppet-resource_api (>= 1.8.1)
puppet-strings (~> 2.3)
puppetfile-resolver (~> 0.5)
- r10k (~> 3.1)
+ r10k (~> 3.10)
ruby_smb (~> 1.0)
terminal-table (~> 1.8)
winrm (~> 2.0)
@@ -47,7 +47,7 @@ GEM
cri (2.15.10)
deep_merge (1.2.1)
erubi (1.10.0)
- facter (4.2.3)
+ facter (4.2.5)
hocon (~> 1.3)
thor (>= 1.0.1, < 2.0)
faraday (0.17.4)
@@ -55,7 +55,7 @@ GEM
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
fast_gettext (1.1.2)
- ffi (1.15.3)
+ ffi (1.15.4)
gettext (3.2.9)
locale (>= 2.0.5)
text (>= 1.3.0)
@@ -100,7 +100,7 @@ GEM
faraday
net-http-persistent
public_suffix (4.0.6)
- puppet (7.10.0)
+ puppet (7.12.0)
concurrent-ruby (~> 1.0)
deep_merge (~> 1.0)
facter (> 2.0.1, < 5)
@@ -125,7 +125,7 @@ GEM
puppetfile-resolver (0.5.0)
molinillo (~> 0.6)
semantic_puppet (~> 1.0)
- r10k (3.11.0)
+ r10k (3.12.1)
colored2 (= 3.1.2)
cri (= 2.15.10)
fast_gettext (~> 1.1.0)
@@ -135,7 +135,7 @@ GEM
log4r (= 1.1.10)
multi_json (~> 1.10)
puppet_forge (~> 2.3.0)
- rgen (0.8.2)
+ rgen (0.9.0)
ruby_smb (1.1.0)
bindata
rubyntlm
@@ -148,7 +148,7 @@ GEM
unicode-display_width (~> 1.1, >= 1.1.1)
text (1.3.1)
thor (1.1.0)
- unicode-display_width (1.7.0)
+ unicode-display_width (1.8.0)
windows_error (0.1.2)
winrm (2.3.6)
builder (>= 2.1.2)
diff --git a/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix
index 9ea6423f29d9..12126edfc829 100644
--- a/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix
+++ b/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix
@@ -15,20 +15,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
+ sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
type = "gem";
};
- version = "1.1.1";
+ version = "1.2.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qq2fsccafv3lag6c86xai9nbiszfhzfdj9hla9iphjpa1wlfqcp";
+ sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0";
type = "gem";
};
- version = "1.493.0";
+ version = "1.516.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l09wjfa3y38jc5njqcxmj4f6gra79adhxzmsym2cvcrazcv272w";
+ sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc";
type = "gem";
};
- version = "3.119.1";
+ version = "3.121.2";
};
aws-sdk-ec2 = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07l9nsd9fk42qbc727s73qylrrbag6l1qig5xgcfqjh2m2qjb9b4";
+ sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain";
type = "gem";
};
- version = "1.260.0";
+ version = "1.271.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -58,10 +58,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0";
+ sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
type = "gem";
};
- version = "1.2.4";
+ version = "1.4.0";
};
bindata = {
groups = ["default"];
@@ -79,10 +79,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zszklla2j1dh4w9drz03zn20ls5im4vji5wsvn6zbyaj2ivkdiq";
+ sha256 = "0jmknsa10zazwba1mi19awywk14vj0danppx1hqzmmrpp0af98if";
type = "gem";
};
- version = "3.17.0";
+ version = "3.19.0";
};
builder = {
groups = ["default"];
@@ -170,10 +170,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08n13ygl2fripg9a8wxf2p6qpv48dkmq079cbcpw3g351pq38gzk";
+ sha256 = "1mhq4rmyc60ijzw6f6sbphyb76vlwcgbaqyqw6y7wb8qdisn19wc";
type = "gem";
};
- version = "4.2.3";
+ version = "4.2.5";
};
faraday = {
dependencies = ["multipart-post"];
@@ -212,10 +212,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
+ sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
type = "gem";
};
- version = "1.15.3";
+ version = "1.15.4";
};
gettext = {
dependencies = ["locale" "text"];
@@ -503,10 +503,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bfqwz6jyx746sf06bh14blf1g2xh7lv5bqpradzpfkxgxcy9j2b";
+ sha256 = "02d9rqbqlmdbw6zh89zwh27ra6pqspcv5afqbpj1yrvg1k6cliri";
type = "gem";
};
- version = "7.10.0";
+ version = "7.12.0";
};
puppet-resource_api = {
dependencies = ["hocon"];
@@ -558,20 +558,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "004z9nhgc3w33snrcyjikhrw53nk5nprysq9l3dkssv79ygfw5dg";
+ sha256 = "05qwvwgh08g5pw1cxikb7hpg0ia6nisva1gwpj0d9gb9wacml2qh";
type = "gem";
};
- version = "3.11.0";
+ version = "3.12.1";
};
rgen = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "077kbdnn4cp6jks0w4xsybpiw2cc8y2c7hw7zx5dpf9cwzl7mq0p";
+ sha256 = "18ryflbkc2pvbb7jwl35pnyb1mlx9fby85dnqi7hsbz78mzsf87n";
type = "gem";
};
- version = "0.8.2";
+ version = "0.9.0";
};
ruby_smb = {
dependencies = ["bindata" "rubyntlm" "windows_error"];
@@ -660,10 +660,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+ sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
type = "gem";
};
- version = "1.7.0";
+ version = "1.8.0";
};
windows_error = {
groups = ["default"];
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 073d61a3d4c0..136da49491b1 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2021.09.15";
+ version = "2021.10.11";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- sha256 = "sha256-BrEgvrAHNfJpFTlI8tec+9w3G+5YR15lbzh/RKKpQ1c=";
+ sha256 = "sha256-2M6nCJD1ovW8Wzw+ucii5PjeNTOiTletor7MPCMPl38=";
};
meta = with lib; {
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index bdb7e55b5cf5..be7a42e19e9d 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -22,21 +22,20 @@
stdenv.mkDerivation {
pname = "bcachefs-tools";
- version = "unstable-2021-10-01";
+ version = "unstable-2021-07-08";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
- rev = "37850436dd7dfbe67738749c4d4a2506ffff1ec3";
- sha256 = "040vgxrimahmfs9rhlggfwg0bzl7h9j2ksx3563rh63asjwlhnhi";
+ rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";
+ sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";
};
postPatch = ''
substituteInPlace Makefile \
--replace "pytest-3" "pytest --verbose" \
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
- "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" \
- --replace "doc/macro2rst.py" "python3 doc/macro2rst.py"
+ "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
'';
nativeBuildInputs = [ pkg-config docutils ];
diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix
index 19359698f02e..0c5b936093cb 100644
--- a/pkgs/tools/graphics/spirv-cross/default.nix
+++ b/pkgs/tools/graphics/spirv-cross/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spirv-cross";
- version = "2021-01-15";
+ version = "MoltenVK-1.1.5";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Cross";
rev = version;
- sha256 = "/9/Owt7XcdOjujWZnaG1Q7FlywvsRo8/l8/CouS48Vk=";
+ sha256 = "/t6hAlGY3+bddWg5ERFbqeU4/MAjq+/AEVv1Jy2C0HA=";
};
nativeBuildInputs = [ cmake python3 ];
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index b1a42f57703f..0deca19a2663 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -1,33 +1,49 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
-, glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, glib
+, i2c-tools
+, udev
+, kmod
+, libgudev
+, libusb1
+, libdrm
+, xorg
+}:
stdenv.mkDerivation rec {
pname = "ddcutil";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
- owner = "rockowitz";
- repo = "ddcutil";
- rev = "v${version}";
- sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc";
+ owner = "rockowitz";
+ repo = "ddcutil";
+ rev = "v${version}";
+ sha256 = "sha256-MH7WnJgROgLvttQEbd/21mLRFElObp4KINy8RarqkRo=";
};
- patches = [
- # Look for kernel modules in /run/booted-system/kernel-modules/lib/modules/*
- ./nixos-paths.diff
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+ buildInputs = [
+ glib
+ i2c-tools
+ kmod
+ libdrm
+ libgudev
+ libusb1
+ udev
+ xorg.libXrandr
];
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [
- i2c-tools udev libgudev
- glib libusb1 libdrm xorg.libXrandr
- ];
+ enableParallelBuilding = true;
meta = with lib; {
- homepage = "http://www.ddcutil.com/";
+ homepage = "http://www.ddcutil.com/";
description = "Query and change Linux monitor settings using DDC/CI and USB";
- license = licenses.gpl2;
- platforms = platforms.linux;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
maintainers = with maintainers; [ rnhmjoj ];
};
}
diff --git a/pkgs/tools/misc/ddcutil/nixos-paths.diff b/pkgs/tools/misc/ddcutil/nixos-paths.diff
deleted file mode 100644
index 54d17ea5bfeb..000000000000
--- a/pkgs/tools/misc/ddcutil/nixos-paths.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/util/linux_util.c
-+++ b/src/util/linux_util.c
-@@ -125,6 +125,7 @@
- "lib64",
- "lib32",
- "usr/lib", // needed for arch?
-+ "run/booted-system/kernel-modules/lib", // NixOS
- NULL};
- int result = -1;
- int ndx = 0;
-@@ -204,14 +205,15 @@
- if (debug)
- printf("(%s) machine: %s", __func__, utsbuf.machine);
-
-- char * libdirs[3];
-+ char * libdirs[4];
- libdirs[0] = "lib";
-+ libdirs[1] = "run/booted-system/kernel-modules/lib";
- if (streq(utsbuf.machine, "amd_64")){
-- libdirs[1] = "lib64";
-- libdirs[2] = NULL;
-+ libdirs[2] = "lib64";
-+ libdirs[3] = NULL;
- }
- else
-- libdirs[1] = NULL;
-+ libdirs[2] = NULL;
-
- int libsndx = 0;
- bool found = false;
diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix
index 52038c8efa9c..4fb7acb188ad 100644
--- a/pkgs/tools/misc/dpt-rp1-py/default.nix
+++ b/pkgs/tools/misc/dpt-rp1-py/default.nix
@@ -32,5 +32,6 @@ python3Packages.buildPythonApplication rec {
description = "Python script to manage Sony DPT-RP1 without Digital Paper App";
license = licenses.mit;
maintainers = with maintainers; [ mt-caret ];
+ mainProgram = "dptrp1";
};
}
diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix
index cc2123c9d33b..1ce5ced3f3ed 100644
--- a/pkgs/tools/misc/esphome/dashboard.nix
+++ b/pkgs/tools/misc/esphome/dashboard.nix
@@ -4,11 +4,11 @@
with python3.pkgs; buildPythonPackage rec {
pname = "esphome-dashboard";
- version = "20210908.0";
+ version = "20211021.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Oz/87FFP9AEK7vVTjgqIA6hSSQJLKet759S2t5Ci1oA=";
+ sha256 = "sha256-stJ6fUs02XpCN671EztHTLkXd57eMo6472Q1e1/cbHY=";
};
# no tests
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 4e772399171c..dbe57f1bdf5b 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -16,13 +16,13 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
- version = "2021.9.3";
+ version = "2021.10.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-vQ4OX+iHWWIxi/r5ayChgNglI7QQsgx0LqXCR6J0pLE=";
+ sha256 = "sha256-zVZantMYtDWkvFrXmX0HpUchmc3T2gbkrMiWGP2ibNc=";
};
patches = [
@@ -54,12 +54,14 @@ with python.pkgs; buildPythonApplication rec {
cryptography
esphome-dashboard
ifaddr
+ kconfiglib
paho-mqtt
pillow
protobuf
pyserial
pyyaml
tornado
+ tzdata
tzlocal
voluptuous
];
diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix
new file mode 100644
index 000000000000..cdc3dbdae101
--- /dev/null
+++ b/pkgs/tools/misc/rust-motd/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, stdenv
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rust-motd";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "rust-motd";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m";
+ };
+
+ cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+
+ meta = with lib; {
+ description = "Beautiful, useful MOTD generation with zero runtime dependencies";
+ homepage = "https://github.com/rust-motd/rust-motd";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix
index 79075dcc8a21..a4f8fff4ae20 100644
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/pkgs/tools/misc/shadowenv/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowenv";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = version;
- sha256 = "sha256-MPky0ZB7yfl/gOPThx1BpRoTgvY7mkLaoqnvGKPvSPo=";
+ sha256 = "sha256-OfrK5eQ2oJ7ZeUem4PZPE2tsjIObQ+aao6GrtrK8AqA=";
};
- cargoSha256 = "sha256-reVw8YkKi+EMDk0Bva2Ugp72VhAYB6axHonkr9Kdos4=";
+ cargoSha256 = "sha256-gno44ZdLthcp5/+NP12d0C+x1jrmJHNkHSnyuHWl3Zk=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index cee704e93812..751f68bf089d 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/skywind3000/z.lua";
description = "A new cd command that helps you navigate faster by learning your habits";
license = licenses.mit;
- maintainers = [ maintainers.marsam ];
+ maintainers = with maintainers; [ marsam ];
+ mainProgram = "z.lua";
};
}
diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index 7c56f43ca16f..fcf2caf277a0 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "zellij";
- version = "0.18.1";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "zellij-org";
repo = "zellij";
rev = "v${version}";
- sha256 = "sha256-r9RZVmWKJJLiNSbSQPVJPR5koLR6DoAwlitTiQOc1fI=";
+ sha256 = "sha256-/1ngmthzWp9K7pBBOBiSMUv0yC66K3Tg2g2PoBskpTU=";
};
- cargoSha256 = "sha256-xaC9wuT21SYH7H8/d4usDjHeojNZ2d/NkqMqNlQQ1n0=";
+ cargoSha256 = "sha256-eFWsqjXO6QFTO26ppZ4tiJXc/PEYD+5ZdbTBMoDoLFI=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix
index 1374e4473c07..c101615855f6 100644
--- a/pkgs/tools/networking/dogdns/default.nix
+++ b/pkgs/tools/networking/dogdns/default.nix
@@ -1,10 +1,11 @@
-{ lib, stdenv
-, fetchFromGitHub
+{ lib
, rustPlatform
+, fetchFromGitHub
+, installShellFiles
+, stdenv
, pkg-config
, openssl
, Security
-, installShellFiles
}:
rustPlatform.buildRustPackage rec {
@@ -34,5 +35,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://dns.lookup.dog";
license = licenses.eupl12;
maintainers = with maintainers; [ bbigras ];
+ mainProgram = "dog";
};
}
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 4b9efdc24a60..0d94861da295 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.6.6";
+ version = "1.6.7";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
- sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c=";
+ sha256 = "bhZrottFT5NX43Iz1wFGYzaUSAgvgkhOwNHX6fjUs7M=";
};
postPatch = lib.optionalString (batchSize != null) ''
diff --git a/pkgs/tools/security/keyscope/default.nix b/pkgs/tools/security/keyscope/default.nix
new file mode 100644
index 000000000000..163ebc592c5e
--- /dev/null
+++ b/pkgs/tools/security/keyscope/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, stdenv
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "keyscope";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "spectralops";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0dv559a5al7p8r3l90sky4fx4qsxwxlm0ani8qn75pxb70z22qj5";
+ };
+
+ cargoSha256 = "sha256-+6O1EY67MVxWrco7a0QTF7Ls1w9YWwNYjiaEe9ckCkg=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+
+ # build script tries to get information from git
+ postPatch = ''
+ echo "fn main() {}" > build.rs
+ '';
+
+ VERGEN_GIT_SEMVER = "v${version}";
+
+ meta = with lib; {
+ description = "A key and secret workflow (validation, invalidation, etc.) tool";
+ homepage = "https://github.com/spectralops/keyscope";
+ changelog = "https://github.com/spectralops/keyscope/blob/v${version}/CHANGELOG.md";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index 612e14b52498..a935c302d446 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubescape";
- version = "1.0.123";
+ version = "1.0.126";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mrpQXIcV1KxOLDhWAS9Og76k18jsey7vPAcbhGe+cN4=";
+ sha256 = "sha256-kx7TgQ+ordlgYfnlt9/KkmTMUwfykGnTOEcTtq7EAYA=";
};
- vendorSha256 = "sha256-4v/7JrSGZKOyLwU6U3+hc9P+kzxGGj4aXG/wXmNdo+M=";
+ vendorSha256 = "sha256-u9Jo3/AdW+AhVe/5RwAPfLIjp+H1Omb1SlpctOEQB5Q=";
# One test is failing, disabling for now
doCheck = false;
diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
index 99e61dc23581..9a7c81971604 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/pkgs/tools/security/rage/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "rage";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
- sha256 = "1vag448zpjyplcjpf1ir81l8ip3yxm9vkrxffqr78zslb4k6hw2w";
+ sha256 = "1dzsqppkcxvajyybmday8xnwwwqv3g44hb5fzqy4whkblwxbn2gk";
};
- cargoSha256 = "06jfhq9vnkq5g5bw1zl2sxsih63yajcyk9zaizhzkdsbhydr4955";
+ cargoSha256 = "1bcj1rd78kgiy1xqpkxffzl6v9xdp778y66g6nhikjq2yarz77ji";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 41da0b99fd98..9c4526c91b3f 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "syslog-ng";
- version = "3.28.1";
+ version = "3.33.2";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "1s56q8k69sdrqsh3y9lr4di01fqw7xb49wr0dz75jmz084yg8kmg";
+ sha256 = "sha256-C3hqBgd7kVAZHXFPRaG0s3kpUstYFjo68zbwdNqfsUs=";
};
nativeBuildInputs = [ pkg-config which ];
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 264e944028e3..805876bd21e2 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -11,7 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7";
};
- patches = ./fix-configure-path.patch;
+ patches = [
+ ./fix-configure-path.patch
+
+ # Fix parallel make depends:
+ # - https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch
+ # - https://github.com/Orc/discount/pull/245
+ ./parallel-make.patch
+ ];
configureScript = "./configure.sh";
configureFlags = [
@@ -21,6 +28,7 @@ stdenv.mkDerivation rec {
"--with-fenced-code"
];
+ enableParallelBuilding = true;
doCheck = true;
meta = with lib; {
diff --git a/pkgs/tools/text/discount/parallel-make.patch b/pkgs/tools/text/discount/parallel-make.patch
new file mode 100644
index 000000000000..583622a9152f
--- /dev/null
+++ b/pkgs/tools/text/discount/parallel-make.patch
@@ -0,0 +1,15 @@
+https://github.com/Orc/discount/pull/245
+https://github.com/Orc/discount/commit/e42188e6c4c30d9de668cf98d98dd0c13ecce7cf.patch
+
+Fix parallel make failure: add missing pandoc_headers dependency.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -139,7 +139,7 @@ test: $(PGMS) $(TESTFRAMEWORK) verify
+
+ pandoc_headers.o: tools/pandoc_headers.c config.h
+ $(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
+-pandoc_headers: pandoc_headers.o
++pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB)
+ $(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown
+
+ branch.o: tools/branch.c config.h
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index eef08eec0a1f..6e9e4d09f55a 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -11,10 +11,10 @@
}:
let
- sha256 = "08j7j9fpxh08vkczjqahb8r55bwks8p3ykrv6a2kfi309629nm96";
+ sha256 = "1hhbwyhw6nmzb2a88papfca5rjavav6srcnvmbni5l6ln79pgqj7";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
- specVersion = "4.104.0";
- specSha256 = "0lbky0djqsndp33067q6yir5525m3zcgkpvf1z16mkspkixzadqs";
+ specVersion = "4.107.0";
+ specSha256 = "1z260w0517k3sgd2ygzwzkhq5w9rbkls69mnl84501fpd2nx7qvi";
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = specSha256;
@@ -24,7 +24,7 @@ in
buildPythonApplication rec {
pname = "linode-cli";
- version = "5.9.0";
+ version = "5.11.1";
src = fetchFromGitHub {
owner = "linode";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e28d75c84211..73fff60ff456 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -885,6 +885,8 @@ mapAliases ({
source-han-serif-korean = source-han-serif;
source-han-serif-simplified-chinese = source-han-serif;
source-han-serif-traditional-chinese = source-han-serif;
+ source-sans-pro = source-sans; # added 2021-10-20
+ source-serif-pro = source-serif; # added 2021-10-20
net_snmp = net-snmp; # added 2019-12-21
oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0e775a80de3..2d12d01244f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -178,6 +178,8 @@ with pkgs;
antsimulator = callPackage ../games/antsimulator { };
+ atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
+
atuin = callPackage ../tools/misc/atuin {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@@ -408,6 +410,7 @@ with pkgs;
dotnet-sdk_2 = dotnetCorePackages.sdk_2_1;
dotnet-sdk_3 = dotnetCorePackages.sdk_3_1;
dotnet-sdk_5 = dotnetCorePackages.sdk_5_0;
+ dotnet-sdk_6 = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_5_0;
dotnet-runtime = dotnetCorePackages.runtime_5_0;
@@ -2586,6 +2589,8 @@ with pkgs;
ddate = callPackage ../tools/misc/ddate { };
+ ddosify = callPackage ../development/tools/ddosify { };
+
dduper = callPackage ../tools/filesystems/dduper { };
dedup = callPackage ../tools/backup/dedup { };
@@ -6599,6 +6604,10 @@ with pkgs;
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
+ keyscope = callPackage ../tools/security/keyscope {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
keystore-explorer = callPackage ../applications/misc/keystore-explorer {
jdk = jdk11;
};
@@ -6983,7 +6992,12 @@ with pkgs;
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false;
};
+ nodejs-17_x = callPackage ../development/web/nodejs/v17.nix { };
+ nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix {
+ enableNpm = false;
+ };
# Update this when adding the newest nodejs major version!
+ # Do not set to nodejs-17_x because it requires 10.13 SDK on Darwin
nodejs_latest = nodejs-16_x;
nodejs-slim_latest = nodejs-slim-16_x;
@@ -9022,6 +9036,10 @@ with pkgs;
rust-code-analysis = callPackage ../development/tools/rust-code-analysis { };
+ rust-motd = callPackage ../tools/misc/rust-motd {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
rust-petname = callPackage ../tools/text/rust-petname { };
rustcat = callPackage ../tools/networking/rustcat {
@@ -12031,7 +12049,6 @@ with pkgs;
else
callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
- /* currently maintained LTS JDK */
openjdk11 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin/11.nix { }
@@ -12047,32 +12064,38 @@ with pkgs;
else
openjdk11.override { headless = true; };
- openjdk16-bootstrap =
- if adoptopenjdk-hotspot-bin-15.meta.available then
- adoptopenjdk-hotspot-bin-15
+ openjdk17-bootstrap =
+ if adoptopenjdk-hotspot-bin-16.meta.available then
+ adoptopenjdk-hotspot-bin-16
else
- /* adoptopenjdk not available for i686, so fall back to our old builds of 12, 13, & 14 for bootstrapping */
- callPackage ../development/compilers/openjdk/15.nix {
+ /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
+ callPackage ../development/compilers/openjdk/16.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
- openjdk15-bootstrap = callPackage ../development/compilers/openjdk/14.nix {
+ openjdk16-bootstrap = callPackage ../development/compilers/openjdk/15.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
- openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix {
+ openjdk15-bootstrap = callPackage ../development/compilers/openjdk/14.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
- openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix {
- stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
+ openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
+ openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix {
+ stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
+ openjfx = openjfx11; /* need this despite next line :-( */
+ enableJavaFX = false;
+ headless = true;
+ inherit (gnome2) GConf gnome_vfs;
+ };
};
};
};
@@ -12082,27 +12105,26 @@ with pkgs;
jdk11_headless = openjdk11_headless;
/* Latest JDK */
- openjdk16 =
+ openjdk17 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin { }
else
- callPackage ../development/compilers/openjdk/16.nix {
+ callPackage ../development/compilers/openjdk/17.nix {
openjfx = openjfx15;
inherit (gnome2) GConf gnome_vfs;
};
- openjdk16_headless =
+ openjdk17_headless =
if stdenv.isDarwin then
- openjdk16
+ openjdk17
else
- openjdk16.override { headless = true; };
+ openjdk17.override { headless = true; };
- jdk16 = openjdk16;
- jdk16_headless = openjdk16_headless;
+ jdk17 = openjdk17;
+ jdk17_headless = openjdk17_headless;
/* default JDK */
-
- jdk = jdk16;
+ jdk = jdk17;
# Since the introduction of the Java Platform Module System in Java 9, Java
# no longer ships a separate JRE package.
@@ -12111,13 +12133,13 @@ with pkgs;
# 'jre_minimal' to build a bespoke JRE containing only the modules you need.
#
# For a general-purpose system, 'jre' defaults to the full JDK:
- jre = jdk16;
- jre_headless = jdk16_headless;
+ jre = jdk17;
+ jre_headless = jdk17_headless;
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
- openjdk = openjdk16;
- openjdk_headless = openjdk16_headless;
+ openjdk = openjdk17;
+ openjdk_headless = openjdk17_headless;
graalvmCEPackages =
recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition {
@@ -13222,6 +13244,8 @@ with pkgs;
mujs = callPackage ../development/interpreters/mujs { };
+ ngn-k = callPackage ../development/interpreters/ngn-k { };
+
octave = callPackage ../development/interpreters/octave {
python = python3;
mkDerivation = stdenv.mkDerivation;
@@ -14295,6 +14319,8 @@ with pkgs;
ezquake = callPackage ../games/ezquake { };
+ faas-cli = callPackage ../development/tools/faas-cli { };
+
findbugs = callPackage ../development/tools/analysis/findbugs { };
findnewest = callPackage ../development/tools/misc/findnewest { };
@@ -16656,7 +16682,10 @@ with pkgs;
hound = callPackage ../development/tools/misc/hound { };
- hpx = callPackage ../development/libraries/hpx { };
+ hpx = callPackage ../development/libraries/hpx {
+ boost = boost17x;
+ asio = asio.override { boost = boost17x; };
+ };
hspell = callPackage ../development/libraries/hspell { };
@@ -22108,6 +22137,8 @@ with pkgs;
go-tools = callPackage ../development/tools/go-tools { };
+ gotest = callPackage ../development/tools/gotest { };
+
gotools = callPackage ../development/tools/gotools { };
gotop = callPackage ../tools/system/gotop { };
@@ -23348,9 +23379,9 @@ with pkgs;
source-code-pro = callPackage ../data/fonts/source-code-pro {};
- source-sans-pro = callPackage ../data/fonts/source-sans-pro { };
+ source-sans = callPackage ../data/fonts/source-sans { };
- source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
+ source-serif = callPackage ../data/fonts/source-serif { };
source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
@@ -24620,6 +24651,8 @@ with pkgs;
geany = callPackage ../applications/editors/geany { };
geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
+ geek-life = callPackage ../applications/misc/geek-life { };
+
genact = callPackage ../applications/misc/genact { };
genxword = callPackage ../applications/misc/genxword { };
@@ -25823,6 +25856,8 @@ with pkgs;
kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
+ kde-gruvbox = callPackage ../data/themes/kde-gruvbox { };
+
kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
@@ -25963,6 +25998,8 @@ with pkgs;
kiln = callPackage ../applications/misc/kiln { };
+ kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { };
+
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };
@@ -31119,9 +31156,7 @@ with pkgs;
abc-verifier = callPackage ../applications/science/logic/abc {};
- abella = callPackage ../applications/science/logic/abella {
- ocamlPackages = ocaml-ng.ocamlPackages_4_07;
- };
+ abella = callPackage ../applications/science/logic/abella { };
acgtk = callPackage ../applications/science/logic/acgtk {};
@@ -32806,6 +32841,8 @@ with pkgs;
wiki-js = callPackage ../servers/web-apps/wiki-js { };
+ wiki-tui = callPackage ../misc/wiki-tui { };
+
winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
callPackage = newScope self;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index dc657ab1df5b..5feb98a17047 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -37,12 +37,15 @@ let
coqtail-math = callPackage ../development/coq-modules/coqtail-math {};
coquelicot = callPackage ../development/coq-modules/coquelicot {};
corn = callPackage ../development/coq-modules/corn {};
+ deriving = callPackage ../development/coq-modules/deriving {};
dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
equations = callPackage ../development/coq-modules/equations { };
+ extructures = callPackage ../development/coq-modules/extructures { };
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
flocq = callPackage ../development/coq-modules/flocq {};
fourcolor = callPackage ../development/coq-modules/fourcolor {};
gaia = callPackage ../development/coq-modules/gaia {};
+ gaia-hydras = callPackage ../development/coq-modules/gaia-hydras {};
gappalib = callPackage ../development/coq-modules/gappalib {};
goedel = callPackage ../development/coq-modules/goedel {};
graph-theory = callPackage ../development/coq-modules/graph-theory {};
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 00b97d1c6590..9e24ea29e7f2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -52,6 +52,7 @@ mapAliases ({
googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
HAP-python = hap-python; # added 2021-06-01
+ jupyter_client = jupyter-client; # added 2021-10-15
lammps-cython = throw "no longer builds and is unmaintained";
MechanicalSoup = mechanicalsoup; # added 2021-06-01
pam = python-pam; # added 2020-09-07.
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 65392f5605fb..61cadea5f264 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -511,6 +511,8 @@ in {
apache-airflow = callPackage ../development/python-modules/apache-airflow { };
+ apcaccess = callPackage ../development/python-modules/apcaccess { };
+
apipkg = callPackage ../development/python-modules/apipkg { };
apispec = callPackage ../development/python-modules/apispec { };
@@ -1491,10 +1493,20 @@ in {
cirq = callPackage ../development/python-modules/cirq { };
+ cirq-aqt = callPackage ../development/python-modules/cirq-aqt { };
+
cirq-core = callPackage ../development/python-modules/cirq-core { };
+ cirq-ionq = callPackage ../development/python-modules/cirq-ionq { };
+
cirq-google = callPackage ../development/python-modules/cirq-google { };
+ cirq-rigetti = callPackage ../development/python-modules/cirq-rigetti { };
+
+ cirq-pasqal = callPackage ../development/python-modules/cirq-pasqal { };
+
+ cirq-web = callPackage ../development/python-modules/cirq-web { };
+
ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
@@ -1822,6 +1834,8 @@ in {
cycler = callPackage ../development/python-modules/cycler { };
+ cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { };
+
cymem = callPackage ../development/python-modules/cymem { };
cypari2 = callPackage ../development/python-modules/cypari2 { };
@@ -3963,7 +3977,7 @@ in {
jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { };
- jupyter_client = callPackage ../development/python-modules/jupyter_client { };
+ jupyter-client = callPackage ../development/python-modules/jupyter-client { };
jupyter_console = callPackage ../development/python-modules/jupyter_console { };
@@ -5623,6 +5637,8 @@ in {
pyatag = callPackage ../development/python-modules/pyatag { };
+ pyatome = callPackage ../development/python-modules/pyatome { };
+
pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };
pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };
@@ -6806,6 +6822,8 @@ in {
pyquery = callPackage ../development/python-modules/pyquery { };
+ pyquil = callPackage ../development/python-modules/pyquil { };
+
pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { };
pyrad = callPackage ../development/python-modules/pyrad { };
@@ -7776,6 +7794,8 @@ in {
qcengine = callPackage ../development/python-modules/qcengine { };
+ qcs-api-client = callPackage ../development/python-modules/qcs-api-client { };
+
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
qdldl = callPackage ../development/python-modules/qdldl { };
@@ -8013,6 +8033,8 @@ in {
retworkx = callPackage ../development/python-modules/retworkx { };
+ rfc3339 = callPackage ../development/python-modules/rfc3339 { };
+
rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { };
rfc3986 = callPackage ../development/python-modules/rfc3986 { };
@@ -8101,6 +8123,8 @@ in {
routes = callPackage ../development/python-modules/routes { };
+ rpcq = callPackage ../development/python-modules/rpcq { };
+
rpdb = callPackage ../development/python-modules/rpdb { };
rply = callPackage ../development/python-modules/rply { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 033bc4dc7c0d..334e86a9d5b2 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -212,7 +212,7 @@ with self; with super; {
jsonrpclib = callPackage ../development/python-modules/jsonrpclib { };
- jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { };
+ jupyter-client = callPackage ../development/python-modules/jupyter-client/5.nix { };
jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { };
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 18c75ebd95e9..4587f2548f2e 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -206,10 +206,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
+ sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z";
type = "gem";
};
- version = "0.1.1";
+ version = "0.2.0";
};
builder = {
groups = ["default"];
@@ -848,10 +848,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
+ sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
type = "gem";
};
- version = "0.14.0";
+ version = "0.15.0";
};
eventmachine = {
groups = ["default"];
@@ -868,10 +868,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a";
+ sha256 = "0g45ib20cjwkf4lzgm30cl6n7b6h1k8p6pdg4vh8s1rllrzrz342";
type = "gem";
};
- version = "0.85.0";
+ version = "0.87.0";
};
execjs = {
groups = ["default"];
@@ -1487,20 +1487,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+ sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry";
type = "gem";
};
- version = "2.5.1";
+ version = "2.6.0";
};
jwt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs";
+ sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838";
type = "gem";
};
- version = "2.2.3";
+ version = "2.3.0";
};
kramdown = {
groups = ["default"];
@@ -1704,10 +1704,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl";
+ sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
- version = "1.1.1";
+ version = "1.1.2";
};
mini_portile2 = {
groups = ["default"];
@@ -1983,10 +1983,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q";
+ sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy";
type = "gem";
};
- version = "0.13.0";
+ version = "0.13.1";
};
pg = {
groups = ["default"];
@@ -2067,20 +2067,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq";
+ sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
type = "gem";
};
- version = "5.5.0";
+ version = "5.5.2";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
type = "gem";
};
- version = "1.5.2";
+ version = "1.6.0";
};
rack = {
groups = ["default"];
@@ -2256,10 +2256,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720";
+ sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw";
type = "gem";
};
- version = "4.4.0";
+ version = "4.5.1";
};
redis-rack = {
dependencies = ["rack" "redis-store"];
@@ -2330,10 +2330,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04ahv5gwfwdmwx6b7c0z91rrsfklvnqichgnqk1f9b9n6md3b8yw";
+ sha256 = "0z1qk9i18zma000cqd758av9ca0622ykwp2cwm1x4dv9c0vw03yg";
type = "gem";
};
- version = "4.2.2";
+ version = "4.2.3";
};
rouge = {
groups = ["default"];
@@ -2625,10 +2625,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dxwkacc0scc1bqq10wc3v7wbh5j0jl5zcmw90kmfbgfjzl0drbr";
+ sha256 = "0fmk4fkmqnh033sdsvbb6r2dadir0f9zaq0z2jyx1wfnvv5712md";
type = "gem";
};
- version = "5.48.0";
+ version = "5.49.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
@@ -2689,10 +2689,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07an5s5xfg8mll0h9ihdc1n23k6n9anil9ca07rm77aiq6k0n0vy";
+ sha256 = "0wy8ws5n2gvxgkncbhrp4vkwjcbphcczw4k7y3g2wfl8fdmv5b4n";
type = "gem";
};
- version = "2.7.1";
+ version = "2.7.2";
};
slop = {
groups = ["default"];