diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8708bf79f540..4c2469d7211c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7477,6 +7477,12 @@
email = "natedevv@gmail.com";
name = "Nathan Moore";
};
+ nathanruiz = {
+ email = "nathanruiz@protonmail.com";
+ github = "nathanruiz";
+ githubId = 18604892;
+ name = "Nathan Ruiz";
+ };
nathan-gs = {
email = "nathan@nathan.gs";
github = "nathan-gs";
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
index 24d86628b211..8f937a13231b 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
@@ -60,6 +60,45 @@ in {
sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw";
};
};
+
+ corefile = mkOption {
+ description = ''
+ Custom coredns corefile configuration.
+
+ See: .
+ '';
+ type = types.str;
+ default = ''
+ .:${toString ports.dns} {
+ errors
+ health :${toString ports.health}
+ kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
+ pods insecure
+ fallthrough in-addr.arpa ip6.arpa
+ }
+ prometheus :${toString ports.metrics}
+ forward . /etc/resolv.conf
+ cache 30
+ loop
+ reload
+ loadbalance
+ }'';
+ defaultText = ''
+ .:${toString ports.dns} {
+ errors
+ health :${toString ports.health}
+ kubernetes ''${config.services.kubernetes.addons.dns.clusterDomain} in-addr.arpa ip6.arpa {
+ pods insecure
+ fallthrough in-addr.arpa ip6.arpa
+ }
+ prometheus :${toString ports.metrics}
+ forward . /etc/resolv.conf
+ cache 30
+ loop
+ reload
+ loadbalance
+ }'';
+ };
};
config = mkIf cfg.enable {
@@ -151,20 +190,7 @@ in {
namespace = "kube-system";
};
data = {
- Corefile = ".:${toString ports.dns} {
- errors
- health :${toString ports.health}
- kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
- pods insecure
- fallthrough in-addr.arpa ip6.arpa
- }
- prometheus :${toString ports.metrics}
- forward . /etc/resolv.conf
- cache 30
- loop
- reload
- loadbalance
- }";
+ Corefile = cfg.corefile;
};
};
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index cdc3a172ea70..f982621e2328 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -339,6 +339,8 @@ in
description =
''
Whether to log rejected or dropped incoming connections.
+ Note: The logs are found in the kernel logs, i.e. dmesg
+ or journalctl -k.
'';
};
@@ -350,6 +352,8 @@ in
Whether to log all rejected or dropped incoming packets.
This tends to give a lot of log messages, so it's mostly
useful for debugging.
+ Note: The logs are found in the kernel logs, i.e. dmesg
+ or journalctl -k.
'';
};
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 3c58cd9ddade..63b249df735e 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -5,15 +5,16 @@ with lib;
let
cfg = config.services.syncthing;
defaultUser = "syncthing";
+ defaultGroup = defaultUser;
devices = mapAttrsToList (name: device: {
deviceID = device.id;
inherit (device) name addresses introducer;
- }) cfg.declarative.devices;
+ }) cfg.devices;
folders = mapAttrsToList ( _: folder: {
inherit (folder) path id label type;
- devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices;
+ devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices;
rescanIntervalS = folder.rescanInterval;
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
@@ -23,7 +24,7 @@ let
}) (filterAttrs (
_: folder:
folder.enable
- ) cfg.declarative.folders);
+ ) cfg.folders);
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu
@@ -50,9 +51,9 @@ let
# generate the new config by merging with the NixOS config options
new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
- "devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + .devices"}),
- "folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + .folders"})
- } * ${builtins.toJSON cfg.declarative.extraOptions}')
+ "devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}),
+ "folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"})
+ } * ${builtins.toJSON cfg.extraOptions}')
# send the new config
curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config
@@ -68,172 +69,177 @@ in {
options = {
services.syncthing = {
- enable = mkEnableOption ''
- Syncthing - the self-hosted open-source alternative
- to Dropbox and Bittorrent Sync. Initial interface will be
- available on http://127.0.0.1:8384/.
- '';
+ enable = mkEnableOption
+ "Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync";
- declarative = {
- cert = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Path to users cert.pem file, will be copied into Syncthing's
- configDir
- '';
- };
+ cert = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Path to the cert.pem file, which will be copied into Syncthing's
+ configDir.
+ '';
+ };
- key = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Path to users key.pem file, will be copied into Syncthing's
- configDir
- '';
- };
+ key = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Path to the key.pem file, which will be copied into Syncthing's
+ configDir.
+ '';
+ };
- overrideDevices = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to delete the devices which are not configured via the
- declarative.devices option.
- If set to false, devices added via the webinterface will
- persist but will have to be deleted manually.
- '';
- };
+ overrideDevices = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to delete the devices which are not configured via the
+ devices option.
+ If set to false, devices added via the web
+ interface will persist and will have to be deleted manually.
+ '';
+ };
- devices = mkOption {
- default = {};
- description = ''
- Peers/devices which Syncthing should communicate with.
- '';
- example = {
- bigbox = {
- id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
- addresses = [ "tcp://192.168.0.10:51820" ];
- };
+ devices = mkOption {
+ default = {};
+ description = ''
+ Peers/devices which Syncthing should communicate with.
+
+ Note that you can still add devices manually, but those changes
+ will be reverted on restart if overrideDevices
+ is enabled.
+ '';
+ example = {
+ bigbox = {
+ id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
+ addresses = [ "tcp://192.168.0.10:51820" ];
};
- type = types.attrsOf (types.submodule ({ name, ... }: {
- options = {
-
- name = mkOption {
- type = types.str;
- default = name;
- description = ''
- Name of the device
- '';
- };
-
- addresses = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- The addresses used to connect to the device.
- If this is let empty, dynamic configuration is attempted
- '';
- };
-
- id = mkOption {
- type = types.str;
- description = ''
- The id of the other peer, this is mandatory. It's documented at
- https://docs.syncthing.net/dev/device-ids.html
- '';
- };
-
- introducer = mkOption {
- type = types.bool;
- default = false;
- description = ''
- If the device should act as an introducer and be allowed
- to add folders on this computer.
- '';
- };
+ };
+ type = types.attrsOf (types.submodule ({ name, ... }: {
+ options = {
+ name = mkOption {
+ type = types.str;
+ default = name;
+ description = ''
+ The name of the device.
+ '';
};
- }));
- };
- overrideFolders = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to delete the folders which are not configured via the
- declarative.folders option.
- If set to false, folders added via the webinterface will persist
- but will have to be deleted manually.
- '';
- };
+ addresses = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ The addresses used to connect to the device.
+ If this is left empty, dynamic configuration is attempted.
+ '';
+ };
- folders = mkOption {
- default = {};
- description = ''
- Folders which should be shared by Syncthing.
- '';
- example = literalExample ''
- {
- "/home/user/sync" = {
- id = "syncme";
- devices = [ "bigbox" ];
- };
- }
- '';
- type = types.attrsOf (types.submodule ({ name, ... }: {
- options = {
+ id = mkOption {
+ type = types.str;
+ description = ''
+ The device ID. See .
+ '';
+ };
- enable = mkOption {
- type = types.bool;
- default = true;
- description = ''
- share this folder.
- This option is useful when you want to define all folders
- in one place, but not every machine should share all folders.
- '';
- };
+ introducer = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether the device should act as an introducer and be allowed
+ to add folders on this computer.
+ See .
+ '';
+ };
- path = mkOption {
- type = types.str;
- default = name;
- description = ''
- The path to the folder which should be shared.
- '';
- };
+ };
+ }));
+ };
- id = mkOption {
- type = types.str;
- default = name;
- description = ''
- The id of the folder. Must be the same on all devices.
- '';
- };
+ overrideFolders = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to delete the folders which are not configured via the
+ folders option.
+ If set to false, folders added via the web
+ interface will persist and will have to be deleted manually.
+ '';
+ };
- label = mkOption {
- type = types.str;
- default = name;
- description = ''
- The label of the folder.
- '';
- };
+ folders = mkOption {
+ default = {};
+ description = ''
+ Folders which should be shared by Syncthing.
- devices = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- The devices this folder should be shared with. Must be defined
- in the declarative.devices attribute.
- '';
- };
+ Note that you can still add devices manually, but those changes
+ will be reverted on restart if overrideDevices
+ is enabled.
+ '';
+ example = literalExample ''
+ {
+ "/home/user/sync" = {
+ id = "syncme";
+ devices = [ "bigbox" ];
+ };
+ }
+ '';
+ type = types.attrsOf (types.submodule ({ name, ... }: {
+ options = {
- versioning = mkOption {
- default = null;
- description = ''
- How to keep changed/deleted files with Syncthing.
- There are 4 different types of versioning with different parameters.
- See https://docs.syncthing.net/users/versioning.html
- '';
- example = [
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to share this folder.
+ This option is useful when you want to define all folders
+ in one place, but not every machine should share all folders.
+ '';
+ };
+
+ path = mkOption {
+ type = types.str;
+ default = name;
+ description = ''
+ The path to the folder which should be shared.
+ '';
+ };
+
+ id = mkOption {
+ type = types.str;
+ default = name;
+ description = ''
+ The ID of the folder. Must be the same on all devices.
+ '';
+ };
+
+ label = mkOption {
+ type = types.str;
+ default = name;
+ description = ''
+ The label of the folder.
+ '';
+ };
+
+ devices = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ The devices this folder should be shared with. Each device must
+ be defined in the devices option.
+ '';
+ };
+
+ versioning = mkOption {
+ default = null;
+ description = ''
+ How to keep changed/deleted files with Syncthing.
+ There are 4 different types of versioning with different parameters.
+ See .
+ '';
+ example = literalExample ''
+ [
{
versioning = {
type = "simple";
@@ -259,98 +265,99 @@ in {
{
versioning = {
type = "external";
- params.versionsPath = pkgs.writers.writeBash "backup" ''
+ params.versionsPath = pkgs.writers.writeBash "backup" '''
folderpath="$1"
filepath="$2"
rm -rf "$folderpath/$filepath"
- '';
+ ''';
};
}
- ];
- type = with types; nullOr (submodule {
- options = {
- type = mkOption {
- type = enum [ "external" "simple" "staggered" "trashcan" ];
- description = ''
- Type of versioning.
- See https://docs.syncthing.net/users/versioning.html
- '';
- };
- params = mkOption {
- type = attrsOf (either str path);
- description = ''
- Parameters for versioning. Structure depends on versioning.type.
- See https://docs.syncthing.net/users/versioning.html
- '';
- };
+ ]
+ '';
+ type = with types; nullOr (submodule {
+ options = {
+ type = mkOption {
+ type = enum [ "external" "simple" "staggered" "trashcan" ];
+ description = ''
+ The type of versioning.
+ See .
+ '';
};
- });
- };
-
- rescanInterval = mkOption {
- type = types.int;
- default = 3600;
- description = ''
- How often the folders should be rescaned for changes.
- '';
- };
-
- type = mkOption {
- type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
- default = "sendreceive";
- description = ''
- Whether to send only changes from this folder, only receive them
- or propagate both.
- '';
- };
-
- watch = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether the folder should be watched for changes by inotify.
- '';
- };
-
- watchDelay = mkOption {
- type = types.int;
- default = 10;
- description = ''
- The delay after an inotify event is triggered.
- '';
- };
-
- ignorePerms = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to propagate permission changes.
- '';
- };
-
- ignoreDelete = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to delete files in destination. See
- upstream's docs.
- '';
- };
+ params = mkOption {
+ type = attrsOf (either str path);
+ description = ''
+ The parameters for versioning. Structure depends on
+ versioning.type.
+ See .
+ '';
+ };
+ };
+ });
};
- }));
- };
- extraOptions = mkOption {
- type = types.addCheck (pkgs.formats.json {}).type isAttrs;
- default = {};
- description = ''
- Extra configuration options for Syncthing.
- '';
- example = {
- options.localAnnounceEnabled = false;
- gui.theme = "black";
+ rescanInterval = mkOption {
+ type = types.int;
+ default = 3600;
+ description = ''
+ How often the folder should be rescanned for changes.
+ '';
+ };
+
+ type = mkOption {
+ type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
+ default = "sendreceive";
+ description = ''
+ Whether to only send changes for this folder, only receive them
+ or both.
+ '';
+ };
+
+ watch = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the folder should be watched for changes by inotify.
+ '';
+ };
+
+ watchDelay = mkOption {
+ type = types.int;
+ default = 10;
+ description = ''
+ The delay after an inotify event is triggered.
+ '';
+ };
+
+ ignorePerms = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to ignore permission changes.
+ '';
+ };
+
+ ignoreDelete = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to skip deleting files that are deleted by peers.
+ See .
+ '';
+ };
};
+ }));
+ };
+
+ extraOptions = mkOption {
+ type = types.addCheck (pkgs.formats.json {}).type isAttrs;
+ default = {};
+ description = ''
+ Extra configuration options for Syncthing.
+ See .
+ '';
+ example = {
+ options.localAnnounceEnabled = false;
+ gui.theme = "black";
};
};
@@ -358,31 +365,35 @@ in {
type = types.str;
default = "127.0.0.1:8384";
description = ''
- Address to serve the GUI.
+ The address to serve the web interface at.
'';
};
systemService = mkOption {
type = types.bool;
default = true;
- description = "Auto launch Syncthing as a system service.";
+ description = ''
+ Whether to auto-launch Syncthing as a system service.
+ '';
};
user = mkOption {
type = types.str;
default = defaultUser;
+ example = "yourUser";
description = ''
- Syncthing will be run under this user (user will be created if it doesn't exist.
- This can be your user name).
+ The user to run Syncthing as.
+ By default, a user named ${defaultUser} will be created.
'';
};
group = mkOption {
type = types.str;
- default = defaultUser;
+ default = defaultGroup;
+ example = "yourGroup";
description = ''
- Syncthing will be run under this group (group will not be created if it doesn't exist.
- This can be your user name).
+ The group to run Syncthing under.
+ By default, a group named ${defaultGroup} will be created.
'';
};
@@ -391,63 +402,67 @@ in {
default = null;
example = "socks5://address.com:1234";
description = ''
- Overwrites all_proxy environment variable for the Syncthing process to
- the given value. This is normaly used to let relay client connect
- through SOCKS5 proxy server.
+ Overwrites the all_proxy environment variable for the Syncthing process to
+ the given value. This is normally used to let Syncthing connect
+ through a SOCKS5 proxy server.
+ See .
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/syncthing";
+ example = "/home/yourUser";
description = ''
- Path where synced directories will exist.
+ The path where synchronised directories will exist.
'';
};
- configDir = mkOption {
+ configDir = let
+ cond = versionAtLeast config.system.stateVersion "19.03";
+ in mkOption {
type = types.path;
description = ''
- Path where the settings and keys will exist.
+ The path where the settings and keys will exist.
'';
- default =
- let
- nixos = config.system.stateVersion;
- cond = versionAtLeast nixos "19.03";
- in cfg.dataDir + (optionalString cond "/.config/syncthing");
+ default = cfg.dataDir + (optionalString cond "/.config/syncthing");
+ defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}";
};
openDefaultPorts = mkOption {
type = types.bool;
default = false;
- example = literalExample "true";
+ example = true;
description = ''
- Open the default ports in the firewall:
- - TCP 22000 for transfers
- - UDP 21027 for discovery
- If multiple users are running Syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled.
- Alternatively, if are running only a single instance on this machine using the default ports, enable this.
+ Whether to open the default ports in the firewall: TCP 22000 for transfers
+ and UDP 21027 for discovery.
+
+ If multiple users are running Syncthing on this machine, you will need
+ to manually open a set of ports for each instance and leave this disabled.
+ Alternatively, if you are running only a single instance on this machine
+ using the default ports, enable this.
'';
};
package = mkOption {
type = types.package;
default = pkgs.syncthing;
- defaultText = "pkgs.syncthing";
- example = literalExample "pkgs.syncthing";
+ defaultText = literalExample "pkgs.syncthing";
description = ''
- Syncthing package to use.
+ The Syncthing package to use.
'';
};
};
};
imports = [
- (mkRemovedOptionModule ["services" "syncthing" "useInotify"] ''
+ (mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] ''
This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
- It can be enabled on a per-folder basis through the webinterface.
+ It can be enabled on a per-folder basis through the web interface.
'')
- ];
+ ] ++ map (o:
+ mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ]
+ ) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"];
###### implementation
@@ -470,8 +485,8 @@ in {
};
};
- users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
- ${defaultUser}.gid =
+ users.groups = mkIf (cfg.systemService && cfg.group == defaultGroup) {
+ ${defaultGroup}.gid =
config.ids.gids.syncthing;
};
@@ -491,14 +506,14 @@ in {
RestartForceExitStatus="3 4";
User = cfg.user;
Group = cfg.group;
- ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null)
+ ExecStartPre = mkIf (cfg.cert != null || cfg.key != null)
"+${pkgs.writers.writeBash "syncthing-copy-keys" ''
install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir}
- ${optionalString (cfg.declarative.cert != null) ''
- install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem
+ ${optionalString (cfg.cert != null) ''
+ install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.cert} ${cfg.configDir}/cert.pem
''}
- ${optionalString (cfg.declarative.key != null) ''
- install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.key} ${cfg.configDir}/key.pem
+ ${optionalString (cfg.key != null) ''
+ install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem
''}
''}"
;
@@ -529,7 +544,7 @@ in {
};
};
syncthing-init = mkIf (
- cfg.declarative.devices != {} || cfg.declarative.folders != {} || cfg.declarative.extraOptions != {}
+ cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
) {
description = "Syncthing configuration updater";
after = [ "syncthing.service" ];
diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix
index f359f0af1c22..8b60ad7faf09 100644
--- a/nixos/tests/syncthing-init.nix
+++ b/nixos/tests/syncthing-init.nix
@@ -9,16 +9,14 @@ in {
machine = {
services.syncthing = {
enable = true;
- declarative = {
- devices.testDevice = {
- id = testId;
- };
- folders.testFolder = {
- path = "/tmp/test";
- devices = [ "testDevice" ];
- };
- extraOptions.gui.user = "guiUser";
+ devices.testDevice = {
+ id = testId;
};
+ folders.testFolder = {
+ path = "/tmp/test";
+ devices = [ "testDevice" ];
+ };
+ extraOptions.gui.user = "guiUser";
};
};
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 67d45c44868d..9a63f90b3936 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -2,19 +2,15 @@
buildGoModule rec {
pname = "ipfs-cluster";
- version = "0.13.1";
+ version = "0.14.0";
- vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh";
-
- patches = [
- ./test.patch
- ];
+ vendorSha256 = "sha256-I8UJxqzbcOE6pHsKkktrEXVHurxwe0D20GZZmASdWH4=";
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
rev = "v${version}";
- sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8";
+ sha256 = "sha256-lB0sYsbZfUJgQVNEFLoXNFszWYxlXNEQbRQWA7fRT2A=";
};
meta = with lib; {
@@ -22,6 +18,6 @@ buildGoModule rec {
homepage = "https://cluster.ipfs.io/";
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ jglukasik ];
+ maintainers = with maintainers; [ Luflosi jglukasik ];
};
}
diff --git a/pkgs/applications/networking/ipfs-cluster/test.patch b/pkgs/applications/networking/ipfs-cluster/test.patch
deleted file mode 100644
index 65f10fec8ef1..000000000000
--- a/pkgs/applications/networking/ipfs-cluster/test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/peer_manager_test.go b/peer_manager_test.go
-index 521e754..cf0d777 100644
---- a/peer_manager_test.go
-+++ b/peer_manager_test.go
-@@ -76,6 +76,7 @@ func clusterAddr(c *Cluster) ma.Multiaddr {
- }
-
- func TestClustersPeerAdd(t *testing.T) {
-+ t.Skip("test is disabld by nixos")
- ctx := context.Background()
- clusters, mocks, boot := peerManagerClusters(t)
- defer shutdownClusters(t, clusters, mocks)
diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 8ff5c50b8a78..762fdf78ce3f 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
- version = "6.24";
+ version = "6.26";
src = fetchFromGitHub {
owner = "convos-chat";
repo = pname;
rev = "v${version}";
- sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx";
+ sha256 = "1wh3ryhd4b7nanh0yp2nycmhky5afw8lpfx34858p6wfimsv9794";
};
nativeBuildInputs = [ makeWrapper ]
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 8a8fc0733553..b106deb074e3 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -1,12 +1,22 @@
-{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem
-, enableX11 ? true}:
-
-let inherit (ocamlPackages) ocaml lablgtk; in
-
-stdenv.mkDerivation (rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+, ocamlPackages
+, fontschumachermisc
+, xset
+, makeWrapper
+, ncurses
+, gnugrep
+, fetchpatch
+, copyDesktopItems
+, makeDesktopItem
+, enableX11 ? true
+}:
+stdenv.mkDerivation rec {
pname = "unison";
version = "2.51.3";
+
src = fetchFromGitHub {
owner = "bcpierce00";
repo = "unison";
@@ -14,8 +24,9 @@ stdenv.mkDerivation (rec {
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
};
- nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems);
- buildInputs = [ ocaml ncurses ];
+ nativeBuildInputs = [ makeWrapper ]
+ ++ lib.optional enableX11 copyDesktopItems;
+ buildInputs = [ ocamlPackages.ocaml ncurses ];
patches = [
# Patch to fix build with ocaml 4.12. Remove in 2.51.4
@@ -27,20 +38,22 @@ stdenv.mkDerivation (rec {
})
];
- preBuild = (lib.strings.optionalString enableX11 ''
- sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
- '') + ''
- echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
+ preBuild = lib.optionalString enableX11 ''
+ sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
+ '' + ''
+ echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
'';
makeFlags = [
"INSTALLDIR=$(out)/bin/"
"UISTYLE=${if enableX11 then "gtk2" else "text"}"
- ] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false";
+ ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false";
- preInstall = "mkdir -p $out/bin";
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
- postInstall = lib.strings.optionalString enableX11 ''
+ postInstall = lib.optionalString enableX11 ''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
@@ -49,9 +62,9 @@ stdenv.mkDerivation (rec {
install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg
'';
- dontStrip = !ocaml.nativeCompilers;
+ dontStrip = !ocamlPackages.ocaml.nativeCompilers;
- desktopItems = lib.lists.optional enableX11 (makeDesktopItem {
+ desktopItems = lib.optional enableX11 (makeDesktopItem {
name = pname;
desktopName = "Unison";
comment = "Bidirectional file synchronizer";
@@ -59,19 +72,18 @@ stdenv.mkDerivation (rec {
exec = "unison";
icon = "unison";
categories = "Utility;FileTools;GTK;";
- extraDesktopEntries={
- StartupWMClass="Unison";
- StartupNotify="true";
- X-MultipleArgs="false";
+ extraDesktopEntries = {
+ StartupWMClass = "Unison";
+ StartupNotify = "true";
+ X-MultipleArgs = "false";
};
});
- meta = {
+ meta = with lib; {
homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
description = "Bidirectional file synchronizer";
- license = lib.licenses.gpl3Plus;
- maintainers = with lib.maintainers; [viric];
- platforms = with lib.platforms; unix;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ viric ];
+ platforms = platforms.unix;
};
-
-})
+}
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 4815ddf2f75c..715f2ea313b4 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -17,13 +17,13 @@ let
in stdenv.mkDerivation rec {
pname = "mosdepth";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "brentp";
repo = "mosdepth";
rev = "v${version}";
- sha256 = "1kcrvamrafz1m0s7mlbhaay8jyg97l1w37p6syl36r2m1plmwxjd";
+ sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ=";
};
nativeBuildInputs = [ nim ];
diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix
index 848daa899ed2..3448226c58d9 100644
--- a/pkgs/data/fonts/scheherazade/default.nix
+++ b/pkgs/data/fonts/scheherazade/default.nix
@@ -1,10 +1,10 @@
-{ lib, fetchzip, version ? "3.100" }:
+{ lib, fetchzip, version ? "3.200" }:
let
new = lib.versionAtLeast version "3.000";
sha256 = {
"2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
- "3.100" = "0svnc7l3z3vvm27zx6msyx56n2fpv6ywb5lm75bym48slkccypn7";
+ "3.200" = "0qvmpsn6ja3g2hlvq0vb9pjsyk6ibna7s3w3n6q7lnhk0rhjg8bv";
}."${version}";
in fetchzip rec {
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 98b19c54a300..d36b8342fdde 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
{
- "commit": "51c018b566e360a908addb7fcabf98fc0fbaafbe",
- "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/51c018b566e360a908addb7fcabf98fc0fbaafbe.tar.gz",
- "sha256": "0xbc0z6zx60c0m3ck0iaa5xsw7d5phk2d8wh66w66j7ci7dyah85",
- "msg": "Update from Hackage at 2021-07-21T05:42:12Z"
+ "commit": "e40930a03e038e12969b8eac001e86d7aa7355b4",
+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e40930a03e038e12969b8eac001e86d7aa7355b4.tar.gz",
+ "sha256": "16wzasswii49xj9pyxmr4r5lwp2qqc2z90a4gq5ihclcy15r8kdc",
+ "msg": "Update from Hackage at 2021-07-26T15:54:23Z"
}
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index 6a769a47ef88..eabea78fd097 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
- version = "unstable-2021-07-08";
+ version = "unstable-2021-07-21";
src = fetchzip {
- url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz";
- sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk";
+ url = "https://github.com/NixOS/cabal2nix/archive/b5b8981921771af9c592cd48631b7f8f21745dff.tar.gz";
+ sha256 = "1r2rkqq0knnn4m8xhjmnkl07mv4cb13adf88y2qq69zpxkb24frn";
};
isLibrary = true;
isExecutable = true;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ece345208aff..9bc5a936e282 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1711,14 +1711,13 @@ self: super: {
excludes = ["test/buildtest"];
});
- # workaround for https://github.com/peti/distribution-nixpkgs/issues/9
- pam = super.pam.override { inherit (pkgs) pam; };
-
# Too strict version bounds on base:
# https://github.com/obsidiansystems/database-id/issues/1
database-id-class = doJailbreak super.database-id-class;
- cabal2nix-unstable = overrideCabal super.cabal2nix-unstable {
+ cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override {
+ distribution-nixpkgs = self.distribution-nixpkgs_1_6_0;
+ }) {
passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
};
@@ -1869,8 +1868,6 @@ EOT
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana;
- hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
-
# Too strict bounds on QuickCheck
# https://github.com/muesli4/table-layout/issues/16
table-layout = doJailbreak super.table-layout;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 251a3d94bb20..5ef659349b38 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -84,8 +84,4 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
}));
- # hackage-db 2.1.1 is incompatible with Cabal < 3.4
- # See https://github.com/NixOS/cabal2nix/issues/501
- hackage-db = self.hackage-db_2_1_0;
-
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 42fa603d3313..99b53b9f14f3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -106,8 +106,4 @@ self: super: {
# https://github.com/haskellari/time-compat/issues/23
time-compat = dontCheck super.time-compat;
- # hackage-db 2.1.1 is incompatible with Cabal < 3.4
- # See https://github.com/NixOS/cabal2nix/issues/501
- hackage-db = super.hackage-db_2_1_0;
-
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 7908066ebb59..7e495474c84f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -136,7 +136,4 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
vector = dontCheck super.vector;
- # hackage-db 2.1.1 is incompatible with Cabal < 3.4
- # See https://github.com/NixOS/cabal2nix/issues/501
- hackage-db = super.hackage-db_2_1_0;
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index f79522ddb8c0..a6329c8f9e39 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -1219,6 +1219,7 @@ broken-packages:
- EnumMap
- enummapmap
- enum-utf8
+ - env-extra
- env-parser
- envstatus
- epanet-haskell
@@ -1607,6 +1608,7 @@ broken-packages:
- ghc-syb-utils
- ghc-tags
- ghc-tags-core
+ - ghc-tcplugin-api
- ghc-time-alloc-prof
- ghc-usage
- gh-labeler
@@ -2307,6 +2309,7 @@ broken-packages:
- hs-tags
- hstats
- hstatsd
+ - hs-term-emulator
- hstest
- hstidy
- hs-twitter
@@ -4531,7 +4534,7 @@ broken-packages:
- streaming-utils
- streaming-with
- streamly-examples
- - streamly-fsnotify
+ - streamly-process
- stream-monad
- streamproc
- StrictBench
@@ -4652,6 +4655,7 @@ broken-packages:
- tapioca
- TaskMonad
- tasty-auto
+ - tasty-checklist
- tasty-fail-fast
- tasty-grading-system
- tasty-hedgehog-coverage
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index da3c5acc483c..8bd6c316f284 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -85,8 +85,13 @@ default-package-overrides:
- dual-tree < 0.2.3.0
- diagrams-core < 1.5.0
- diagrams-lib < 1.4.4
- # streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot
- - streamly-bytestring == 0.1.2
+ # streamly-* packages which are not in stackage and to be constrained
+ # as long as we have streamly < 0.8.0
+ - streamly-archive < 0.1.0
+ - streamly-bytestring < 0.1.3
+ - streamly-lmdb < 0.3.0
+ - streamly-process
+ - distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@@ -113,7 +118,6 @@ extra-packages:
- sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
package-maintainers:
abbradar:
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index a9741a2fdc07..e4c8c8b1529b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 18.2
+# Stackage LTS 18.4
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -895,7 +895,7 @@ default-package-overrides:
- ghc-lib-parser-ex ==8.10.0.21
- ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12
- - ghc-prof ==1.4.1.8
+ - ghc-prof ==1.4.1.9
- ghc-source-gen ==0.4.1.0
- ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4.2
@@ -963,7 +963,7 @@ default-package-overrides:
- gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1
- H ==0.9.0.1
- - hackage-db ==2.1.1
+ - hackage-db ==2.1.2
- hackage-security ==0.6.0.1
- haddock-library ==1.10.0
- hadoop-streaming ==0.2.0.3
@@ -1244,7 +1244,7 @@ default-package-overrides:
- inline-c-cpp ==0.4.0.3
- inline-r ==0.10.4
- inliterate ==0.1.0
- - input-parsers ==0.2.2
+ - input-parsers ==0.2.3
- insert-ordered-containers ==0.2.5
- inspection-testing ==0.4.5.0
- instance-control ==0.1.2.0
@@ -1308,7 +1308,7 @@ default-package-overrides:
- json-rpc-generic ==0.2.1.5
- JuicyPixels ==3.3.5
- JuicyPixels-blurhash ==0.1.0.3
- - JuicyPixels-extra ==0.5.1
+ - JuicyPixels-extra ==0.5.2
- JuicyPixels-scale-dct ==0.1.2
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
@@ -1330,7 +1330,7 @@ default-package-overrides:
- kmeans ==0.1.3
- koji ==0.0.2
- koofr-client ==1.0.0.3
- - krank ==0.2.2
+ - krank ==0.2.3
- kubernetes-webhook-haskell ==0.2.0.3
- l10n ==0.1.0.1
- labels ==0.3.3
@@ -1389,7 +1389,7 @@ default-package-overrides:
- liboath-hs ==0.0.1.2
- libyaml ==0.1.2
- LibZip ==1.0.1
- - lifted-async ==0.10.2
+ - lifted-async ==0.10.2.1
- lifted-base ==0.2.3.12
- lift-generics ==0.2
- lift-type ==0.1.0.1
@@ -1437,6 +1437,7 @@ default-package-overrides:
- lukko ==0.1.1.3
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3
+ - lzma-clib ==5.2.2
- lzma-conduit ==1.2.1
- machines ==0.7.2
- machines-binary ==7.0.0.0
@@ -1555,7 +1556,7 @@ default-package-overrides:
- monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1
- mongoDB ==2.7.1.1
- - monoid-subclasses ==1.1
+ - monoid-subclasses ==1.1.1
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0
@@ -1647,7 +1648,7 @@ default-package-overrides:
- nqe ==0.6.3
- nri-env-parser ==0.1.0.7
- nri-observability ==0.1.1.1
- - nri-prelude ==0.6.0.2
+ - nri-prelude ==0.6.0.3
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@@ -1867,7 +1868,7 @@ default-package-overrides:
- prospect ==0.1.0.0
- proto3-wire ==1.2.2
- protobuf ==0.2.1.3
- - protobuf-simple ==0.1.1.0
+ - protobuf-simple ==0.1.1.1
- protocol-buffers ==2.4.17
- protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1
@@ -1923,7 +1924,7 @@ default-package-overrides:
- Ranged-sets ==0.4.0
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1
- - rank2classes ==1.4.1
+ - rank2classes ==1.4.2
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.15
@@ -1969,13 +1970,13 @@ default-package-overrides:
- regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43
- - regex-posix ==0.96.0.0
+ - regex-posix ==0.96.0.1
- regex-tdfa ==1.3.1.1
- regex-with-pcre ==1.1.0.0
- registry ==0.2.0.3
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.0
- - relational-query ==0.12.2.3
+ - relational-query ==0.12.3.0
- relational-query-HDBC ==0.7.2.0
- relational-record ==0.2.2.0
- relational-schemas ==0.1.8.0
@@ -2015,6 +2016,7 @@ default-package-overrides:
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5
+ - rpm-nvr ==0.1.0
- rp-tree ==0.6
- RSA ==2.4.1
- runmemo ==1.0.0.1
@@ -2039,7 +2041,7 @@ default-package-overrides:
- sandwich ==0.1.0.8
- sandwich-quickcheck ==0.1.0.5
- sandwich-slack ==0.1.0.4
- - sandwich-webdriver ==0.1.0.5
+ - sandwich-webdriver ==0.1.0.6
- say ==0.1.0.1
- sbp ==2.6.3
- sbv ==8.15
@@ -2122,7 +2124,7 @@ default-package-overrides:
- SHA ==1.6.4.4
- shake ==0.19.5
- shake-language-c ==0.12.0
- - shake-plus ==0.3.3.1
+ - shake-plus ==0.3.4.0
- shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25
- shared-memory ==0.2.0.0
@@ -2214,14 +2216,14 @@ default-package-overrides:
- squeather ==0.8.0.0
- srcloc ==0.6
- stache ==2.3.0
- - stack ==2.7.1
+ - stack ==2.7.3
- stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2
- stateref ==0.3
- StateVar ==1.2.1
- - static-text ==0.2.0.6
+ - static-text ==0.2.0.7
- statistics ==0.15.2.0
- - status-notifier-item ==0.3.0.5
+ - status-notifier-item ==0.3.1.0
- stb-image-redux ==0.2.1.3
- step-function ==0.2
- stm-chans ==3.0.0.4
@@ -2408,7 +2410,7 @@ default-package-overrides:
- th-test-utils ==1.1.0
- th-utilities ==0.2.4.3
- thyme ==0.3.5.5
- - tidal ==1.7.7
+ - tidal ==1.7.8
- tile ==0.3.0.0
- time-compat ==1.9.5
- timeit ==2.0
@@ -2519,7 +2521,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- - unliftio ==0.2.18
+ - unliftio ==0.2.19
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@@ -2625,7 +2627,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- - witch ==0.3.3.0
+ - witch ==0.3.4.0
- witherable ==0.4.1
- within ==0.2.0.1
- with-location ==0.1.0
@@ -2686,13 +2688,13 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.6.3.4
- yesod-bin ==1.6.1
- - yesod-core ==1.6.20.2
+ - yesod-core ==1.6.21.0
- yesod-fb ==0.6.1
- yesod-form ==1.7.0
- - yesod-gitrev ==0.2.1
+ - yesod-gitrev ==0.2.2
- yesod-markdown ==0.12.6.11
- yesod-newsfeed ==1.7.0.0
- - yesod-page-cursor ==2.0.0.8
+ - yesod-page-cursor ==2.0.0.9
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 3f5ee43b8db0..dbc93b59045b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -1837,6 +1837,7 @@ dont-distribute-packages:
- keid-geometry
- keid-render-basic
- keid-resource-gltf
+ - keid-sound-openal
- keid-ui-dearimgui
- kevin
- keysafe
@@ -2346,6 +2347,7 @@ dont-distribute-packages:
- polysemy-log-co
- polysemy-log-di
- polysemy-methodology
+ - polysemy-methodology-co-log
- polysemy-methodology-composite
- polysemy-mocks
- polysemy-optics
@@ -2355,6 +2357,7 @@ dont-distribute-packages:
- polysemy-readline
- polysemy-req
- polysemy-resume
+ - polysemy-several
- polysemy-socket
- polysemy-test
- polysemy-time
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f8556253d545..3ebdfe48fdd6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -11709,8 +11709,8 @@ self: {
}:
mkDerivation {
pname = "JuicyPixels-extra";
- version = "0.5.1";
- sha256 = "1kgb2l6ymhjr7wq93jpdhxy3k4i7jz0rz256phz10ycdpyvdbjpq";
+ version = "0.5.2";
+ sha256 = "11y4735bbp99wvi4fkpvkda7cj4c6iqp437drs27flicx2ygc687";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base JuicyPixels ];
testHaskellDepends = [ base hspec JuicyPixels ];
@@ -12818,7 +12818,7 @@ self: {
description = "an adapter for LogicGrowsOnTrees that uses MPI";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
- }) {openmpi = null;};
+ }) {inherit (pkgs) openmpi;};
"LogicGrowsOnTrees-network" = callPackage
({ mkDerivation, base, cereal, cmdtheline, composition, containers
@@ -19211,6 +19211,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "StateVar_1_2_2" = callPackage
+ ({ mkDerivation, base, stm, transformers }:
+ mkDerivation {
+ pname = "StateVar";
+ version = "1.2.2";
+ sha256 = "098q4lk60najzpbfal4bg4sh7izxm840aa5h4ycaamjn77d3jjsy";
+ libraryHaskellDepends = [ base stm transformers ];
+ description = "State variables";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"StateVar-transformer" = callPackage
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
@@ -20755,8 +20767,8 @@ self: {
({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
mkDerivation {
pname = "VulkanMemoryAllocator";
- version = "0.6.0.1";
- sha256 = "082i8jhx9s977j8dgn6v92h9nzkblcyw820jk87bg14w4lcgi91v";
+ version = "0.7";
+ sha256 = "0f7l91lds878s49yjq210sc49y6c6i3m3hys02902b64dqdgslpa";
libraryHaskellDepends = [
base bytestring transformers vector vulkan
];
@@ -21914,18 +21926,19 @@ self: {
({ mkDerivation, base, bytestring, Cabal, case-insensitive
, containers, deepseq, ghc-prim, hashable, hspec, hspec-discover
, HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances
- , scientific, tagged, template-haskell, time, unicode-collation
- , unordered-containers
+ , random, scientific, tagged, template-haskell, time
+ , unicode-collation, unordered-containers, uuid-types
}:
mkDerivation {
pname = "Z-Data";
- version = "1.0.0.1";
- sha256 = "1lhcmcjhr6p3ac50lpmppdvj80vx2wi8xjljd9s9mbiy5kf4pc63";
+ version = "1.1.0.0";
+ sha256 = "0zjgai814a4zbcyjrmfcy1kq97rds0pjsiz8lma1g8c0fhq2gy5c";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq ghc-prim
- hashable integer-gmp primitive QuickCheck scientific tagged
+ hashable integer-gmp primitive QuickCheck random scientific tagged
template-haskell time unicode-collation unordered-containers
+ uuid-types
];
testHaskellDepends = [
base containers hashable hspec HUnit integer-gmp primitive
@@ -32288,8 +32301,8 @@ self: {
}:
mkDerivation {
pname = "arch-hs";
- version = "0.9.0.0";
- sha256 = "09i5b4pdbc1x7977icq0m7amk59iy0822ki5dlhd7y74m2dmdf9z";
+ version = "0.9.1.0";
+ sha256 = "0k9xi2k4ifrnnh6p80pf1xhf45cbhrs1zdwy0ayp08p0ajdlh74b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41502,7 +41515,7 @@ self: {
license = "unknown";
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs) blas; liblapack = null;};
+ }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
"bindings-libcddb" = callPackage
({ mkDerivation, base, bindings-DSL, libcddb }:
@@ -49567,6 +49580,8 @@ self: {
pname = "cabal2nix";
version = "2.17.0";
sha256 = "0y91agkhgpzzaf9l7l1h7x516iryj8z2vk1in1h7pyjlxaiak6lm";
+ revision = "2";
+ editedCabalFile = "05lb28s4l4c1s6jv1zaqpm9mwx5r4gm113akzq9xr1w5447vw2c3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -50870,6 +50885,30 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "capability_0_5_0_0" = callPackage
+ ({ mkDerivation, base, constraints, containers, dlist, exceptions
+ , generic-lens, hspec, lens, monad-control, mtl, mutable-containers
+ , primitive, reflection, safe-exceptions, silently, streaming
+ , temporary, text, transformers, unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "capability";
+ version = "0.5.0.0";
+ sha256 = "116phv80mqs5jd3pv0ar29xfjcg8jf2c77fp530dk0k3da8v5d38";
+ libraryHaskellDepends = [
+ base constraints dlist exceptions generic-lens lens monad-control
+ mtl mutable-containers primitive reflection safe-exceptions
+ streaming transformers unliftio unliftio-core
+ ];
+ testHaskellDepends = [
+ base containers dlist hspec lens mtl silently streaming temporary
+ text unliftio
+ ];
+ description = "Extensional capabilities and deriving combinators";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"capataz" = callPackage
({ mkDerivation, async, base, bytestring, pretty-show
, prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck
@@ -55942,8 +55981,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks";
- version = "0.26.3";
- sha256 = "119hybfny3sriscgk8zjf56yfc36jxnzydkhb04wxfip9r84mn03";
+ version = "0.26.4";
+ sha256 = "0gvfplid34idkfg5s7dvcwg22ij3fryn82hz958z2960a4jb7ngv";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state aeson aeson-qq attoparsec base blaze-html bytestring
@@ -56163,8 +56202,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-theme-bootstrap";
- version = "0.4.2.4";
- sha256 = "0ay3rb6vfzvb43mwhjzgdf3cp7dcya0l9sl7msns0niak4xmnz1l";
+ version = "0.4.3";
+ sha256 = "01hs4rh89zp0y2gkfam27kdwywh5fqr10pzwf1d4c92kpnz9xd5d";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
@@ -59801,8 +59840,8 @@ self: {
}:
mkDerivation {
pname = "compdoc";
- version = "0.2.0.0";
- sha256 = "0cdgyvbx2xf7dgvg0h6k980yfh9vj7yg5vsg08i7cb8iik2w0k0m";
+ version = "0.3.0.0";
+ sha256 = "07gbs64r8qsxw4j0mlk7kldbdjjzz4v34pm8b5cj7a6r1l33w7k5";
libraryHaskellDepends = [
aeson base composite-aeson composite-aeson-throw composite-base
pandoc pandoc-throw path rio vinyl
@@ -59817,10 +59856,8 @@ self: {
}:
mkDerivation {
pname = "compdoc-dhall-decoder";
- version = "0.2.0.0";
- sha256 = "0iygbgcqcs3ixdnphhrp57s1ihpwnf9q59z7r74qqj7qx1yjrxig";
- revision = "1";
- editedCabalFile = "1g15qxkxfipvf6al3k8bdcvvcl1vyhjhg3r1w2z2g91ngz0b5y18";
+ version = "0.3.0.0";
+ sha256 = "0qsq67zj8gr9xlgcbxgn5fi1cyv4qf7w5vzfl3v4hvil7xf3fn77";
libraryHaskellDepends = [
base compdoc composite-aeson composite-base dhall either pandoc
text
@@ -60168,6 +60205,19 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "composite-dhall" = callPackage
+ ({ mkDerivation, base, composite-base, dhall, lens, text }:
+ mkDerivation {
+ pname = "composite-dhall";
+ version = "0.0.1.0";
+ sha256 = "1hhy3incp4j8n0c8jyk12qi9zgxmwqpvb08zhc8rql855g88rpfq";
+ revision = "2";
+ editedCabalFile = "16ki1iii379yn1qwxs76qfjm4wvkysdm15b60m24v1gz1vkxidhi";
+ libraryHaskellDepends = [ base composite-base dhall lens text ];
+ description = "Dhall instances for composite records";
+ license = lib.licenses.mit;
+ }) {};
+
"composite-ekg" = callPackage
({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl
}:
@@ -63376,6 +63426,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "contravariant_1_5_4" = callPackage
+ ({ mkDerivation, base, StateVar, transformers }:
+ mkDerivation {
+ pname = "contravariant";
+ version = "1.5.4";
+ sha256 = "19bwqkxvpgdfvjamk0g8wk1q4rfvbhxain6lx78ldhjmc7m5v9ql";
+ libraryHaskellDepends = [ base StateVar transformers ];
+ description = "Contravariant functors";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"contravariant-extras" = callPackage
({ mkDerivation, base, contravariant, template-haskell
, template-haskell-compat-v0208
@@ -64850,7 +64912,7 @@ self: {
license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {python3 = null;};
+ }) {inherit (pkgs) python3;};
"cql" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, Decimal
@@ -77452,6 +77514,26 @@ self: {
maintainers = with lib.maintainers; [ peti ];
}) {};
+ "distribution-nixpkgs_1_6_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+ , deepseq, hspec, language-nix, lens, pretty, process, split
+ }:
+ mkDerivation {
+ pname = "distribution-nixpkgs";
+ version = "1.6.0";
+ sha256 = "0m1kw3wy0n611487qhskldivrxmkh7m5bkzib44d8n0qfg5lv06i";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring Cabal containers deepseq language-nix lens
+ pretty process split
+ ];
+ testHaskellDepends = [ base deepseq hspec lens ];
+ description = "Types and functions to manipulate the Nixpkgs distribution";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = with lib.maintainers; [ peti ];
+ }) {};
+
"distribution-opensuse" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, containers
, deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class
@@ -77964,18 +78046,20 @@ self: {
({ mkDerivation, base, base16-bytestring, bytestring
, case-insensitive, conduit, conduit-extra, config-ini, containers
, cryptonite, exceptions, extra, filepath, generic-lens, hspec
- , http-client-tls, http-conduit, http-types, memory, microlens
- , mime-types, mtl, resourcet, text, time, transformers, xml-conduit
+ , http-api-data, http-client-tls, http-conduit, http-types, memory
+ , microlens, mime-types, mtl, resourcet, text, time, transformers
+ , unliftio, xml-conduit
}:
mkDerivation {
pname = "do-spaces";
- version = "0.1.0";
- sha256 = "1xj0n2pmmwkm4ss5gvsbvw8m545w4890a3hhk1ns1vbbm06zmvsi";
+ version = "0.2";
+ sha256 = "0nl3gj7jfamm4j8z16jxxl6xq3507p091zsvsa0gxmqiwkjqfc65";
libraryHaskellDepends = [
base base16-bytestring bytestring case-insensitive conduit
conduit-extra config-ini containers cryptonite exceptions extra
- filepath generic-lens http-client-tls http-conduit http-types
- memory microlens mime-types mtl text time transformers xml-conduit
+ filepath generic-lens http-api-data http-client-tls http-conduit
+ http-types memory microlens mime-types mtl text time transformers
+ unliftio xml-conduit
];
testHaskellDepends = [
base bytestring case-insensitive conduit conduit-extra containers
@@ -80924,8 +81008,8 @@ self: {
}:
mkDerivation {
pname = "dynamic-pipeline";
- version = "0.3.1.2";
- sha256 = "02dnji253nvszgma7yzn7ghkz7gy4a24qa54l0pbm3mnf9xmwn31";
+ version = "0.3.1.3";
+ sha256 = "01f98acd9hkqi5jbgm7zb69ci6gsf8rwlwddw6g5id2kvim557n8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -84570,6 +84654,8 @@ self: {
];
description = "Safe helpers for accessing and modifying environment variables";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"env-locale" = callPackage
@@ -102011,27 +102097,6 @@ self: {
}) {c = null;};
"ghc-prof" = callPackage
- ({ mkDerivation, attoparsec, base, containers, directory, filepath
- , process, scientific, tasty, tasty-hunit, temporary, text, time
- }:
- mkDerivation {
- pname = "ghc-prof";
- version = "1.4.1.8";
- sha256 = "02k6il0a6cdr5dvf5x6gpjyn9vzn43kahqdsq5lzjvw5c6l0462p";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base containers scientific text time
- ];
- testHaskellDepends = [
- attoparsec base containers directory filepath process tasty
- tasty-hunit temporary text
- ];
- description = "Library for parsing GHC time and allocation profiling reports";
- license = lib.licenses.bsd3;
- }) {};
-
- "ghc-prof_1_4_1_9" = callPackage
({ mkDerivation, attoparsec, base, containers, directory, filepath
, process, scientific, tasty, tasty-hunit, temporary, text, time
}:
@@ -102050,7 +102115,6 @@ self: {
];
description = "Library for parsing GHC time and allocation profiling reports";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"ghc-prof-aeson" = callPackage
@@ -102324,6 +102388,19 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "ghc-tcplugin-api" = callPackage
+ ({ mkDerivation, base, ghc, transformers }:
+ mkDerivation {
+ pname = "ghc-tcplugin-api";
+ version = "0.2.0.0";
+ sha256 = "0x58s2ip5p59vpx1x6lwdq46vxjfx6b28yzxjpd9pb148x787yfd";
+ libraryHaskellDepends = [ base ghc transformers ];
+ description = "An API for type-checker plugins";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"ghc-tcplugins-extra_0_3_2" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
@@ -103853,7 +103930,7 @@ self: {
license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {gtk-mac-integration-gtk3 = null;};
+ }) {inherit (pkgs) gtk-mac-integration-gtk3;};
"gi-gtksheet" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -105511,15 +105588,15 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "gitlab-haskell_0_3_0_1" = callPackage
+ "gitlab-haskell_0_3_0_2" = callPackage
({ mkDerivation, aeson, base, bytestring, connection, http-client
, http-conduit, http-types, tasty, tasty-hunit, temporary, text
, time, transformers, unix, unliftio, unliftio-core
}:
mkDerivation {
pname = "gitlab-haskell";
- version = "0.3.0.1";
- sha256 = "103wkbfnx8n5klaacqfl4vyg6rwszac04rpg7p7hka1m7jsrikwf";
+ version = "0.3.0.2";
+ sha256 = "0ndwff0rk1b7vkggymb0ca0h0hg69kym7npcckv2x2pnw55lb5yz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring connection http-client http-conduit
@@ -106410,8 +106487,8 @@ self: {
}:
mkDerivation {
pname = "gloss-export";
- version = "0.1.0.3";
- sha256 = "1m1fxv516kfqx4y684xcd1x0vvzirgv1acawiam5nm26hqvxcf85";
+ version = "0.1.0.4";
+ sha256 = "1mllkmb11cqgaw183jjxmivs8h1n8vbr31bqlw94v4vjm4r4ljzl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -112450,8 +112527,8 @@ self: {
}:
mkDerivation {
pname = "gtk-sni-tray";
- version = "0.1.6.2";
- sha256 = "1rcw57d5f0298y40ajmb2664ryrqsmcwbr2y1pk0sl2ggwr1zzsl";
+ version = "0.1.8.0";
+ sha256 = "0b8b8hvsv60zvnjidqm1qchxdgqdf5gcmm5pz8fvrvcjqq27b1xa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -112725,7 +112802,7 @@ self: {
license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {gtk-mac-integration-gtk3 = null;};
+ }) {inherit (pkgs) gtk-mac-integration-gtk3;};
"gtkglext" = callPackage
({ mkDerivation, base, Cabal, glib, gtk, gtk2, gtk2hs-buildtools
@@ -113515,7 +113592,7 @@ self: {
license = "GPL";
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs) blas; liblapack = null;};
+ }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
"hXmixer" = callPackage
({ mkDerivation, base, directory, gtk3, process, split, text }:
@@ -114072,48 +114149,7 @@ self: {
broken = true;
}) {};
- "hackage-db_2_1_0" = callPackage
- ({ mkDerivation, aeson, base, bytestring, Cabal, containers
- , directory, exceptions, filepath, tar, time, utf8-string
- }:
- mkDerivation {
- pname = "hackage-db";
- version = "2.1.0";
- sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l";
- revision = "1";
- editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring Cabal containers directory exceptions
- filepath tar time utf8-string
- ];
- description = "Access cabal-install's Hackage database via Data.Map";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- maintainers = with lib.maintainers; [ peti ];
- }) {};
-
"hackage-db" = callPackage
- ({ mkDerivation, aeson, base, bytestring, Cabal, containers
- , directory, exceptions, filepath, tar, time, utf8-string
- }:
- mkDerivation {
- pname = "hackage-db";
- version = "2.1.1";
- sha256 = "16y1iqb3y019hjdsq7q3zx51qy834ky3mw5vszqmzzhflqpicd31";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring Cabal containers directory exceptions
- filepath tar time utf8-string
- ];
- description = "Access cabal-install's Hackage database via Data.Map";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ peti ];
- }) {};
-
- "hackage-db_2_1_2" = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, containers
, directory, exceptions, filepath, tar, time, utf8-string
}:
@@ -114129,7 +114165,6 @@ self: {
];
description = "Access cabal-install's Hackage database via Data.Map";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -119483,7 +119518,7 @@ self: {
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {open-pal = null; open-rte = null; openmpi = null;};
+ }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
"haskell-names" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
@@ -121285,19 +121320,21 @@ self: {
"hasklepias" = callPackage
({ mkDerivation, aeson, base, bytestring, cmdargs, co-log
, containers, flow, ghc-prim, hspec, interval-algebra, lens
- , lens-aeson, mtl, process, QuickCheck, safe, tasty, tasty-hspec
- , tasty-hunit, text, time, unordered-containers, vector, witherable
+ , lens-aeson, mtl, nonempty-containers, process, QuickCheck, safe
+ , semiring-simple, tasty, tasty-hspec, tasty-hunit, text, time
+ , unordered-containers, vector, witherable
}:
mkDerivation {
pname = "hasklepias";
- version = "0.12.0";
- sha256 = "0zjlzd6c5plyi803vpx0f4js9b2zys8pd6ikbdya2ifmgxfwj2zh";
+ version = "0.13.1";
+ sha256 = "1fhlw490bwyblsgjrzgms4lzkv0zd8bhsvl2ywlpz0flhdd999zr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring cmdargs co-log containers flow ghc-prim
- interval-algebra lens lens-aeson mtl process QuickCheck safe tasty
- tasty-hunit text time unordered-containers vector witherable
+ interval-algebra lens lens-aeson mtl nonempty-containers process
+ QuickCheck safe semiring-simple tasty tasty-hunit text time
+ unordered-containers vector witherable
];
testHaskellDepends = [
aeson base bytestring containers flow hspec interval-algebra lens
@@ -121521,8 +121558,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.53.6";
- sha256 = "04f9aybim3nv5xhlcawcm9jgbf4ql8v3lqgw8yvk5snrzy30yf1f";
+ version = "0.53.8";
+ sha256 = "1djlq58v6wm3kr8jsvr612qxaxz1k03mfxvywd6ia45f761ry1ks";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121567,8 +121604,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store-data";
- version = "0.53.7";
- sha256 = "150nprl5i8v5api6h7svdwdskzjiy7ljrwmz3zfil1h05b2qz3l6";
+ version = "0.53.8";
+ sha256 = "06q9h1n9c8gz6fycc8nsjxp98c98zin1f7y7qiyy80cddhcj1jzf";
libraryHaskellDepends = [
aeson base binary bytes bytestring cereal containers data-default
deepseq hashable haskoin-core http-client http-types lens mtl
@@ -123686,7 +123723,7 @@ self: {
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs) blas; liblapack = null;};
+ }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
"hblock" = callPackage
({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal
@@ -124976,13 +125013,13 @@ self: {
, case-insensitive, conduit, conduit-extra, config-ini, containers
, exceptions, filepath, generic-lens, hashable, hspec
, http-api-data, http-client, http-client-tls, http-conduit
- , http-types, microlens, mtl, random, scientific, split, text, time
- , unliftio, unordered-containers, uri-bytestring
+ , http-types, microlens, microlens-ghc, mtl, random, scientific
+ , split, text, time, unliftio, unordered-containers, uri-bytestring
}:
mkDerivation {
pname = "heddit";
- version = "0.0.3";
- sha256 = "04kdhsxlna5l6h6wxyvxacxvmklhv19h5r802qac34gkpfvld851";
+ version = "0.2";
+ sha256 = "1hxshqw9s40yzpk0j4byqyvb3cqnfw2l3b2s4azbng77prvnmmd7";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -124990,8 +125027,9 @@ self: {
aeson aeson-casing base bytestring case-insensitive conduit
conduit-extra config-ini containers exceptions filepath
generic-lens hashable http-api-data http-client http-client-tls
- http-conduit http-types microlens mtl random scientific split text
- time unliftio unordered-containers uri-bytestring
+ http-conduit http-types microlens microlens-ghc mtl random
+ scientific split text time unliftio unordered-containers
+ uri-bytestring
];
testHaskellDepends = [
aeson base bytestring containers generic-lens hspec microlens
@@ -131190,7 +131228,7 @@ self: {
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {liblapack = null;};
+ }) {inherit (pkgs) liblapack;};
"hmatrix-csv" = callPackage
({ mkDerivation, base, bytestring, cassava, hmatrix, vector }:
@@ -131277,7 +131315,7 @@ self: {
benchmarkHaskellDepends = [ base criterion hmatrix ];
description = "Low-level machine learning auxiliary functions";
license = lib.licenses.bsd3;
- }) {inherit (pkgs) blas; liblapack = null;};
+ }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
"hmatrix-nipals" = callPackage
({ mkDerivation, base, hmatrix }:
@@ -135666,6 +135704,29 @@ self: {
broken = true;
}) {};
+ "hs-term-emulator" = callPackage
+ ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring
+ , containers, criterion, hspec, hspec-discover, lens, text, vector
+ }:
+ mkDerivation {
+ pname = "hs-term-emulator";
+ version = "0.1.0.0";
+ sha256 = "03aidqaw9pmwggd1w8ir6qhb08hlhv0q5gnl0hqa5zjj86dd0rp2";
+ libraryHaskellDepends = [
+ ansi-terminal attoparsec base bytestring containers lens text
+ vector
+ ];
+ testHaskellDepends = [
+ ansi-terminal attoparsec base hspec text vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Terminal Emulator written in 100% Haskell";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"hs-twitter" = callPackage
({ mkDerivation, base, HTTP, json, mime, network, old-locale
, old-time, random, utf8-string
@@ -137246,7 +137307,8 @@ self: {
libraryPkgconfigDepends = [ gsl ];
description = "Signal processing and EEG data analysis";
license = lib.licenses.bsd3;
- }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;};
+ }) {inherit (pkgs) blas; inherit (pkgs) gsl;
+ inherit (pkgs) liblapack;};
"hsilop" = callPackage
({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir
@@ -142418,8 +142480,8 @@ self: {
}:
mkDerivation {
pname = "hurl";
- version = "2.1.0.1";
- sha256 = "16j7kxxp60i0nbiscc1x5a14s7n8qyv8rzjm6a03pqdpbmfzrrwq";
+ version = "2.1.1.0";
+ sha256 = "0hlkqgbk8siycz055lqn01qgn8npgqyq59br2yvpbk4rz7jzjmfa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148238,22 +148300,6 @@ self: {
}) {};
"input-parsers" = callPackage
- ({ mkDerivation, attoparsec, base, binary, bytestring
- , monoid-subclasses, parsec, parsers, text, transformers
- }:
- mkDerivation {
- pname = "input-parsers";
- version = "0.2.2";
- sha256 = "1kb70nxg8bji7bd0y0w81bqyhx62xrbv3y2vib6sp3jkz7yriarz";
- libraryHaskellDepends = [
- attoparsec base binary bytestring monoid-subclasses parsec parsers
- text transformers
- ];
- description = "Extension of the parsers library with more capability and efficiency";
- license = lib.licenses.bsd3;
- }) {};
-
- "input-parsers_0_2_3" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring
, monoid-subclasses, parsec, parsers, text, transformers
}:
@@ -148267,7 +148313,6 @@ self: {
];
description = "Extension of the parsers library with more capability and efficiency";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"inquire" = callPackage
@@ -153452,7 +153497,7 @@ self: {
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {python = null;};
+ }) {inherit (pkgs) python;};
"json-qq" = callPackage
({ mkDerivation, base, haskell-src-meta, parsec, template-haskell
@@ -155994,6 +156039,22 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "keid-sound-openal" = callPackage
+ ({ mkDerivation, base, geomancy, keid-core, OpenAL, opusfile
+ , resourcet, rio, unliftio
+ }:
+ mkDerivation {
+ pname = "keid-sound-openal";
+ version = "0.1.0.0";
+ sha256 = "17ml9xh8qrvyrcsi1ai6br286bf9c6j29wbmp5sp65spp2kwlyng";
+ libraryHaskellDepends = [
+ base geomancy keid-core OpenAL opusfile resourcet rio unliftio
+ ];
+ description = "OpenAL sound system for Keid engine";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"keid-ui-dearimgui" = callPackage
({ mkDerivation, base, binary, bytestring, cryptohash-md5
, dear-imgui, derive-storable, derive-storable-plugin, foldl
@@ -157010,36 +157071,6 @@ self: {
}) {};
"krank" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, hspec
- , hspec-expectations, http-client, http-types, lifted-async, mtl
- , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req
- , safe-exceptions, text, unordered-containers
- }:
- mkDerivation {
- pname = "krank";
- version = "0.2.2";
- sha256 = "10w6vbpcn9n07s99w02izg7nfizpbq5m5mg6zv46f1llm35jpv6w";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring containers http-client http-types
- lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions
- text unordered-containers
- ];
- executableHaskellDepends = [
- base containers mtl optparse-applicative pcre-heavy pretty-terminal
- PyF text
- ];
- testHaskellDepends = [
- aeson base bytestring containers hspec hspec-expectations
- http-client http-types lifted-async mtl pcre-heavy pretty-terminal
- PyF req safe-exceptions text unordered-containers
- ];
- description = "Krank checks your code source comments for important markers";
- license = lib.licenses.bsd3;
- }) {};
-
- "krank_0_2_3" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec
, hspec-expectations, http-client, http-types, lifted-async, mtl
, optparse-applicative, pcre-heavy, pretty-terminal, process, PyF
@@ -157067,7 +157098,6 @@ self: {
];
description = "Krank checks issue tracker link status in your source code";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"krapsh" = callPackage
@@ -159861,7 +159891,7 @@ self: {
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {liblapack = null;};
+ }) {inherit (pkgs) liblapack;};
"lapack-ffi-tools" = callPackage
({ mkDerivation, base, bytestring, cassava, containers
@@ -163420,8 +163450,8 @@ self: {
}:
mkDerivation {
pname = "lifted-async";
- version = "0.10.2";
- sha256 = "0alhvrvxp4f4srllyq5br3waiba4c93cc4nxm7jd23440swr6a31";
+ version = "0.10.2.1";
+ sha256 = "0j4f5471qfxkxy84ri87bcvp30ikh4m30imcggwn8m5v8igp218d";
libraryHaskellDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -179135,25 +179165,6 @@ self: {
}) {};
"monoid-subclasses" = callPackage
- ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
- , quickcheck-instances, tasty, tasty-quickcheck, text, vector
- }:
- mkDerivation {
- pname = "monoid-subclasses";
- version = "1.1";
- sha256 = "1bv0ripdw53121aj39zalczkfwrajpzzd1i99jn49sr4bfwgy3p4";
- libraryHaskellDepends = [
- base bytestring containers primes text vector
- ];
- testHaskellDepends = [
- base bytestring containers primes QuickCheck quickcheck-instances
- tasty tasty-quickcheck text vector
- ];
- description = "Subclasses of Monoid";
- license = lib.licenses.bsd3;
- }) {};
-
- "monoid-subclasses_1_1_1" = callPackage
({ mkDerivation, base, bytestring, containers, primes, QuickCheck
, quickcheck-instances, tasty, tasty-quickcheck, text, vector
}:
@@ -179170,7 +179181,6 @@ self: {
];
description = "Subclasses of Monoid";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"monoid-transformer" = callPackage
@@ -189103,33 +189113,6 @@ self: {
}) {};
"nri-prelude" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base
- , bytestring, containers, directory, exceptions, filepath, ghc
- , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text
- , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text
- , time, vector
- }:
- mkDerivation {
- pname = "nri-prelude";
- version = "0.6.0.2";
- sha256 = "002bq6qwaiw4v30b677hg8pv2sa9iaqdv90h02fbq4pkhqsqhpkw";
- libraryHaskellDepends = [
- aeson aeson-pretty async auto-update base bytestring containers
- directory exceptions filepath ghc hedgehog junit-xml pretty-diff
- pretty-show safe-coloured-text safe-coloured-text-terminfo
- safe-exceptions terminal-size text time vector
- ];
- testHaskellDepends = [
- aeson aeson-pretty async auto-update base bytestring containers
- directory exceptions filepath ghc hedgehog junit-xml pretty-diff
- pretty-show safe-coloured-text safe-coloured-text-terminfo
- safe-exceptions terminal-size text time vector
- ];
- description = "A Prelude inspired by the Elm programming language";
- license = lib.licenses.bsd3;
- }) {};
-
- "nri-prelude_0_6_0_3" = callPackage
({ mkDerivation, aeson, aeson-pretty, async, auto-update, base
, bytestring, containers, directory, exceptions, filepath, ghc
, hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text
@@ -189154,7 +189137,6 @@ self: {
];
description = "A Prelude inspired by the Elm programming language";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"nri-redis" = callPackage
@@ -195112,7 +195094,7 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
- }) {pam = null;};
+ }) {inherit (pkgs) pam;};
"pan-os-syslog" = callPackage
({ mkDerivation, base, byteslice, bytesmith, chronos, gauge, ip
@@ -195832,8 +195814,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.4.3";
- sha256 = "1z40rjmcbs7d0f9aksgdm2w4l3jyglgm5iap4z110mfkmrvwrlfx";
+ version = "0.4.4";
+ sha256 = "17kwyqwywnj694b30bs3da4pns73jp7pr2jxpc7zy261gmfqvpyz";
description = "A box of patterns and paradigms";
license = lib.licenses.mit;
}) {};
@@ -197522,10 +197504,8 @@ self: {
}:
mkDerivation {
pname = "parsley-core";
- version = "1.3.0.0";
- sha256 = "0qx5q7a9hkj9swpwlxh24c19pf9i6yvlmp44xiwshflz4cf1n8dq";
- revision = "1";
- editedCabalFile = "03a4l7ai39kii4qdxv78wgknj3iz2n2g2055rk3mi0wsiy280jfg";
+ version = "1.4.0.0";
+ sha256 = "1w9pilgaajaycxr0nvjwdzk5fjf7pg4spnwh2197gbpqhbkj75q3";
libraryHaskellDepends = [
array base bytestring containers dependent-map dependent-sum
ghc-prim hashable mtl pretty-terminal template-haskell text
@@ -200256,8 +200236,8 @@ self: {
}:
mkDerivation {
pname = "persistent-documentation";
- version = "0.1.0.3";
- sha256 = "03p3ppjrn9j76bwgq7n921c2h0xkzsf9ish6nx6bhxdggyq3bfwy";
+ version = "0.1.0.4";
+ sha256 = "0ib56hz4q83knw6lqdbfcflnpwd0x8381p67yibmnbyn9p5b6r1q";
libraryHaskellDepends = [
base containers mtl persistent template-haskell text
];
@@ -201577,19 +201557,19 @@ self: {
"phonetic-languages-phonetics-basics" = callPackage
({ mkDerivation, base, foldable-ix, lists-flines, mmsyn2-array
- , mmsyn5
+ , mmsyn3, mmsyn5
}:
mkDerivation {
pname = "phonetic-languages-phonetics-basics";
- version = "0.7.0.0";
- sha256 = "16a8b5xpdrayfh03czs0nb1xz6kn95rr4k4dim5viqjxpc9f0zbn";
+ version = "0.8.1.0";
+ sha256 = "1y67w8ywcmv8d86b52vhiqxsgk31pglf8hcjnmml2q5kh8cpjwmp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base foldable-ix lists-flines mmsyn2-array mmsyn5
+ base foldable-ix lists-flines mmsyn2-array mmsyn3 mmsyn5
];
executableHaskellDepends = [
- base foldable-ix lists-flines mmsyn2-array mmsyn5
+ base foldable-ix lists-flines mmsyn2-array mmsyn3 mmsyn5
];
description = "A library for working with generalized phonetic languages usage";
license = lib.licenses.mit;
@@ -201687,8 +201667,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-examples-array";
- version = "0.5.0.0";
- sha256 = "0p7zsk9d6p4srjr0vk18r454p72v49kjpdh7hk3iwh9vh9mbjrbx";
+ version = "0.5.0.1";
+ sha256 = "0wrh3bmwa6l5vfjv481wvnqqd82xgm27vcbm9xg1nm7psihj6gqj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201749,8 +201729,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-generalized-examples-array";
- version = "0.4.2.1";
- sha256 = "1h95v0vspx9dziqnki4553b7sblpq33l9h3a86xwim0rv7mpqsjs";
+ version = "0.5.0.1";
+ sha256 = "0gif3xwcbc5v4qjyhn1qwyj36jkqj7rdrq35fzxsr7xbmjcw13h2";
libraryHaskellDepends = [
base heaps mmsyn2-array mmsyn3 parallel
phonetic-languages-constraints-array
@@ -201788,8 +201768,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-generalized-properties-array";
- version = "0.2.0.0";
- sha256 = "1k1id4dz0siz3qqax738k4k2dfj68slph4yy8ad6f4r9fink9jqr";
+ version = "0.3.0.0";
+ sha256 = "192i7dr6kpzrclvym1y1j3zgabcx3fldaan07rgxhhys3k7gbqxa";
libraryHaskellDepends = [
base phonetic-languages-phonetics-basics
phonetic-languages-rhythmicity phonetic-languages-simplified-base
@@ -201905,8 +201885,8 @@ self: {
({ mkDerivation, base, mmsyn2-array, mmsyn5 }:
mkDerivation {
pname = "phonetic-languages-ukrainian-array";
- version = "0.1.0.0";
- sha256 = "0h88qcdkckgn5cjyjiwvdxci8p04h12xr6jj5pjp4wzqyp6a5wcf";
+ version = "0.2.1.0";
+ sha256 = "17gyg64hwk5cj9drpdsadyn3l94g2n6m859ghfplr665id2pgzlg";
libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ];
description = "Prepares Ukrainian text to be used as a phonetic language text";
license = lib.licenses.mit;
@@ -205582,6 +205562,19 @@ self: {
broken = true;
}) {};
+ "polynomial-algebra" = callPackage
+ ({ mkDerivation, array, base, compact-word-vectors, containers }:
+ mkDerivation {
+ pname = "polynomial-algebra";
+ version = "0.1";
+ sha256 = "03133j7hknn0d6b6lvq0q05zy6m92lx5wh68chimgm45xh2p8y0a";
+ libraryHaskellDepends = [
+ array base compact-word-vectors containers
+ ];
+ description = "Multivariate polynomial rings";
+ license = lib.licenses.bsd3;
+ }) {};
+
"polynomials-bernstein" = callPackage
({ mkDerivation, base, vector }:
mkDerivation {
@@ -205938,21 +205931,37 @@ self: {
}) {};
"polysemy-methodology" = callPackage
- ({ mkDerivation, base, co-log-polysemy, polysemy, polysemy-plugin
- , polysemy-zoo
+ ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-plugin
+ , polysemy-several
}:
mkDerivation {
pname = "polysemy-methodology";
- version = "0.1.8.0";
- sha256 = "0p4h6vjrq6g6pd27mqpzp33jg84gfi3wpymjkbxfrwz7ky74jag5";
+ version = "0.2.0.0";
+ sha256 = "0cfd0xqcx8b5zrl5my03zx1h1mxqkdyrhn1nba453mk3lnvynwmw";
libraryHaskellDepends = [
- base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
+ base polysemy polysemy-kvstore polysemy-plugin polysemy-several
];
description = "Domain modelling algebra for polysemy";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
+ "polysemy-methodology-co-log" = callPackage
+ ({ mkDerivation, base, co-log-polysemy, polysemy
+ , polysemy-methodology, polysemy-plugin
+ }:
+ mkDerivation {
+ pname = "polysemy-methodology-co-log";
+ version = "0.1.0.0";
+ sha256 = "1pvvb83lkpxqni6055y3s0ckjg50nd1jfivq1c8701zjv31ylbpa";
+ libraryHaskellDepends = [
+ base co-log-polysemy polysemy polysemy-methodology polysemy-plugin
+ ];
+ description = "Logging functions for polysemy-methodology";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"polysemy-methodology-composite" = callPackage
({ mkDerivation, base, composite-base, polysemy, polysemy-extra
, polysemy-methodology, polysemy-vinyl, vinyl
@@ -205999,16 +206008,12 @@ self: {
}) {};
"polysemy-path" = callPackage
- ({ mkDerivation, base, path, polysemy, polysemy-extra
- , polysemy-plugin
- }:
+ ({ mkDerivation, base, path, polysemy, polysemy-extra }:
mkDerivation {
pname = "polysemy-path";
- version = "0.2.0.0";
- sha256 = "0p5ylp8758zkhlgqrhq6v6fli03q9gmak7bzkw1czrxwdshkv0gi";
- libraryHaskellDepends = [
- base path polysemy polysemy-extra polysemy-plugin
- ];
+ version = "0.2.1.0";
+ sha256 = "0smaai432vpqci9w7pyg443kcd1rpz7zpwww2wcxbyqszzllbhnr";
+ libraryHaskellDepends = [ base path polysemy polysemy-extra ];
description = "Polysemy versions of Path functions";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -206111,6 +206116,18 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "polysemy-several" = callPackage
+ ({ mkDerivation, base, polysemy }:
+ mkDerivation {
+ pname = "polysemy-several";
+ version = "0.1.0.0";
+ sha256 = "1mw6a6fz3879yqnpq6h0221i8b8f05j90b1zydhzr57nsbklxzps";
+ libraryHaskellDepends = [ base polysemy ];
+ description = "Run several effects at once, taken from the polysemy-zoo";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"polysemy-socket" = callPackage
({ mkDerivation, base, bytestring, polysemy, polysemy-plugin
, socket
@@ -206184,6 +206201,8 @@ self: {
pname = "polysemy-uncontrolled";
version = "0.1.0.0";
sha256 = "137zw5366c4h7q8w7cj7h4wc4njf1n2f7kabyrl6bqav1fjb96lx";
+ revision = "1";
+ editedCabalFile = "1wadnvrazf6z10k5s86749zadymmw2j45amak286706qfh4zwjd1";
libraryHaskellDepends = [
base polysemy polysemy-methodology polysemy-plugin
];
@@ -206212,12 +206231,16 @@ self: {
}) {};
"polysemy-vinyl" = callPackage
- ({ mkDerivation, base, polysemy, polysemy-extra, vinyl }:
+ ({ mkDerivation, base, polysemy, polysemy-extra, polysemy-several
+ , vinyl
+ }:
mkDerivation {
pname = "polysemy-vinyl";
- version = "0.1.4.0";
- sha256 = "1545a125bfgi5314dxhak5dnx9h5kwanzgbp1f88f96hlxik1rjh";
- libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ];
+ version = "0.1.5.0";
+ sha256 = "06y91nv2fcis058gqv5hlpl5a6kmia5r9sc6npp6102lc19vkkc4";
+ libraryHaskellDepends = [
+ base polysemy polysemy-extra polysemy-several vinyl
+ ];
description = "Functions for mapping vinyl records in polysemy";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -210528,14 +210551,14 @@ self: {
license = lib.licenses.mit;
}) {};
- "process_1_6_12_0" = callPackage
+ "process_1_6_13_1" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
, unix
}:
mkDerivation {
pname = "process";
- version = "1.6.12.0";
- sha256 = "1zw551zrnq70ip9dsc564aw1zf90l48jf59rxhjgx4d00ngs165x";
+ version = "1.6.13.1";
+ sha256 = "1fkaapar94w5prsvdpyybqb0j4hyjhf68czdlr5psb42i314lnj7";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
@@ -210774,17 +210797,17 @@ self: {
}) {};
"procex" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, unix
- , utf8-string
+ ({ mkDerivation, async, base, bytestring, containers, deepseq
+ , hspec, unix, utf8-string
}:
mkDerivation {
pname = "procex";
- version = "0.1.0.0";
- sha256 = "08pd4v8jxhfy6i9vry0hlssqhlzx1wmi64kmhb0qwxagrj3r6dsx";
+ version = "0.2.2";
+ sha256 = "0gnrpk3n8127wc92m3qrq0hka6p56pxjrmgafxgb0w03mlvwc89q";
libraryHaskellDepends = [
- async base bytestring containers unix utf8-string
+ async base bytestring containers deepseq unix utf8-string
];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [ async base bytestring hspec unix ];
description = "Ergonomic process launching with extreme flexibility and speed";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
@@ -212209,31 +212232,6 @@ self: {
}) {};
"protobuf-simple" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers
- , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
- , QuickCheck, quickcheck-instances, split, text
- }:
- mkDerivation {
- pname = "protobuf-simple";
- version = "0.1.1.0";
- sha256 = "1i6dmf9nppjk2xd2s91bmbnb9r915h5ypq5923jpralry2ax6ach";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base binary bytestring containers data-binary-ieee754 mtl text
- ];
- executableHaskellDepends = [
- base containers directory filepath mtl parsec split text
- ];
- testHaskellDepends = [
- base binary bytestring containers data-binary-ieee754 filepath
- hspec parsec QuickCheck quickcheck-instances split text
- ];
- description = "Simple Protocol Buffers library (proto2)";
- license = lib.licenses.mit;
- }) {};
-
- "protobuf-simple_0_1_1_1" = callPackage
({ mkDerivation, base, binary, bytestring, containers
, data-binary-ieee754, directory, filepath, hspec, mtl, parsec
, QuickCheck, quickcheck-instances, split, text
@@ -212256,7 +212254,6 @@ self: {
];
description = "Simple Protocol Buffers library (proto2)";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"protocol" = callPackage
@@ -212487,8 +212484,8 @@ self: {
}:
mkDerivation {
pname = "provenience";
- version = "0.1.2.1";
- sha256 = "15ghl4zdf4hz27kkfky4m405abmarzr8j7fqi07ax7mswwwha9f1";
+ version = "0.1.2.2";
+ sha256 = "1glilqib6bs1kbb0yyrzqxbsijrcrdm9q3cgmymgacc7kllc616n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -214024,7 +214021,7 @@ self: {
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {python = null;};
+ }) {inherit (pkgs) python;};
"pyfi" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, pureMD5
@@ -214042,7 +214039,7 @@ self: {
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {python = null;};
+ }) {inherit (pkgs) python;};
"python-pickle" = callPackage
({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs
@@ -217177,27 +217174,6 @@ self: {
}) {};
"rank2classes" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
- , markdown-unlit, tasty, tasty-hunit, template-haskell
- , transformers
- }:
- mkDerivation {
- pname = "rank2classes";
- version = "1.4.1";
- sha256 = "1cmc7xqnvjdvzgfyz7i3nmnhdm92rwfc9bqlpjcirmnkn47va4kb";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base distributive template-haskell transformers
- ];
- testHaskellDepends = [
- base distributive doctest tasty tasty-hunit
- ];
- testToolDepends = [ markdown-unlit ];
- description = "standard type constructor class hierarchy, only with methods of rank 2 types";
- license = lib.licenses.bsd3;
- }) {};
-
- "rank2classes_1_4_2" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
, markdown-unlit, tasty, tasty-hunit, template-haskell
, transformers
@@ -217216,7 +217192,6 @@ self: {
testToolDepends = [ markdown-unlit ];
description = "standard type constructor class hierarchy, only with methods of rank 2 types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"rapid" = callPackage
@@ -219466,7 +219441,7 @@ self: {
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {raptor2 = null; redland = null;};
+ }) {raptor2 = null; inherit (pkgs) redland;};
"redo" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
@@ -221105,21 +221080,6 @@ self: {
}) {};
"regex-posix" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, regex-base }:
- mkDerivation {
- pname = "regex-posix";
- version = "0.96.0.0";
- sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5";
- revision = "2";
- editedCabalFile = "10al5qljh6pc46581nkhrs0rjn8w05pp6jb4v55lgfr17ac0z1xx";
- libraryHaskellDepends = [
- array base bytestring containers regex-base
- ];
- description = "POSIX Backend for \"Text.Regex\" (regex-base)";
- license = lib.licenses.bsd3;
- }) {};
-
- "regex-posix_0_96_0_1" = callPackage
({ mkDerivation, array, base, bytestring, containers, regex-base }:
mkDerivation {
pname = "regex-posix";
@@ -221130,7 +221090,6 @@ self: {
];
description = "POSIX Backend for \"Text.Regex\" (regex-base)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"regex-posix-clib" = callPackage
@@ -221882,30 +221841,6 @@ self: {
}) {};
"relational-query" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, dlist
- , names-th, persistable-record, product-isomorphic
- , quickcheck-simple, sql-words, template-haskell, text
- , th-constraint-compat, th-reify-compat, time, time-locale-compat
- , transformers
- }:
- mkDerivation {
- pname = "relational-query";
- version = "0.12.2.3";
- sha256 = "0zjqk0gkzdhg1l8rw0bz7iwvp55p585xaqp8dc3sbbr0abhmsgi5";
- libraryHaskellDepends = [
- array base bytestring containers dlist names-th persistable-record
- product-isomorphic sql-words template-haskell text
- th-constraint-compat th-reify-compat time time-locale-compat
- transformers
- ];
- testHaskellDepends = [
- base containers product-isomorphic quickcheck-simple transformers
- ];
- description = "Typeful, Modular, Relational, algebraic query engine";
- license = lib.licenses.bsd3;
- }) {};
-
- "relational-query_0_12_3_0" = callPackage
({ mkDerivation, array, base, bytestring, containers, dlist
, names-th, persistable-record, product-isomorphic
, quickcheck-simple, sql-words, template-haskell, text
@@ -221928,7 +221863,6 @@ self: {
];
description = "Typeful, Modular, Relational, algebraic query engine";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"relational-query-HDBC" = callPackage
@@ -223226,13 +223160,13 @@ self: {
"require" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, criterion
- , directory, dlist, megaparsec, mtl, optparse-generic, relude
- , tasty, tasty-hspec, text
+ , directory, dlist, hspec, megaparsec, mtl, optparse-generic
+ , relude, tasty, tasty-hspec, text
}:
mkDerivation {
pname = "require";
- version = "0.4.10";
- sha256 = "0ha9301ncb5li3sxjlbbq5hgjijr40vl5jy33fsi0wn13zp99x94";
+ version = "0.4.11";
+ sha256 = "17nfpzwhwxnl6jmqnh2rf52mki3mh44y24w7masscbnadxnfp98a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -223244,7 +223178,7 @@ self: {
optparse-generic relude text
];
testHaskellDepends = [
- ansi-terminal base bytestring directory dlist megaparsec mtl
+ ansi-terminal base bytestring directory dlist hspec megaparsec mtl
optparse-generic relude tasty tasty-hspec text
];
benchmarkHaskellDepends = [
@@ -228801,49 +228735,6 @@ self: {
}) {};
"sandwich-webdriver" = callPackage
- ({ mkDerivation, aeson, base, containers, convertible, data-default
- , directory, exceptions, filepath, http-client, http-client-tls
- , http-conduit, lifted-base, microlens, microlens-aeson
- , monad-control, monad-logger, mtl, network, process, random, retry
- , safe, safe-exceptions, sandwich, string-interpolate, temporary
- , text, time, transformers, unix, unordered-containers, vector
- , webdriver, X11
- }:
- mkDerivation {
- pname = "sandwich-webdriver";
- version = "0.1.0.5";
- sha256 = "113as1i4f3hghbwrf4ii8lnxxb8nih177ffjbx3shsddnhx0fa8y";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base containers convertible data-default directory exceptions
- filepath http-client http-client-tls http-conduit lifted-base
- microlens microlens-aeson monad-control monad-logger mtl network
- process random retry safe safe-exceptions sandwich
- string-interpolate temporary text time transformers unix
- unordered-containers vector webdriver X11
- ];
- executableHaskellDepends = [
- aeson base containers convertible data-default directory exceptions
- filepath http-client http-client-tls http-conduit lifted-base
- microlens microlens-aeson monad-control monad-logger mtl network
- process random retry safe safe-exceptions sandwich
- string-interpolate temporary text time transformers unix
- unordered-containers vector webdriver X11
- ];
- testHaskellDepends = [
- aeson base containers convertible data-default directory exceptions
- filepath http-client http-client-tls http-conduit lifted-base
- microlens microlens-aeson monad-control monad-logger mtl network
- process random retry safe safe-exceptions sandwich
- string-interpolate temporary text time transformers unix
- unordered-containers vector webdriver X11
- ];
- description = "Sandwich integration with Selenium WebDriver";
- license = lib.licenses.bsd3;
- }) {};
-
- "sandwich-webdriver_0_1_0_6" = callPackage
({ mkDerivation, aeson, base, containers, data-default, directory
, exceptions, filepath, http-client, http-client-tls, http-conduit
, lifted-base, microlens, microlens-aeson, monad-control
@@ -228884,7 +228775,6 @@ self: {
];
description = "Sandwich integration with Selenium WebDriver";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"sarasvati" = callPackage
@@ -235531,19 +235421,19 @@ self: {
}) {};
"servant-util" = callPackage
- ({ mkDerivation, aeson, autoexporter, base, containers
- , data-default, fmt, hspec, hspec-discover, hspec-expectations
- , http-client, http-types, insert-ordered-containers, lens
- , megaparsec, mtl, pretty-terminal, QuickCheck, reflection
- , regex-posix, safe-exceptions, servant, servant-client
- , servant-client-core, servant-server, servant-swagger
- , servant-swagger-ui, servant-swagger-ui-core, swagger2, text
- , text-format, time, universum, wai, wai-extra, warp
+ ({ mkDerivation, aeson, base, containers, data-default, fmt, hspec
+ , hspec-discover, hspec-expectations, http-client, http-types
+ , insert-ordered-containers, lens, megaparsec, mtl, pretty-terminal
+ , QuickCheck, reflection, regex-posix, safe-exceptions, servant
+ , servant-client, servant-client-core, servant-server
+ , servant-swagger, servant-swagger-ui, servant-swagger-ui-core
+ , swagger2, text, text-format, time, universum, wai, wai-extra
+ , warp
}:
mkDerivation {
pname = "servant-util";
- version = "0.1.0.1";
- sha256 = "0idb3h2482hhrj9yvphdb74wxyr2y3rzfql2q2qn2a724b1bmax4";
+ version = "0.1.0.2";
+ sha256 = "1l0pwwz8y4qwnpn30w3mla3j3dmbyv99kilbb8z283iwpnbgrn2w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -235554,7 +235444,6 @@ self: {
servant-swagger-ui servant-swagger-ui-core swagger2 text
text-format time universum wai
];
- libraryToolDepends = [ autoexporter ];
executableHaskellDepends = [
aeson base containers data-default fmt http-types
insert-ordered-containers lens megaparsec mtl pretty-terminal
@@ -235578,22 +235467,21 @@ self: {
}) {};
"servant-util-beam-pg" = callPackage
- ({ mkDerivation, autoexporter, base, beam-core, beam-postgres
- , containers, hspec, hspec-discover, QuickCheck, servant
- , servant-client, servant-client-core, servant-server, servant-util
- , text, universum
+ ({ mkDerivation, base, beam-core, beam-postgres, containers, hspec
+ , hspec-discover, QuickCheck, servant, servant-client
+ , servant-client-core, servant-server, servant-util, text
+ , universum
}:
mkDerivation {
pname = "servant-util-beam-pg";
- version = "0.1.0.1";
- sha256 = "1qhs2bvlka3qm4kv64m5p5ldcd9nfgzs0za9vqy2z9fmdhzihxz1";
+ version = "0.1.0.2";
+ sha256 = "048ybnlkhp7dabki4r3k6q147cdm3w3l14c57rrf1n1vf4rwkgn2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base beam-core beam-postgres containers servant servant-client
servant-client-core servant-server servant-util text universum
];
- libraryToolDepends = [ autoexporter ];
executableHaskellDepends = [
base beam-core beam-postgres containers servant servant-client
servant-client-core servant-server servant-util text universum
@@ -237147,17 +237035,6 @@ self: {
}) {};
"shake-plus" = callPackage
- ({ mkDerivation, base, extra, path, rio, shake }:
- mkDerivation {
- pname = "shake-plus";
- version = "0.3.3.1";
- sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5";
- libraryHaskellDepends = [ base extra path rio shake ];
- description = "Re-export of Shake using well-typed paths and ReaderT";
- license = lib.licenses.mit;
- }) {};
-
- "shake-plus_0_3_4_0" = callPackage
({ mkDerivation, base, extra, path, rio, shake }:
mkDerivation {
pname = "shake-plus";
@@ -237166,7 +237043,6 @@ self: {
libraryHaskellDepends = [ base extra path rio shake ];
description = "Re-export of Shake using well-typed paths and ReaderT";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"shake-plus-extended" = callPackage
@@ -239231,8 +239107,8 @@ self: {
({ mkDerivation, base, formatting, simple-media-timestamp }:
mkDerivation {
pname = "simple-media-timestamp-formatting";
- version = "0.1.0.0";
- sha256 = "05km174zc9as8aa4l18fgwnjl19068kqr1chvmnn7r3b8ms00z57";
+ version = "0.1.1.0";
+ sha256 = "1fkjplpkv1jxcadhc596rv7jzbgn2f1xnmwdfa68wls3hl0h7s70";
libraryHaskellDepends = [ base formatting simple-media-timestamp ];
description = "Formatting for simple-media-timestamp";
license = lib.licenses.mit;
@@ -239312,8 +239188,8 @@ self: {
}:
mkDerivation {
pname = "simple-parser";
- version = "0.8.0";
- sha256 = "0k2sj1n42kkfvr0g8sdhz5vasv0h38hgs04r8fjy5gpxmrzni472";
+ version = "0.8.2";
+ sha256 = "15nxh0byl0893gzsakb80asam8dr4lqxqnlj372cdjgqvrzcxrap";
libraryHaskellDepends = [
base bytestring containers errata list-t mmorph mtl
nonempty-containers scientific text text-builder
@@ -246591,6 +246467,40 @@ self: {
license = lib.licenses.mit;
}) {};
+ "srt-dhall" = callPackage
+ ({ mkDerivation, attoparsec, base, dhall, either, formatting
+ , simple-media-timestamp, simple-media-timestamp-formatting, srt
+ , srt-attoparsec, srt-formatting, text
+ }:
+ mkDerivation {
+ pname = "srt-dhall";
+ version = "0.1.0.0";
+ sha256 = "16ygxiqb9d0js3gr4823fdkk8pzsairby6iywnvsafas1qvhm0yp";
+ libraryHaskellDepends = [
+ attoparsec base dhall either formatting simple-media-timestamp
+ simple-media-timestamp-formatting srt srt-attoparsec srt-formatting
+ text
+ ];
+ description = "Dhall Encoder/Decoder for SRT";
+ license = lib.licenses.mit;
+ }) {};
+
+ "srt-formatting" = callPackage
+ ({ mkDerivation, base, formatting, simple-media-timestamp
+ , simple-media-timestamp-formatting, srt
+ }:
+ mkDerivation {
+ pname = "srt-formatting";
+ version = "0.1.0.0";
+ sha256 = "0ssbxjlzqn0n3lj3f4m3881m1z0jk5qq94badddwszxs898d1zk5";
+ libraryHaskellDepends = [
+ base formatting simple-media-timestamp
+ simple-media-timestamp-formatting srt
+ ];
+ description = "Format an SRT";
+ license = lib.licenses.mit;
+ }) {};
+
"sscan" = callPackage
({ mkDerivation, async, base, brick, directory, filepath, microlens
, microlens-th, process, temporary, text, time, vty
@@ -246950,100 +246860,6 @@ self: {
}) {};
"stack" = callPackage
- ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
- , async, attoparsec, base, base64-bytestring, bytestring, Cabal
- , casa-client, casa-types, colour, conduit, conduit-extra
- , containers, cryptonite, cryptonite-conduit, deepseq, directory
- , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify
- , generic-deriving, hackage-security, hashable, hi-file-parser
- , hpack, hpc, hspec, http-client, http-client-tls, http-conduit
- , http-download, http-types, memory, microlens, mintty
- , mono-traversable, mtl, mustache, neat-interpolation, network-uri
- , open-browser, optparse-applicative, pantry, path, path-io
- , persistent, persistent-sqlite, persistent-template, pretty
- , primitive, process, project-template, QuickCheck, raw-strings-qq
- , regex-applicative-text, retry, rio, rio-prettyprint, semigroups
- , smallcheck, split, stm, streaming-commons, tar, template-haskell
- , temporary, text, text-metrics, th-reify-many, time, tls
- , transformers, typed-process, unicode-transforms, unix
- , unix-compat, unliftio, unordered-containers, vector, yaml
- , zip-archive, zlib
- }:
- mkDerivation {
- pname = "stack";
- version = "2.7.1";
- sha256 = "09mw5jwgcmbkwsgvg1ls114hq9v2vl49pdvix8ir7vvgicvdhnv0";
- configureFlags = [
- "-fdisable-git-info" "-fhide-dependency-versions"
- "-fsupported-build"
- ];
- isLibrary = true;
- isExecutable = true;
- setupHaskellDepends = [ base Cabal filepath ];
- libraryHaskellDepends = [
- aeson annotated-wl-pprint ansi-terminal array async attoparsec base
- base64-bytestring bytestring Cabal casa-client casa-types colour
- conduit conduit-extra containers cryptonite cryptonite-conduit
- deepseq directory echo exceptions extra file-embed filelock
- filepath fsnotify generic-deriving hackage-security hashable
- hi-file-parser hpack hpc http-client http-client-tls http-conduit
- http-download http-types memory microlens mintty mono-traversable
- mtl mustache neat-interpolation network-uri open-browser
- optparse-applicative pantry path path-io persistent
- persistent-sqlite persistent-template pretty primitive process
- project-template regex-applicative-text retry rio rio-prettyprint
- semigroups split stm streaming-commons tar template-haskell
- temporary text text-metrics th-reify-many time tls transformers
- typed-process unicode-transforms unix unix-compat unliftio
- unordered-containers vector yaml zip-archive zlib
- ];
- executableHaskellDepends = [
- aeson annotated-wl-pprint ansi-terminal array async attoparsec base
- base64-bytestring bytestring Cabal casa-client casa-types colour
- conduit conduit-extra containers cryptonite cryptonite-conduit
- deepseq directory echo exceptions extra file-embed filelock
- filepath fsnotify generic-deriving hackage-security hashable
- hi-file-parser hpack hpc http-client http-client-tls http-conduit
- http-download http-types memory microlens mintty mono-traversable
- mtl mustache neat-interpolation network-uri open-browser
- optparse-applicative pantry path path-io persistent
- persistent-sqlite persistent-template pretty primitive process
- project-template regex-applicative-text retry rio rio-prettyprint
- semigroups split stm streaming-commons tar template-haskell
- temporary text text-metrics th-reify-many time tls transformers
- typed-process unicode-transforms unix unix-compat unliftio
- unordered-containers vector yaml zip-archive zlib
- ];
- testHaskellDepends = [
- aeson annotated-wl-pprint ansi-terminal array async attoparsec base
- base64-bytestring bytestring Cabal casa-client casa-types colour
- conduit conduit-extra containers cryptonite cryptonite-conduit
- deepseq directory echo exceptions extra file-embed filelock
- filepath fsnotify generic-deriving hackage-security hashable
- hi-file-parser hpack hpc hspec http-client http-client-tls
- http-conduit http-download http-types memory microlens mintty
- mono-traversable mtl mustache neat-interpolation network-uri
- open-browser optparse-applicative pantry path path-io persistent
- persistent-sqlite persistent-template pretty primitive process
- project-template QuickCheck raw-strings-qq regex-applicative-text
- retry rio rio-prettyprint semigroups smallcheck split stm
- streaming-commons tar template-haskell temporary text text-metrics
- th-reify-many time tls transformers typed-process
- unicode-transforms unix unix-compat unliftio unordered-containers
- vector yaml zip-archive zlib
- ];
- doCheck = false;
- preCheck = "export HOME=$TMPDIR";
- postInstall = ''
- exe=$out/bin/stack
- mkdir -p $out/share/bash-completion/completions
- $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
- '';
- description = "The Haskell Tool Stack";
- license = lib.licenses.bsd3;
- }) {};
-
- "stack_2_7_3" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
, async, attoparsec, base, base64-bytestring, bytestring, Cabal
, casa-client, casa-types, colour, conduit, conduit-extra
@@ -247135,7 +246951,6 @@ self: {
'';
description = "The Haskell Tool Stack";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"stack-all" = callPackage
@@ -248441,27 +248256,6 @@ self: {
}) {};
"static-text" = callPackage
- ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen
- , markdown-unlit, tasty, tasty-hunit, template-haskell, text
- , vector
- }:
- mkDerivation {
- pname = "static-text";
- version = "0.2.0.6";
- sha256 = "14z6ib2b1n6m460c5li58wh0p5kwmb471zwpwjn0pmgsayp8vzzi";
- libraryHaskellDepends = [
- base bytestring template-haskell text vector
- ];
- testHaskellDepends = [
- base bytestring doctest doctest-driver-gen markdown-unlit tasty
- tasty-hunit template-haskell
- ];
- testToolDepends = [ markdown-unlit ];
- description = "Lists, Texts, ByteStrings and Vectors of statically known length";
- license = lib.licenses.bsd3;
- }) {};
-
- "static-text_0_2_0_7" = callPackage
({ mkDerivation, base, bytestring, doctest, doctest-driver-gen
, markdown-unlit, tasty, tasty-hunit, template-haskell, text
, vector
@@ -248480,7 +248274,6 @@ self: {
testToolDepends = [ markdown-unlit ];
description = "Lists, Texts, ByteStrings and Vectors of statically known length";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"staticanalysis" = callPackage
@@ -248704,8 +248497,8 @@ self: {
}:
mkDerivation {
pname = "status-notifier-item";
- version = "0.3.0.5";
- sha256 = "165kdg1wb0xpy4z7hlk8654ph2psdibal1p0f32zzrccbnk0w801";
+ version = "0.3.1.0";
+ sha256 = "1x3zqa2b9vl5mirfbh2bmyali47jpfcqsw4xxgbmsgz9jiffpda9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -249642,6 +249435,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "storable-record_0_0_6" = callPackage
+ ({ mkDerivation, base, QuickCheck, semigroups, transformers
+ , utility-ht
+ }:
+ mkDerivation {
+ pname = "storable-record";
+ version = "0.0.6";
+ sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base QuickCheck semigroups transformers utility-ht
+ ];
+ description = "Elegant definition of Storable instances for records";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"storable-static-array" = callPackage
({ mkDerivation, array, base, tagged, vector }:
mkDerivation {
@@ -250662,6 +250473,28 @@ self: {
license = lib.licenses.bsd3;
}) {archive = null;};
+ "streamly-archive_0_1_0" = callPackage
+ ({ mkDerivation, archive, base, bytestring, cryptonite, directory
+ , filepath, QuickCheck, streamly, tar, tasty, tasty-hunit
+ , tasty-quickcheck, temporary, zlib
+ }:
+ mkDerivation {
+ pname = "streamly-archive";
+ version = "0.1.0";
+ sha256 = "0094qi2n7fg7hsdaag307gmcvgrl39m4w0lz29csrk1fq4yy578x";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base bytestring streamly ];
+ librarySystemDepends = [ archive ];
+ testHaskellDepends = [
+ base bytestring cryptonite directory filepath QuickCheck streamly
+ tar tasty tasty-hunit tasty-quickcheck temporary zlib
+ ];
+ testSystemDepends = [ archive ];
+ description = "Stream data from archives using the streamly library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {archive = null;};
+
"streamly-binary" = callPackage
({ mkDerivation, base, binary, bytestring, hspec, QuickCheck
, streamly
@@ -250785,8 +250618,6 @@ self: {
];
description = "Folder watching as a Streamly stream";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"streamly-lmdb" = callPackage
@@ -250808,6 +250639,26 @@ self: {
license = lib.licenses.bsd3;
}) {inherit (pkgs) lmdb;};
+ "streamly-lmdb_0_3_0" = callPackage
+ ({ mkDerivation, async, base, bytestring, directory, lmdb
+ , QuickCheck, streamly, tasty, tasty-quickcheck, temporary
+ }:
+ mkDerivation {
+ pname = "streamly-lmdb";
+ version = "0.3.0";
+ sha256 = "1da87rbmh9sgffjy5367pzy1d80f7zlxhszi9sq87jfws4i20pk7";
+ libraryHaskellDepends = [ async base bytestring streamly ];
+ librarySystemDepends = [ lmdb ];
+ testHaskellDepends = [
+ async base bytestring directory QuickCheck streamly tasty
+ tasty-quickcheck temporary
+ ];
+ testSystemDepends = [ lmdb ];
+ description = "Stream data to or from LMDB databases using the streamly library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {inherit (pkgs) lmdb;};
+
"streamly-posix" = callPackage
({ mkDerivation, base, bytestring, filepath, hpath-posix, hspec
, hspec-discover, safe-exceptions, streamly, streamly-bytestring
@@ -250829,6 +250680,27 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "streamly-process" = callPackage
+ ({ mkDerivation, base, directory, exceptions, fusion-plugin, hspec
+ , process, QuickCheck, streamly, tasty-bench, unix
+ }:
+ mkDerivation {
+ pname = "streamly-process";
+ version = "0.1.0";
+ sha256 = "066ldbphb230cc21jvsmmqlnjli6cwqpphs7vjb88q62lbl8yf6p";
+ libraryHaskellDepends = [ base exceptions process streamly unix ];
+ testHaskellDepends = [
+ base directory exceptions hspec process QuickCheck streamly
+ ];
+ benchmarkHaskellDepends = [
+ base directory fusion-plugin process streamly tasty-bench
+ ];
+ description = "Use OS processes as stream transformation functions";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"streamproc" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -256099,8 +255971,8 @@ self: {
}:
mkDerivation {
pname = "taffybar";
- version = "3.2.5";
- sha256 = "1gfdlqgdqq2ivvzj7cgqahpm2bmwg90ri5ss7ah38alrp5rvda1v";
+ version = "3.3.0";
+ sha256 = "17ggcv1y3md11sccbb9mpss2qdanlkv7wy098qh28gra9kq4ibgm";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -256190,8 +256062,8 @@ self: {
pname = "tagged";
version = "0.8.6.1";
sha256 = "00kcc6lmj7v3xm2r3wzw5jja27m4alcw1wi8yiismd0bbzwzrq7m";
- revision = "1";
- editedCabalFile = "1rzqfw2pafxbnfpl1lizf9zldpxyy28g92x4jzq49miw9hr1xpsx";
+ revision = "2";
+ editedCabalFile = "0qi63c3z40i9qm44r571yjzcpb8d473vj2km4kq0fij0ljc7vii9";
libraryHaskellDepends = [
base deepseq template-haskell transformers
];
@@ -257271,22 +257143,25 @@ self: {
}) {};
"tasty-checklist" = callPackage
- ({ mkDerivation, base, exceptions, parameterized-utils, tasty
- , tasty-expected-failure, tasty-hunit, text
+ ({ mkDerivation, base, doctest, exceptions, HUnit
+ , parameterized-utils, tasty, tasty-expected-failure, tasty-hunit
+ , text
}:
mkDerivation {
pname = "tasty-checklist";
- version = "1.0.1.0";
- sha256 = "0nj4xjnlrd3righ0d0yv4py7wjls51khjyacpgjs3s5knaxyippp";
+ version = "1.0.2.0";
+ sha256 = "0smd93c1zs44nwiz0dk87izg0c9cyvx2klzy126w0p0xcxwwbhlr";
libraryHaskellDepends = [
base exceptions parameterized-utils text
];
testHaskellDepends = [
- base parameterized-utils tasty tasty-expected-failure tasty-hunit
- text
+ base doctest HUnit parameterized-utils tasty tasty-expected-failure
+ tasty-hunit text
];
description = "Check multiple items during a tasty test";
license = lib.licenses.isc;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"tasty-dejafu" = callPackage
@@ -263218,28 +263093,6 @@ self: {
}) {};
"tidal" = callPackage
- ({ mkDerivation, base, bifunctors, bytestring, clock, colour
- , containers, criterion, deepseq, hosc, microspec, network, parsec
- , primitive, random, text, transformers, weigh
- }:
- mkDerivation {
- pname = "tidal";
- version = "1.7.7";
- sha256 = "19r9h45yd2xwmah81xqmwx5bi5gi0x2hqhq2nqa47jgb0nd12a25";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base bifunctors bytestring clock colour containers deepseq hosc
- network parsec primitive random text transformers
- ];
- testHaskellDepends = [
- base containers deepseq hosc microspec parsec
- ];
- benchmarkHaskellDepends = [ base criterion weigh ];
- description = "Pattern language for improvised music";
- license = lib.licenses.gpl3Only;
- }) {};
-
- "tidal_1_7_8" = callPackage
({ mkDerivation, base, bifunctors, bytestring, clock, colour
, containers, criterion, deepseq, hosc, microspec, network, parsec
, primitive, random, text, transformers, weigh
@@ -263259,7 +263112,6 @@ self: {
benchmarkHaskellDepends = [ base criterion weigh ];
description = "Pattern language for improvised music";
license = lib.licenses.gpl3Only;
- hydraPlatforms = lib.platforms.none;
}) {};
"tidal-midi" = callPackage
@@ -265266,6 +265118,23 @@ self: {
broken = true;
}) {};
+ "token-limiter-concurrent" = callPackage
+ ({ mkDerivation, async, base, genvalidity, genvalidity-sydtest
+ , QuickCheck, sydtest, sydtest-discover
+ }:
+ mkDerivation {
+ pname = "token-limiter-concurrent";
+ version = "0.0.0.0";
+ sha256 = "1g64638v7kiblixb8xg5dvnif60mlpplp1l18pv32lr9sph7yv1c";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ async base genvalidity genvalidity-sydtest QuickCheck sydtest
+ ];
+ testToolDepends = [ sydtest-discover ];
+ description = "A thread-safe concurrent token-bucket rate limiter that guarantees fairness";
+ license = lib.licenses.mit;
+ }) {};
+
"token-search" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, hashable, hspec
, process, streaming-commons, text, unordered-containers
@@ -266319,6 +266188,8 @@ self: {
pname = "tracetree";
version = "0.1.0.2";
sha256 = "0ga78nkrfg2hlanqfd65il0yw596n7xy9jx76l7sffs438mx4wvr";
+ revision = "1";
+ editedCabalFile = "1k6a5n70qmch9vqyv9kyrkii4pnwjdgbiwrqwk8q3yhv9naqijkh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -266746,6 +266617,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "transformers-compat_0_7" = callPackage
+ ({ mkDerivation, base, ghc-prim, transformers }:
+ mkDerivation {
+ pname = "transformers-compat";
+ version = "0.7";
+ sha256 = "13x9f3rq1ibx5lhzrsysg7m5nkqas75kv6b0zmzvspjiswfp7bd4";
+ libraryHaskellDepends = [ base ghc-prim transformers ];
+ description = "A small compatibility shim for the transformers library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"transformers-compose" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -268919,8 +268802,8 @@ self: {
}:
mkDerivation {
pname = "tweet-hs";
- version = "1.0.2.2";
- sha256 = "1sl4pld3jig1m26alhj4s96ff43v3g00wxzrng4yhb76d88z0ipw";
+ version = "1.0.2.3";
+ sha256 = "0chkg9xkancp6dms0ha0m86fkcmvk690q6z0rvprg37lhj42xp1i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -272214,8 +272097,8 @@ self: {
pname = "unicode-transforms";
version = "0.3.7.1";
sha256 = "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f";
- revision = "1";
- editedCabalFile = "01kf1hanqcwc7vpkwq2rw5v2mn4nxx58l3v5hpk166jalmwqijaz";
+ revision = "2";
+ editedCabalFile = "0kbcn5881sxh0i8pqckjam4kwr1n7m3gl5ppcq4li32dzfiz9b57";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ghc-prim text ];
@@ -272229,6 +272112,32 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "unicode-transforms_0_3_8" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, filepath
+ , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck
+ , split, tasty-bench, text, unicode-data
+ }:
+ mkDerivation {
+ pname = "unicode-transforms";
+ version = "0.3.8";
+ sha256 = "1j3dwz3qmak3fyb1p4qzr1rnxch2ydqfp2jizyy4rv425h0smxzl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring ghc-prim text unicode-data
+ ];
+ testHaskellDepends = [
+ base deepseq getopt-generics hspec QuickCheck split text
+ unicode-data
+ ];
+ benchmarkHaskellDepends = [
+ base deepseq filepath path path-io tasty-bench text
+ ];
+ description = "Unicode normalization";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"unicode-tricks" = callPackage
({ mkDerivation, base, containers, data-default, deepseq, hashable
, hspec, hspec-discover, QuickCheck, text
@@ -272475,8 +272384,8 @@ self: {
({ mkDerivation, array, base, mtl }:
mkDerivation {
pname = "union-find-array";
- version = "0.1.0.2";
- sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
+ version = "0.1.0.3";
+ sha256 = "1nfvgmgvins9gq5ba9vf9yqj9svj2c22xgvvfq03ls9wm62vj1xw";
libraryHaskellDepends = [ array base mtl ];
description = "union find data structure";
license = lib.licenses.mit;
@@ -273381,31 +273290,6 @@ self: {
}) {};
"unliftio" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, deepseq
- , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
- , transformers, unix, unliftio-core
- }:
- mkDerivation {
- pname = "unliftio";
- version = "0.2.18";
- sha256 = "0yg5x2v3p4pdw7892l1mkihmdbak14qvmni1vk2a0y2gdmxfvx1y";
- libraryHaskellDepends = [
- async base bytestring deepseq directory filepath process stm time
- transformers unix unliftio-core
- ];
- testHaskellDepends = [
- async base bytestring containers deepseq directory filepath hspec
- process QuickCheck stm time transformers unix unliftio-core
- ];
- benchmarkHaskellDepends = [
- async base bytestring deepseq directory filepath gauge process stm
- time transformers unix unliftio-core
- ];
- description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
- license = lib.licenses.mit;
- }) {};
-
- "unliftio_0_2_19" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, directory, filepath, gauge, hspec, process, QuickCheck, stm, time
, transformers, unix, unliftio-core
@@ -273428,7 +273312,6 @@ self: {
];
description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"unliftio-core" = callPackage
@@ -276093,6 +275976,39 @@ self: {
broken = true;
}) {};
+ "variable-media-field" = callPackage
+ ({ mkDerivation, base, text }:
+ mkDerivation {
+ pname = "variable-media-field";
+ version = "0.1.0.0";
+ sha256 = "13fpvd3w3c7lndkf4l4d48fcfsssxwi7ip9309gzwlrlycq57908";
+ libraryHaskellDepends = [ base text ];
+ description = "Simple type for representing one of several media types";
+ license = lib.licenses.mit;
+ }) {};
+
+ "variable-media-field-dhall" = callPackage
+ ({ mkDerivation, base, dhall, variable-media-field }:
+ mkDerivation {
+ pname = "variable-media-field-dhall";
+ version = "0.1.0.0";
+ sha256 = "0h2gm5h86n7bm5gf9rbc0zlkkhrkyavygvrkz251r9l57qw48qax";
+ libraryHaskellDepends = [ base dhall variable-media-field ];
+ description = "Dhall instances for VF";
+ license = lib.licenses.mit;
+ }) {};
+
+ "variable-media-field-optics" = callPackage
+ ({ mkDerivation, base, optics-th, variable-media-field }:
+ mkDerivation {
+ pname = "variable-media-field-optics";
+ version = "0.1.0.0";
+ sha256 = "1n4ccd52yy5yna28bmn4sc7cyrngyllgk976q4v7f262l49wmphj";
+ libraryHaskellDepends = [ base optics-th variable-media-field ];
+ description = "Optics for variable-media-field";
+ license = lib.licenses.mit;
+ }) {};
+
"variable-precision" = callPackage
({ mkDerivation, base, complex-generic, floatshow, integer-gmp
, type-level-natural-number
@@ -278562,8 +278478,8 @@ self: {
}:
mkDerivation {
pname = "vulkan-utils";
- version = "0.5.0.2";
- sha256 = "19jxd73li1ybdfzznlql2im8k0qad1yas75d5cdfvjazv7x4g3n1";
+ version = "0.5.1";
+ sha256 = "1552vk9nzvcpkgh5b9lln9gl6rxg1jr8z7blgp3sss3pjsvi3s11";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring containers dependent-map dependent-sum extra
@@ -279367,8 +279283,8 @@ self: {
}:
mkDerivation {
pname = "wai-make-assets";
- version = "0.2";
- sha256 = "0h6ng8g42bpb8d75wykb1q9byqh3zx745asy31yqzp49v0aip1vy";
+ version = "0.3";
+ sha256 = "07h56bjyap8x2aaay23k3l6n6gk1h5a3qqijd33b4pnc0nygfzci";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -283188,24 +283104,6 @@ self: {
}) {};
"witch" = callPackage
- ({ mkDerivation, base, bytestring, containers, HUnit
- , template-haskell, text, time
- }:
- mkDerivation {
- pname = "witch";
- version = "0.3.3.0";
- sha256 = "0wckjjy7yxq899f515xhwl2izqmrr9zck0kjlgz6qfa1fsl6lbvx";
- libraryHaskellDepends = [
- base bytestring containers template-haskell text time
- ];
- testHaskellDepends = [
- base bytestring containers HUnit text time
- ];
- description = "Convert values from one type into another";
- license = lib.licenses.isc;
- }) {};
-
- "witch_0_3_4_0" = callPackage
({ mkDerivation, base, bytestring, containers, HUnit
, template-haskell, text, time
}:
@@ -283221,7 +283119,6 @@ self: {
];
description = "Convert values from one type into another";
license = lib.licenses.isc;
- hydraPlatforms = lib.platforms.none;
}) {};
"with-index" = callPackage
@@ -286304,6 +286201,28 @@ self: {
broken = true;
}) {};
+ "xml-parser" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, hashable
+ , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
+ , tasty-quickcheck, text, text-builder, transformers
+ , unordered-containers, xml-conduit
+ }:
+ mkDerivation {
+ pname = "xml-parser";
+ version = "0.1.0.1";
+ sha256 = "079ggb9bhad9px6gqbjhbir423hds389p42jc853caz7232dc6vx";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers hashable text text-builder
+ transformers unordered-containers xml-conduit
+ ];
+ testHaskellDepends = [
+ attoparsec QuickCheck quickcheck-instances rerebase tasty
+ tasty-hunit tasty-quickcheck xml-conduit
+ ];
+ description = "XML parser with informative error-reporting and simple API";
+ license = lib.licenses.mit;
+ }) {};
+
"xml-picklers" = callPackage
({ mkDerivation, base, Cabal, containers, QuickCheck, tasty
, tasty-hunit, tasty-quickcheck, text, xml-types
@@ -287323,16 +287242,15 @@ self: {
}) {};
"xsd" = callPackage
- ({ mkDerivation, attoparsec, base, directory, doctest, filepath
- , lens, QuickCheck, quickcheck-instances, text, time
+ ({ mkDerivation, base, lens, parsec, parsers, semigroupoids, text
+ , time
}:
mkDerivation {
pname = "xsd";
- version = "0.5.0.1";
- sha256 = "1a5i2idpkm5i70jpp2kjglpylja4b9cd0nklgvl6lm8cpjn2j0k0";
- libraryHaskellDepends = [ attoparsec base lens text time ];
- testHaskellDepends = [
- base directory doctest filepath QuickCheck quickcheck-instances
+ version = "0.6.2";
+ sha256 = "0m8xb12bfcr03w5b15xx5s2wwy7kz735vwaxyk3qbny3wkq7m0fw";
+ libraryHaskellDepends = [
+ base lens parsec parsers semigroupoids text time
];
description = "XML Schema data structures";
license = lib.licenses.bsd3;
@@ -289486,8 +289404,8 @@ self: {
}:
mkDerivation {
pname = "yesod-core";
- version = "1.6.20.2";
- sha256 = "184j6nslwrfxw4zmsxlii6gs1z0h350kgmbnr5y3wwk3n4dsdzyb";
+ version = "1.6.21.0";
+ sha256 = "0wmh7ip318p89lyy6k5mvxkkpq43knp41wlq9iaf3icz0ahqdmb7";
libraryHaskellDepends = [
aeson auto-update base blaze-html blaze-markup bytestring
case-insensitive cereal clientsession conduit conduit-extra
@@ -289897,23 +289815,6 @@ self: {
}) {};
"yesod-gitrev" = callPackage
- ({ mkDerivation, aeson, base, githash, template-haskell, yesod-core
- }:
- mkDerivation {
- pname = "yesod-gitrev";
- version = "0.2.1";
- sha256 = "0wd6xvq9aa11n8y4hna0a5ivqfxnbg8w2bq5lramm895xs7c8d7w";
- libraryHaskellDepends = [
- aeson base githash template-haskell yesod-core
- ];
- testHaskellDepends = [ base yesod-core ];
- description = "A subsite for displaying git information";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "yesod-gitrev_0_2_2" = callPackage
({ mkDerivation, aeson, base, githash, process, template-haskell
, yesod-core
}:
@@ -290121,30 +290022,6 @@ self: {
}) {};
"yesod-page-cursor" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, hspec
- , hspec-expectations-lifted, http-link-header, http-types, lens
- , lens-aeson, monad-logger, mtl, network-uri, persistent
- , persistent-sqlite, persistent-template, scientific, text, time
- , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test
- }:
- mkDerivation {
- pname = "yesod-page-cursor";
- version = "2.0.0.8";
- sha256 = "1azd2kv5b36kryz3l587mn329a46m8mp4z8knzx5va24bmhca9jy";
- libraryHaskellDepends = [
- aeson base bytestring containers http-link-header network-uri text
- unliftio yesod-core
- ];
- testHaskellDepends = [
- aeson base bytestring hspec hspec-expectations-lifted
- http-link-header http-types lens lens-aeson monad-logger mtl
- persistent persistent-sqlite persistent-template scientific text
- time unliftio unliftio-core wai-extra yesod yesod-core yesod-test
- ];
- license = lib.licenses.mit;
- }) {};
-
- "yesod-page-cursor_2_0_0_9" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec
, hspec-expectations-lifted, http-link-header, http-types, lens
, lens-aeson, monad-logger, mtl, network-uri, persistent
@@ -290166,7 +290043,6 @@ self: {
time unliftio unliftio-core wai-extra yesod yesod-core yesod-test
];
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"yesod-paginate" = callPackage
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index f4688f34982c..b0f1f0eae257 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
};
- patches = lib.lists.optional withTracing ./tracing.patch;
+ patches = lib.optional withTracing ./tracing.patch;
nativeBuildInputs = [ cmake ];
buildInputs = [ opencl-headers ];
diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix
index 53b0dca09127..df1c6683fbcf 100644
--- a/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
buildInputs =
- lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
- ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
+ lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
+ ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
propagatedBuildInputs =
- lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
- ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
+ lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
+ ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
preAutoreconf = ''
gtkdocize
diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix
index c3c271c17194..f4871538effe 100644
--- a/pkgs/development/libraries/libayatana-indicator/default.nix
+++ b/pkgs/development/libraries/libayatana-indicator/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ ayatana-ido ]
- ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
- ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];
+ ++ lib.optionals (gtkVersion == "2") [ gtk2 ]
+ ++ lib.optionals (gtkVersion == "3") [ gtk3 ];
configureFlags = [ "--with-gtk=${gtkVersion}" ];
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 9e271a781e11..3078148e24f7 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcouchbase";
- version = "3.1.4";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "couchbase";
repo = "libcouchbase";
rev = version;
- sha256 = "sha256-6IBTUodKpE/RkqQb0IwSEgXfnIhfYyNNrZt5hxJ6DV8=";
+ sha256 = "sha256-8//FEWXXcp/COHj10l4jysaLobzZIl65RCYz/HgL+kc=";
};
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 8967ec49a094..30e5aa0cfa91 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libffcall";
- version = "2.1";
+ version = "2.2";
src = fetchurl {
url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz";
- sha256 = "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0";
+ sha256 = "sha256-6/o3+XtslPrCTs8xk/n8gpUXz4Gu6awtGRr5k9c8t0c=";
};
enableParallelBuilding = false;
diff --git a/pkgs/development/python-modules/bootstrapped-pip/2.nix b/pkgs/development/python-modules/bootstrapped-pip/2.nix
index 2d06b44b5074..f89d39ae2b79 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/2.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/2.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
- installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+ installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'' + ''
# Give folders a known name
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 81aca3f3c574..84016043929c 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
- installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+ installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'' + ''
# Give folders a known name
diff --git a/pkgs/development/python-modules/environmental-override/default.nix b/pkgs/development/python-modules/environmental-override/default.nix
new file mode 100644
index 000000000000..235401153136
--- /dev/null
+++ b/pkgs/development/python-modules/environmental-override/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "environmental-override";
+ version = "0.1.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1vhd37i6f8xh6kd61yxc2ynzgcln7v2p7fyzjmhbkdnws6gwfs6s";
+ };
+
+ # No tests have been written for this library.
+ doCheck = false;
+
+ pythonImportsCheck = [ "environmental_override" ];
+
+ meta = {
+ description = "Easily configure apps using simple environmental overrides";
+ homepage = "https://github.com/coddingtonbear/environmental-override";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ nathanruiz ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix
index 34bc7bb5eb66..5dce573eaebb 100644
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyiqvia";
- version = "1.0.0";
+ version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,12 +21,16 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-6BbJgRpn2hivm4N3Zpll9NACMSNlIhxj8CF2iVduIro=";
+ sha256 = "18qzxxn9xw9rwv3qz8k3zxh9xxy8c7rs8xlsrdrcq9wb0dhd7p0r";
};
- nativeBuildInputs = [ poetry-core ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
- propagatedBuildInputs = [ aiohttp ];
+ propagatedBuildInputs = [
+ aiohttp
+ ];
checkInputs = [
aresponses
@@ -36,7 +40,8 @@ buildPythonPackage rec {
];
# Ignore the examples as they are prefixed with test_
- pytestFlagsArray = [ "--ignore examples/" ];
+ disabledTestPaths = [ "examples/" ];
+
pythonImportsCheck = [ "pyiqvia" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix
index 7c7d6b01e408..40265dc639b9 100644
--- a/pkgs/development/python-modules/setuptools/44.0.nix
+++ b/pkgs/development/python-modules/setuptools/44.0.nix
@@ -61,7 +61,7 @@ in buildPythonPackage rec {
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
- preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+ preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 2c8f5d898dcb..62e7fb686c4a 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -62,7 +62,7 @@ in buildPythonPackage rec {
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
- preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+ preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';
diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
new file mode 100644
index 000000000000..08a87a2f7c02
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sphinx
+}:
+
+buildPythonPackage rec {
+ pname = "sphinxext-opengraph";
+ version = "0.4.2";
+
+ src = fetchFromGitHub {
+ owner = "wpilibsuite";
+ repo = "sphinxext-opengraph";
+ rev = "v${version}";
+ sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY=";
+ };
+
+ propagatedBuildInputs = [
+ sphinx
+ ];
+
+ doCheck = false; # no tests
+
+ pythonImportsCheck = [ "sphinxext.opengraph" ];
+
+ meta = with lib; {
+ description = "Sphinx extension to generate unique OpenGraph metadata";
+ homepage = "https://github.com/wpilibsuite/sphinxext-opengraph";
+ license = licenses.mit;
+ maintainers = with maintainers; [ Luflosi ];
+ };
+}
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 546989ef349d..3015e8d7ebb9 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -24,20 +24,15 @@
buildPythonPackage rec {
pname = "trezor";
- version = "0.12.2";
+ version = "0.12.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv";
+ sha256 = "02c39c333435b8f6dc62cc79bb5bf35fc7f0eb144a1a748be3b7c065ee3e85ae";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace 'click>=7,<8' 'click>=7,<9'
- '';
-
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index abd6a1b691ed..af45487a86a8 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
'';
- buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])
+ buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ])
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 688fd6eb849e..259ca5cfc94c 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -5,9 +5,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
- version = "2.2.17";
+ version = "2.2.18";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
- sha256 = "sha256-T48ui7jgq9ni3pC09Jd2WzkT9PBaJ+SUDfcXA5QMjM8=";
+ sha256 = "sha256-NQiwkGuDLXMXyNNiIHmOwnS3IefvY9DPmRxo8Z2drpA=";
deps = bundlerEnv rec {
name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 332fb265f878..a4014789b061 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -64,10 +64,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl";
+ sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a";
type = "gem";
};
- version = "0.84.0";
+ version = "0.85.0";
};
ffi = {
groups = ["default"];
@@ -138,10 +138,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj";
+ sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh";
type = "gem";
};
- version = "3.5.1";
+ version = "3.6.0";
};
little-plugger = {
groups = ["default"];
@@ -310,15 +310,15 @@
version = "2.3.2";
};
vagrant_cloud = {
- dependencies = ["excon" "log4r"];
+ dependencies = ["excon" "log4r" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rwfw014fbvaxshf8abi87srfaiirb7cr93s61qm177jm8q86h57";
+ sha256 = "0np0d8rjca130si5iaxasbqmfbbx4l3kd9mxdsa3p5mqiia7za3b";
type = "gem";
};
- version = "3.0.4";
+ version = "3.0.5";
};
wdm = {
groups = ["default"];
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index f9f164dd7646..009b64666002 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "adguardhome";
+ pname = "adguardhome";
version = "0.106.3";
src = fetchurl {
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index f2193d67ff5a..9e5e81457e90 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -6,10 +6,10 @@ assert enableCgiScripts -> gd != null;
stdenv.mkDerivation rec {
pname = "apcupsd";
- name = "${pname}-3.14.14";
+ version = "3.14.14";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
};
diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix
index 454cdbb57e3d..8a8aa34fdb2d 100644
--- a/pkgs/servers/computing/slurm-spank-x11/default.nix
+++ b/pkgs/servers/computing/slurm-spank-x11/default.nix
@@ -1,10 +1,7 @@
{ lib, stdenv, fetchFromGitHub, slurm } :
-let
+stdenv.mkDerivation rec {
+ pname = "slurm-spank-x11";
version = "0.2.5";
-in
-stdenv.mkDerivation {
- name = "slurm-spank-x11-${version}";
- version = version;
src = fetchFromGitHub {
owner = "hautreux";
diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix
index a9f5245ff1fe..a514cb1d86d0 100644
--- a/pkgs/servers/domoticz/default.nix
+++ b/pkgs/servers/domoticz/default.nix
@@ -32,7 +32,7 @@ let
};
in
stdenv.mkDerivation rec {
- name = "domoticz";
+ pname = "domoticz";
inherit version;
src = domoticz-src;
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index d03cd1c915ab..0220a18916b3 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -2,11 +2,12 @@
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
-stdenv.mkDerivation {
- name = "bsd-fingerd-0.17";
+stdenv.mkDerivation rec {
+ pname = "bsd-fingerd";
+ version = "0.17";
src = fetchurl {
- url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz";
+ url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
};
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index c441771157ce..cd7c1a07d2d4 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -1,14 +1,11 @@
{ lib, stdenv, fetchurl }:
-let
+stdenv.mkDerivation rec {
pname = "bftpd";
-
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "5.9";
src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY=";
};
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix
index 3ea030440626..b88d926e1db6 100644
--- a/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/pkgs/servers/ftp/pure-ftpd/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, openssl, fetchpatch }:
stdenv.mkDerivation rec {
- name = "pure-ftpd-1.0.49";
+ pname = "pure-ftpd";
+ version = "1.0.49";
src = fetchurl {
- url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz";
+ url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn";
};
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index a477551df307..d78c7ca18d19 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libcap, openssl, pam }:
stdenv.mkDerivation rec {
- name = "vsftpd-3.0.3";
+ pname = "vsftpd";
+ version = "3.0.3";
src = fetchurl {
- url = "https://security.appspot.com/downloads/${name}.tar.gz";
+ url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz";
sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx";
};
diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix
index 2a7f18430808..36e823ac5574 100644
--- a/pkgs/servers/gotify/ui.nix
+++ b/pkgs/servers/gotify/ui.nix
@@ -3,7 +3,7 @@
}:
yarn2nix-moretea.mkYarnPackage rec {
- name = "gotify-ui";
+ pname = "gotify-ui";
packageJSON = ./package.json;
yarnNix = ./yarndeps.nix;
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index bde4150d15d7..4337820683d0 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -5,10 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "gpm-1.20.7";
+ pname = "gpm";
+ version = "1.20.7";
src = fetchurl {
- url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
+ url = "https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.bz2";
sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
};
diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix
index 73a96d6a3c0e..d49d18c39019 100644
--- a/pkgs/servers/hashi-ui/default.nix
+++ b/pkgs/servers/hashi-ui/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "hashi-ui";
+ pname = "hashi-ui";
version = "1.3.8";
src = fetchurl {
diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix
index af2f6f2a11f3..4413324e1594 100644
--- a/pkgs/servers/hasura/cli.nix
+++ b/pkgs/servers/hasura/cli.nix
@@ -1,7 +1,7 @@
{ buildGoModule, hasura-graphql-engine }:
buildGoModule rec {
- name = "hasura-${version}";
+ pname = "hasura";
version = hasura-graphql-engine.version;
src = hasura-graphql-engine.src;
diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix
index 0d138e1f648e..f98352c5c95d 100644
--- a/pkgs/servers/holochain-go/default.nix
+++ b/pkgs/servers/holochain-go/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "holochain-go${version}";
+ pname = "holochain-go";
version = "0.1.0-alpha";
rev = "a17510b910a7a377441c152b8dccdbae1999f63f";
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index 0e5a5fed31c1..eeabbc1f30dc 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -1,17 +1,15 @@
{ lib, stdenv, fetchurl, apacheHttpd }:
let
- version = "2.4.7.1";
-
apache-24-patch = fetchurl {
- name = "compile-against-apache24.diff";
- url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
- sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
- };
+ name = "compile-against-apache24.diff";
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
+ sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
+ };
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "mod_fastcgi";
- inherit version;
+ version = "2.4.7.1";
src = fetchurl {
url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
index e05bf4bfce8c..8db1b7a2d04d 100644
--- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix
+++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
@@ -1,11 +1,12 @@
{ lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation {
- name = "jboss-mysql-jdbc";
+ pname = "jboss-mysql-jdbc";
builder = ./builder.sh;
inherit mysql_jdbc;
+ version = mysql_jdbc.version;
meta = {
platforms = lib.platforms.unix;
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix
index 99960d6cb719..01ff91ebda6b 100644
--- a/pkgs/servers/http/micro-httpd/default.nix
+++ b/pkgs/servers/http/micro-httpd/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "micro-httpd-20140814";
+ pname = "micro-httpd";
+ version = "20140814";
src = fetchurl {
url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz";
diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix
index d4e92bc3f6c2..30027467a2ea 100644
--- a/pkgs/servers/http/redstore/default.nix
+++ b/pkgs/servers/http/redstore/default.nix
@@ -2,10 +2,11 @@
, librdf_rasqal }:
stdenv.mkDerivation rec {
- name = "redstore-0.5.4";
+ pname = "redstore";
+ version = "0.5.4";
src = fetchurl {
- url = "https://www.aelius.com/njh/redstore/${name}.tar.gz";
+ url = "https://www.aelius.com/njh/redstore/redstore-${version}.tar.gz";
sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq";
};
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
index 3796d5458b2b..7585cabccd14 100644
--- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
+++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
@@ -1,11 +1,12 @@
{ lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation {
- name = "tomcat-mysql-jdbc";
+ pname = "tomcat-mysql-jdbc";
builder = ./builder.sh;
buildInputs = [ mysql_jdbc ];
inherit mysql_jdbc;
+ version = mysql_jdbc.version;
meta = {
platforms = lib.platforms.unix;
diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
index 15e5e81d0585..e04716214fec 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/pkgs/servers/icecast/default.nix
@@ -3,10 +3,11 @@
, libvorbis, libtheora, speex, libkate, libopus }:
stdenv.mkDerivation rec {
- name = "icecast-2.4.4";
+ pname = "icecast";
+ version = "2.4.4";
src = fetchurl {
- url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz";
+ url = "http://downloads.xiph.org/releases/icecast/icecast-${version}.tar.gz";
sha256 = "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9";
};
diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix
index 0a152a7e157e..05f9b9c971b7 100644
--- a/pkgs/servers/icingaweb2/theme-april/default.nix
+++ b/pkgs/servers/icingaweb2/theme-april/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "icingaweb2-theme-april";
+ pname = "icingaweb2-theme-april";
version = "1.0.4";
src = fetchFromGitHub {
owner = "Mikesch-mp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g";
};
diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix
index 59b8df6b4d42..e2c60ef79869 100644
--- a/pkgs/servers/icingaweb2/theme-lsd/default.nix
+++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "icingaweb2-theme-lsd";
+ pname = "icingaweb2-theme-lsd";
version = "1.0.3";
src = fetchFromGitHub {
owner = "Mikesch-mp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w";
};
diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix
index ddd363701a7c..7e8adb72c6d9 100644
--- a/pkgs/servers/icingaweb2/theme-particles/default.nix
+++ b/pkgs/servers/icingaweb2/theme-particles/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "icingaweb2-theme-particles";
+ pname = "icingaweb2-theme-particles";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy";
};
diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix
index 5650d1ccdba8..9b571b948b52 100644
--- a/pkgs/servers/icingaweb2/theme-snow/default.nix
+++ b/pkgs/servers/icingaweb2/theme-snow/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "icingaweb2-theme-snow";
+ pname = "icingaweb2-theme-snow";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp";
};
diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix
index dda26caf6a19..8392124eb072 100644
--- a/pkgs/servers/icingaweb2/theme-spring/default.nix
+++ b/pkgs/servers/icingaweb2/theme-spring/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "icingaweb2-theme-spring";
+ pname = "icingaweb2-theme-spring";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9";
};
diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
index a2bb3f9e4a2b..39c4e7b92743 100644
--- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix
+++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
- name = "icingaweb2-theme-unicorn";
+ pname = "icingaweb2-theme-unicorn";
version = "1.0.2";
srcs = [
(fetchFromGitHub {
owner = "Mikesch-mp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05";
})
diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index 3b2508a7760b..53bfbb81cd91 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,12 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
stdenv.mkDerivation rec {
- name = "charybdis-4.1.2";
+ pname = "charybdis";
+ version = "4.1.2";
src = fetchFromGitHub {
owner = "charybdis-ircd";
repo = "charybdis";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3";
};
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index b29f75fb5293..b4b567608f3e 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "ircd-hybrid-8.2.36";
+ pname = "ircd-hybrid";
+ version = "8.2.36";
src = fetchurl {
- url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
+ url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz";
sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv";
};
diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix
index fab8d4b0096b..a87d30d73570 100644
--- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix
+++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix
@@ -9,7 +9,7 @@
# * Update `version`+`hash` and rebuild.
mkYarnPackage rec {
- name = "grafana-image-renderer";
+ pname = "grafana-image-renderer";
version = "3.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index 2460cc633ebe..d1205ae353b2 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -2,7 +2,8 @@
buildGoPackage rec {
rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
- name = "heapster-${lib.strings.substring 0 7 rev}";
+ pname = "heapster";
+ version = lib.strings.substring 0 7 rev;
goPackagePath = "k8s.io/heapster";
subPackages = [ "./" ];
diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
index 65ec5ff69b41..35c67af92b12 100644
--- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
@@ -14,17 +14,15 @@ buildGoModule rec {
vendorSha256 = null;
- buildFlagsArray = let
- goPackagePath = "github.com/prometheus/influxdb_exporter";
- in ''
- -ldflags=
- -s -w
- -X github.com/prometheus/common/version.Version=${version}
- -X github.com/prometheus/common/version.Revision=${rev}
- -X github.com/prometheus/common/version.Branch=unknown
- -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
- -X github.com/prometheus/common/version.BuildDate=unknown
- '';
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/prometheus/common/version.Version=${version}"
+ "-X github.com/prometheus/common/version.Revision=${rev}"
+ "-X github.com/prometheus/common/version.Branch=unknown"
+ "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
+ "-X github.com/prometheus/common/version.BuildDate=unknown"
+ ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; };
@@ -33,6 +31,5 @@ buildGoModule rec {
homepage = "https://github.com/prometheus/influxdb_exporter";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
index 459ddf01de3c..9a311c02f335 100644
--- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
+++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
@@ -1,16 +1,13 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
-let
+stdenv.mkDerivation rec {
+ pname = "jmx-prometheus-httpserver";
version = "0.15.0";
- jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
- mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
-in stdenv.mkDerivation {
- inherit version jarName;
- name = "jmx-prometheus-httpserver-${version}";
+ jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
src = fetchurl {
- url = mavenUrl;
+ url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz";
};
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index f97485f9478b..7f0e5c78eba9 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -19,17 +19,15 @@ buildGoModule rec {
excludedPackages = [ "docs/node-mixin" ];
- buildFlagsArray = let
- goPackagePath = "github.com/prometheus/node_exporter";
- in ''
- -ldflags=
- -s -w
- -X github.com/prometheus/common/version.Version=${version}
- -X github.com/prometheus/common/version.Revision=${rev}
- -X github.com/prometheus/common/version.Branch=unknown
- -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
- -X github.com/prometheus/common/version.BuildDate=unknown
- '';
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/prometheus/common/version.Version=${version}"
+ "-X github.com/prometheus/common/version.Revision=${rev}"
+ "-X github.com/prometheus/common/version.Branch=unknown"
+ "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
+ "-X github.com/prometheus/common/version.BuildDate=unknown"
+ ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
@@ -38,6 +36,5 @@ buildGoModule rec {
homepage = "https://github.com/prometheus/node_exporter";
license = licenses.asl20;
maintainers = with maintainers; [ benley fpletz globin Frostman ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix
index bc8022f9feb1..663b532c8fc6 100644
--- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, nixosTests }:
python3Packages.buildPythonApplication rec {
- name = "tor-exporter-${version}";
+ pname = "tor-exporter";
version = "0.4";
# Just a single .py file to use as the application's main entry point.
diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix
index 4732368ac887..c5dba62c6e7c 100644
--- a/pkgs/servers/nas/default.nix
+++ b/pkgs/servers/nas/default.nix
@@ -1,11 +1,9 @@
{ lib, stdenv, fetchurl, imake, bison, flex, gccmakedep
, xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }:
-let
+stdenv.mkDerivation rec {
pname = "nas";
version = "1.9.4";
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz";
diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix
index 670806db17e8..77c6f8839f71 100644
--- a/pkgs/servers/neard/default.nix
+++ b/pkgs/servers/neard/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }:
stdenv.mkDerivation rec {
- name = "neard-0.16";
+ pname = "neard";
+ version = "0.16";
src = fetchurl {
- url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz";
+ url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz";
sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
};
diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index eb6ce851c6ee..03aea95177a4 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, pcre }:
stdenv.mkDerivation {
- name = "leafnode-2.0.0.alpha20121101a.12";
+ pname = "leafnode";
+ version = "2.0.0.alpha20121101a.12";
src = fetchurl {
url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2";
diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index 19147be3f5da..88a30e358ab9 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, python3Packages, php }:
python3Packages.buildPythonApplication rec {
- name = "nextcloud-news-updater-${version}";
+ pname = "nextcloud-news-updater";
version = "10.0.1";
src = fetchurl {
diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix
index 2d1db24474bb..a2de1d8fad3a 100644
--- a/pkgs/servers/rippled/data-api.nix
+++ b/pkgs/servers/rippled/data-api.nix
@@ -5,7 +5,7 @@ with lib;
let
np = nodePackages.override { generated = ./package.nix; self = np; };
in nodePackages.buildNodePackage rec {
- name = "ripple-data-api-${version}";
+ pname = "ripple-data-api";
version = lib.strings.substring 0 7 rev;
rev = "c56b860105f36c1c44ae011189d495272648c589";
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 3558fd5935e4..4b92592f65df 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -13,10 +13,10 @@ with lib;
stdenv.mkDerivation (rec {
version = elk6Version;
- name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}";
+ pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
src = fetchurl {
- url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
+ url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
sha256 =
if enableUnfree
then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42"
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index f808b6985b47..fb15951399fe 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -27,10 +27,10 @@ let
in
stdenv.mkDerivation (rec {
version = elk7Version;
- name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}";
+ pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
src = fetchurl {
- url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz";
+ url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz";
sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 6737119d8812..91f84f2f587f 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -22,10 +22,11 @@ let
in
with lib;
stdenv.mkDerivation rec {
- name = "shishi-1.0.2";
+ pname = "shishi";
+ version = "1.0.2";
src = fetchurl {
- url = "mirror://gnu/shishi/${name}.tar.gz";
+ url = "mirror://gnu/shishi/shishi-${version}.tar.gz";
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
};
diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix
index 48bc4395d073..83596cffadfb 100644
--- a/pkgs/servers/silc-server/default.nix
+++ b/pkgs/servers/silc-server/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "silc-server-1.1.18";
+ pname = "silc-server";
+ version = "1.1.18";
src = fetchurl {
- url = "http://silcnet.org/download/server/sources/${name}.tar.bz2";
+ url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2";
sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s";
};
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index f5b3288c60cc..4f4f5e44ee60 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }:
stdenv.mkDerivation rec {
- name = "sipwitch-1.9.15";
+ pname = "sipwitch";
+ version = "1.9.15";
src = fetchurl {
- url = "mirror://gnu/sipwitch/${name}.tar.gz";
+ url = "mirror://gnu/sipwitch/sipwitch-${version}.tar.gz";
sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482";
};
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 6b22185cd800..7e6422a6f53c 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,11 +1,12 @@
{lib, stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation rec {
- name = "mysql-connector-java-5.1.46";
+ pname = "mysql-connector-java";
+ version = "5.1.46";
builder = ./builder.sh;
src = fetchurl {
- url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip";
+ url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip";
sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
};
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index e424120a390f..a4a8e6b0fe37 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -2,7 +2,8 @@
stdenv.mkDerivation {
- name = "pg_similarity-1.0";
+ pname = "pg_similarity";
+ version = "1.0";
src = fetchFromGitHub {
owner = "eulerto";
repo = "pg_similarity";
diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix
index 4737c0a38942..c811a1624128 100644
--- a/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/pkgs/servers/sql/virtuoso/6.x.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec {
- name = "virtuoso-opensource-6.1.6";
+ pname = "virtuoso-opensource";
+ version = "6.1.6";
src = fetchurl {
- url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
+ url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz";
sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6";
};
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
postInstall = ''
echo Moving documentation
mkdir -pv $out/share/doc
- mv -v $out/share/virtuoso/doc $out/share/doc/${name}
+ mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version}
echo Removing jars and empty directories
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix
index a27cd249f1ce..173124596a09 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/pkgs/servers/sql/virtuoso/7.x.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec {
- name = "virtuoso-opensource-7.2.4.2";
+ pname = "virtuoso-opensource";
+ version = "7.2.4.2";
src = fetchurl {
- url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
+ url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz";
sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002";
};
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
postInstall=''
echo Moving documentation
mkdir -pv $out/share/doc
- mv -v $out/share/virtuoso/doc $out/share/doc/${name}
+ mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version}
echo Removing jars and empty directories
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
'';
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 55d13ffae31f..4511eb3a7245 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.2";
- name = "${varnish.name}-digest-${version}";
+ pname = "${varnish.name}-digest";
src = fetchFromGitHub {
owner = "varnish";
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
index 6ad8288871b1..637380a5abd4 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.4";
- name = "${varnish.name}-dynamic-${version}";
+ pname = "${varnish.name}-dynamic";
src = fetchFromGitHub {
owner = "nigoroll";
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 0a8e97df61ee..527dd17c03c0 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.15.0";
- name = "${varnish.name}-modules-${version}";
+ pname = "${varnish.name}-modules";
src = fetchFromGitHub {
owner = "varnish";
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index 1c35ebeff3b0..f7a02b5c13dd 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -14,12 +14,12 @@ let
});
in package.override rec {
- name = "bookstack";
+ pname = "bookstack";
version = "21.05.3";
src = fetchFromGitHub {
owner = "bookstackapp";
- repo = name;
+ repo = pname;
rev = "v${version}";
sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8";
};
diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix
index 0e1d933ab589..40f8b1b43278 100644
--- a/pkgs/servers/web-apps/hedgedoc/default.nix
+++ b/pkgs/servers/web-apps/hedgedoc/default.nix
@@ -29,7 +29,7 @@ let
in
mkYarnPackage rec {
- name = "hedgedoc";
+ pname = "hedgedoc";
version = "1.8.2";
src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix
index 2cdd33a245e5..40e7d878da29 100644
--- a/pkgs/servers/web-apps/plausible/default.nix
+++ b/pkgs/servers/web-apps/plausible/default.nix
@@ -13,7 +13,6 @@
let
pname = "plausible";
version = "1.3.0";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "plausible";
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 8f3bbf61baa9..ad4d5603a135 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -95,7 +95,8 @@ let
];
};
in stdenv.mkDerivation {
- name = "xquartz-${lib.getVersion xorg.xorgserver}";
+ pname = "xquartz";
+ version = lib.getVersion xorg.xorgserver;
nativeBuildInputs = [ ruby makeWrapper ];
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index 3d130c93b784..e296112045d4 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -1,10 +1,11 @@
{ fetchurl, fetchpatch, lib, stdenv, libtirpc }:
stdenv.mkDerivation rec {
- name = "xinetd-2.3.15";
+ pname = "xinetd";
+ version = "2.3.15";
src = fetchurl {
- url = "http://www.xinetd.org/${name}.tar.gz";
+ url = "http://www.xinetd.org/xinetd-${version}.tar.gz";
sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz";
};
diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix
index c432d47becde..e298751facab 100644
--- a/pkgs/tools/backup/tsm-client/default.nix
+++ b/pkgs/tools/backup/tsm-client/default.nix
@@ -152,7 +152,7 @@ buildEnv {
ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir
ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys
ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys
- ${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"}
+ ${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"}
for bin in $out/bin/*
do
target=$(readlink "$bin")
diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/tools/networking/nttcp/default.nix
index 8979c5fd2acf..c5a4c4c1cd1f 100644
--- a/pkgs/tools/networking/nttcp/default.nix
+++ b/pkgs/tools/networking/nttcp/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, fetchurl, ... }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "nttcp";
version = "1.47";
src = fetchurl {
- url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";
+ url = "https://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";
sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50";
};
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 67df00b8e694..ff69dbc75445 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, fetchpatch
-, pkg-config, autoreconfHook
+{ lib, stdenv, fetchpatch, fetchFromGitHub
+, pkg-config, autoreconfHook, perl, gperf, bison, flex
, gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib
, openresolv
, systemd, pam
@@ -19,14 +19,16 @@ stdenv.mkDerivation rec {
pname = "strongswan";
version = "5.8.1"; # Make sure to also update when upgrading!
- src = fetchurl {
- url = "https://download.strongswan.org/${pname}-${version}.tar.bz2";
- sha256 = "034rd6kr1bmnvj8rg2kcxdjb0cgj3dn9310mmm94j1awxan71byr";
+ src = fetchFromGitHub {
+ owner = "strongswan";
+ repo = "strongswan";
+ rev = version;
+ sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd";
};
dontPatchELF = true;
- nativeBuildInputs = [ pkg-config autoreconfHook ];
+ nativeBuildInputs = [ pkg-config autoreconfHook perl gperf bison flex ];
buildInputs =
[ curl gmp python3 ldns unbound openssl pcsclite ]
++ optionals enableTNC [ trousers sqlite libxml2 ]
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 20b1fe720d34..9b4b37a232ca 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
};
makeWrapperArgs = [
- "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
+ "--prefix" "PATH" ":" "${lib.makeBinPath [ nixUnstable git ]}"
];
doCheck = false;
@@ -26,6 +26,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
homepage = "https://github.com/Mic92/nixpkgs-review";
license = licenses.mit;
- maintainers = [ maintainers.mic92 ];
+ maintainers = with maintainers; [ mic92 SuperSandro2000 ];
};
}
diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix
index f72f3c978ffe..127e7e9805e6 100644
--- a/pkgs/tools/security/step-ca/default.nix
+++ b/pkgs/tools/security/step-ca/default.nix
@@ -11,16 +11,18 @@
buildGoModule rec {
pname = "step-ca";
- version = "0.15.15";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
- sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY==";
+ sha256 = "sha256-8gesSfyL5ne0JqbB/TvEkQDZziTzJmsnIV+MTOfy3jk=";
};
- vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs=";
+ vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU=";
+
+ buildFlagsArray = [ "-ldflags=-buildid=" ];
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 68df6e557f61..c38f370b0bf1 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -42,8 +42,8 @@ in stdenv.mkDerivation {
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/vault \
- --prefix PATH ${lib.makeBinPath [ gawk glibc ]}
- '' + ''
+ --prefix PATH : ${lib.makeBinPath [ gawk glibc ]}
+
runHook postInstall
'';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd8257a3400b..a77b27b3002a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13645,7 +13645,7 @@ in
ffuf = callPackage ../tools/security/ffuf { };
flow = callPackage ../development/tools/analysis/flow {
- ocamlPackages = ocaml-ng.ocamlPackages_4_09;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_10;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1ac5196f265a..b798f462f7eb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6231,10 +6231,10 @@ let
DevelNYTProf = buildPerlPackage {
pname = "Devel-NYTProf";
- version = "6.06";
+ version = "6.10";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz";
- sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55";
+ url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz";
+ sha256 = "24ac4174f1f01322063fa4e119b247d371d3260ddca6e778c6c1a0e3f905f58e";
};
propagatedBuildInputs = [ FileWhich JSONMaybeXS ];
meta = {
@@ -6242,7 +6242,7 @@ let
description = "Powerful fast feature-rich Perl source code profiler";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
- buildInputs = [ TestDifferences ];
+ buildInputs = [ CaptureTiny TestDifferences ];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/*
@@ -11410,10 +11410,10 @@ let
LinkEmbedder = buildPerlPackage {
pname = "LinkEmbedder";
- version = "1.18";
+ version = "1.20";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.18.tar.gz";
- sha256 = "17gnixbawzr0r1k37dry7axb7ry6sj2xiahki28m8qbk1l69dfjz";
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.20.tar.gz";
+ sha256 = "19fwr3y8dd1bya2z86x3904s4dxfx15h7b777529j8n74m78ppmi";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ Mojolicious ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 067eaf167499..ced481b704ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2326,6 +2326,8 @@ in {
env-canada = callPackage ../development/python-modules/env-canada { };
+ environmental-override = callPackage ../development/python-modules/environmental-override {};
+
envisage = callPackage ../development/python-modules/envisage { };
envs = callPackage ../development/python-modules/envs { };
@@ -8286,6 +8288,8 @@ in {
sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };
+ sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { };
+
spidev = callPackage ../development/python-modules/spidev { };
splinter = callPackage ../development/python-modules/splinter { };