diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix
index ae7036e4626439ecf12028dff84366c86843ce61..68edd270985431213089ad0bb1a1def609469b9d 100644
--- a/doc/doc-support/lib-function-locations.nix
+++ b/doc/doc-support/lib-function-locations.nix
@@ -14,10 +14,10 @@ let
builtins.map
(subsetname: {
subsetname = subsetname;
- functions = libDefPos toplib."${subsetname}";
+ functions = libDefPos toplib.${subsetname};
})
(builtins.filter
- (name: builtins.isAttrs toplib."${name}")
+ (name: builtins.isAttrs toplib.${name})
(builtins.attrNames toplib));
nixpkgsLib = pkgs.lib;
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 1f5eb0d11e8bf7726184c8f10698d483374e1e73..3be36fcd719b03a0320de900726bb1638634a878 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -47,7 +47,7 @@ rec {
/* `makeOverridable` takes a function from attribute set to attribute set and
- injects `override` attibute which can be used to override arguments of
+ injects `override` attribute which can be used to override arguments of
the function.
nix-repl> x = {a, b}: { result = a + b; }
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 15de50456612876a596d0ed3b71201629df53191..155d6f0c3611ef1e128165423a6c5c636de8aafd 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -24,7 +24,7 @@ rec {
let arg = (merger init (defaultMergeArg init x));
# now add the function with composed args already applied to the final attrs
base = (setAttrMerge "passthru" {} (f arg)
- ( z: z // rec {
+ ( z: z // {
function = foldArgs merger f arg;
args = (lib.attrByPath ["passthru" "args"] {} z) // x;
} ));
diff --git a/lib/kernel.nix b/lib/kernel.nix
index 5923011774b153961c9ac55a419fe17fa9de5538..36ea3083828939bdc237c33cc60560207c9d4bcb 100644
--- a/lib/kernel.nix
+++ b/lib/kernel.nix
@@ -1,7 +1,7 @@
{ lib, version }:
with lib;
-rec {
+{
# Common patterns/legacy
whenAtLeast = ver: mkIf (versionAtLeast version ver);
whenOlder = ver: mkIf (versionOlder version ver);
diff --git a/lib/licenses.nix b/lib/licenses.nix
index c964060d2a5c88436f4652084066d8d91991b3a2..83e1ec7748d56fb22cd919683164028c7a938925 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -7,7 +7,7 @@ let
in
-lib.mapAttrs (n: v: v // { shortName = n; }) rec {
+lib.mapAttrs (n: v: v // { shortName = n; }) {
/* License identifiers from spdx.org where possible.
* If you cannot find your license here, then look for a similar license or
* add it to this list. The URL mentioned above is a good source for inspiration.
diff --git a/lib/lists.nix b/lib/lists.nix
index e4fcf959b60c845671e1fde2187c6d0dea3ee0d8..d075a02d4755218557c3e39c5225deae928b9643 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -459,11 +459,11 @@ rec {
if length list < 2
then # finish
{ result = list; }
- else if dfsthis ? "cycle"
+ else if dfsthis ? cycle
then # there's a cycle, starting from the current vertex, return it
{ cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited);
inherit (dfsthis) loops; }
- else if toporest ? "cycle"
+ else if toporest ? cycle
then # there's a cycle somewhere else in the graph, return it
toporest
# Slow, but short. Can be made a bit faster with an explicit stack.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 8aa413f53817b9e60249c1f7478390b2f2b700f7..0c0cdf1f11b197e2d1d6b3ab74dfb9cfd7421c3d 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -58,13 +58,13 @@ rec {
uname = {
# uname -s
system = {
- "linux" = "Linux";
- "windows" = "Windows";
- "darwin" = "Darwin";
- "netbsd" = "NetBSD";
- "freebsd" = "FreeBSD";
- "openbsd" = "OpenBSD";
- "wasi" = "Wasi";
+ linux = "Linux";
+ windows = "Windows";
+ darwin = "Darwin";
+ netbsd = "NetBSD";
+ freebsd = "FreeBSD";
+ openbsd = "OpenBSD";
+ wasi = "Wasi";
}.${final.parsed.kernel.name} or null;
# uname -p
@@ -86,10 +86,10 @@ rec {
else if final.isx86_64 then "x86_64"
else if final.isx86 then "i386"
else {
- "powerpc" = "ppc";
- "powerpcle" = "ppc";
- "powerpc64" = "ppc64";
- "powerpc64le" = "ppc64le";
+ powerpc = "ppc";
+ powerpcle = "ppc";
+ powerpc64 = "ppc64";
+ powerpc64le = "ppc64le";
}.${final.parsed.cpu.name} or final.parsed.cpu.name;
emulator = pkgs: let
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 823f6a915d6e7fe31eb545149e4e235b608b71b1..8e02fcb5de0c554c468ca243fc0355f72370bb00 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -33,7 +33,7 @@ let
filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);
-in rec {
+in {
inherit all;
none = [];
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index aa55438de082e004e96c8974e3e3e693c4a529fc..511ae1979485d98d682709b86e3f3212a3d6434d 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -24,27 +24,27 @@ rec {
platform = platforms.powernv;
};
- sheevaplug = rec {
+ sheevaplug = {
config = "armv5tel-unknown-linux-gnueabi";
platform = platforms.sheevaplug;
};
- raspberryPi = rec {
+ raspberryPi = {
config = "armv6l-unknown-linux-gnueabihf";
platform = platforms.raspberrypi;
};
- armv7l-hf-multiplatform = rec {
+ armv7l-hf-multiplatform = {
config = "armv7l-unknown-linux-gnueabihf";
platform = platforms.armv7l-hf-multiplatform;
};
- aarch64-multiplatform = rec {
+ aarch64-multiplatform = {
config = "aarch64-unknown-linux-gnu";
platform = platforms.aarch64-multiplatform;
};
- armv7a-android-prebuilt = rec {
+ armv7a-android-prebuilt = {
config = "armv7a-unknown-linux-androideabi";
sdkVer = "24";
ndkVer = "18b";
@@ -52,7 +52,7 @@ rec {
useAndroidPrebuilt = true;
};
- aarch64-android-prebuilt = rec {
+ aarch64-android-prebuilt = {
config = "aarch64-unknown-linux-android";
sdkVer = "24";
ndkVer = "18b";
@@ -65,17 +65,17 @@ rec {
inherit (platform.gcc) fpu;
};
- pogoplug4 = rec {
+ pogoplug4 = {
config = "armv5tel-unknown-linux-gnueabi";
platform = platforms.pogoplug4;
};
- ben-nanonote = rec {
+ ben-nanonote = {
config = "mipsel-unknown-linux-uclibc";
platform = platforms.ben_nanonote;
};
- fuloongminipc = rec {
+ fuloongminipc = {
config = "mipsel-unknown-linux-gnu";
platform = platforms.fuloong2f_n32;
};
@@ -236,4 +236,9 @@ rec {
useLLVM = true;
};
+ # Ghcjs
+ ghcjs = {
+ config = "js-unknown-ghcjs";
+ platform = {};
+ };
}
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 9a12e3c3926dd61a9b84709452b156a06164ecba..8a983b3d363720caeab170b102cdd9b41067630c 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -12,7 +12,7 @@ rec {
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
isPowerPC = { cpu = cpuTypes.powerpc; };
- isPower = { cpu = { family = "power"; }; };
+ isPower = { cpu = { family = "power"; }; };
isx86 = { cpu = { family = "x86"; }; };
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
@@ -23,6 +23,7 @@ rec {
isMsp430 = { cpu = { family = "msp430"; }; };
isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; };
+ isJavaScript = { cpu = cpuTypes.js; };
is32bit = { cpu = { bits = 32; }; };
is64bit = { cpu = { bits = 64; }; };
@@ -44,6 +45,7 @@ rec {
isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
isWasi = { kernel = kernels.wasi; };
+ isGhcjs = { kernel = kernels.ghcjs; };
isNone = { kernel = kernels.none; };
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index b088cd342f1264315377304895f9694c56e813b6..5e12df32ffdd25dbcf5cf0fbdee4868fe64701ea 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -106,11 +106,13 @@ rec {
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
-
+
alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; };
avr = { bits = 8; family = "avr"; };
+
+ js = { bits = 32; significantByte = littleEndian; family = "js"; };
};
# Determine where two CPUs are compatible with each other. That is,
@@ -271,6 +273,7 @@ rec {
solaris = { execFormat = elf; families = { }; };
wasi = { execFormat = wasm; families = { }; };
windows = { execFormat = pe; families = { }; };
+ ghcjs = { execFormat = unknown; families = { }; };
} // { # aliases
# 'darwin' is the kernel for all of them. We choose macOS by default.
darwin = kernels.macos;
@@ -384,6 +387,8 @@ rec {
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
+ else if (elemAt l 2 == "ghcjs")
+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
else throw "Target specification with 3 components is ambiguous";
"4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
}.${toString (length l)}
@@ -403,7 +408,7 @@ rec {
getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
- parsed = rec {
+ parsed = {
cpu = getCpu args.cpu;
vendor =
/**/ if args ? vendor then getVendor args.vendor
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index a2b43c970a411ef6e894d1a5fb1b1bcea48da20e..ab3cf1d54301711125b9c2e64aa3cf03aa3775a6 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -456,16 +456,16 @@ rec {
};
selectBySystem = system: {
- "i486-linux" = pc32;
- "i586-linux" = pc32;
- "i686-linux" = pc32;
- "x86_64-linux" = pc64;
- "armv5tel-linux" = sheevaplug;
- "armv6l-linux" = raspberrypi;
- "armv7a-linux" = armv7l-hf-multiplatform;
- "armv7l-linux" = armv7l-hf-multiplatform;
- "aarch64-linux" = aarch64-multiplatform;
- "mipsel-linux" = fuloong2f_n32;
- "powerpc64le-linux" = powernv;
+ i486-linux = pc32;
+ i586-linux = pc32;
+ i686-linux = pc32;
+ x86_64-linux = pc64;
+ armv5tel-linux = sheevaplug;
+ armv6l-linux = raspberrypi;
+ armv7a-linux = armv7l-hf-multiplatform;
+ armv7l-linux = armv7l-hf-multiplatform;
+ aarch64-linux = aarch64-multiplatform;
+ mipsel-linux = fuloong2f_n32;
+ powerpc64le-linux = powernv;
}.${system} or pcBase;
}
diff --git a/lib/types.nix b/lib/types.nix
index 9c00656ab9186b9cc58af2591153d3910d455cda..5e9a28ac4f0a8e8bb57d6cea63eb25bfec0f90a1 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -42,7 +42,7 @@ rec {
# Default type functor
defaultFunctor = name: {
inherit name;
- type = types."${name}" or null;
+ type = types.${name} or null;
wrapped = null;
payload = null;
binOp = a: b: null;
@@ -107,7 +107,7 @@ rec {
merge = mergeEqualOption;
};
- int = mkOptionType rec {
+ int = mkOptionType {
name = "int";
description = "signed integer";
check = isInt;
@@ -136,7 +136,7 @@ rec {
sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
"signedInt${toString bit}" "${toString bit} bit signed integer";
- in rec {
+ in {
/* An int with a fixed range.
*
* Example:
@@ -172,7 +172,7 @@ rec {
# Alias of u16 for a port number
port = ints.u16;
- float = mkOptionType rec {
+ float = mkOptionType {
name = "float";
description = "floating point number";
check = isFloat;
@@ -217,7 +217,8 @@ rec {
# Deprecated; should not be used because it quietly concatenates
# strings, which is usually not what you want.
- string = separatedString "";
+ string = warn "types.string is deprecated because it quietly concatenates strings"
+ (separatedString "");
attrs = mkOptionType {
name = "attrs";
diff --git a/lib/versions.nix b/lib/versions.nix
index 8f7f98ff5e1e1cdafb1a463ce96a7159c4742be1..2c05445b3dd077a54d49d6a51503609402394ca9 100644
--- a/lib/versions.nix
+++ b/lib/versions.nix
@@ -7,7 +7,7 @@ let
in
-rec {
+{
/* Get the major version string from a string.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94ef79ee387b963040280d5b7eda21fc62804bb1..397bec6057dc16174d78eb5a3bd50653826c32df 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2091,7 +2091,7 @@
githubId = 2817965;
name = "f--t";
};
- f-breidenstein = {
+ fleaz = {
email = "mail@felixbreidenstein.de";
github = "fleaz";
githubId = 2489598;
@@ -5095,6 +5095,12 @@
githubId = 9568176;
name = "Piotr Halama";
};
+ puckipedia = {
+ email = "puck@puckipedia.com";
+ github = "puckipedia";
+ githubId = 488734;
+ name = "Puck Meerburg";
+ };
puffnfresh = {
email = "brian@brianmckenna.org";
github = "puffnfresh";
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 21c4ea75d6dd662599ac2006f6c0bce3c2aaee2e..04fa1643d0fd06363e666648c3d664d725d54ef8 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -16,6 +16,6 @@
On images where the installation media also becomes an installation target,
copying over configuration.nix should be disabled by
setting installer.cloneConfig to false.
- This is already done in sd-image.nix.
+ For example, this is done in sd-image-aarch64.nix.
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 560b3198517611caffe8953a10f66a336b22f749..11c13b8d942b118ad10180443184685d76c4473f 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -57,6 +57,64 @@
and simultaneously or to downgrade from Xfce 4.14 after upgrading.
+
+
+ The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
+ like games.
+
+ This can be achieved with the following options which the desktop manager default enables, excluding games.
+ services.gnome3.core-os-services.enable
+ services.gnome3.core-shell.enable
+ services.gnome3.core-utilities.enable
+ services.gnome3.games.enable
+
+ With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
+ disable options or use which only excluded the optional applications.
+ is now unguarded, it can exclude any package installed with
+ in the GNOME 3 module.
+
+
+
+
+ Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
+ to match as close as possible to a default reference GNOME 3 experience.
+
+
+ The following changes were enacted in
+
+
+ Applications removed from defaults:
+ accerciser
+ dconf-editor
+ evolution
+ gnome-documents
+ gnome-nettool
+ gnome-power-manager
+ gnome-todo
+ gnome-tweaks
+ gnome-usage
+ gucharmap
+ nautilus-sendto
+ vinagre
+
+
+ Applications added to defaults:
+ cheese
+ geary
+
+
+ The following changes were enacted in
+
+
+ Applications added to defaults:
+ gnome-color-manager
+ orca
+
+
+ Services enabled:
+
+
+
@@ -348,6 +406,12 @@
What used to be called emacsPackagesNg is now simply called emacsPackages.
+
+
+ is now disabled by default.
+ It was not useful except for debugging purposes and was confusingly set as default in some circumstances.
+
+
@@ -547,8 +611,8 @@
-
- This also configures the kernel to pass coredumps to systemd-coredump.
+ This also configures the kernel to pass coredumps to systemd-coredump,
+ and restricts the SysRq key combinations to the sync command only.
These sysctl snippets can be found in /etc/sysctl.d/50-*.conf,
and overridden via boot.kernel.sysctl
(which will place the parameters in /etc/sysctl.d/60-nixos.conf).
@@ -591,6 +655,51 @@
The defaults from fontconfig are sufficient.
+
+
+ The crashplan package and the
+ crashplan service have been removed from nixpkgs due to
+ crashplan shutting down the service, while the crashplansb
+ package and crashplan-small-business service have been
+ removed from nixpkgs due to lack of maintainer.
+
+
+ The redis module was hardcoded to use the redis user,
+ /run/redis as runtime directory and
+ /var/lib/redis as state directory.
+ Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP),
+ because this features causes major performance problems for Redis,
+ e.g. (https://redis.io/topics/latency).
+
+
+
+
+ Using adds a default emoji font noto-fonts-emoji.
+
+ Users of the following options will have this enabled by default:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The altcoins categorization of packages has
+ been removed. You now access these packages at the top level,
+ ie. nix-shell -p dogecoin instead of
+ nix-shell -p altcoins.dogecoin, etc.
+
+
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index 88e052106a2890f02c1121f2e1e9bee733cdf727..35c8b543dece54dda34d8a600d9739a0efd375c8 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -126,7 +126,7 @@ let
}
'';
-in rec {
+in {
inherit optionsNix;
optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix);
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index 779f0377a512300e8b65ac3eea73615f53e63583..774f66b4804e0de6fe58c7f88a407744905b2137 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -17,9 +17,9 @@ in
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
qemuBinary = qemuPkg: {
- "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
- "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
- "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
- "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+ x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+ armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
+ aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
+ x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
}.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm";
}
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index b68e55a40b90829d06e620f9924c149b6ecfe464..3297cf06108b7402c1f5da392c56e233831af62d 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -1,6 +1,6 @@
pkgs: with pkgs.lib;
-rec {
+{
# Check whenever fileSystem is needed for boot
fsNeededForBoot = fs: fs.neededForBoot
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 7100f10dcfc88f396418a51a06204741c7aa50c0..7e311a21acf69a3aec7120b3072aad2779f5fda4 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -35,8 +35,8 @@ let
then "fontconfig"
else "fontconfig_${version}";
makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
- cache = makeCache pkgs."${fcPackage}";
- cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}";
+ cache = makeCache pkgs.${fcPackage};
+ cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
in
pkgs.writeText "fc-00-nixos-cache.conf" ''
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 45328f3eaf13915df97901fc55ce8d96655e2fac..84d90899dfff4e1d22f083b835e447ab9019f003 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -79,7 +79,7 @@ in
config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
fonts.fontconfig.confPackages = [ confPkg ];
- environment.variables."INFINALITY_FT" = cfg.preset;
+ environment.variables.INFINALITY_FT = cfg.preset;
};
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index fe0b88cf4c266f0eb07fb96a14c4dfba487496eb..bcb86f11ead7637350fba75a12a0e3e3ff71d6d9 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -116,7 +116,7 @@ let
defaultFontsConf =
let genDefault = fonts: name:
optionalString (fonts != []) ''
-
+
${name}
${concatStringsSep ""
@@ -139,6 +139,8 @@ let
${genDefault cfg.defaultFonts.monospace "monospace"}
+ ${genDefault cfg.defaultFonts.emoji "emoji"}
+
'';
@@ -344,6 +346,21 @@ in
in case multiple languages must be supported.
'';
};
+
+ emoji = mkOption {
+ type = types.listOf types.str;
+ default = ["Noto Color Emoji"];
+ description = ''
+ System-wide default emoji font(s). Multiple fonts may be listed
+ in case a font does not support all emoji.
+
+ Note that fontconfig matches color emoji fonts preferentially,
+ so if you want to use a black and white font while having
+ a color font installed (eg. Noto Color Emoji installed alongside
+ Noto Emoji), fontconfig will still choose the color font even
+ when it is later in the list.
+ '';
+ };
};
hinting = {
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index 0dd01df9da7476e3fcfb5da4273954fa490a9e10..abb806b601a76a5f497531204b6120bf569579b1 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -43,6 +43,7 @@ with lib;
pkgs.xorg.fontmiscmisc
pkgs.xorg.fontcursormisc
pkgs.unifont
+ pkgs.noto-fonts-emoji
];
};
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index 87021a27d34f240778ed65bead0470138d8c4bdf..ff16ffcf9c65b67575aa2a9a1da449f81250aaa1 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -15,7 +15,7 @@ let
realms = optionalAttrs (lib.all (value: value != null) [
cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer
]) {
- "${cfg.defaultRealm}" = {
+ ${cfg.defaultRealm} = {
kdc = cfg.kdc;
admin_server = cfg.kerberosAdminServer;
};
@@ -25,7 +25,7 @@ let
cfg.domainRealm cfg.defaultRealm
]) {
".${cfg.domainRealm}" = cfg.defaultRealm;
- "${cfg.domainRealm}" = cfg.defaultRealm;
+ ${cfg.domainRealm} = cfg.defaultRealm;
};
};
diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
index 65130454735c734cc30917deac8965e314a237e0..31a659ee83fe92f5837aaf8f49720393f7adb30f 100644
--- a/nixos/modules/config/malloc.nix
+++ b/nixos/modules/config/malloc.nix
@@ -6,7 +6,7 @@ let
# The set of alternative malloc(3) providers.
providers = {
- "graphene-hardened" = rec {
+ graphene-hardened = {
libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so";
description = ''
An allocator designed to mitigate memory corruption attacks, such as
@@ -14,7 +14,7 @@ let
'';
};
- "jemalloc" = {
+ jemalloc = {
libPath = "${pkgs.jemalloc}/lib/libjemalloc.so";
description = ''
A general purpose allocator that emphasizes fragmentation avoidance
@@ -22,7 +22,7 @@ let
'';
};
- "scudo" = {
+ scudo = {
libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so";
description = ''
A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,
@@ -32,7 +32,7 @@ let
};
};
- providerConf = providers."${cfg.provider}";
+ providerConf = providers.${cfg.provider};
# An output that contains only the shared library, to avoid
# needlessly bloating the system closure
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 4b9086022ed53d2e8b1cd56e86c909c2e02e26e9..a89667ea221cc4dc0621346b13188f8907c9e48f 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -171,13 +171,13 @@ in
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
- "services".source = pkgs.iana-etc + "/etc/services";
+ services.source = pkgs.iana-etc + "/etc/services";
# /etc/protocols: IP protocol numbers.
- "protocols".source = pkgs.iana-etc + "/etc/protocols";
+ protocols.source = pkgs.iana-etc + "/etc/protocols";
# /etc/hosts: Hostname-to-IP mappings.
- "hosts".text = let
+ hosts.text = let
oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
in ''
@@ -190,7 +190,7 @@ in
} // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
# /etc/rpc: RPC program numbers.
- "rpc".source = pkgs.glibc.out + "/etc/rpc";
+ rpc.source = pkgs.glibc.out + "/etc/rpc";
};
networking.proxy.envVars =
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 0277f1ad11e9c4d2ba96e9d4a8536a0cc6b96bd0..64cdf50f1413f643af398cee7f48963efd1ac93f 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -78,7 +78,7 @@ in
};
# Service executed before suspending/hibernating.
- systemd.services."pre-sleep" =
+ systemd.services.pre-sleep =
{ description = "Pre-Sleep Actions";
wantedBy = [ "sleep.target" ];
before = [ "sleep.target" ];
@@ -89,7 +89,7 @@ in
serviceConfig.Type = "oneshot";
};
- systemd.services."post-resume" =
+ systemd.services.post-resume =
{ description = "Post-Resume Actions";
after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ];
script =
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 6379b52870ea27be181069c2ad4f5a63f6467540..9dfc1add82996e3691687248dce910253f635876 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -163,7 +163,7 @@ in
l = "ls -alh";
};
- environment.etc."shells".text =
+ environment.etc.shells.text =
''
${concatStringsSep "\n" (map utils.toShellPath cfg.shells)}
/bin/sh
@@ -171,7 +171,7 @@ in
# For resetting environment with `. /etc/set-environment` when needed
# and discoverability (see motivation of #30418).
- environment.etc."set-environment".source = config.system.build.setEnvironment;
+ environment.etc.set-environment.source = config.system.build.setEnvironment;
system.build.setEnvironment = pkgs.writeText "set-environment"
''
diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index 4fd6ba5ea605902cbb021d4eacba10b70122ab58..b86ce2dbf05726939f5adc762166bde2cf4cb6ad 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -8,7 +8,7 @@
"/share/terminfo"
];
- environment.etc."terminfo" = {
+ environment.etc.terminfo = {
source = "${config.system.path}/share/terminfo";
};
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 25f1c67ce83063e73ceaaa9dc6efaa729b616219..ba79bd3d6ecc5708dbc13edcc5a77ab547a16239 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -181,7 +181,7 @@ let
};
hashedPassword = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the hashed password for the user.
@@ -191,7 +191,7 @@ let
};
password = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the (clear text) password for the user.
@@ -203,7 +203,7 @@ let
};
passwordFile = mkOption {
- type = with types; uniq (nullOr string);
+ type = with types; nullOr str;
default = null;
description = ''
The full path to a file that contains the user's password. The password
@@ -215,7 +215,7 @@ let
};
initialHashedPassword = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the initial hashed password for the user, i.e. the
@@ -230,7 +230,7 @@ let
};
initialPassword = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the initial password for the user, i.e. the
@@ -304,7 +304,7 @@ let
};
members = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [];
description = ''
The user names of the group members, added to the
@@ -546,11 +546,11 @@ in {
environment.systemPackages = systemShells;
environment.etc = {
- "subuid" = {
+ subuid = {
text = subuidFile;
mode = "0644";
};
- "subgid" = {
+ subgid = {
text = subgidFile;
mode = "0644";
};
diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix
index 60fc95a7582814cdb7005319c28bb6fc54993480..02e4c3f46f8d28b590e75aef0d95a9d67393c1f7 100644
--- a/nixos/modules/hardware/nitrokey.nix
+++ b/nixos/modules/hardware/nitrokey.nix
@@ -36,6 +36,6 @@ in
{ inherit (cfg) group; }
))
];
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
};
}
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index f867bba806304bc904dc8b4b5a1e359408aee136..0aab7bd6b92c9c2780e2af9ecec8afc0321abcec 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -33,7 +33,7 @@ in
boot.blacklistedKernelModules = [ "radeon" ];
- environment.etc."ati".source = "${ati_x11}/etc/ati";
+ environment.etc.ati.source = "${ati_x11}/etc/ati";
};
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index da3c8ee5a9fa4b257ae3355f01558fa7a310cea0..3ab2afc9740704eb1fc06eec48c73235edc1b6da 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -88,7 +88,7 @@ in
};
hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
- type = lib.types.string;
+ type = lib.types.str;
default = "";
example = "PCI:1:0:0";
description = ''
@@ -98,7 +98,7 @@ in
};
hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
- type = lib.types.string;
+ type = lib.types.str;
default = "";
example = "PCI:0:2:0";
description = ''
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index a9241870fa71f013eb77755b5f45bdb4cacf86d0..2d34406a0320e46e9939295e8d4859882c25eb85 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -59,4 +59,8 @@ in
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
'';
};
+
+ # the installation media is also the installation target,
+ # so we don't want to provide the installation configuration.nix.
+ installer.cloneConfig = false;
}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index dab0924153160e2b4d9d061f5286b97a1877a655..651d1a36dc11b057d160529bff5dfd92b8b96280 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -56,4 +56,8 @@ in
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
'';
};
+
+ # the installation media is also the installation target,
+ # so we don't want to provide the installation configuration.nix.
+ installer.cloneConfig = false;
}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 8c9090471dcdbc9f503cad446392d0af1d5e2f43..2a131d9ce980f946ad09d7f16353089c9e697c8e 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -45,4 +45,8 @@ in
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
'';
};
+
+ # the installation media is also the installation target,
+ # so we don't want to provide the installation configuration.nix.
+ installer.cloneConfig = false;
}
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 07f6f627e6c0bdd198d89f78a93e4c03342f82d0..0a01504415549bbad3d134ae294676954e274baa 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -54,7 +54,7 @@ in
};
firmwarePartitionID = mkOption {
- type = types.string;
+ type = types.str;
default = "0x2178694e";
description = ''
Volume ID for the /boot/firmware partition on the SD card. This value
@@ -63,7 +63,7 @@ in
};
rootPartitionUUID = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7";
description = ''
@@ -194,9 +194,5 @@ in
rm -f /nix-path-registration
fi
'';
-
- # the installation media is also the installation target,
- # so we don't want to provide the installation configuration.nix.
- installer.cloneConfig = false;
};
}
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index 5da5df81ede120c312cca4a86efe2d8d158135d7..bf8b7deb59eb8d9f545ab37304090fe224d52e61 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -129,7 +129,7 @@ in
];
nixpkgs.config = {
- packageOverrides = p: rec {
+ packageOverrides = p: {
linux_3_4 = p.linux_3_4.override {
extraConfig = ''
# Enable drivers in kernel for most NICs.
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index f9b8d95c684de6c80a61c46b726cff23acc208eb..5146858cccf5a399cc422da0a1f41a2f6c930d42 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -18,7 +18,7 @@ with lib;
};
- config = rec {
+ config = {
# Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency.
boot.loader.grub.enable = false;
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 3ae60cb7916018f788eec290dbc2164cc6037769..773724ffbd5e85b12db2c54df4ee9450e1244f29 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -85,7 +85,7 @@ in
# Generate /etc/os-release. See
# https://www.freedesktop.org/software/systemd/man/os-release.html for the
# format.
- environment.etc."os-release".text =
+ environment.etc.os-release.text =
''
NAME=NixOS
ID=nixos
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b6c946b99e001fe98f665a969eb9c27031dd1bf3..4bc37ed3f17162548a19781fd42ed47559ce33ab 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -138,6 +138,7 @@
./programs/qt5ct.nix
./programs/screen.nix
./programs/sedutil.nix
+ ./programs/seahorse.nix
./programs/slock.nix
./programs/shadow.nix
./programs/shell.nix
@@ -216,8 +217,6 @@
./services/backup/bacula.nix
./services/backup/borgbackup.nix
./services/backup/duplicati.nix
- ./services/backup/crashplan.nix
- ./services/backup/crashplan-small-business.nix
./services/backup/duplicity.nix
./services/backup/mysql-backup.nix
./services/backup/postgresql-backup.nix
@@ -303,7 +302,6 @@
./services/desktops/gnome3/gnome-settings-daemon.nix
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/rygel.nix
- ./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
./services/desktops/gnome3/tracker-miners.nix
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index 4651cdb76e0b833f162305d0b36921f24b0402e5..7ef8d687ca17f50088eb8462102d60623d6ce3c8 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -30,7 +30,7 @@ in
};
config = mkIf (cfg.settings != {}) {
- environment.etc."atoprc".text =
+ environment.etc.atoprc.text =
concatStrings (mapAttrsToList (n: v: "${n} ${toString v}\n") cfg.settings);
};
}
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 99daec5ff5b7299d892694fa40072d66befd19e8..548babac38ca1d308574026e38f4906573fd85bc 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -159,7 +159,7 @@ in
};
- environment.etc."profile".text =
+ environment.etc.profile.text =
''
# /etc/profile: DO NOT EDIT -- this file has been generated automatically.
# This file is read for login shells.
@@ -184,7 +184,7 @@ in
fi
'';
- environment.etc."bashrc".text =
+ environment.etc.bashrc.text =
''
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
@@ -212,7 +212,7 @@ in
# Configuration for readline in bash. We use "option default"
# priority to allow user override using both .text and .source.
- environment.etc."inputrc".source = mkOptionDefault ./inputrc;
+ environment.etc.inputrc.source = mkOptionDefault ./inputrc;
users.defaultUserShell = mkDefault pkgs.bashInteractive;
diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 46ee4bc0f7a015db9eed93502842205e315fd1ac..74c3e4425a7c53289ea28b0d5801f69a9e344d97 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.programs.firejail;
- wrappedBins = pkgs.stdenv.mkDerivation rec {
+ wrappedBins = pkgs.stdenv.mkDerivation {
name = "firejail-wrapped-binaries";
nativeBuildInputs = with pkgs; [ makeWrapper ];
buildCommand = ''
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index 9fdf99e9c694af257f93526c769e7c9a2685a66d..e19935b77cafbfbc75028210c056ad7272445cde 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -54,8 +54,8 @@ in
type = types.attrsOf types.str;
default = {};
example = {
- "h" = "noaction 5\e(";
- "l" = "noaction 5\e)";
+ h = "noaction 5\e(";
+ l = "noaction 5\e)";
};
description = "Defines new command keys.";
};
@@ -74,7 +74,7 @@ in
type = types.attrsOf types.str;
default = {};
example = {
- "\e" = "abort";
+ e = "abort";
};
description = "Defines new line-editing keys.";
};
@@ -111,11 +111,11 @@ in
environment.systemPackages = [ pkgs.less ];
environment.variables = {
- "LESSKEY_SYSTEM" = toString lessKey;
+ LESSKEY_SYSTEM = toString lessKey;
} // optionalAttrs (cfg.lessopen != null) {
- "LESSOPEN" = cfg.lessopen;
+ LESSOPEN = cfg.lessopen;
} // optionalAttrs (cfg.lessclose != null) {
- "LESSCLOSE" = cfg.lessclose;
+ LESSCLOSE = cfg.lessclose;
};
warnings = optional (
diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix
index 6a4d46338e19bb3774ad553e0ac43d374b5c6b88..5837dd46d7cd71021e79421c1b270526e02f19e8 100644
--- a/nixos/modules/programs/nano.nix
+++ b/nixos/modules/programs/nano.nix
@@ -35,7 +35,7 @@ in
###### implementation
config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) {
- environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc
+ environment.etc.nanorc.text = lib.concatStrings [ cfg.nanorc
(lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ];
};
diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix
index 5fdd4fa841a1ebec87d8cd1f6747ea7a278bd4c8..b351d80c7acfc80481cd0ec30c4dcac8c17cfb0e 100644
--- a/nixos/modules/programs/npm.nix
+++ b/nixos/modules/programs/npm.nix
@@ -36,7 +36,7 @@ in
###### implementation
config = lib.mkIf cfg.enable {
- environment.etc."npmrc".text = cfg.npmrc;
+ environment.etc.npmrc.text = cfg.npmrc;
environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix
index c1daaa58f16f4d0a3348e9aa3b2e03eb56d08b98..4fd800dbae79ac27dd146a55f5ce2471cc793b0e 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixos/modules/programs/screen.nix
@@ -24,7 +24,7 @@ in
###### implementation
config = mkIf (cfg.screenrc != "") {
- environment.etc."screenrc".text = cfg.screenrc;
+ environment.etc.screenrc.text = cfg.screenrc;
environment.systemPackages = [ pkgs.screen ];
};
diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c08b0a85374cdeb8e1b85efdb8f90f9a88ec81f1
--- /dev/null
+++ b/nixos/modules/programs/seahorse.nix
@@ -0,0 +1,44 @@
+# Seahorse.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ # Added 2019-08-27
+ imports = [
+ (mkRenamedOptionModule
+ [ "services" "gnome3" "seahorse" "enable" ]
+ [ "programs" "seahorse" "enable" ])
+ ];
+
+
+ ###### interface
+
+ options = {
+
+ programs.seahorse = {
+
+ enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring";
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.programs.seahorse.enable {
+
+ environment.systemPackages = [
+ pkgs.gnome3.seahorse
+ ];
+
+ services.dbus.packages = [
+ pkgs.gnome3.seahorse
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index 21ed6603c1bdd283bef4ebea5f83a9b6766c81b8..b909916158d3897103227fdfc3837486238affda 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -17,7 +17,7 @@ in
alias = mkOption {
default = "fuck";
- type = types.string;
+ type = types.str;
description = ''
`thefuck` needs an alias to be configured.
diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index 648fd9a8a94f45ffdfd6421b8ffe79d69b506de4..c03e59a5b4abe87707ae496ace0ca3233021505c 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -61,7 +61,7 @@ in
description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option.";
example = {
- "projname" = {
+ projname = {
id = 50;
path = "/xfsprojects/projname";
sizeHardLimit = "50g";
diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix
index 5cd2a49f8073395f6deebbb7d17b634b45c5f9cf..1590020f7b64898650636ecbe28b222f05019b3f 100644
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixos/modules/programs/xonsh.nix
@@ -45,7 +45,7 @@ in
config = mkIf cfg.enable {
- environment.etc."xonshrc".text = cfg.config;
+ environment.etc.xonshrc.text = cfg.config;
environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
index 070463311db58a464eddb2e6718a54dfa90f6674..a7ad9b89db4dbb22176b60692836f7c878684494 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixos/modules/programs/xss-lock.nix
@@ -12,7 +12,7 @@ in
lockerCommand = mkOption {
default = "${pkgs.i3lock}/bin/i3lock";
example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
- type = types.string;
+ type = types.separatedString " ";
description = "Locker to be used with xsslock";
};
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index db085211366ee84f3aa13e5c63e033de70698a96..5de9331ac5204d6642fcf0f80baa96d4b474da9d 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -76,7 +76,7 @@ in
font = mkOption {
default = "sans bold 9";
example = "Droid Sans, FontAwesome Bold 9";
- type = types.string;
+ type = types.str;
description = ''
The font that will be used to draw the status bar.
@@ -95,7 +95,7 @@ in
extra = mkOption {
default = {};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
description = ''
An attribute set which contains further attributes of a bar.
@@ -107,7 +107,7 @@ in
type = types.attrsOf(types.submodule {
options.exec = mkOption {
example = "YABAR_DATE";
- type = types.string;
+ type = types.str;
description = ''
The type of the indicator to be executed.
'';
@@ -125,7 +125,7 @@ in
options.extra = mkOption {
default = {};
- type = types.attrsOf (types.either types.string types.int);
+ type = types.attrsOf (types.either types.str types.int);
description = ''
An attribute set which contains further attributes of a indicator.
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 89087a229eb7396c27bae2915b4e617d130f4f2d..7184e5d9b9a826a5a4ccc67f5e442517880a044f 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -33,7 +33,7 @@ in
patterns = mkOption {
default = {};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
example = literalExample ''
{
@@ -50,7 +50,7 @@ in
};
styles = mkOption {
default = {};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
example = literalExample ''
{
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 6e9eefd74d18a8ad78fb90fd3944682adb9be85e..c66c29ed45fb926716f56f8bb66184d2372bda40 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -133,7 +133,7 @@ in
programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
- environment.etc."zshenv".text =
+ environment.etc.zshenv.text =
''
# /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
# This file is read for all shells.
@@ -157,7 +157,7 @@ in
fi
'';
- environment.etc."zprofile".text =
+ environment.etc.zprofile.text =
''
# /etc/zprofile: DO NOT EDIT -- this file has been generated automatically.
# This file is read for login shells.
@@ -176,7 +176,7 @@ in
fi
'';
- environment.etc."zshrc".text =
+ environment.etc.zshrc.text =
''
# /etc/zshrc: DO NOT EDIT -- this file has been generated automatically.
# This file is read for interactive shells.
@@ -225,7 +225,7 @@ in
fi
'';
- environment.etc."zinputrc".source = ./zinputrc;
+ environment.etc.zinputrc.source = ./zinputrc;
environment.systemPackages = [ pkgs.zsh ]
++ optional cfg.enableCompletion pkgs.nix-zsh-completions;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1048c2af2ea85aa4f10c54dadae32051dcbad8b6..9e0ab60ca679845ae3e0788ccb891d73d7236647 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -256,7 +256,7 @@ with lib;
# binfmt
(mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
-
+
# ACME
(mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
(mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
@@ -285,6 +285,13 @@ with lib;
throw "services.redshift.longitude is set to null, you can remove this"
else builtins.fromJSON value))
+ # Redis
+ (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
+ (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
+ (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")
+ (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")
+ (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")
+
] ++ (forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
"snmpExporter" "unifiExporter" "varnishExporter" ]
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index feb54affbf83102919fedbf4cba9468563a9796a..b321c04e574c49b15362433f8a524e5d1d48eb3a 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -213,7 +213,7 @@ in
StateDirectoryMode = rights;
WorkingDirectory = "/var/lib/${lpath}";
ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}";
- ExecStopPost =
+ ExecStopPost =
let
script = pkgs.writeScript "acme-post-stop" ''
#!${pkgs.runtimeShell} -e
@@ -298,6 +298,9 @@ in
};
})
);
+
+ systemd.targets.acme-selfsigned-certificates = mkIf cfg.preliminarySelfsigned {};
+ systemd.targets.acme-certificates = {};
})
];
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 6abac244dac24a0be9f99f28d7b68d5cb071e1e5..9d26cfbcfb10ecdb02d7459f208ce7f7748799a5 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -6,6 +6,10 @@ with lib;
options.security.auditd.enable = mkEnableOption "the Linux Audit daemon";
config = mkIf config.security.auditd.enable {
+ boot.kernelParams = [ "audit=1" ];
+
+ environment.systemPackages = [ pkgs.audit ];
+
systemd.services.auditd = {
description = "Linux Audit daemon";
wantedBy = [ "basic.target" ];
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index be6acb3f1f53e8b68b4c460d5673bb46f4a15fbc..2255477f26e4cb6a70c3e3bd41b87c3460a1268f 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -24,6 +24,6 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ sandbox ];
- security.wrappers."${sandbox.passthru.sandboxExecutableName}".source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
+ security.wrappers.${sandbox.passthru.sandboxExecutableName}.source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
};
}
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 89e71c5136e43b9275c4d8aa56b0fac4c222c3f6..9c7ddc2f4eea27aaebdd48bce8158ec8a71f41d7 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -685,7 +685,7 @@ in
};
id = mkOption {
example = "42";
- type = types.string;
+ type = types.str;
description = "client id";
};
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 7f1de81d5b70dfda49dcb3d99a93bd0145826049..f2b2df4004cb863195299851f6b63f76418af187 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -85,7 +85,7 @@ in
security.wrappers = {
pkexec.source = "${pkgs.polkit.bin}/bin/pkexec";
- "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
+ polkit-agent-helper-1.source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix
index 1c643f2e1a57063c527da467547c11173ff17810..b899ccb6c3e24cab94c030498fb4b54637a6dc5d 100644
--- a/nixos/modules/security/prey.nix
+++ b/nixos/modules/security/prey.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.prey;
- myPrey = pkgs."prey-bash-client".override {
+ myPrey = pkgs.prey-bash-client.override {
apiKey = cfg.apiKey;
deviceKey = cfg.deviceKey;
};
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 573588aaeecc04cb21c85f41bf3fbe73e328c0e0..10ee036be84ebc6653b79a6690d0b5fbf3f737fd 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -91,7 +91,7 @@ in
type = with types; listOf (submodule {
options = {
users = mkOption {
- type = with types; listOf (either string int);
+ type = with types; listOf (either str int);
description = ''
The usernames / UIDs this rule should apply for.
'';
@@ -99,7 +99,7 @@ in
};
groups = mkOption {
- type = with types; listOf (either string int);
+ type = with types; listOf (either str int);
description = ''
The groups / GIDs this rule should apply for.
'';
@@ -107,7 +107,7 @@ in
};
host = mkOption {
- type = types.string;
+ type = types.str;
default = "ALL";
description = ''
For what host this rule should apply.
@@ -115,7 +115,7 @@ in
};
runAs = mkOption {
- type = with types; string;
+ type = with types; str;
default = "ALL:ALL";
description = ''
Under which user/group the specified command is allowed to run.
@@ -130,11 +130,11 @@ in
description = ''
The commands for which the rule should apply.
'';
- type = with types; listOf (either string (submodule {
+ type = with types; listOf (either str (submodule {
options = {
command = mkOption {
- type = with types; string;
+ type = with types; str;
description = ''
A command being either just a path to a binary to allow any arguments,
the full command with arguments pre-set or with "" used as the argument,
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index dcb9c8d4ed5f3acf73c5c7bf559c3073b913f875..47738e7962ea66bcc8c61e0e28f20f95bf5858bc 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -7,7 +7,7 @@ let
programs =
(lib.mapAttrsToList
- (n: v: (if v ? "program" then v else v // {program=n;}))
+ (n: v: (if v ? program then v else v // {program=n;}))
wrappers);
securityWrapper = pkgs.stdenv.mkDerivation {
@@ -74,15 +74,15 @@ let
mkWrappedPrograms =
builtins.map
- (s: if (s ? "capabilities")
+ (s: if (s ? capabilities)
then mkSetcapProgram
({ owner = "root";
group = "root";
} // s)
else if
- (s ? "setuid" && s.setuid) ||
- (s ? "setgid" && s.setgid) ||
- (s ? "permissions")
+ (s ? setuid && s.setuid) ||
+ (s ? setgid && s.setgid) ||
+ (s ? permissions)
then mkSetuidProgram s
else mkSetuidProgram
({ owner = "root";
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 27bfd91cd2d58f0eaae5198050e353f531cffb64..7729da27304bb6438100a923f463e0c231d46b92 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -40,7 +40,7 @@ in {
'';
};
configurationURI = mkOption {
- type = types.string;
+ type = types.str;
default = "xbean:activemq.xml";
description = ''
The URI that is passed along to the BrokerFactory to
@@ -51,7 +51,7 @@ in {
'';
};
baseDir = mkOption {
- type = types.string;
+ type = types.str;
default = "/var/activemq";
description = ''
The base directory where ActiveMQ stores its persistent data and logs.
@@ -81,7 +81,7 @@ in {
'';
};
extraJavaOptions = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
example = "-Xmx2G -Xms2G -XX:MaxPermSize=512M";
description = ''
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 376aad66e236225de09944bf4d8693a3b98fa0eb..f632644af09ef4655dcd903f762347eb3d6ccaf1 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -64,7 +64,7 @@ in
};
volumeStep = mkOption {
- type = types.string;
+ type = types.str;
default = "1";
example = "1%";
description = ''
@@ -99,7 +99,7 @@ in
boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
- systemd.services."alsa-store" =
+ systemd.services.alsa-store =
{ description = "Store Sound Card State";
wantedBy = [ "multi-user.target" ];
unitConfig.RequiresMountsFor = "/var/lib/alsa";
diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix
index 919b766225107b59f3dd04a0c8a4372a62477e6b..551bd941fe687824ca8ace355c110c03e5ad6a9a 100644
--- a/nixos/modules/services/audio/ympd.nix
+++ b/nixos/modules/services/audio/ympd.nix
@@ -23,7 +23,7 @@ in {
mpd = {
host = mkOption {
- type = types.string;
+ type = types.str;
default = "localhost";
description = "The host where MPD is listening.";
example = "localhost";
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
deleted file mode 100644
index 790dafefe66fd22003a4409409a904dc55fc9f81..0000000000000000000000000000000000000000
--- a/nixos/modules/services/backup/crashplan-small-business.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- cfg = config.services.crashplansb;
- crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
-in
-
-with lib;
-
-{
- options = {
- services.crashplansb = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Starts crashplan for small business background service.
- '';
- };
- maxRam = mkOption {
- default = "1024m";
- example = "2G";
- type = types.str;
- description = ''
- Maximum amount of ram that the crashplan engine should use.
- '';
- };
- openPorts = mkOption {
- description = "Open ports in the firewall for crashplan.";
- default = true;
- type = types.bool;
- };
- ports = mkOption {
- # https://support.code42.com/Administrator/6/Planning_and_installing/TCP_and_UDP_ports_used_by_the_Code42_platform
- # used ports can also be checked in the desktop app console using the command connection.info
- description = "which ports to open.";
- default = [ 4242 4243 4244 4247 ];
- type = types.listOf types.int;
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ crashplansb ];
- networking.firewall.allowedTCPPorts = mkIf cfg.openPorts cfg.ports;
-
- systemd.services.crashplansb = {
- description = "CrashPlan Backup Engine";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
-
- preStart = ''
- install -d -m 755 ${crashplansb.vardir}
- install -d -m 700 ${crashplansb.vardir}/conf
- install -d -m 700 ${crashplansb.manifestdir}
- install -d -m 700 ${crashplansb.vardir}/cache
- install -d -m 700 ${crashplansb.vardir}/backupArchives
- install -d -m 777 ${crashplansb.vardir}/log
- cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf
- '';
-
- serviceConfig = {
- Type = "forking";
- EnvironmentFile = "${crashplansb}/bin/run.conf";
- ExecStart = "${crashplansb}/bin/CrashPlanEngine start";
- ExecStop = "${crashplansb}/bin/CrashPlanEngine stop";
- PIDFile = "${crashplansb.vardir}/CrashPlanEngine.pid";
- WorkingDirectory = crashplansb;
- };
- };
- };
-}
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
deleted file mode 100644
index c540cc6e2aee6a0da6683db36f8fab8ceca2b65c..0000000000000000000000000000000000000000
--- a/nixos/modules/services/backup/crashplan.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- cfg = config.services.crashplan;
- crashplan = pkgs.crashplan;
-in
-
-with lib;
-
-{
- options = {
- services.crashplan = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Starts crashplan background service.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ crashplan ];
-
- systemd.services.crashplan = {
- description = "CrashPlan Backup Engine";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
-
- preStart = ''
- ensureDir() {
- dir=$1
- mode=$2
-
- if ! test -e $dir; then
- ${pkgs.coreutils}/bin/mkdir -m $mode -p $dir
- elif [ "$(${pkgs.coreutils}/bin/stat -c %a $dir)" != "$mode" ]; then
- ${pkgs.coreutils}/bin/chmod $mode $dir
- fi
- }
-
- ensureDir ${crashplan.vardir} 755
- ensureDir ${crashplan.vardir}/conf 700
- ensureDir ${crashplan.manifestdir} 700
- ensureDir ${crashplan.vardir}/cache 700
- ensureDir ${crashplan.vardir}/backupArchives 700
- ensureDir ${crashplan.vardir}/log 777
- cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
- for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do
- rm -f ${crashplan.vardir}/$x;
- ln -sf ${crashplan}/$x ${crashplan.vardir}/$x;
- done
- '';
-
- serviceConfig = {
- Type = "forking";
- EnvironmentFile = "${crashplan}/bin/run.conf";
- ExecStart = "${crashplan}/bin/CrashPlanEngine start";
- ExecStop = "${crashplan}/bin/CrashPlanEngine stop";
- PIDFile = "${crashplan.vardir}/CrashPlanEngine.pid";
- WorkingDirectory = crashplan;
- };
- };
- };
-}
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index ba6e154f6b3d0f4387b4d072b310b0fa22399566..dbd5605143f609343469be80399fec3691b86be9 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -103,7 +103,7 @@ in
}];
systemd = {
- timers."mysql-backup" = {
+ timers.mysql-backup = {
description = "Mysql backup timer";
wantedBy = [ "timers.target" ];
timerConfig = {
@@ -112,7 +112,7 @@ in
Unit = "mysql-backup.service";
};
};
- services."mysql-backup" = {
+ services.mysql-backup = {
description = "Mysql backup service";
enable = true;
serviceConfig = {
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 17b410a97f3ea288a53aa753bd63de67df83569e..13a36ae32ac0ef82dc1a7e17ca0020cb819a8808 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -81,7 +81,7 @@ in {
};
pgdumpOptions = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "-Cbo";
description = ''
Command line options for pg_dump. This options is not used
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index bb5dcab1dcf2da07873097bbf036193a70d9e927..6635a51ec2c656a76833058913893721f73d97c9 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -2,7 +2,7 @@
with lib;
-let
+let
cfg = config.services.rsnapshot;
cfgfile = pkgs.writeText "rsnapshot.conf" ''
config_version 1.2
@@ -52,7 +52,7 @@ in
cronIntervals = mkOption {
default = {};
example = { hourly = "0 * * * *"; daily = "50 21 * * *"; };
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
description = ''
Periodicity at which intervals should be run by cron.
Note that the intervals also have to exist in configuration
diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix
index 3b2bb37491b5eb2ad6bf41a88b81bde50d738e59..6c238745797ee5fb6c47d95fb14775fe8c4256b3 100644
--- a/nixos/modules/services/backup/tsm.nix
+++ b/nixos/modules/services/backup/tsm.nix
@@ -78,7 +78,7 @@ in
config = mkIf cfg.enable {
inherit assertions;
programs.tsmClient.enable = true;
- programs.tsmClient.servers."${cfg.servername}".passwdDir =
+ programs.tsmClient.servers.${cfg.servername}.passwdDir =
mkDefault "/var/lib/tsm-backup/password";
systemd.services.tsm-backup = {
description = "IBM Spectrum Protect (Tivoli Storage Manager) Backup";
diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index 785cedb98694b49fac7950088e08495c862d4efa..5a64304275d54758880c83a920c126e1b06a0d17 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -60,7 +60,7 @@ in {
pkgs.lz4
];
- systemd.services."zfs-replication" = {
+ systemd.services.zfs-replication = {
after = [
"zfs-snapshot-daily.service"
"zfs-snapshot-frequent.service"
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 9c7f846557279da27db5351f663dffa5cdc8cc38..f317078ddda22ae3127165163df4eef13c6fe491 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -361,7 +361,7 @@ in
environment.systemPackages = [ pkgs.znapzend ];
systemd.services = {
- "znapzend" = {
+ znapzend = {
description = "ZnapZend - ZFS Backup System";
wantedBy = [ "zfs.target" ];
after = [ "zfs.target" ];
diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix
index a38b6a78d3a51efed1bd0edf6c7ec9dd20bcd1cb..4f4b0a92108fa4e1fb286ff6ed398165c7acfb1f 100644
--- a/nixos/modules/services/cluster/hadoop/hdfs.nix
+++ b/nixos/modules/services/cluster/hadoop/hdfs.nix
@@ -24,7 +24,7 @@ with lib;
config = mkMerge [
(mkIf cfg.hdfs.namenode.enabled {
- systemd.services."hdfs-namenode" = {
+ systemd.services.hdfs-namenode = {
description = "Hadoop HDFS NameNode";
wantedBy = [ "multi-user.target" ];
@@ -44,7 +44,7 @@ with lib;
};
})
(mkIf cfg.hdfs.datanode.enabled {
- systemd.services."hdfs-datanode" = {
+ systemd.services.hdfs-datanode = {
description = "Hadoop HDFS DataNode";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix
index 5345a2732d7e01dbcfb5c32b84966045983c2e03..c92020637e476a440bc327c1f9bcc4562bd807f5 100644
--- a/nixos/modules/services/cluster/hadoop/yarn.nix
+++ b/nixos/modules/services/cluster/hadoop/yarn.nix
@@ -35,7 +35,7 @@ with lib;
})
(mkIf cfg.yarn.resourcemanager.enabled {
- systemd.services."yarn-resourcemanager" = {
+ systemd.services.yarn-resourcemanager = {
description = "Hadoop YARN ResourceManager";
wantedBy = [ "multi-user.target" ];
@@ -53,7 +53,7 @@ with lib;
})
(mkIf cfg.yarn.nodemanager.enabled {
- systemd.services."yarn-nodemanager" = {
+ systemd.services.yarn-nodemanager = {
description = "Hadoop YARN NodeManager";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
index 2295694ffc740072aaad095b5f3985a26f7c3ee3..5117726bee990a93e2379dc1b51c2736f5794994 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
@@ -74,7 +74,7 @@ in {
spec = {
replicas = 1;
revisionHistoryLimit = 10;
- selector.matchLabels."k8s-app" = "kubernetes-dashboard";
+ selector.matchLabels.k8s-app = "kubernetes-dashboard";
template = {
metadata = {
labels = {
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
index ee0ac632ecf0870bae1a6be3e2eea54824242304..47e588de3c9337becd214dc763ae90cc2d61ac9b 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
@@ -73,7 +73,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/bootstrapping" = "rbac-defaults";
};
@@ -102,7 +102,7 @@ in {
};
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/bootstrapping" = "rbac-defaults";
};
@@ -130,7 +130,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
};
name = "coredns";
@@ -144,7 +144,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = cfg.reconcileMode;
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
};
name = "coredns";
@@ -175,7 +175,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = cfg.reconcileMode;
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/name" = "CoreDNS";
};
@@ -301,7 +301,7 @@ in {
};
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/name" = "CoreDNS";
};
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 143b41f57f6a3f886acfe1897bfece1efa4f693e..823cc1c35f4eb5731c11fd4d9358a6038704df82 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -261,7 +261,7 @@ in {
before = [ "kubernetes.target" ];
};
- systemd.services.kube-control-plane-online = rec {
+ systemd.services.kube-control-plane-online = {
description = "Kubernetes control plane is online";
wantedBy = [ "kube-control-plane-online.target" ];
after = [ "kube-scheduler.service" "kube-controller-manager.service" ];
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 7022751b3f012d0f0d6ca570889b6de14ea77741..a7edac0253841e98c1f6f1bc2c1773b96fc257ef 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -111,7 +111,7 @@ in
systemd.services.boinc = {
description = "BOINC Client";
- after = ["network.target" "local-fs.target"];
+ after = ["network.target"];
wantedBy = ["multi-user.target"];
script = ''
${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index c7fe4eeeab9966179bffb14014f2a7f5a16e8c30..500acb48562030fa0991081cf322e66a9a420a0a 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -43,7 +43,7 @@ in
###### interface
options = {
- services.hydra = rec {
+ services.hydra = {
enable = mkOption {
type = types.bool;
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index a9da3a3c5620238d6243ed43029e27cdc595fee0..90c094f68b61b6e85f801307bf3a4975293988ba 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -259,7 +259,7 @@ in {
'';
};
incrementalRepairOptions = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = [ "--partitioner-range" ];
description = ''
@@ -267,7 +267,7 @@ in {
'';
};
maxHeapSize = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "4G";
description = ''
@@ -287,7 +287,7 @@ in {
'';
};
heapNewSize = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "800M";
description = ''
@@ -352,11 +352,11 @@ in {
type = types.listOf (types.submodule {
options = {
username = mkOption {
- type = types.string;
+ type = types.str;
description = "Username for JMX";
};
password = mkOption {
- type = types.string;
+ type = types.str;
description = "Password for JMX";
};
};
@@ -397,14 +397,14 @@ in {
}
];
users = mkIf (cfg.user == defaultUser) {
- extraUsers."${defaultUser}" =
+ extraUsers.${defaultUser} =
{ group = cfg.group;
home = cfg.homeDir;
createHome = true;
uid = config.ids.uids.cassandra;
description = "Cassandra service user";
};
- extraGroups."${defaultUser}".gid = config.ids.gids.cassandra;
+ extraGroups.${defaultUser}.gid = config.ids.gids.cassandra;
};
systemd.services.cassandra =
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 77e404116c8a613569b638c8dc2fb419ad8993c3..53224db1d89611b92d788a94939124d54b8b613a 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -56,7 +56,7 @@ in {
user = mkOption {
- type = types.string;
+ type = types.str;
default = "couchdb";
description = ''
User account under which couchdb runs.
@@ -64,7 +64,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "couchdb";
description = ''
Group account under which couchdb runs.
@@ -106,7 +106,7 @@ in {
};
bindAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = ''
Defines the IP address by which CouchDB will be accessible.
@@ -138,7 +138,7 @@ in {
};
configFile = mkOption {
- type = types.string;
+ type = types.path;
description = ''
Configuration file for persisting runtime changes. File
needs to be readable and writable from couchdb user/group.
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 3746b875c7f22df327c536040fc3096ae2a74cd3..8f8d0da7c8d3d4e9c960f989dbe40509a2060986 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -140,7 +140,7 @@ in
};
logSize = mkOption {
- type = types.string;
+ type = types.str;
default = "10MiB";
description = ''
Roll over to a new log file after the current log file
@@ -149,7 +149,7 @@ in
};
maxLogSize = mkOption {
- type = types.string;
+ type = types.str;
default = "100MiB";
description = ''
Delete the oldest log file when the total size of all log
@@ -171,7 +171,7 @@ in
};
memory = mkOption {
- type = types.string;
+ type = types.str;
default = "8GiB";
description = ''
Maximum memory used by the process. The default value is
@@ -193,7 +193,7 @@ in
};
storageMemory = mkOption {
- type = types.string;
+ type = types.str;
default = "1GiB";
description = ''
Maximum memory used for data storage. The default value is
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index 589c8cf5ec8074347802fda4485a8a6bc590ff09..2d1a47bbaa311f2e4f034f8b178f129ef2050fc5 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -53,7 +53,7 @@ in {
user = mkOption {
- type = types.string;
+ type = types.str;
default = "hbase";
description = ''
User account under which HBase runs.
@@ -61,7 +61,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "hbase";
description = ''
Group account under which HBase runs.
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 6868050c8446b3ce76a7913f5715bb1b4f0bd739..2f176a0387299e98eaefb80642a668ce4ec81f80 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -129,13 +129,13 @@ in
user = mkOption {
default = "influxdb";
description = "User account under which influxdb runs";
- type = types.string;
+ type = types.str;
};
group = mkOption {
default = "influxdb";
description = "Group under which influxdb runs";
- type = types.string;
+ type = types.str;
};
dataDir = mkOption {
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index c458a1d648a02640aad47d868a4cc13d9c6498ee..12879afed477b9381b32ca382b627806613afe8b 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -65,9 +65,9 @@ in
default = false;
description = "Enable client authentication. Creates a default superuser with username root!";
};
-
+
initialRootPassword = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = "Password for the root user if auth is enabled.";
};
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index d8e2c715afb9dd221c16e1278cd6a9dde8bdba90..5bf57a1bf9cbadb989e107f3836180be761fec20 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -47,26 +47,26 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "openldap";
description = "User account under which slapd runs.";
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "openldap";
description = "Group account under which slapd runs.";
};
urlList = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [ "ldap:///" ];
description = "URL list slapd should listen on.";
example = [ "ldaps:///" ];
};
dataDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/db/openldap";
description = "The database directory.";
};
diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix
index b26fa9093ef467c9a8b93603879c7e92548509ba..c4bd71f3d60e5c45a27de9fe679a5133b0ece9c1 100644
--- a/nixos/modules/services/databases/opentsdb.nix
+++ b/nixos/modules/services/databases/opentsdb.nix
@@ -34,7 +34,7 @@ in {
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "opentsdb";
description = ''
User account under which OpenTSDB runs.
@@ -42,7 +42,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "opentsdb";
description = ''
Group account under which OpenTSDB runs.
diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix
index 1050c2dd481addef4f4efab9e915dbd445d1904c..0f8634dab31937957992c5c3e1ecf9d2662392ea 100644
--- a/nixos/modules/services/databases/pgmanage.nix
+++ b/nixos/modules/services/databases/pgmanage.nix
@@ -59,8 +59,8 @@ in {
type = types.attrsOf types.str;
default = {};
example = {
- "nuc-server" = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
- "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
+ nuc-server = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
+ mini-server = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
};
description = ''
pgmanage requires at least one PostgreSQL server be defined.
@@ -192,13 +192,13 @@ in {
};
};
users = {
- users."${pgmanage}" = {
+ users.${pgmanage} = {
name = pgmanage;
group = pgmanage;
home = cfg.sqlRoot;
createHome = true;
};
- groups."${pgmanage}" = {
+ groups.${pgmanage} = {
name = pgmanage;
};
};
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 3f2857100f52c315d39559e979877337015bed91..9c389d80a6dfef109929335a526e108f672dab41 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -8,17 +8,19 @@ let
condOption = name: value: if value != null then "${name} ${toString value}" else "";
redisConfig = pkgs.writeText "redis.conf" ''
- pidfile ${cfg.pidFile}
port ${toString cfg.port}
${condOption "bind" cfg.bind}
${condOption "unixsocket" cfg.unixSocket}
+ daemonize yes
+ supervised systemd
loglevel ${cfg.logLevel}
logfile ${cfg.logfile}
syslog-enabled ${redisBool cfg.syslog}
+ pidfile /run/redis/redis.pid
databases ${toString cfg.databases}
${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
- dbfilename ${cfg.dbFilename}
- dir ${toString cfg.dbpath}
+ dbfilename dump.rdb
+ dir /var/lib/redis
${if cfg.slaveOf != null then "slaveof ${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}" else ""}
${condOption "masterauth" cfg.masterAuth}
${condOption "requirepass" cfg.requirePass}
@@ -40,7 +42,12 @@ in
enable = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable the Redis server.";
+ description = ''
+ Whether to enable the Redis server. Note that the NixOS module for
+ Redis disables kernel support for Transparent Huge Pages (THP),
+ because this features causes major performance problems for Redis,
+ e.g. (https://redis.io/topics/latency).
+ '';
};
package = mkOption {
@@ -50,18 +57,6 @@ in
description = "Which Redis derivation to use.";
};
- user = mkOption {
- type = types.str;
- default = "redis";
- description = "User account under which Redis runs.";
- };
-
- pidFile = mkOption {
- type = types.path;
- default = "/var/lib/redis/redis.pid";
- description = "";
- };
-
port = mkOption {
type = types.int;
default = 6379;
@@ -95,7 +90,7 @@ in
type = with types; nullOr path;
default = null;
description = "The path to the socket to bind to.";
- example = "/run/redis.sock";
+ example = "/run/redis/redis.sock";
};
logLevel = mkOption {
@@ -131,18 +126,6 @@ in
example = [ [900 1] [300 10] [60 10000] ];
};
- dbFilename = mkOption {
- type = types.str;
- default = "dump.rdb";
- description = "The filename where to dump the DB.";
- };
-
- dbpath = mkOption {
- type = types.path;
- default = "/var/lib/redis";
- description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration.";
- };
-
slaveOf = mkOption {
default = null; # { ip, port }
description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave.";
@@ -170,12 +153,6 @@ in
description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence.";
};
- appendOnlyFilename = mkOption {
- type = types.str;
- default = "appendonly.aof";
- description = "Filename for the append-only file (stored inside of dbpath)";
- };
-
appendFsync = mkOption {
type = types.str;
default = "everysec"; # no, always, everysec
@@ -217,27 +194,30 @@ in
allowedTCPPorts = [ cfg.port ];
};
- users.users.redis =
- { name = cfg.user;
- description = "Redis database user";
- };
+ users.users.redis.description = "Redis database user";
environment.systemPackages = [ cfg.package ];
+ systemd.services.disable-transparent-huge-pages = {
+ description = "Disable Transparent Huge Pages (required by Redis)";
+ before = [ "redis.service" ];
+ wantedBy = [ "redis.service" ];
+ script = "echo never > /sys/kernel/mm/transparent_hugepage/enabled";
+ serviceConfig.Type = "oneshot";
+ };
+
systemd.services.redis =
{ description = "Redis Server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- preStart = ''
- install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
- chown -R ${cfg.user} ${cfg.dbpath}
- '';
-
serviceConfig = {
ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}";
- User = cfg.user;
+ RuntimeDirectory = "redis";
+ StateDirectory = "redis";
+ Type = "notify";
+ User = "redis";
};
};
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index ac086cf5599644c35da977cbd8eb3026625091a2..885215209bdf470179a426193c87b3095a0f73cb 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -29,7 +29,7 @@ in
};
nodeName = mkOption {
- type = types.string;
+ type = types.str;
default = "riak@127.0.0.1";
description = ''
Name of the Erlang node.
@@ -37,7 +37,7 @@ in
};
distributedCookie = mkOption {
- type = types.string;
+ type = types.str;
default = "riak";
description = ''
Cookie for distributed node communication. All nodes in the
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 040fe157d52d2dea0ae737f965317b753162ed5b..6007dddf50c0c31310a268ddc96b0d25cc2ea2a2 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -202,14 +202,14 @@ in
];
# restart geoclue service when the configuration changes
- systemd.services."geoclue".restartTriggers = [
+ systemd.services.geoclue.restartTriggers = [
config.environment.etc."geoclue/geoclue.conf".source
];
# this needs to run as a user service, since it's associated with the
# user who is making the requests
systemd.user.services = mkIf cfg.enableDemoAgent {
- "geoclue-agent" = {
+ geoclue-agent = {
description = "Geoclue agent";
script = "${package}/libexec/geoclue-2.0/demos/agent";
# this should really be `partOf = [ "geoclue.service" ]`, but
@@ -219,12 +219,12 @@ in
};
};
- services.geoclue2.appConfig."epiphany" = {
+ services.geoclue2.appConfig.epiphany = {
isAllowed = true;
isSystem = false;
};
- services.geoclue2.appConfig."firefox" = {
+ services.geoclue2.appConfig.firefox = {
isAllowed = true;
isSystem = false;
};
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
deleted file mode 100644
index 9631157934f973ee4c00a824dd002684940d59b7..0000000000000000000000000000000000000000
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# Seahorse daemon.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
- ###### interface
-
- options = {
-
- services.gnome3.seahorse = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable Seahorse search provider for the GNOME Shell activity search.
- '';
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf config.services.gnome3.seahorse.enable {
-
- environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
-
- services.dbus.packages = [ pkgs.gnome3.seahorse ];
-
- };
-
-}
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index e4e47cfbd43838845e8c949fc30008e47238e416..a8ac22ac12765c7f8d20dee4498bffb6763ca5bf 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -34,7 +34,7 @@ in {
psd = {
enable = true;
description = "Profile Sync daemon";
- wants = [ "psd-resync.service" "local-fs.target" ];
+ wants = [ "psd-resync.service" ];
wantedBy = [ "default.target" ];
path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
unitConfig = {
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index d04673a6c8b8a49f3447cc47e7c7aff95d876820..f3831156f453e26f8a3ffd192a9702b616371da7 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -55,7 +55,7 @@ in
'';
};
saveName = mkOption {
- type = types.string;
+ type = types.str;
default = "default";
description = ''
The name of the savegame that will be used by the server.
@@ -81,7 +81,7 @@ in
'';
};
stateDirName = mkOption {
- type = types.string;
+ type = types.str;
default = "factorio";
description = ''
Name of the directory under /var/lib holding the server's data.
@@ -102,14 +102,14 @@ in
'';
};
game-name = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "Factorio Game";
description = ''
Name of the game as it will appear in the game listing.
'';
};
description = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "";
description = ''
Description of the game that will appear in the listing.
@@ -130,28 +130,28 @@ in
'';
};
username = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Your factorio.com login credentials. Required for games with visibility public.
'';
};
password = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Your factorio.com login credentials. Required for games with visibility public.
'';
};
token = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Authentication token. May be used instead of 'password' above.
'';
};
game-password = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Game password.
diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix
index 31f8edca20ce02c1619c5a603db41c389091f83b..a59b74c0b4c4b69c80cc9b3635dcdddf046f7cce 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixos/modules/services/games/terraria.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.terraria;
- worldSizeMap = { "small" = 1; "medium" = 2; "large" = 3; };
+ worldSizeMap = { small = 1; medium = 2; large = 3; };
valFlag = name: val: optionalString (val != null) "-${name} \"${escape ["\\" "\""] (toString val)}\"";
boolFlag = name: val: optionalString val "-${name}";
flags = [
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 066ccaa4d7cf49bfaa61aee90d0099c53270171b..83f1e8c84f283047dad6a0ef4e76217c4076ed4d 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -28,7 +28,7 @@ in {
};
devices = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [ "/dev/sda" ];
description = ''
Device paths to all internal spinning hard drives.
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 223adfee96e8dbb1f2d32f442531cb5d5e64c80e..6c341bcbf2406cbf976360154975eaa3e2fb83f3 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -43,7 +43,7 @@ in {
};
blacklistDevices = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
description = ''
@@ -52,7 +52,7 @@ in {
};
blacklistPlugins = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [ "test" ];
example = [ "udev" ];
description = ''
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index fe05c5a5c06f8e613072e6b3d4138e5a143d91cb..b344dfc20610fb231925e2242e3a83a5528e4c67 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -76,7 +76,7 @@ in
};
hardware.sane.configDir = mkOption {
- type = types.string;
+ type = types.str;
internal = true;
description = "The value of SANE_CONFIG_DIR.";
};
@@ -124,7 +124,7 @@ in
environment.sessionVariables = env;
services.udev.packages = backends;
- users.groups."scanner".gid = config.ids.gids.scanner;
+ users.groups.scanner.gid = config.ids.gids.scanner;
})
(mkIf config.services.saned.enable {
@@ -152,7 +152,7 @@ in
};
};
- users.users."scanner" = {
+ users.users.scanner = {
uid = config.ids.uids.scanner;
group = "scanner";
};
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
index fd19d8020fb87ece81947bcba76b218b73f35535..6bf31982b71a91639e68cfe28bba2daf740cb7f1 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
@@ -33,7 +33,7 @@ let
addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "brscan4-etc-files-0.4.3-3";
src = "${brscan4}/opt/brother/scanner/brscan4";
diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index d4b0a9495d75779f87eb65af540b7a556bd4b271..3876280ee6bcde7ef80e802bdcf4e494b2cb2e5a 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -49,13 +49,13 @@ in
user = mkOption {
default = "tss";
- type = types.string;
+ type = types.str;
description = "User account under which tcsd runs.";
};
group = mkOption {
default = "tss";
- type = types.string;
+ type = types.str;
description = "Group account under which tcsd runs.";
};
@@ -65,19 +65,19 @@ in
description = ''
The location of the system persistent storage file.
The system persistent storage file holds keys and data across
- restarts of the TCSD and system reboots.
+ restarts of the TCSD and system reboots.
'';
};
firmwarePCRs = mkOption {
default = "0,1,2,3,4,5,6,7";
- type = types.string;
+ type = types.str;
description = "PCR indices used in the TPM for firmware measurements.";
};
kernelPCRs = mkOption {
default = "8,9,10,11,12";
- type = types.string;
+ type = types.str;
description = "PCR indices used in the TPM for kernel measurements.";
};
diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix
index 13fc5e4792e60e639a8f13cddced2e1b2546d4e2..7617c4492d7c6a9280dd3ac68cdf33809ca31fb9 100644
--- a/nixos/modules/services/hardware/throttled.nix
+++ b/nixos/modules/services/hardware/throttled.nix
@@ -20,7 +20,7 @@ in {
config = mkIf cfg.enable {
systemd.packages = [ pkgs.throttled ];
# The upstream package has this in Install, but that's not enough, see the NixOS manual
- systemd.services."lenovo_fix".wantedBy = [ "multi-user.target" ];
+ systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ];
environment.etc."lenovo_fix.conf".source =
if cfg.extraConfig != ""
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 092ff051a042327a25570d9bb001c567ed70c808..4f8af7978286a79f7abc3ef0d79eb517eb2bcb63 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -60,11 +60,11 @@ in
powerManagement.cpufreq.max = null;
powerManagement.cpufreq.min = null;
- systemd.sockets."systemd-rfkill".enable = false;
+ systemd.sockets.systemd-rfkill.enable = false;
systemd.services = {
"systemd-rfkill@".enable = false;
- "systemd-rfkill".enable = false;
+ systemd-rfkill.enable = false;
tlp = {
description = "TLP system startup/shutdown";
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix
index a500cb4fc367ccf33a444a3997d7df9046602e5b..f9f5234bdc3f29900951f532028be5fddeadb79b 100644
--- a/nixos/modules/services/hardware/triggerhappy.nix
+++ b/nixos/modules/services/hardware/triggerhappy.nix
@@ -102,7 +102,6 @@ in
systemd.services.triggerhappy = {
wantedBy = [ "multi-user.target" ];
- after = [ "local-fs.target" ];
description = "Global hotkey daemon";
serviceConfig = {
ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
diff --git a/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
index e90d9e7a12b6203cdad4c9d63fdd1a9c22387568..f26aef7262ba1b81861397f8fb12b0b9fa0ad659 100644
--- a/nixos/modules/services/logging/SystemdJournal2Gelf.nix
+++ b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
@@ -16,7 +16,7 @@ in
};
graylogServer = mkOption {
- type = types.string;
+ type = types.str;
example = "graylog2.example.com:11201";
description = ''
Host and port of your graylog2 input. This should be a GELF
@@ -25,7 +25,7 @@ in
};
extraOptions = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = ''
Any extra flags to pass to SystemdJournal2Gelf. Note that
@@ -56,4 +56,4 @@ in
};
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index 54799d699a74670540cf058bcf942cb91ca77f08..a92ff3bee490b02ee9efb9f90b5cecf0478b62b9 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -32,7 +32,7 @@ in
};
updateAt = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "hourly";
description = ''
@@ -50,7 +50,7 @@ in
description = ''Enable the awstats web service. This switches on httpd.'';
};
urlPrefix = mkOption {
- type = types.string;
+ type = types.str;
default = "/awstats";
description = "The URL prefix under which the awstats service appears.";
};
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index f139190a170943340312f4187bacd6b19961c434..6d8be5b926d5f3c64c60170a1507a159f0f9ad13 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -23,9 +23,9 @@ let
flags = "-r ${rulesDir} -c ${configFile} -L ${logFiles} -${levelFlag} -m ${cfg.mailTo}";
levelFlag = getAttrFromPath [cfg.level]
- { "paranoid" = "p";
- "server" = "s";
- "workstation" = "w";
+ { paranoid = "p";
+ server = "s";
+ workstation = "w";
};
cronJob = ''
@@ -155,7 +155,7 @@ in
config = mkOption {
default = "FQDN=1";
- type = types.string;
+ type = types.lines;
description = ''
Config options that you would like in logcheck.conf.
'';
diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
index 1ea96b8f132528ef2195f7454cbff26f592e9038..b924d94e0b0dec9c5725dae961d82436b23b9d37 100644
--- a/nixos/modules/services/logging/rsyslogd.nix
+++ b/nixos/modules/services/logging/rsyslogd.nix
@@ -46,7 +46,7 @@ in
};
defaultConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = defaultConf;
description = ''
The default syslog.conf file configures a
@@ -56,7 +56,7 @@ in
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
example = "news.* -/var/log/news";
description = ''
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index c05811291359e18a33cad301fc22f06e917cb80a..47812dd1e40ee78d9b80a6d603c39d23b561e6e7 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -21,7 +21,7 @@ in
};
config = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description = ''
Verbatim Exim configuration. This should not contain exim_user,
@@ -30,7 +30,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "exim";
description = ''
User to use when no root privileges are required.
@@ -42,7 +42,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "exim";
description = ''
Group to use when no root privileges are required.
@@ -50,7 +50,7 @@ in
};
spoolDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/spool/exim";
description = ''
Location of the spool directory of exim.
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 11565bc02f89198b79f35bc662ab2cd6bd6ee2de..7ae00f3e501eb745552aff9ee8f1937fb63db378 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -137,7 +137,7 @@ in
${pkgs.postfix}/bin/postmap ${stateDir}/transports
'';
- systemd.services."mlmmj-maintd" = {
+ systemd.services.mlmmj-maintd = {
description = "mlmmj maintenance daemon";
serviceConfig = {
User = cfg.user;
@@ -146,7 +146,7 @@ in
};
};
- systemd.timers."mlmmj-maintd" = {
+ systemd.timers.mlmmj-maintd = {
description = "mlmmj maintenance timer";
timerConfig.OnUnitActiveSec = cfg.maintInterval;
wantedBy = [ "timers.target" ];
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 9997d287013edd519adb6f4fca723bb726f2349b..2c2910e0aa9b7d3be085e4dd9e1b23563f7b716a 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -14,7 +14,7 @@ with lib;
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "nullmailer";
description = ''
User to use to run nullmailer-send.
@@ -22,7 +22,7 @@ with lib;
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "nullmailer";
description = ''
Group to use to run nullmailer-send.
diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix
index 9599854352c9fd334ff78d8fd2f1be893e569830..38984f896d6af35d0c96da6c118df35340822a9e 100644
--- a/nixos/modules/services/mail/pfix-srsd.nix
+++ b/nixos/modules/services/mail/pfix-srsd.nix
@@ -40,7 +40,7 @@ with lib;
systemPackages = [ pkgs.pfixtools ];
};
- systemd.services."pfix-srsd" = {
+ systemd.services.pfix-srsd = {
description = "Postfix sender rewriting scheme daemon";
before = [ "postfix.service" ];
#note that we use requires rather than wants because postfix
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2b08ab1e6aa6e0b00ddb4fc1b2a8469e181d61b9..d5fd76da970baf62e1fed0b6ae3dc9c6f2e83edb 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -509,7 +509,7 @@ in
};
localRecipients = mkOption {
- type = with types; nullOr (listOf string);
+ type = with types; nullOr (listOf str);
default = null;
description = ''
List of accepted local users. Specify a bare username, an
@@ -530,7 +530,7 @@ in
dnsBlacklists = mkOption {
default = [];
- type = with types; listOf string;
+ type = with types; listOf str;
description = "dns blacklist servers to use with smtpd_client_restrictions";
};
@@ -877,22 +877,22 @@ in
}
(mkIf haveAliases {
- services.postfix.aliasFiles."aliases" = aliasesFile;
+ services.postfix.aliasFiles.aliases = aliasesFile;
})
(mkIf haveTransport {
- services.postfix.mapFiles."transport" = transportFile;
+ services.postfix.mapFiles.transport = transportFile;
})
(mkIf haveVirtual {
- services.postfix.mapFiles."virtual" = virtualFile;
+ services.postfix.mapFiles.virtual = virtualFile;
})
(mkIf haveLocalRecipients {
- services.postfix.mapFiles."local_recipients" = localRecipientMapFile;
+ services.postfix.mapFiles.local_recipients = localRecipientMapFile;
})
(mkIf cfg.enableHeaderChecks {
- services.postfix.mapFiles."header_checks" = headerChecksFile;
+ services.postfix.mapFiles.header_checks = headerChecksFile;
})
(mkIf (cfg.dnsBlacklists != []) {
- services.postfix.mapFiles."client_access" = checkClientAccessFile;
+ services.postfix.mapFiles.client_access = checkClientAccessFile;
})
]);
}
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 8e2b9c5dbc56a4bad3b525b51cd6005190974d69..88fb7f0b4ad178b407f3149acb9e0b128e5979b6 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -7,12 +7,12 @@ with lib; let
natural = with types; addCheck int (x: x >= 0);
natural' = with types; addCheck int (x: x > 0);
- socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
+ socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? path || x ? port);
inetSocket = with types; {
options = {
addr = mkOption {
- type = nullOr string;
+ type = nullOr str;
default = null;
example = "127.0.0.1";
description = "The address to bind to. Localhost if null";
@@ -34,7 +34,7 @@ with lib; let
};
mode = mkOption {
- type = string;
+ type = str;
default = "0777";
description = "Mode of the unix socket";
};
@@ -63,17 +63,17 @@ in {
description = "Socket to bind to";
};
greylistText = mkOption {
- type = string;
+ type = str;
default = "Greylisted for %%s seconds";
description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient";
};
greylistAction = mkOption {
- type = string;
+ type = str;
default = "DEFER_IF_PERMIT";
description = "Response status for greylisted messages (see access(5))";
};
greylistHeader = mkOption {
- type = string;
+ type = str;
default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d";
description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
};
@@ -88,7 +88,7 @@ in {
description = "Delete entries from whitelist if they haven't been seen for N days";
};
retryWindow = mkOption {
- type = either string natural;
+ type = either str natural;
default = 2;
example = "12h";
description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
@@ -151,7 +151,7 @@ in {
};
systemd.services.postgrey = let
- bind-flag = if cfg.socket ? "path" then
+ bind-flag = if cfg.socket ? path then
''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
else
''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}'';
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index e59d5715de05900681710c804bb7b40d61182252..89aa9d17ff7f65c9ac43b1fca099a25fd0d1943a 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -308,7 +308,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "rspamd";
description = ''
User to use when no root privileges are required.
@@ -316,7 +316,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "rspamd";
description = ''
Group to use when no root privileges are required.
@@ -387,7 +387,7 @@ in
gid = config.ids.gids.rspamd;
};
- environment.etc."rspamd".source = rspamdDir;
+ environment.etc.rspamd.source = rspamdDir;
systemd.services.rspamd = {
description = "Rspamd Service";
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 8b2ec82c770544be835634c912b30699f8436ac7..919d3b2f6e6406e1bcc6160bac39ffed7e549b59 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -34,7 +34,7 @@ in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = ''
The host name or IP address on which to bind Airsonic.
@@ -105,7 +105,7 @@ in {
config = mkIf cfg.enable {
systemd.services.airsonic = {
description = "Airsonic Media Server";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
@@ -138,8 +138,8 @@ in {
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
- virtualHosts."${cfg.virtualHost}" = {
- locations."${cfg.contextPath}".proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}";
+ virtualHosts.${cfg.virtualHost} = {
+ locations.${cfg.contextPath}.proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}";
};
};
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 9eeae9556992dcdc96c319b4ae1cefba6bc11f15..798e902ccae429f89af2b91ccd6dbec8048c2830 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -46,7 +46,7 @@ in {
hostname = mkOption {
description = "Hostname the broker should bind to.";
default = "localhost";
- type = types.string;
+ type = types.str;
};
logDirs = mkOption {
@@ -54,13 +54,13 @@ in {
default = [ "/tmp/kafka-logs" ];
type = types.listOf types.path;
};
-
+
zookeeper = mkOption {
description = "Zookeeper connection string";
default = "localhost:2181";
- type = types.string;
+ type = types.str;
};
-
+
extraProperties = mkOption {
description = "Extra properties for server.properties.";
type = types.nullOr types.lines;
@@ -79,8 +79,8 @@ in {
log4jProperties = mkOption {
description = "Kafka log4j property configuration.";
default = ''
- log4j.rootLogger=INFO, stdout
-
+ log4j.rootLogger=INFO, stdout
+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixos/modules/services/misc/cpuminer-cryptonight.nix
index f31526f8d1078e80381e36a608d5fb3eb15ae76b..907b9d90da295e19ffc1d85afdb672ec59d458e1 100644
--- a/nixos/modules/services/misc/cpuminer-cryptonight.nix
+++ b/nixos/modules/services/misc/cpuminer-cryptonight.nix
@@ -28,15 +28,15 @@ in
'';
};
url = mkOption {
- type = types.string;
+ type = types.str;
description = "URL of mining server";
};
user = mkOption {
- type = types.string;
+ type = types.str;
description = "Username for mining server";
};
pass = mkOption {
- type = types.string;
+ type = types.str;
default = "x";
description = "Password for mining server";
};
@@ -63,4 +63,4 @@ in
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 61ea822890ed8a2255e5450b4fe56d604a56a7ec..9402d5cd801c0c0d3ca723373f2c34383408a3d2 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -8,9 +8,9 @@ let
printProperties = properties:
concatMapStrings (propertyName:
let
- property = properties."${propertyName}";
+ property = properties.${propertyName};
in
- if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties."${propertyName}")})\n"
+ if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n"
else "${propertyName}=\"${toString property}\"\n"
) (builtins.attrNames properties);
@@ -31,7 +31,7 @@ let
${concatMapStrings (containerName:
let
- containerProperties = cfg.containers."${containerName}";
+ containerProperties = cfg.containers.${containerName};
in
''
cat > ${containerName} <!motd command.
'';
};
@@ -183,4 +183,4 @@ in
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index bf38b9ad7a2df6a23574322b88d41c12f93b079c..3bff04e7127d7933a4e1fbd8c07892483a09041f 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -11,7 +11,7 @@ let
group = {
nginx = config.services.nginx.group;
none = user;
- }."${cfg.webserver}";
+ }.${cfg.webserver};
useNginx = cfg.webserver == "nginx";
@@ -225,7 +225,7 @@ in {
nginx = lib.mkIf useNginx {
enable = true;
virtualHosts = {
- "${cfg.hostname}" = {
+ ${cfg.hostname} = {
default = true;
root = "${pkg}/share/zoneminder/www";
listen = [ { addr = "0.0.0.0"; inherit (cfg) port; } ];
@@ -312,7 +312,7 @@ in {
};
systemd.services = {
- zoneminder = with pkgs; rec {
+ zoneminder = with pkgs; {
inherit (zoneminder.meta) description;
documentation = [ "https://zoneminder.readthedocs.org/en/latest/" ];
path = [
@@ -356,11 +356,11 @@ in {
};
};
- users.groups."${user}" = {
+ users.groups.${user} = {
gid = config.ids.gids.zoneminder;
};
- users.users."${user}" = {
+ users.users.${user} = {
uid = config.ids.uids.zoneminder;
group = user;
inherit home;
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 49957e6529006c11d5c0c43c0b8fa25cca674df2..75218aa1d46b00548e5f9866fe1ac7cba6e336a8 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -91,7 +91,7 @@ in
BATTERYLEVEL 50
MINUTES 5
'';
- type = types.string;
+ type = types.lines;
description = ''
Contents of the runtime configuration file, apcupsd.conf. The default
settings makes apcupsd autodetect USB UPSes, limit network access to
@@ -106,7 +106,7 @@ in
example = {
doshutdown = ''# shell commands to notify that the computer is shutting down'';
};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.lines;
description = ''
Each attribute in this option names an apcupsd event and the string
value it contains will be executed in a shell, in response to that
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 8bf741adb6e3370410a7e58ebec08211a07b3108..b1c12cce1f8095691ff8bcb6cae746137bce7206 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -41,7 +41,7 @@ in {
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "bosun";
description = ''
User account under which bosun runs.
@@ -49,7 +49,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "bosun";
description = ''
Group account under which bosun runs.
@@ -57,7 +57,7 @@ in {
};
opentsdbHost = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "localhost:4242";
description = ''
Host and port of the OpenTSDB database that stores bosun data.
@@ -66,7 +66,7 @@ in {
};
influxHost = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "localhost:8086";
description = ''
@@ -75,7 +75,7 @@ in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = ":8070";
description = ''
The host address and port that bosun's web interface will listen on.
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 7f78db74677cafeefa8f86719da488f20c7cb2e9..02a9f316fc327d07a272fe94bdd5a83299bb03ff 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -87,7 +87,7 @@ in {
description = "The hostname to show in the Datadog dashboard (optional)";
default = null;
example = "mymachine.mydomain";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
};
logLevel = mkOption {
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index abc8d65d58f260ff71b5ce5e938d91eb503fca96..5ee6b092a6a47a63b437cee509fc2c2e659447bf 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -145,47 +145,46 @@ in {
description = "The hostname to show in the Datadog dashboard (optional)";
default = null;
example = "mymachine.mydomain";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
};
postgresqlConfig = mkOption {
description = "Datadog PostgreSQL integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
nginxConfig = mkOption {
description = "Datadog nginx integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
mongoConfig = mkOption {
description = "MongoDB integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
jmxConfig = mkOption {
description = "JMX integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
processConfig = mkOption {
description = ''
Process integration configuration
-
- See http://docs.datadoghq.com/integrations/process/
+ See
'';
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
};
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
+ environment.systemPackages = [ pkgs.dd-agent pkgs.sysstat pkgs.procps ];
users.users.datadog = {
description = "Datadog Agent User";
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
index 9c976c65ea49af4e8953ef6477dbfdfe388262f8..b90579bb70c76591cfb58f73c6e755b5045ebe4b 100644
--- a/nixos/modules/services/monitoring/fusion-inventory.nix
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -51,7 +51,7 @@ in {
description = "FusionInventory user";
};
- systemd.services."fusion-inventory" = {
+ systemd.services.fusion-inventory = {
description = "Fusion Inventory Agent";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index d6473220c1409af49cdf2f37a1b008033a75138d..64cb6c3da1e572c9af8777d0774bf12bb81081ad 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -11,7 +11,7 @@ let
graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" {
inherit graphiteLocalSettings;
- preferLocalBuild = true;
+ preferLocalBuild = true;
} ''
mkdir -p $out
ln -s $graphiteLocalSettings $out/graphite_local_settings.py
@@ -215,7 +215,7 @@ in {
storageAggregation = mkOption {
description = "Defines how to aggregate data to lower-precision retentions.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[all_min]
pattern = \.min$
@@ -227,7 +227,7 @@ in {
storageSchemas = mkOption {
description = "Defines retention rates for storing metrics.";
default = "";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[apache_busyWorkers]
pattern = ^servers\.www.*\.workers\.busyWorkers$
@@ -238,14 +238,14 @@ in {
blacklist = mkOption {
description = "Any metrics received which match one of the experssions will be dropped.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = "^some\.noisy\.metric\.prefix\..*";
};
whitelist = mkOption {
description = "Only metrics received which match one of the experssions will be persisted.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ".*";
};
@@ -255,7 +255,7 @@ in {
in a search and replace fashion.
'';
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[post]
_sum$ =
@@ -272,7 +272,7 @@ in {
relayRules = mkOption {
description = "Relay rules are used to send certain metrics to a certain backend.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[example]
pattern = ^mydata\.foo\..+
@@ -289,7 +289,7 @@ in {
aggregationRules = mkOption {
description = "Defines if and how received metrics will be aggregated.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
.applications..all.requests (60) = sum .applications..*.requests
.applications..all.latency (60) = avg .applications..*.latency
diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix
index fbdff2eb5dbe4ed6a9c0aaaad60435156d66d1cb..6da0831b4c5f6449b86632374d0478ee13591464 100644
--- a/nixos/modules/services/monitoring/heapster.nix
+++ b/nixos/modules/services/monitoring/heapster.nix
@@ -15,19 +15,19 @@ in {
source = mkOption {
description = "Heapster metric source";
example = "kubernetes:https://kubernetes.default";
- type = types.string;
+ type = types.str;
};
sink = mkOption {
description = "Heapster metic sink";
example = "influxdb:http://localhost:8086";
- type = types.string;
+ type = types.str;
};
extraOpts = mkOption {
description = "Heapster extra options";
default = "";
- type = types.string;
+ type = types.separatedString " ";
};
package = mkOption {
diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix
index 0f236d25c9ed6104b12ddda198ceaafe1049afe6..9b4ff3c56124d1a20400fb9e48ff63ca92a74fb4 100644
--- a/nixos/modules/services/monitoring/kapacitor.nix
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@@ -116,17 +116,17 @@ in
url = mkOption {
description = "The URL to an InfluxDB server that serves as the default database";
example = "http://localhost:8086";
- type = types.string;
+ type = types.str;
};
username = mkOption {
description = "The username to connect to the remote InfluxDB server";
- type = types.string;
+ type = types.str;
};
password = mkOption {
description = "The password to connect to the remote InfluxDB server";
- type = types.string;
+ type = types.str;
};
};
@@ -137,7 +137,7 @@ in
description = "The URL to the Alerta REST API";
default = "http://localhost:5000";
example = "http://localhost:5000";
- type = types.string;
+ type = types.str;
};
token = mkOption {
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index 32e14ab21ffc82ed52f3534580b8856cfbceb556..ca9352272174ec03c2a1bd03ee9511535118013b 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -23,7 +23,7 @@ in
environment.systemPackages = [ pkgs.monit ];
- environment.etc."monitrc" = {
+ environment.etc.monitrc = {
text = cfg.config;
mode = "0400";
};
@@ -39,7 +39,7 @@ in
KillMode = "process";
Restart = "always";
};
- restartTriggers = [ config.environment.etc."monitrc".source ];
+ restartTriggers = [ config.environment.etc.monitrc.source ];
};
};
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index ffe223fedbe134cf90b197d0f6b87122ee1343b2..8af0650c7380d49eebe9d47f1f30abb066521978 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -233,7 +233,7 @@ in
# In the meantime this at least suppresses a useless graph full of
# NaNs in the output.
default = [ "munin_stats" ];
- type = with types; listOf string;
+ type = with types; listOf str;
description = ''
Munin plugins to disable, even if
munin-node-configure --suggest tries to enable
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 2ab8910ff9dbb4a75e03cfa84582e0f8ef3dd458..b69310c34ff512df8b7a328fad050c90907c6db2 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -132,14 +132,10 @@ let
in
mkIf conf.enable {
warnings = conf.warnings or [];
- users.users = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {
- "${name}-exporter" = {
- description = ''
- Prometheus ${name} exporter service user
- '';
- isSystemUser = true;
- inherit (conf) group;
- };
+ users.users."${name}-exporter" = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {
+ description = "Prometheus ${name} exporter service user";
+ isSystemUser = true;
+ inherit (conf) group;
});
users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) {
"${name}-exporter" = {};
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index 7e394e8463e03959d019f1c958831019b827cf42..adc2abe0b91c88a447a5b622b9d0c75f20983082 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -9,7 +9,7 @@ in
port = 9100;
extraOpts = {
enabledCollectors = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = ''[ "systemd" ]'';
description = ''
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index 2b647b6b1ade82d404fcb977f272733749887e99..86a11694e7b49aadcd9519eaac6cc272e42a68a6 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -35,7 +35,7 @@ in {
'';
};
extraArgs = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = ''
A list of commandline-switches forwarded to a riemann-tool.
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index dc0899c7e68458bafe5af88b0d624df253a20b50..38cd2213de763d8b0b8cb678e53a55505382540e 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -51,7 +51,7 @@ in {
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "scollector";
description = ''
User account under which scollector runs.
@@ -59,7 +59,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "scollector";
description = ''
Group account under which scollector runs.
@@ -67,7 +67,7 @@ in {
};
bosunHost = mkOption {
- type = types.string;
+ type = types.str;
default = "localhost:8070";
description = ''
Host and port of the bosun server that will store the collected
diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix
index b41e99b764773a5279c0d6214eadce36c24a080a..272c9429af1c09743ae37f153f68bac579bb113b 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixos/modules/services/monitoring/thanos.nix
@@ -70,14 +70,14 @@ let
} ''json2yaml -i $json -o $out'';
thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" +
- (let args = cfg."${cmd}".arguments;
+ (let args = cfg.${cmd}.arguments;
in optionalString (length args != 0) (" \\\n " +
concatStringsSep " \\\n " args));
argumentsOf = cmd: concatLists (collect isList
- (flip mapParamsRecursive params."${cmd}" (path: param:
+ (flip mapParamsRecursive params.${cmd} (path: param:
let opt = concatStringsSep "." path;
- v = getAttrFromPath path cfg."${cmd}";
+ v = getAttrFromPath path cfg.${cmd};
in param.toArgs opt v)));
mkArgumentsOption = cmd: mkOption {
@@ -95,7 +95,7 @@ let
};
mapParamsRecursive =
- let noParam = attr: !(attr ? "toArgs" && attr ? "option");
+ let noParam = attr: !(attr ? toArgs && attr ? option);
in mapAttrsRecursiveCond noParam;
paramsToOptions = mapParamsRecursive (_path: param: param.option);
@@ -607,7 +607,7 @@ let
assertRelativeStateDir = cmd: {
assertions = [
{
- assertion = !hasPrefix "/" cfg."${cmd}".stateDir;
+ assertion = !hasPrefix "/" cfg.${cmd}.stateDir;
message =
"The option services.thanos.${cmd}.stateDir should not be an absolute directory." +
" It should be a directory relative to /var/lib.";
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 429b40227d47f15035e49c44cd5a2ef4f536d543..1bdc4e4410f135ae72e57751efe73ddc72e5ed7f 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -55,7 +55,7 @@ let
description = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Description of the UPS.
'';
@@ -71,7 +71,7 @@ let
summary = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Lines which would be added inside ups.conf for handling this UPS.
'';
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index c0993f3bc2e7cdccee485549e9f39456b7e9ebe4..245badc3e44f988ae4ba75677668a91721dd8407 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -57,7 +57,7 @@ in {
nodeEnv = mkOption {
description = "The node environment to run in (development, production, etc.)";
- type = types.string;
+ type = types.str;
default = "production";
};
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index b1645f8611010042f6f260c7509cc48e1f7d38fd..856b9432892b5b58af353e40de98137880860609 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -135,7 +135,7 @@ in
users.groups.${group} = { };
- systemd.services."zabbix-agent" = {
+ systemd.services.zabbix-agent = {
description = "Zabbix Agent";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix
index 90abed30db5d37a5d19ac64a141372ff3cb8767d..9d214469c3b32dedb0482be8625dc811cb7664aa 100644
--- a/nixos/modules/services/monitoring/zabbix-proxy.nix
+++ b/nixos/modules/services/monitoring/zabbix-proxy.nix
@@ -252,7 +252,7 @@ in
fping.source = "${pkgs.fping}/bin/fping";
};
- systemd.services."zabbix-proxy" = {
+ systemd.services.zabbix-proxy = {
description = "Zabbix Proxy";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index 11311b466c3fc66895d93a2d0e32ecedc3df31a9..4b4049ed360e0f045157496464a0949309590fa0 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -237,7 +237,7 @@ in
fping.source = "${pkgs.fping}/bin/fping";
};
- systemd.services."zabbix-server" = {
+ systemd.services.zabbix-server = {
description = "Zabbix Server";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index 86b1bb9160f10f645ef25e8c34cc6a0ad30193b8..2e03a422665ab0504041a949478784ebd65594bd 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -69,7 +69,7 @@ let
# functions to generate systemd.service entries
systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg:
- (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable {
+ (nameValuePair "beegfs-${service}-${name}" (mkIf cfg.${service}.enable {
wantedBy = [ "multi-user.target" ];
requires = [ "network-online.target" ];
after = [ "network-online.target" ];
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 4e3bc839d4007b79bea2f78880010e36a5cb3e2a..0191b0640f002ba8e0d22912fae04995d308b7ee 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -9,7 +9,7 @@ let
translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
generateDaemonList = (daemonType: daemons: extraServiceConfig:
mkMerge (
- map (daemon:
+ map (daemon:
{ "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
) daemons
)
@@ -17,8 +17,8 @@ let
generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
enable = true;
description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
- after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
- wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
+ after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
+ wants = [ "network-online.target" "time-sync.target" ];
partOf = [ "ceph-${daemonType}.target" ];
wantedBy = [ "ceph-${daemonType}.target" ];
@@ -41,7 +41,7 @@ let
daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
if [ ! -d ''$daemonPath ]; then
mkdir -m 755 -p ''$daemonPath
- chown -R ceph:ceph ''$daemonPath
+ chown -R ceph:ceph ''$daemonPath
fi
'';
} // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
@@ -55,7 +55,7 @@ let
};
}
);
-in
+in
{
options.services.ceph = {
# Ceph has a monolithic configuration file but different sections for
@@ -86,7 +86,7 @@ in
type = with types; nullOr commas;
default = null;
example = ''
- node0, node1, node2
+ node0, node1, node2
'';
description = ''
List of hosts that will be used as monitors at startup.
@@ -313,9 +313,9 @@ in
}
];
- warnings = optional (cfg.global.monInitialMembers == null)
+ warnings = optional (cfg.global.monInitialMembers == null)
''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
-
+
environment.etc."ceph/ceph.conf".text = let
# Translate camelCaseOptions to the expected camel case option for ceph.conf
translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
@@ -324,10 +324,10 @@ in
# Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf
globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig);
totalConfig = {
- "global" = globalConfig;
- } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; }
- // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; }
- // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; }
+ global = globalConfig;
+ } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; }
+ // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; }
+ // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; }
// optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig;
in
generators.toINI {} totalConfig;
@@ -344,18 +344,18 @@ in
};
systemd.services = let
- services = []
- ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
+ services = []
+ ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
- in
+ in
mkMerge services;
systemd.targets = let
targets = [
- { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; }
+ { ceph = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; }
] ++ optional cfg.mon.enable (generateTargetFile "mon")
++ optional cfg.mds.enable (generateTargetFile "mds")
++ optional cfg.osd.enable (generateTargetFile "osd")
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix
index c16e12378d758e97d66601e1e9e274beb756231d..100d458d536c0e0560400b08afb3b6519ede58a1 100644
--- a/nixos/modules/services/network-filesystems/davfs2.nix
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -21,7 +21,7 @@ in
};
davUser = mkOption {
- type = types.string;
+ type = types.str;
default = "davfs2";
description = ''
When invoked by root the mount.davfs daemon will run as this user.
@@ -30,7 +30,7 @@ in
};
davGroup = mkOption {
- type = types.string;
+ type = types.str;
default = "davfs2";
description = ''
The group of the running mount.davfs daemon. Ordinary users must be
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
index 57b1fbb597c7a964b28a3290a813575e25848216..4ab74ed8e1c0e57d4096c59b347f33a67abaaf53 100644
--- a/nixos/modules/services/network-filesystems/drbd.nix
+++ b/nixos/modules/services/network-filesystems/drbd.nix
@@ -23,7 +23,7 @@ let cfg = config.services.drbd; in
services.drbd.config = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Contents of the drbd.conf configuration file.
'';
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index 00875c6c4a18348d26d2fa215814c624dcd27a7a..d70092999f674dd0470e1196dc96ebb507a67ae6 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -156,7 +156,7 @@ in
wantedBy = [ "multi-user.target" ];
requires = lib.optional cfg.useRpcbind "rpcbind.service";
- after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
+ after = [ "network.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
preStart = ''
install -m 0755 -d /var/log/glusterfs
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index bbbfcf6a473853e0995ede5613a2f6aa750cd07e..b6d881afd7bd99f2bf596c6cb899858b54ac92d9 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -236,7 +236,6 @@ in {
systemd.services.ipfs-init = recursiveUpdate commonEnv {
description = "IPFS Initializer";
- after = [ "local-fs.target" ];
before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];
script = ''
@@ -263,21 +262,21 @@ in {
systemd.services.ipfs = recursiveUpdate baseService {
description = "IPFS Daemon";
wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
+ after = [ "network.target" "ipfs-init.service" ];
conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
};
systemd.services.ipfs-offline = recursiveUpdate baseService {
description = "IPFS Daemon (offline mode)";
wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
- after = [ "local-fs.target" "ipfs-init.service" ];
+ after = [ "ipfs-init.service" ];
conflicts = [ "ipfs.service" "ipfs-norouting.service"];
};
systemd.services.ipfs-norouting = recursiveUpdate baseService {
description = "IPFS Daemon (no routing mode)";
wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
- after = [ "local-fs.target" "ipfs-init.service" ];
+ after = [ "ipfs-init.service" ];
conflicts = [ "ipfs.service" "ipfs-offline.service"];
};
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index 1cc9bed847ab1987120fcd2d7f4004734a088db7..e068ee761c2ad74595e65b0833c7b4e54e472806 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -3,7 +3,7 @@
let
inherit (lib) concatStringsSep mkOption types;
-in rec {
+in {
mkCellServDB = cellName: db: ''
>${cellName}
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index 054057d52ab1ece83a1340ea214dc6de2ec8deab..b17ec3aa930089b61d8072e6fe118908f25e5287 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -35,7 +35,7 @@ in
};
motd = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = ''
Message of the day to display to clients on each connect.
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 69368441c62c124e2a33d2fcfec497b1db59ce8d..055508a32244d9c8f9cdd3ad26e0173a49eb93f1 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -234,10 +234,10 @@ in
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
# for correct use with systemd
services = {
- "samba-smbd" = daemonService "smbd" "";
- "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "");
- "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
- "samba-setup" = {
+ samba-smbd = daemonService "smbd" "";
+ samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" "");
+ samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
+ samba-setup = {
description = "Samba Setup Task";
script = setupScript;
unitConfig.RequiresMountsFor = "/var/lib/samba";
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index e93f45b49867b59a6473adc8c7da42e94fb1f096..0aa01ef9e6d9291861590eaefa20b5c81b277959 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -29,7 +29,7 @@ in
username = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Your yandex.com login name.
'';
@@ -37,7 +37,7 @@ in
password = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Your yandex.com password. Warning: it will be world-readable in /nix/store.
'';
@@ -57,7 +57,7 @@ in
excludes = mkOption {
default = "";
- type = types.string;
+ type = types.commas;
example = "data,backup";
description = ''
Comma-separated list of directories which are excluded from synchronization.
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index 53829bf1886371d26bfa4afb93d8af962b843cc8..156fef144791e467ff40654c6a7b325d785c6179 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -47,8 +47,8 @@ in
'';
};
downloadDir = mkOption {
- type = types.string;
- default = "${downloadDir}";
+ type = types.path;
+ default = downloadDir;
description = ''
Directory to store downloaded files.
'';
@@ -66,7 +66,7 @@ in
description = "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535";
};
rpcSecret = mkOption {
- type = types.string;
+ type = types.str;
default = "aria2rpc";
description = ''
Set RPC secret authorization token.
@@ -74,7 +74,7 @@ in
'';
};
extraArguments = mkOption {
- type = types.string;
+ type = types.separatedString " ";
example = "--rpc-listen-all --remote-time=true";
default = "";
description = ''
@@ -109,7 +109,7 @@ in
systemd.services.aria2 = {
description = "aria2 Service";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
if [[ ! -e "${sessionFile}" ]]
diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix
index a098a155e9910e8fe4557e89a0b3460778d2dfba..a8d9a027e9fa136345b03a545c052991d2acacb6 100644
--- a/nixos/modules/services/networking/autossh.nix
+++ b/nixos/modules/services/networking/autossh.nix
@@ -20,12 +20,12 @@ in
type = types.listOf (types.submodule {
options = {
name = mkOption {
- type = types.string;
+ type = types.str;
example = "socks-peer";
description = "Name of the local AutoSSH session";
};
user = mkOption {
- type = types.string;
+ type = types.str;
example = "bill";
description = "Name of the user the AutoSSH session should run as";
};
@@ -40,7 +40,7 @@ in
'';
};
extraArguments = mkOption {
- type = types.string;
+ type = types.separatedString " ";
example = "-N -D4343 bill@socks.example.net";
description = ''
Arguments to be passed to AutoSSH and retransmitted to SSH
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix
index 3dfd80f6ff52e5830874dc1238dcfc80b8b8fd4e..de863461eab294f5dfa06b6515a2561317abffda 100644
--- a/nixos/modules/services/networking/babeld.nix
+++ b/nixos/modules/services/networking/babeld.nix
@@ -52,7 +52,7 @@ in
example =
{
type = "tunnel";
- "split-horizon" = true;
+ split-horizon = true;
};
};
@@ -66,8 +66,8 @@ in
example =
{ enp0s2 =
{ type = "wired";
- "hello-interval" = 5;
- "split-horizon" = "auto";
+ hello-interval = 5;
+ split-horizon = "auto";
};
};
};
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index e3aba063f87b9fb029cd4a0de93cb3ab6b945d01..da26246e703e097c3e1577ab5f2c0c3f4a573758 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -21,14 +21,14 @@ in
enable = mkEnableOption "Charybdis IRC daemon";
config = mkOption {
- type = types.string;
+ type = types.str;
description = ''
Charybdis IRC daemon configuration file.
'';
};
statedir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/lib/charybdis";
description = ''
Location of the state directory of charybdis.
@@ -36,7 +36,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "ircd";
description = ''
Charybdis IRC daemon user.
@@ -44,7 +44,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "ircd";
description = ''
Charybdis IRC daemon group.
@@ -101,7 +101,7 @@ in
};
}
-
+
(mkIf (cfg.motd != null) {
environment.etc."charybdis/ircd.motd".text = cfg.motd;
})
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index c3ca6fbe725e56ce90c7747810d450ad9e83b532..31127f7904996402029fb6b2ed3bac28dedfdfac 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -45,7 +45,7 @@ in {
};
networkInterfaceBlacklist = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ];
description = ''
Default blacklisted interfaces, this includes NixOS containers interfaces (ve).
@@ -53,7 +53,7 @@ in {
};
extraFlags = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ ];
example = [ "--nodnsproxy" ];
description = ''
@@ -82,7 +82,7 @@ in {
environment.systemPackages = [ connman ];
- systemd.services."connman" = {
+ systemd.services.connman = {
description = "Connection service";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ];
@@ -95,7 +95,7 @@ in {
};
};
- systemd.services."connman-vpn" = mkIf cfg.enableVPN {
+ systemd.services.connman-vpn = mkIf cfg.enableVPN {
description = "ConnMan VPN service";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ];
@@ -108,7 +108,7 @@ in {
};
};
- systemd.services."net-connman-vpn" = mkIf cfg.enableVPN {
+ systemd.services.net-connman-vpn = mkIf cfg.enableVPN {
description = "D-BUS Service";
serviceConfig = {
Name = "net.connman.vpn";
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index f080f12eaccddbefc4223dd0041f322141f0c9f7..689cbc8a986d92c8e981e560baddb60b1e91d343 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -156,7 +156,7 @@ in
config = mkIf cfg.enable (
mkMerge [{
- users.users."consul" = {
+ users.users.consul = {
description = "Consul agent daemon user";
uid = config.ids.uids.consul;
# The shell is needed for health checks
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 4ea891262e5657cb4c831fb0e1e11f484acda5e0..5b3aa19af3bb7715caa3e7d54cc357bc09d48268 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -58,7 +58,7 @@ let
${text}
''; in "${dir}/bin/${name}";
- defaultInterface = { default = mapAttrs (name: value: cfg."${name}") commonOptions; };
+ defaultInterface = { default = mapAttrs (name: value: cfg.${name}) commonOptions; };
allInterfaces = defaultInterface // cfg.interfaces;
startScript = writeShScript "firewall-start" ''
diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index c0020349ec7403f0b97713cf0a97c394e8de8e63..a638a3083fbafe172c2f565a4e3a708add8a95d9 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -115,7 +115,7 @@ in
gid = config.ids.gids.git;
};
- systemd.services."git-daemon" = {
+ systemd.services.git-daemon = {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
script = "${pkgs.git}/bin/git daemon --reuseaddr "
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index 9d16f0efb4354e4551ee3a80f8dfa7a7035c4531..c9b03bca71122852f87fdcb946dd61fc12cd143f 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
@@ -34,7 +34,7 @@ in
password = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Path to a file (as a string), containing your gogoNET password, if any.
'';
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 54a5bed2563facf72bd407be62c4fbcfa5003b09..2915b54f05b4405988efb0c8d2654a6ad2f67b63 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -81,7 +81,7 @@ in
driver = mkOption {
default = "nl80211";
example = "hostapd";
- type = types.string;
+ type = types.str;
description = ''
Which driver hostapd will use.
Most applications will probably use the default.
@@ -91,7 +91,7 @@ in
ssid = mkOption {
default = "nixos";
example = "mySpecialSSID";
- type = types.string;
+ type = types.str;
description = "SSID to be used in IEEE 802.11 management frames.";
};
@@ -119,7 +119,7 @@ in
group = mkOption {
default = "wheel";
example = "network";
- type = types.string;
+ type = types.str;
description = ''
Members of this group can control hostapd.
'';
@@ -135,7 +135,7 @@ in
wpaPassphrase = mkOption {
default = "my_sekret";
example = "any_64_char_string";
- type = types.string;
+ type = types.str;
description = ''
WPA-PSK (pre-shared-key) passphrase. Clients will need this
passphrase to associate with this access point.
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
index 0c6602e7f8abdeea57e2aec702bc5b0df819593c..b9b9b9dca4f0a11165699730c09ab6c500cc90a2 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -68,7 +68,7 @@ let
inherit (cfg) spoolAreaPath;
};
- sockets."hylafax-hfaxd" = {
+ sockets.hylafax-hfaxd = {
description = "HylaFAX server socket";
documentation = [ "man:hfaxd(8)" ];
wantedBy = [ "multi-user.target" ];
@@ -77,7 +77,7 @@ let
socketConfig.Accept = true;
};
- paths."hylafax-faxq" = {
+ paths.hylafax-faxq = {
description = "HylaFAX queue manager sendq watch";
documentation = [ "man:faxq(8)" "man:sendq(5)" ];
wantedBy = [ "multi-user.target" ];
@@ -87,11 +87,11 @@ let
timers = mkMerge [
(
mkIf (cfg.faxcron.enable.frequency!=null)
- { "hylafax-faxcron".timerConfig.Persistent = true; }
+ { hylafax-faxcron.timerConfig.Persistent = true; }
)
(
mkIf (cfg.faxqclean.enable.frequency!=null)
- { "hylafax-faxqclean".timerConfig.Persistent = true; }
+ { hylafax-faxqclean.timerConfig.Persistent = true; }
)
];
@@ -121,7 +121,7 @@ let
in
service: service // { serviceConfig = apply service; };
- services."hylafax-spool" = {
+ services.hylafax-spool = {
description = "HylaFAX spool area preparation";
documentation = [ "man:hylafax-server(4)" ];
script = ''
@@ -140,7 +140,7 @@ let
unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ];
};
- services."hylafax-faxq" = {
+ services.hylafax-faxq = {
description = "HylaFAX queue manager";
documentation = [ "man:faxq(8)" ];
requires = [ "hylafax-spool.service" ];
@@ -178,7 +178,7 @@ let
serviceConfig.PrivateNetwork = null;
};
- services."hylafax-faxcron" = rec {
+ services.hylafax-faxcron = rec {
description = "HylaFAX spool area maintenance";
documentation = [ "man:faxcron(8)" ];
after = [ "hylafax-spool.service" ];
@@ -194,7 +194,7 @@ let
];
};
- services."hylafax-faxqclean" = rec {
+ services.hylafax-faxqclean = rec {
description = "HylaFAX spool area queue cleaner";
documentation = [ "man:faxqclean(8)" ];
after = [ "hylafax-spool.service" ];
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index 2bd898edf89716d517b94b0bcdda0cc6e8a05ec1..f5abe61a1baf4c8c3a3db0ca8bddc7bda715fdf9 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -121,7 +121,7 @@ in
users.groups.ircd.gid = config.ids.gids.ircd;
- systemd.services."ircd-hybrid" = {
+ systemd.services.ircd-hybrid = {
description = "IRCD Hybrid server";
after = [ "started networking" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
index 0c66b85fe8a5f6cc409229e5b680910e89064549..68f1e9af9fff197cd2ea2cda64210ef5238706fd 100644
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@@ -54,7 +54,7 @@ in {
};
genesisBlockHash = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "d70495af81ae8600aca3e642b2427327cb6001ec4d7a0037e96a00dabed163f9";
description = ''
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 40c38254a57c3a1229b796cbf66b39a88ed0f7df..bdea6a1d1caab78826bd1fd35b0f3c9298af24c8 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -11,7 +11,7 @@ with lib;
let
cfg = config.services.kippo;
in
-rec {
+{
options = {
services.kippo = {
enable = mkOption {
@@ -26,22 +26,22 @@ rec {
};
hostname = mkOption {
default = "nas3";
- type = types.string;
+ type = types.str;
description = ''Hostname for kippo to present to SSH login'';
};
varPath = mkOption {
default = "/var/lib/kippo";
- type = types.string;
+ type = types.path;
description = ''Path of read/write files needed for operation and configuration.'';
};
logPath = mkOption {
default = "/var/log/kippo";
- type = types.string;
+ type = types.path;
description = ''Path of log files needed for operation and configuration.'';
};
pidPath = mkOption {
default = "/run/kippo";
- type = types.string;
+ type = types.path;
description = ''Path of pid files needed for operation.'';
};
extraConfig = mkOption {
@@ -109,8 +109,8 @@ rec {
serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
serviceConfig.PermissionsStartOnly = true;
- serviceConfig.User = "kippo";
- serviceConfig.Group = "kippo";
+ serviceConfig.User = "kippo";
+ serviceConfig.Group = "kippo";
};
};
}
diff --git a/nixos/modules/services/networking/logmein-hamachi.nix b/nixos/modules/services/networking/logmein-hamachi.nix
index 406626a8a343ab0314bb5b9eff2f5db24525874e..11cbdda2f845b4ba79da83c3c1d4dcbf38e78263 100644
--- a/nixos/modules/services/networking/logmein-hamachi.nix
+++ b/nixos/modules/services/networking/logmein-hamachi.nix
@@ -35,7 +35,7 @@ in
description = "LogMeIn Hamachi Daemon";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
serviceConfig = {
Type = "forking";
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index ed0c1044a57091b29d6a268903c3c56d9653aa4b..0947471adbc943d66d14fdaf74141a70f0ee0857 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -96,7 +96,7 @@ in
{ description = "MiniDLNA Server";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
serviceConfig =
{ User = "minidlna";
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index cc81e27e93996102de644e9c89e968fabd4a2559..1b3084fe9abbc81d2c81c91f2bee65c610f23ca2 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -27,7 +27,7 @@ in
};
key = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = "HMAC url validation key (hexadecimal encoded).
Leave blank to disable. Without validation key, anyone can
@@ -56,7 +56,7 @@ in
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = "The address on which the service listens";
defaultText = "127.0.0.1 (localhost)";
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 1d49c137723ca3dc2cad807a92fae7a704c8d832..d2feb93e2b723e3c8b196185ff491ec548033a50 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -49,7 +49,7 @@ in
host = mkOption {
default = "127.0.0.1";
example = "0.0.0.0";
- type = types.string;
+ type = types.str;
description = ''
Host to listen on without SSL.
'';
@@ -88,7 +88,7 @@ in
host = mkOption {
default = "0.0.0.0";
example = "localhost";
- type = types.string;
+ type = types.str;
description = ''
Host to listen on with SSL.
'';
@@ -135,7 +135,7 @@ in
};
acl = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
example = [ "topic read A/B" "topic A/#" ];
description = ''
Control client access to topics on the broker.
diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixos/modules/services/networking/mtprotoproxy.nix
index 24bf33815da8d73319df8cbd43062acf27916a42..d896f227b82c868eccc31c9cdc8418b27b78b28e 100644
--- a/nixos/modules/services/networking/mtprotoproxy.nix
+++ b/nixos/modules/services/networking/mtprotoproxy.nix
@@ -50,8 +50,8 @@ in
users = mkOption {
type = types.attrsOf types.str;
example = {
- "tg" = "00000000000000000000000000000000";
- "tg2" = "0123456789abcdef0123456789abcdef";
+ tg = "00000000000000000000000000000000";
+ tg2 = "0123456789abcdef0123456789abcdef";
};
description = ''
Allowed users and their secrets. A secret is a 32 characters long hex string.
@@ -80,7 +80,7 @@ in
type = types.attrs;
default = {};
example = {
- "STATS_PRINT_PERIOD" = 600;
+ STATS_PRINT_PERIOD = 600;
};
description = ''
Extra configuration options for mtprotoproxy.
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix
index ba17f1ba825a5debfe56018ec89d0e3f274bac36..92088623517f8b8e96cd509cdba5e836d6a3e388 100644
--- a/nixos/modules/services/networking/ndppd.nix
+++ b/nixos/modules/services/networking/ndppd.nix
@@ -142,7 +142,7 @@ in {
messages, and respond to them according to a set of rules.
'';
default = {};
- example = { "eth0".rules."1111::/64" = {}; };
+ example = { eth0.rules."1111::/64" = {}; };
};
};
@@ -153,7 +153,7 @@ in {
'' ];
services.ndppd.proxies = mkIf (cfg.interface != null && cfg.network != null) {
- "${cfg.interface}".rules."${cfg.network}" = {};
+ ${cfg.interface}.rules.${cfg.network} = {};
};
systemd.services.ndppd = {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 551636a33d25c5d8ec5b6ed2d96186faf2cc5cf7..2061c02fffbdbe8026dddae074d5b7581f4ff25d 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -81,9 +81,9 @@ let
'';
dispatcherTypesSubdirMap = {
- "basic" = "";
- "pre-up" = "pre-up.d/";
- "pre-down" = "pre-down.d/";
+ basic = "";
+ pre-up = "pre-up.d/";
+ pre-down = "pre-down.d/";
};
macAddressOpt = mkOption {
@@ -156,7 +156,7 @@ in {
};
unmanaged = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = ''
List of interfaces that will not be managed by NetworkManager.
@@ -453,7 +453,7 @@ in {
systemd.packages = cfg.packages;
- systemd.services."NetworkManager" = {
+ systemd.services.NetworkManager = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
@@ -483,7 +483,7 @@ in {
};
};
- systemd.services."NetworkManager-dispatcher" = {
+ systemd.services.NetworkManager-dispatcher = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index ca458d089dcc3270e049af0f890341b7f6a6da1e..347d87b3f385fa905ccffdb79b973ad677509cac 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -19,7 +19,7 @@ in
};
bindAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = ''
IP address where nix-serve will bind its listening socket.
@@ -44,7 +44,7 @@ in
};
extraParams = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = ''
Extra command line parameters for nix-serve.
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index c69b77f9deecbe97a66f6d9a3ad9bbf21fdc3413..bc0966e6b8e6ad117ffc975490e117e6789a0f35 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -954,7 +954,7 @@ in
'';
};
- systemd.timers."nsd-dnssec" = mkIf dnssec {
+ systemd.timers.nsd-dnssec = mkIf dnssec {
description = "Automatic DNSSEC key rollover";
wantedBy = [ "nsd.service" ];
@@ -965,7 +965,7 @@ in
};
};
- systemd.services."nsd-dnssec" = mkIf dnssec {
+ systemd.services.nsd-dnssec = mkIf dnssec {
description = "DNSSEC key rollover";
wantedBy = [ "nsd.service" ];
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index b061ce34ed2cf04b019a6a3907d195985e7144db..7c171281a9262ba6b69478e6976a6178c07b9a1d 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -65,7 +65,7 @@ let
};
acceptInterface = mkOption {
- type = types.string;
+ type = types.str;
default = "lo";
description = ''
Tell nylon which interface to listen for client requests on, default is "lo".
@@ -73,7 +73,7 @@ let
};
bindInterface = mkOption {
- type = types.string;
+ type = types.str;
default = "enp3s0f0";
description = ''
Tell nylon which interface to use as an uplink, default is "enp3s0f0".
@@ -89,7 +89,7 @@ let
};
allowedIPRanges = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ "192.168.0.0/16" "127.0.0.1/8" "172.16.0.1/12" "10.0.0.0/8" ];
description = ''
Allowed client IP ranges are evaluated first, defaults to ARIN IPv4 private ranges:
@@ -98,7 +98,7 @@ let
};
deniedIPRanges = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ "0.0.0.0/0" ];
description = ''
Denied client IP ranges, these gets evaluated after the allowed IP ranges, defaults to all IPv4 addresses:
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index 57638ebc9c01842fcf1758d5b6f46b1ab93a902c..f3920aa8064603eb2eb0235ecbb3acbbb5f586aa 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -40,7 +40,7 @@ in
};
extraOptions = mkOption {
- type = with types; string;
+ type = with types; separatedString " ";
default = "";
example = "-s";
description = ''
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index f47122ee70bf553e66fa49428be0a5a2cd5b5504..05be97e66a3d4d2107b402a6df6a33b6dce86994 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -182,12 +182,12 @@ in
options = {
username = mkOption {
description = "The username to store inside the credentials file.";
- type = types.string;
+ type = types.str;
};
password = mkOption {
description = "The password to store inside the credentials file.";
- type = types.string;
+ type = types.str;
};
};
});
diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix
index 13f784dc53c18593098a914227319c5c770affb4..5e8cce5b89aaf83ebaed67d96a6c9be351969e6c 100644
--- a/nixos/modules/services/networking/ostinato.nix
+++ b/nixos/modules/services/networking/ostinato.nix
@@ -50,7 +50,7 @@ in
rpcServer = {
address = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = ''
By default, the Drone RPC server will listen on all interfaces and
@@ -63,7 +63,7 @@ in
portList = {
include = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = ''[ "eth*" "lo*" ]'';
description = ''
diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix
index 529115a1c6e146837d5ce4f2fe458bb3ee8839b3..dbe3b7380970bc3655496effb6c9b6de39d5d61f 100644
--- a/nixos/modules/services/networking/polipo.nix
+++ b/nixos/modules/services/networking/polipo.nix
@@ -30,7 +30,7 @@ in
};
proxyAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = "IP address on which Polipo will listen.";
};
@@ -51,7 +51,7 @@ in
};
parentProxy = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "localhost:8124";
description = ''
@@ -61,7 +61,7 @@ in
};
socksParentProxy = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "localhost:9050";
description = ''
@@ -74,7 +74,7 @@ in
type = types.lines;
default = "";
description = ''
- Polio configuration. Contents will be added
+ Polio configuration. Contents will be added
verbatim to the configuration file.
'';
};
@@ -111,4 +111,4 @@ in
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index d8b9e8f8341a5a84cc47e1868f1fb611fc6d75e2..3e7753b9dd3520eedf85607bf95193552b1d2501 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -8,13 +8,13 @@ with lib;
enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
serverIp = mkOption {
- type = types.string;
+ type = types.str;
description = "The server-side IP address.";
default = "10.124.124.1";
};
clientIpRange = mkOption {
- type = types.string;
+ type = types.str;
description = "The range from which client IPs are drawn.";
default = "10.124.124.2-11";
};
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 40bd9015b1eb09a3c17ae4874386f28ae29d9c1f..1ae063aa6bb52d3b11e48ee73b8a295eaa5e23fa 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -297,7 +297,7 @@ in
};
dataDir = mkOption {
- type = types.string;
+ type = types.path;
description = "Directory where Prosody stores its data";
default = "/var/lib/prosody";
};
diff --git a/nixos/modules/services/networking/quicktun.nix b/nixos/modules/services/networking/quicktun.nix
index 5bcf923f909c235b6cc9ee25875f8f4a3ec3c0f9..fb783c836464db71d03c014e9855d93e1fe9c53f 100644
--- a/nixos/modules/services/networking/quicktun.nix
+++ b/nixos/modules/services/networking/quicktun.nix
@@ -93,18 +93,18 @@ with lib;
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = {
- "INTERFACE" = name;
- "TUN_MODE" = toString qtcfg.tunMode;
- "REMOTE_ADDRESS" = qtcfg.remoteAddress;
- "LOCAL_ADDRESS" = qtcfg.localAddress;
- "LOCAL_PORT" = toString qtcfg.localPort;
- "REMOTE_PORT" = toString qtcfg.remotePort;
- "REMOTE_FLOAT" = toString qtcfg.remoteFloat;
- "PRIVATE_KEY" = qtcfg.privateKey;
- "PUBLIC_KEY" = qtcfg.publicKey;
- "TIME_WINDOW" = toString qtcfg.timeWindow;
- "TUN_UP_SCRIPT" = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript;
- "SUID" = "nobody";
+ INTERFACE = name;
+ TUN_MODE = toString qtcfg.tunMode;
+ REMOTE_ADDRESS = qtcfg.remoteAddress;
+ LOCAL_ADDRESS = qtcfg.localAddress;
+ LOCAL_PORT = toString qtcfg.localPort;
+ REMOTE_PORT = toString qtcfg.remotePort;
+ REMOTE_FLOAT = toString qtcfg.remoteFloat;
+ PRIVATE_KEY = qtcfg.privateKey;
+ PUBLIC_KEY = qtcfg.publicKey;
+ TIME_WINDOW = toString qtcfg.timeWindow;
+ TUN_UP_SCRIPT = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript;
+ SUID = "nobody";
};
serviceConfig = {
Type = "simple";
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index d6fabbcd47001dfa90f75bd1de9a79acaeceb760..1daced4a6c70e1fcbaa7947b12ac4df57224bb0a 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -41,7 +41,7 @@ in
};
services.radicale.config = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = ''
Radicale configuration, this will set the service
@@ -50,7 +50,7 @@ in
};
services.radicale.extraArgs = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = "Extra arguments passed to the Radicale daemon.";
};
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index ee7f82ac7bee162c080648219cd77f117ae4fc25..9b25aa57583748c52591cfa2dc5eef6c2fcf9937 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -249,7 +249,7 @@ in
systemd.services.resilio = with pkgs; {
description = "Resilio Sync Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
serviceConfig = {
Restart = "on-abort";
UMask = "0002";
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index f511a9af256213c167daa59fa0a432385ebc5720..e548ec66962a60c73879bdd71a5595ba8bbe7ab9 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -35,7 +35,7 @@ in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = "IP interface to listen on for http connections.";
};
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index c41d0edaf17fc38f63bb21bb06623d91596c0659..d4d0594a9cdd3e1bed4c15eb751b5cbfe21f7418 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -55,7 +55,7 @@ in
description = "Enable the smokeping service";
};
alertConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
to = root@localhost
from = smokeping@localhost
@@ -73,19 +73,20 @@ in
description = "Configuration for alerts.";
};
cgiUrl = mkOption {
- type = types.string;
- default = "http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi";
+ type = types.str;
+ default = "http://${cfg.hostName}:${toString cfg.port}/smokeping.cgi";
+ defaultText = "http://\${hostName}:\${toString port}/smokeping.cgi";
example = "https://somewhere.example.com/smokeping.cgi";
description = "URL to the smokeping cgi.";
};
config = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.lines;
default = null;
description = "Full smokeping config supplied by the user. Overrides " +
"and replaces any other configuration supplied.";
};
databaseConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
step = 300
pings = 20
@@ -122,14 +123,15 @@ in
description = "Any additional customization not already included.";
};
hostName = mkOption {
- type = types.string;
+ type = types.str;
default = config.networking.hostName;
example = "somewhere.example.com";
description = "DNS name for the urls generated in the cgi.";
};
imgUrl = mkOption {
- type = types.string;
- default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
+ type = types.str;
+ default = "http://${cfg.hostName}:${toString cfg.port}/cache";
+ defaultText = "http://\${hostName}:\${toString port}/cache";
example = "https://somewhere.example.com/cache";
description = "Base url for images generated in the cgi.";
};
@@ -140,19 +142,19 @@ in
description = "DNS name for the urls generated in the cgi.";
};
mailHost = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "localhost";
description = "Use this SMTP server to send alerts";
};
owner = mkOption {
- type = types.string;
+ type = types.str;
default = "nobody";
example = "Joe Admin";
description = "Real name of the owner of the instance";
};
ownerEmail = mkOption {
- type = types.string;
+ type = types.str;
default = "no-reply@${cfg.hostName}";
example = "no-reply@yourdomain.com";
description = "Email contact for owner";
@@ -170,7 +172,7 @@ in
description = "TCP port to use for the web server.";
};
presentationConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
+ charts
menu = Charts
@@ -211,12 +213,12 @@ in
description = "presentation graph style";
};
presentationTemplate = mkOption {
- type = types.string;
+ type = types.str;
default = "${pkgs.smokeping}/etc/basepage.html.dist";
description = "Default page layout for the web UI.";
};
probeConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
+ FPing
binary = ${config.security.wrapperDir}/fping
@@ -230,12 +232,12 @@ in
description = "Use this sendmail compatible script to deliver alerts";
};
smokeMailTemplate = mkOption {
- type = types.string;
+ type = types.str;
default = "${cfg.package}/etc/smokemail.dist";
description = "Specify the smokemail template for alerts.";
};
targetConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
probe = FPing
menu = Top
@@ -253,7 +255,7 @@ in
description = "Target configuration";
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "smokeping";
description = "User that runs smokeping and (optionally) thttpd";
};
@@ -275,7 +277,7 @@ in
];
security.wrappers = {
fping.source = "${pkgs.fping}/bin/fping";
- "fping6".source = "${pkgs.fping}/bin/fping6";
+ fping6.source = "${pkgs.fping}/bin/fping6";
};
environment.systemPackages = [ pkgs.fping ];
users.users = singleton {
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 65df93a00da946fd267794e67a06f552cdb58cd5..2dc73d81b258c20abeda8f8693f6c073bbf28fa6 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -50,7 +50,7 @@ in
};
dataDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/lib/softether";
description = ''
Data directory for SoftEther VPN.
@@ -68,7 +68,7 @@ in
mkMerge [{
environment.systemPackages = [ package ];
- systemd.services."softether-init" = {
+ systemd.services.softether-init = {
description = "SoftEther VPN services initial task";
wantedBy = [ "network.target" ];
serviceConfig = {
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
index 95a174122d04f56f92ffff196bdd262721e4322e..dfdfc50d8ae2335444aafae966348df44362e6d8 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
@@ -63,7 +63,7 @@ rec {
StrongSwan default:
'';
- single = f: name: value: { "${name}" = f value; };
+ single = f: name: value: { ${name} = f value; };
mkStrParam = mkParamOfType types.str;
mkOptionalStrParam = mkStrParam null;
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
index 193ad27f035a733b2276ad7afc6a1a030a092242..2bbb39a76049be47d71d811c6551b7bafd69b03c 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
@@ -21,7 +21,7 @@ rec {
mkConf = indent : ps :
concatMapStringsSep "\n"
(name:
- let value = ps."${name}";
+ let value = ps.${name};
indentation = replicate indent " ";
in
indentation + (
@@ -58,7 +58,7 @@ rec {
) set);
# Recursively map over every parameter in the given attribute set.
- mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? "_type" && as._type == "param")));
+ mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? _type && as._type == "param")));
mapAttrsRecursiveCond' = cond: f: set:
let
@@ -67,7 +67,7 @@ rec {
g =
name: value:
if isAttrs value && cond value
- then { "${name}" = recurse (path ++ [name]) value; }
+ then { ${name} = recurse (path ++ [name]) value; }
else f (path ++ [name]) name value;
in mapAttrs'' g set;
in recurse [] set;
@@ -77,6 +77,6 @@ rec {
# Extract the options from the given set of parameters.
paramsToOptions = ps :
- mapParamsRecursive (_path: name: param: { "${name}" = param.option; }) ps;
+ mapParamsRecursive (_path: name: param: { ${name} = param.option; }) ps;
}
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 89a14966eca7655cdd4df91e836a39b8e6897809..cbc899f2b4d7354472dd6f042cc0740ec4920f02 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -35,12 +35,12 @@ let
clientConfig = {
options = {
accept = mkOption {
- type = types.string;
+ type = types.str;
description = "IP:Port on which connections should be accepted.";
};
connect = mkOption {
- type = types.string;
+ type = types.str;
description = "IP:Port destination to connect to.";
};
@@ -63,7 +63,7 @@ let
};
verifyHostname = mkOption {
- type = with types; nullOr string;
+ type = with types; nullOr str;
default = null;
description = "If set, stunnel checks if the provided certificate is valid for the given hostname.";
};
@@ -88,13 +88,13 @@ in
};
user = mkOption {
- type = with types; nullOr string;
+ type = with types; nullOr str;
default = "nobody";
description = "The user under which stunnel runs.";
};
group = mkOption {
- type = with types; nullOr string;
+ type = with types; nullOr str;
default = "nogroup";
description = "The group under which stunnel runs.";
};
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 126f5b7b527beaf59654359eba0d04a17e90a6b0..165fd5970cf88a048dd78121ad4dd4237ad624fa 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -373,7 +373,7 @@ in {
systemd.packages = [ pkgs.syncthing ];
users.users = mkIf (cfg.systemService && cfg.user == defaultUser) {
- "${defaultUser}" =
+ ${defaultUser} =
{ group = cfg.group;
home = cfg.dataDir;
createHome = true;
@@ -383,7 +383,7 @@ in {
};
users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
- "${defaultUser}".gid =
+ ${defaultUser}.gid =
config.ids.gids.syncthing;
};
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 7830dfb1834c53764081cade8fe64abe4cd8bb1a..7daacba185fe738d5131c59cf30a81562975f63f 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -8,7 +8,7 @@ with lib;
enable = mkEnableOption "toxvpn running on startup";
localip = mkOption {
- type = types.string;
+ type = types.str;
default = "10.123.123.1";
description = "your ip on the vpn";
};
@@ -20,7 +20,7 @@ with lib;
};
auto_add_peers = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = ''[ "toxid1" "toxid2" ]'';
description = "peers to automacally connect to on startup";
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 31e1e65fa9cacdbf03c83f5199ca1f0197f77aa4..67be60da567398f75251408a84ba95b3b1b92cad 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -164,7 +164,7 @@ in
};
anonymousUmask = mkOption {
- type = types.string;
+ type = types.str;
default = "077";
example = "002";
description = "Anonymous write umask.";
diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix
index 4b76350ecf8a7ac08882d091353aaa8fe96aaf68..d9177df65bd628be55bf1fad218f56815bfffc1e 100644
--- a/nixos/modules/services/networking/websockify.nix
+++ b/nixos/modules/services/networking/websockify.nix
@@ -44,9 +44,9 @@ let cfg = config.services.networking.websockify; in {
scriptArgs = "%i";
};
- systemd.targets."default-websockify" = {
+ systemd.targets.default-websockify = {
description = "Target to start all default websockify@ services";
- unitConfig."X-StopOnReconfiguration" = true;
+ unitConfig.X-StopOnReconfiguration = true;
wants = mapAttrsToList (name: value: "websockify@${name}:${toString value}.service") cfg.portMap;
wantedBy = [ "multi-user.target" ];
};
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 2d7cd5cebb48625ead92fdb01eaae50519d97593..8dc6f845ed853e4aa6b443ec803ce5b3e0bd5656 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -53,7 +53,7 @@ in
services.xinetd.extraDefaults = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Additional configuration lines added to the default section of xinetd's configuration.
'';
@@ -70,13 +70,13 @@ in
options = {
name = mkOption {
- type = types.string;
+ type = types.str;
example = "login";
description = "Name of the service.";
};
protocol = mkOption {
- type = types.string;
+ type = types.str;
default = "tcp";
description =
"Protocol of the service. Usually tcp or udp.";
@@ -90,25 +90,25 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "nobody";
description = "User account for the service";
};
server = mkOption {
- type = types.string;
+ type = types.str;
example = "/foo/bin/ftpd";
description = "Path of the program that implements the service.";
};
serverArgs = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = "Command-line arguments for the server program.";
};
flags = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = "";
};
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index d0a3ed7bb5e0afcc2ed8460e49e661b450e73185..7dbe51422d96454db57ef5e351de7643b8aca81f 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -8,13 +8,13 @@ with lib;
enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
serverIp = mkOption {
- type = types.string;
+ type = types.str;
description = "The server-side IP address.";
default = "10.125.125.1";
};
clientIpRange = mkOption {
- type = types.string;
+ type = types.str;
description = "The range from which client IPs are drawn.";
default = "10.125.125.2-11";
};
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 06ccd7032e6c08885c4ceccda391a640c93a2ba8..78de246a816fba73a3bed22d205eea2ba504f787 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -74,7 +74,7 @@ in
};
config = mkIf (cfg.enable) {
- users.users."${cfg.user}" =
+ users.users.${cfg.user} =
if cfg.user == "zerobin" then {
isSystemUser = true;
group = cfg.group;
@@ -82,7 +82,7 @@ in
createHome = true;
}
else {};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.services.zerobin = {
enable = true;
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 42c1b9482cb2a17e3c46eb0fdd14f6b211d79346..7f1e793b980e49e1161d9686a03fa6e102f5a5d6 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -287,7 +287,7 @@ in
};
environment.systemPackages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
- environment.etc."cups".source = "/var/lib/cups";
+ environment.etc.cups.source = "/var/lib/cups";
services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index f77b3bcd5921e58ed6647448e494ba3b392883c4..e43ca014e148a15954271a4fc4678d0d5b5a7ac1 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -143,7 +143,6 @@ in
};
systemd.services.fcron = {
description = "fcron daemon";
- after = [ "local-fs.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.fcron ];
diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index b1ca4ab2345263d37988990cd2b7f2b301896465..474490391463f814c1d6c8fd08dcc646efdb623c 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -67,7 +67,7 @@ in {
services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ];
- systemd.services."fprot-updater" = {
+ systemd.services.fprot-updater = {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = false;
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index b64a1b4d03e0f0515e374faaf334c3ab338b6189..618e689924fd6d2be7c388841aba8176919c25e9 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -69,7 +69,7 @@ in
configFile = mkOption {
default = "empty.lua";
example = "/srv/haka/myfilter.lua";
- type = types.string;
+ type = types.str;
description = ''
Specify which configuration file Haka uses.
It can be absolute path or a path relative to the sample directory of
@@ -80,7 +80,7 @@ in
interfaces = mkOption {
default = [ "eth0" ];
example = [ "any" ];
- type = with types; listOf string;
+ type = with types; listOf str;
description = ''
Specify which interface(s) Haka listens to.
Use 'any' to listen to all interfaces.
diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix
index 1c4f8e20552fbfea10d4d8b12923de04708d9a85..89178886471097eb101dd648011156889a94df57 100644
--- a/nixos/modules/services/security/munge.nix
+++ b/nixos/modules/services/security/munge.nix
@@ -19,7 +19,7 @@ in
password = mkOption {
default = "/etc/munge/munge.key";
- type = types.string;
+ type = types.path;
description = ''
The path to a daemon's secret key.
'';
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 61f203ef9e7d8dd6dca1962056fa25746d043ff9..bb03f7fc9e43cb95fb838fb85e390b5936d6a427 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -284,7 +284,7 @@ in
####################################################
# UPSTREAM Configuration
upstream = mkOption {
- type = with types; coercedTo string (x: [x]) (listOf string);
+ type = with types; coercedTo str (x: [x]) (listOf str);
default = [];
description = ''
The http url(s) of the upstream endpoint or file://
@@ -523,7 +523,7 @@ in
};
keyFile = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.path;
default = null;
description = ''
oauth2_proxy allows passing sensitive configuration via environment variables.
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index a9ad5497a657aa15d7744d94e966f8ea77647563..be6734f439f3de7e93a4c868d9933e0d182c7efa 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -6,14 +6,14 @@ in
{
options.services.oauth2_proxy.nginx = {
proxy = mkOption {
- type = types.string;
+ type = types.str;
default = config.services.oauth2_proxy.httpAddress;
description = ''
The address of the reverse proxy endpoint for oauth2_proxy
'';
};
virtualHosts = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = ''
A list of nginx virtual hosts to put behind the oauth2 proxy
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 97fbd6aae6e023671e52b5cdcdcd0323ad67b74f..61bcd84f2e643b46f18b10b9f05a29a30285c474 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -99,7 +99,7 @@ in
# for physlock -l and physlock -L
environment.systemPackages = [ pkgs.physlock ];
- systemd.services."physlock" = {
+ systemd.services.physlock = {
enable = true;
description = "Physlock";
wantedBy = optional cfg.lockOn.suspend "suspend.target"
diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 1b7a2ad139801fc3b6088fdd1f1b087674d88923..a91060dc659a76b19e1d9c6ee71884fcbb05bb05 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -108,7 +108,7 @@ in {
hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
hkpPort = builtins.toString cfg.hkpPort;
in {
- "sks-db" = {
+ sks-db = {
description = "SKS database server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index abdc0cd78b4dbd2cdc22a1b182d5dce30ba17401..ed862387cce1d9dcd80b533077c41974048a873c 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -722,7 +722,6 @@ in
systemd.services.tor-init =
{ description = "Tor Daemon Init";
wantedBy = [ "tor.service" ];
- after = [ "local-fs.target" ];
script = ''
install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion
install -m 0750 -o tor -g tor -d ${torRunDirectory}
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 20d5e3b28eb9ec2890b1178d0b14930e0d536d63..4ced5acd9bd9d2f7355368df0eb2df8462ccae72 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -195,7 +195,7 @@ in {
description = "USBGuard daemon";
wantedBy = [ "basic.target" ];
- wants = [ "systemd-udevd.service" "local-fs.target" ];
+ wants = [ "systemd-udevd.service" ];
# make sure an empty rule file and required directories exist
preStart = ''
diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix
index 59d3deced86786020e4b748327c4492b277d3b8c..d3d57aa769281bdba561da2c3c413d3274646bfa 100644
--- a/nixos/modules/services/system/cgmanager.nix
+++ b/nixos/modules/services/system/cgmanager.nix
@@ -14,7 +14,6 @@ in {
config = mkIf cfg.enable {
systemd.services.cgmanager = {
wantedBy = [ "multi-user.target" ];
- after = [ "local-fs.target" ];
description = "Cgroup management daemon";
restartIfChanged = false;
serviceConfig = {
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 3ad555f78ef826a619fe942df7a6f64553f08cf1..15fe822aec67987b33f11c93d454c9cb2aa1ae45 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -112,8 +112,6 @@ in
systemd.services.cloud-init-local =
{ description = "Initial cloud-init job (pre-networking)";
wantedBy = [ "multi-user.target" ];
- wants = [ "local-fs.target" ];
- after = [ "local-fs.target" ];
path = path;
serviceConfig =
{ Type = "oneshot";
@@ -127,9 +125,9 @@ in
systemd.services.cloud-init =
{ description = "Initial cloud-init job (metadata service crawler)";
wantedBy = [ "multi-user.target" ];
- wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service"
+ wants = [ "network-online.target" "cloud-init-local.service"
"sshd.service" "sshd-keygen.service" ];
- after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ];
+ after = [ "network-online.target" "cloud-init-local.service" ];
before = [ "sshd.service" "sshd-keygen.service" ];
requires = [ "network.target "];
path = path;
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index e0458021844216bb19e8d9ecef7c0d038d72dc10..936646a5fd78f5176c13aa49d0cbc4d1d518c156 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -44,8 +44,10 @@ in
message bus. Specifically, files in the following directories
will be included into their respective DBus configuration paths:
pkg/etc/dbus-1/system.d
+ pkg/share/dbus-1/system.d
pkg/share/dbus-1/system-services
pkg/etc/dbus-1/session.d
+ pkg/share/dbus-1/session.d
pkg/share/dbus-1/services
'';
};
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
index 04595fc82fbb9e9af736a8dcd7f94e2df6d15eec..c3c0b432b4940bf9c0b4ecfa11cf25ac231734d0 100644
--- a/nixos/modules/services/system/localtime.nix
+++ b/nixos/modules/services/system/localtime.nix
@@ -22,7 +22,7 @@ in {
config = mkIf cfg.enable {
services.geoclue2 = {
enable = true;
- appConfig."localtime" = {
+ appConfig.localtime = {
isAllowed = true;
isSystem = true;
};
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 48ec4d692e2fb42b9da89c2ca3008913ad611ef6..e1c5e052a12f751980fbce5a106ec8c9011283c0 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -173,12 +173,15 @@ in {
# Provide a default set of `extraPackages`.
services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ];
- systemd.tmpfiles.rules = [ "d '${configDir}' 0770 ${cfg.user} ${cfg.group}" ]
- ++ optional (cfg.config ? "download_location")
+ systemd.tmpfiles.rules = [
+ "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group}"
+ "d '${cfg.dataDir}/.config' 0770 ${cfg.user} ${cfg.group}"
+ "d '${cfg.dataDir}/.config/deluge' 0770 ${cfg.user} ${cfg.group}"
+ ]
"d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}"
- ++ optional (cfg.config ? "torrentfiles_location")
+ ++ optional (cfg.config ? torrentfiles_location)
"d '${cfg.config.torrentfiles_location}' 0770 ${cfg.user} ${cfg.group}"
- ++ optional (cfg.config ? "move_completed_path")
+ ++ optional (cfg.config ? move_completed_path)
"d '${cfg.config.move_completed_path}' 0770 ${cfg.user} ${cfg.group}";
systemd.services.deluged = {
@@ -237,7 +240,6 @@ in {
group = cfg.group;
uid = config.ids.uids.deluge;
home = cfg.dataDir;
- createHome = true;
description = "Deluge Daemon user";
};
};
diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index ca63f529a5dfba8d47dc85a93d81d83235b3ee65..6ac85f8fa1782279291fde538855f6f1a1038087 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -19,7 +19,7 @@ in {
user = mkOption {
default = "deluge";
example = "some_user";
- type = types.string;
+ type = types.str;
description = "The user under which to run flexget.";
};
@@ -33,7 +33,7 @@ in {
interval = mkOption {
default = "10m";
example = "1h";
- type = types.string;
+ type = types.str;
description = "When to perform a flexget run. See man 7 systemd.time for the format.";
};
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index a94a471361ef80a38f478158909d9dd2e9d9202b..7409eb8cdcbef970158c07ce849c486685f1194d 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -102,7 +102,7 @@ in
config = mkIf cfg.enable {
systemd.services.transmission = {
description = "Transmission BitTorrent Service";
- after = [ "local-fs.target" "network.target" ] ++ optional apparmor "apparmor.service";
+ after = [ "network.target" ] ++ optional apparmor "apparmor.service";
requires = mkIf apparmor [ "apparmor.service" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index b50de496e97538ad6d594b543b9db636ea8b08ea..f127d8a0276db4f380083287d5bc50158fe41ee5 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -92,7 +92,7 @@ in
restartIfChanged = false;
};
- systemd.services."console-getty" =
+ systemd.services.console-getty =
{ serviceConfig.ExecStart = [
"" # override upstream default with an empty ExecStart
(gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM")
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index cf163271d27675874ce32a456f59d6459fee6229..59185fdbd36f28e038d6ebf7cf638de6e3753a24 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -142,12 +142,12 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 020ca8d89dbb21f2e0e9523585fc82de80879715..ceab656b15e8730f61d95176da96c300473f576a 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -110,12 +110,12 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} ${cfg.group} - -"
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index b0019e77ac279e9b9c1c933858e81463390c3039..ce04982e8a9eec9265cc206a39e12b78c54bf1ae 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -148,12 +148,12 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"
diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix
index e885dc69b3c08256a23d94f5444261e9d127091b..7914e5cc0ee19b17ddeeb8d872a0c18263eee764 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixos/modules/services/web-apps/frab.nix
@@ -19,7 +19,7 @@ let
RAILS_SERVE_STATIC_FILES = "1";
} // cfg.extraEnvironment;
- frab-rake = pkgs.stdenv.mkDerivation rec {
+ frab-rake = pkgs.stdenv.mkDerivation {
name = "frab-rake";
buildInputs = [ package.env pkgs.makeWrapper ];
phases = "installPhase fixupPhase";
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 95c8fb160510edc83297bec452fbe29689727954..195ee76ff4e3b3977d03f503f78ea98c0a0e686c 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -189,7 +189,7 @@ in {
services.nginx = {
enable = true;
virtualHosts = mkIf (cfg.virtualHost != null) {
- "${cfg.virtualHost}" = {
+ ${cfg.virtualHost} = {
root = "${pkgs.icingaweb2}/public";
extraConfig = ''
@@ -216,7 +216,7 @@ in {
# /etc/icingaweb2
environment.etc = let
- doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; };
+ doModule = name: optionalAttrs (cfg.modules.${name}.enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; };
in {}
# Module packages
// (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages)
diff --git a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix b/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
index 167e5e38956827a9b2a63a52e77b9c893e2e30cf..e9c1d4ffe5eab8a1795264654560f6c85c56ba7d 100644
--- a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
@@ -58,7 +58,7 @@ in {
};
backends = mkOption {
- default = { "icinga" = { resource = "icinga_ido"; }; };
+ default = { icinga = { resource = "icinga_ido"; }; };
description = "Monitoring backends to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index 2797feb32ebfa2ccc80ef61de79c887543950016..68b57a9b90ddfc8b0854caf2df6dfdceb90ea52c 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -277,7 +277,7 @@ in
systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
- users.users."${user}".group = group;
+ users.users.${user}.group = group;
};
}
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index ada14ad39291674abd007f23ca1425ff6413f5c9..5f5469e485077bf396ad7d450eee550d120952b8 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -102,10 +102,10 @@ in {
phpOptions = mkOption {
type = types.attrsOf types.str;
default = {
- "short_open_tag" = "Off";
- "expose_php" = "Off";
- "error_reporting" = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
- "display_errors" = "stderr";
+ short_open_tag = "Off";
+ expose_php = "Off";
+ error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
+ display_errors = "stderr";
"opcache.enable_cli" = "1";
"opcache.interned_strings_buffer" = "8";
"opcache.max_accelerated_files" = "10000";
@@ -113,7 +113,7 @@ in {
"opcache.revalidate_freq" = "1";
"opcache.fast_shutdown" = "1";
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
- "catch_workers_output" = "yes";
+ catch_workers_output = "yes";
};
description = ''
Options for PHP's php.ini file for nextcloud.
@@ -289,7 +289,7 @@ in {
];
}
- { systemd.timers."nextcloud-cron" = {
+ { systemd.timers.nextcloud-cron = {
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "5m";
timerConfig.OnUnitActiveSec = "15m";
@@ -297,7 +297,7 @@ in {
};
systemd.services = {
- "nextcloud-setup" = let
+ nextcloud-setup = let
c = cfg.config;
writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
overrideConfig = pkgs.writeText "nextcloud-config.php" ''
@@ -397,13 +397,13 @@ in {
'';
serviceConfig.Type = "oneshot";
};
- "nextcloud-cron" = {
+ nextcloud-cron = {
environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
serviceConfig.Type = "oneshot";
serviceConfig.User = "nextcloud";
serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php";
};
- "nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable {
+ nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
serviceConfig.Type = "oneshot";
serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
startAt = cfg.autoUpdateApps.startAt;
@@ -441,7 +441,7 @@ in {
services.nginx = {
enable = true;
virtualHosts = {
- "${cfg.hostName}" = {
+ ${cfg.hostName} = {
root = pkgs.nextcloud;
locations = {
"= /robots.txt" = {
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index 052dbed6d4f83acac676a6527d66b4a9a2d7212e..3af97e146d0aa72eaf098d8801aeb12d64dfeb7a 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -80,14 +80,14 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
home = cfg.home;
createHome = true;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.services.nexus = {
description = "Sonatype Nexus3";
diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
index 93f69bd12651473750111506406e8dae7a5acd0e..ad70ba70bbeffeacf28d1e955f4d5ad34077e14f 100644
--- a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
+++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
@@ -60,7 +60,7 @@ in
services.nginx.virtualHosts = let
hkpPort = builtins.toString cfg.hkpPort;
in {
- "${cfg.hostname}" = {
+ ${cfg.hostname} = {
root = webPkg;
locations = {
"/pks".extraConfig = ''
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 6a1b4143bc16458cf956dced2d04556b42690616..11272ed591b85835a6a70b5a19b9a2b8eb64f441 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -181,6 +181,7 @@ in
services.phpfpm.pools = {
"${poolName}" = {
inherit (cfg) user group;
+
phpOptions = ''
date.timezone = "CET"
@@ -207,7 +208,7 @@ in
};
services.nginx.enable = true;
- services.nginx.virtualHosts."${cfg.virtualHost.serverName}" = {
+ services.nginx.virtualHosts.${cfg.virtualHost.serverName} = {
listen = [ { addr = cfg.virtualHost.listenHost; port = cfg.virtualHost.listenPort; } ];
serverName = cfg.virtualHost.serverName;
root = runDir;
diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix
index 56b7cafffe8bd24da198ba726e551ff4f54c5171..d693c401565ff5adb2b456ada92baad8fa1d5ce6 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixos/modules/services/web-apps/selfoss.nix
@@ -114,7 +114,6 @@ in
};
config = mkIf cfg.enable {
-
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = {
user = "nginx";
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 59b0ee1addc6487eb7d2f77d7218d7937049f459..4daf3ff9f991cf7ca973920a673e82478412b0e6 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -541,7 +541,7 @@ let
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
virtualHosts = {
- "${cfg.virtualHost}" = {
+ ${cfg.virtualHost} = {
root = "${cfg.root}";
locations."/" = {
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index 98dc84588189c2f0bac2245e240ae5bcb0b3f157..8847543705875b0875afc207a63e10c4aa495945 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -133,7 +133,7 @@ let
'';
};
- database = rec {
+ database = {
host = mkOption {
type = types.str;
default = "localhost";
diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix
index 691cbdc8d1d5a940562d0b64fe76a0f2fa9a3885..830edac20bac367db9a4d79cd458f0940cca771c 100644
--- a/nixos/modules/services/web-apps/youtrack.nix
+++ b/nixos/modules/services/web-apps/youtrack.nix
@@ -28,28 +28,28 @@ in
The interface youtrack will listen on.
'';
default = "127.0.0.1";
- type = types.string;
+ type = types.str;
};
baseUrl = mkOption {
description = ''
Base URL for youtrack. Will be auto-detected and stored in database.
'';
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
};
extraParams = mkOption {
default = {};
description = ''
- Extra parameters to pass to youtrack. See
+ Extra parameters to pass to youtrack. See
https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html
for more information.
'';
example = {
"jetbrains.youtrack.overrideRootPassword" = "tortuga";
};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
};
package = mkOption {
@@ -73,7 +73,7 @@ in
description = ''
Where to keep the youtrack database.
'';
- type = types.string;
+ type = types.path;
default = "/var/lib/youtrack";
};
@@ -83,7 +83,7 @@ in
If null, do not setup anything.
'';
default = null;
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
};
jvmOpts = mkOption {
@@ -92,7 +92,7 @@ in
See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html
for more information.
'';
- type = types.string;
+ type = types.separatedString " ";
example = "-XX:MetaspaceSize=250m";
default = "";
};
@@ -101,7 +101,7 @@ in
description = ''
Maximum Java heap size
'';
- type = types.string;
+ type = types.str;
default = "1g";
};
@@ -109,7 +109,7 @@ in
description = ''
Maximum java Metaspace memory.
'';
- type = types.string;
+ type = types.str;
default = "350m";
};
};
diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix
index fa358ffafbc3e3df940de0ffdb5cf0025b650517..dac243b20e97ae3ac20e3a89d8a0a246b007b6dc 100644
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixos/modules/services/web-apps/zabbix.nix
@@ -16,7 +16,7 @@ let
'';
- type = types.string;
+ type = types.lines;
description = "Extra zope.conf";
};
diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix
index 6ec395bb05eca869daf54f035554a8f7bd86ccc6..4daf6d8d9db7ee494c5d8a2ed50dbd0701cb5202 100644
--- a/nixos/modules/services/x11/clight.nix
+++ b/nixos/modules/services/x11/clight.nix
@@ -75,7 +75,7 @@ in {
longitude = mkDefault config.location.longitude;
});
- services.geoclue2.appConfig."clightc" = {
+ services.geoclue2.appConfig.clightc = {
isAllowed = true;
isSystem = true;
};
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0caa93ad217fd335b51975141f0fcd2bc36e7611..6f344f4121ba7e626dde2eca712bf8b48e5af43b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -37,7 +37,7 @@ let
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
[org.gnome.shell]
- favorite-apps=[ 'org.gnome.Epiphany.desktop', 'evolution.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
+ favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
${cfg.extraGSettingsOverrides}
EOF
@@ -238,6 +238,8 @@ in
services.dbus.packages =
optional config.services.printing.enable pkgs.system-config-printer;
+ services.avahi.enable = mkDefault true;
+
services.geoclue2.enable = mkDefault true;
services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
@@ -261,16 +263,19 @@ in
source-sans-pro
];
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome3; [
adwaita-icon-theme
gnome-backgrounds
gnome-bluetooth
+ gnome-color-manager
gnome-control-center
gnome-getting-started-docs
gnome-shell
gnome-shell-extensions
gnome-themes-extra
gnome-user-docs
+ pkgs.orca
pkgs.glib # for gsettings
pkgs.gnome-menus
pkgs.gtk3.out # for gtk-launch
@@ -281,23 +286,43 @@ in
];
})
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst
(mkIf serviceCfg.core-utilities.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
- baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator
- gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan
- gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks
- pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
- gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit
- gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage
+ baobab
+ cheese
+ eog
+ epiphany
+ geary
+ gedit
+ gnome-calculator
+ gnome-calendar
+ gnome-characters
+ gnome-clocks
+ gnome-contacts
+ gnome-font-viewer
+ gnome-logs
+ gnome-maps
+ gnome-music
+ gnome-photos
+ gnome-screenshot
+ gnome-software
+ gnome-system-monitor
+ gnome-weather
+ nautilus
+ simple-scan
+ totem
+ yelp
+ # Unsure if sensible for NixOS
+ /* gnome-boxes */
] config.environment.gnome3.excludePackages);
# Enable default programs
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
programs.gnome-disks.enable = mkDefault true;
- programs.gnome-documents.enable = mkDefault true;
programs.gnome-terminal.enable = mkDefault true;
- services.gnome3.seahorse.enable = mkDefault true;
+ programs.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
# Let nautilus find extensions
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index e1084b0053ccdf21f6bf3402553acc6e92b41437..6a2aa650c0b2e983c1e127254d45518e70049367 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -105,7 +105,7 @@ in
services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;
- security.pam.services."mate-screensaver".unixAuth = true;
+ security.pam.services.mate-screensaver.unixAuth = true;
environment.pathsToLink = [ "/share" ];
};
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index ae23015d2005de61aac5bca7745e0644456b1262..5b82cb1f02620abc3d4af3e75e0cfac227c5c5b7 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -145,6 +145,9 @@ in
programs.dconf.enable = true;
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
+ # Otherwise you can't store NetworkManager Secrets with
+ # "Store the password only for this user"
+ programs.nm-applet.enable = true;
# Shell integration for VTE terminals
programs.bash.vteIntegration = mkDefault true;
@@ -191,6 +194,7 @@ in
gtk3.out
hicolor-icon-theme
lightlocker
+ onboard
plank
qgnomeplatform
shared-mime-info
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 94a307ae1007765f61b3b733d5d3d507c216c385..a51f3c537ab7358d4fa1ab2043f91b01d5b81c59 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -72,7 +72,7 @@ in
security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
- "start_kdeinit".source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
+ start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
kwin_wayland = {
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
capabilities = "cap_sys_nice+ep";
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 232bbf5c55d43aaad5794799dcd86e0e85e3bba1..140dde828daa3da1d2c444f6931e92ecdc527a45 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -48,7 +48,7 @@ in {
enable = mkEnableOption "surf-display as a kiosk browser session";
defaultWwwUri = mkOption {
- type = types.string;
+ type = types.str;
default = "${pkgs.surf-display}/share/surf-display/empty-page.html";
example = "https://www.example.com/";
description = "Default URI to display.";
@@ -69,7 +69,7 @@ in {
};
screensaverSettings = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = ''
Screensaver settings, see man 1 xset for possible options.
@@ -77,7 +77,7 @@ in {
};
pointerButtonMap = mkOption {
- type = types.string;
+ type = types.str;
default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
description = ''
Disable right and middle pointer device click in browser sessions
@@ -87,14 +87,14 @@ in {
};
hideIdlePointer = mkOption {
- type = types.string;
+ type = types.str;
default = "yes";
example = "no";
description = "Hide idle mouse pointer.";
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
example = ''
# Enforce fixed resolution for all displays (default: not set):
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index ea441fbbe715c8f3332935a2eeff9ceb6ae0473e..93987bd1dfc517a8f729075847bdb7261a1dae19 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -5,7 +5,6 @@ with lib;
let
cfg = config.services.xserver.desktopManager.xterm;
- xserverEnabled = config.services.xserver.enable;
in
@@ -14,7 +13,7 @@ in
services.xserver.desktopManager.xterm.enable = mkOption {
type = types.bool;
- default = xserverEnabled;
+ default = false;
defaultText = "config.services.xserver.enable";
description = "Enable a xterm terminal as a desktop manager.";
};
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index afa0cebbc527fd900f4b40485c41f7c0372ffcc7..956c95e48220dd192ab126fd18bd4f3f84ec637f 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -6,7 +6,7 @@ let
xcfg = config.services.xserver;
dmcfg = xcfg.displayManager;
- xEnv = config.systemd.services."display-manager".environment;
+ xEnv = config.systemd.services.display-manager.environment;
cfg = dmcfg.lightdm;
dmDefault = xcfg.desktopManager.default;
@@ -114,7 +114,7 @@ in
};
name = mkOption {
- type = types.string;
+ type = types.str;
description = ''
The name of a .desktop file in the directory specified
in the 'package' option.
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index d1ed345ac579363128339dbead97e7d0566e02c1..c6cb281c2cc2e5434ef602d165cb261e2c2aff44 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -7,7 +7,7 @@ let
xcfg = config.services.xserver;
dmcfg = xcfg.displayManager;
cfg = dmcfg.sddm;
- xEnv = config.systemd.services."display-manager".environment;
+ xEnv = config.systemd.services.display-manager.environment;
inherit (pkgs) sddm;
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index a0a5e26568520725ba44e5d058c0cb3c7367f7ab..bd289976532bdc2ebbed720d34998a800ccfaa87 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -41,13 +41,13 @@ in {
};
accelSpeed = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
};
buttonMapping = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description =
''
@@ -61,7 +61,7 @@ in {
};
calibrationMatrix = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description =
''
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index f032c5938852bbd1242f5cb412512e870bcd906f..22af869f1f8aa083db5bb71e402011bcf008e813 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -44,19 +44,19 @@ in {
};
accelFactor = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "0.001";
description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
};
minSpeed = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "0.6";
description = "Cursor speed factor for precision finger motion.";
};
maxSpeed = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "1.0";
description = "Cursor speed factor for highest-speed finger motion.";
};
@@ -167,7 +167,7 @@ in {
services.xserver.modules = [ pkg.out ];
- environment.etc."${etcFile}".source =
+ environment.etc.${etcFile}.source =
"${pkg.out}/share/X11/xorg.conf.d/70-synaptics.conf";
environment.systemPackages = [ pkg ];
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 55f8f75021bc98013202aa5ff25b1e1a6232e2c7..6ddb4c83764a2016de0fd453aabfd5d20602e9f9 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -81,7 +81,7 @@ in {
# needed so that .desktop files are installed, which geoclue cares about
environment.systemPackages = [ cfg.package ];
- services.geoclue2.appConfig."redshift" = {
+ services.geoclue2.appConfig.redshift = {
isAllowed = true;
isSystem = true;
};
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index a6055f26789efd6e5c029854e7f308214b2b1e53..0e1314122767101e2472006d405d7c2cc7a0ad4d 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -59,7 +59,7 @@ in
config = mkOption {
default = null;
- type = with lib.types; nullOr (either path string);
+ type = with lib.types; nullOr (either path str);
description = ''
Configuration from which XMonad gets compiled. If no value
is specified, the xmonad config from $HOME/.xmonad is taken.
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
index 10eef8aefbcde1d7c63d7c6ce92c7db8b84f6b34..3e03131ca11457ae7b1dc65a26d51c98bbae3dda 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -132,7 +132,7 @@ in
] ++ (lib.forEach [ "locker" "notifier" "nowlocker" "killer" ]
(option:
{
- assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/";
+ assertion = cfg.${option} != null -> builtins.substring 0 1 cfg.${option} == "/";
message = "Please specify a canonical path for `services.xserver.xautolock.${option}`";
})
);
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index c94a064383156051dd17e9d1d0044211d0424d99..a8406544a72f57dab2400439e0a23eab963e259c 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -659,7 +659,7 @@ in
systemd.services.display-manager =
{ description = "X11 Server";
- after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
+ after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ];
wants = [ "systemd-udev-settle.service" ];
restartIfChanged = false;
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index a550ffd6320fd4a3bb4c48a7989dd2c6e9bb3648..a32c9dc1f2b4980feefb52dec28c372bd87db542 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -239,7 +239,7 @@ in {
List of systems to emulate. Will also configure Nix to
support your new systems.
'';
- type = types.listOf types.string;
+ type = types.listOf types.str;
};
};
};
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index baa8c602a99e7ed7f3c70705f5757d7fadf4ec9f..50dbf2f83651ba68ae0d323d664959540b93c4a7 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -261,7 +261,7 @@ in
source = kernelModulesConf;
};
- systemd.services."systemd-modules-load" =
+ systemd.services.systemd-modules-load =
{ wantedBy = [ "multi-user.target" ];
restartTriggers = [ kernelModulesConf ];
serviceConfig =
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index fd2cb94b756bea679610028e2276cc81abc64171..27a8e0217c5589a44c7e82017522cf578a9c57ca 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -4,7 +4,7 @@
config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) {
environment.systemPackages = [ pkgs.kexectools ];
- systemd.services."prepare-kexec" =
+ systemd.services.prepare-kexec =
{ description = "Preparation for kexec";
wantedBy = [ "kexec.target" ];
before = [ "systemd-kexec.service" ];
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index eca9dad642224999f3f63e6600b9bb3632f9afb5..e13f0421d38f6c762551104cc0a1441a0a8b769e 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -8,7 +8,7 @@ let
efi = config.boot.loader.efi;
- grubPkgs =
+ grubPkgs =
# Package set of targeted architecture
if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;
@@ -72,7 +72,7 @@ let
else "${convertedFont}");
});
- bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}
+ bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
(concatMap (args: args.devices) cfg.mirroredBoots);
convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}
@@ -333,7 +333,7 @@ in
};
backgroundColor = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
example = "#7EBAE4";
default = null;
description = ''
@@ -399,7 +399,7 @@ in
example = "text";
type = types.str;
description = ''
- The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
+ The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
'';
};
@@ -408,7 +408,7 @@ in
example = "keep";
type = types.str;
description = ''
- The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
+ The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
'';
};
@@ -535,7 +535,7 @@ in
default = false;
type = types.bool;
description = ''
- Whether to force the use of a ia32 boot loader on x64 systems. Required
+ Whether to force the use of a ia32 boot loader on x64 systems. Required
to install and run NixOS on 64bit x86 systems with 32bit (U)EFI.
'';
};
@@ -554,7 +554,7 @@ in
systemHasTPM = mkOption {
default = "";
example = "YES_TPM_is_activated";
- type = types.string;
+ type = types.str;
description = ''
Assertion that the target system has an activated TPM. It is a safety
check before allowing the activation of 'trustedBoot.enable'. TrustedBoot
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 7db60daa60b8f724cc8499b22695beea37c1bf62..1c8354e52696d746530fc96dded31a829126503d 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -10,7 +10,7 @@ let
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
- builder =
+ builder =
if cfg.uboot.enable then
"${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c"
else
@@ -86,7 +86,7 @@ in
firmwareConfig = mkOption {
default = null;
- type = types.nullOr types.string;
+ type = types.nullOr types.lines;
description = ''
Extra options that will be appended to /boot/config.txt file.
For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index b5c8d5241a3db9ac27cd3e72843d884beffb1e7f..a4029d766b05a2cc118d08b78b8d62a591aeff6a 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -476,7 +476,7 @@ in
boot.initrd.luks.devices = mkOption {
default = { };
- example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; };
+ example = { luksroot.device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; };
description = ''
The encrypted disk that should be opened before the root
filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 34a34091a7dc6a84d5e4e525c90df4e2668a73fe..db6e06b41072fd6089607bbe5327392222a598b9 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -117,7 +117,7 @@ in {
environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];
- systemd.targets."multi-user".wants = [ "machines.target" ];
+ systemd.targets.multi-user.wants = [ "machines.target" ];
};
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a79513850624bbe2614b7e40d1e288e211de2fb4..2287a82418fec40e141f61c20ed2a3db8dc118e9 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -328,7 +328,7 @@ let
[Service]
${let env = cfg.globalEnvironment // def.environment;
in concatMapStrings (n:
- let s = optionalString (env."${n}" != null)
+ let s = optionalString (env.${n} != null)
"Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
# systemd max line length is now 1MiB
# https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af
@@ -496,7 +496,7 @@ in
systemd.generators = mkOption {
type = types.attrsOf types.path;
default = {};
- example = { "systemd-gpt-auto-generator" = "/dev/null"; };
+ example = { systemd-gpt-auto-generator = "/dev/null"; };
description = ''
Definition of systemd generators.
For each NAME = VALUE pair of the attrSet, a link is generated from
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 43764bb82f1f4f777b3c70ebb352f7febfe5b1b9..688c77cb22d15845edc1de654ef625a0d9f939d4 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -12,7 +12,7 @@ let
fileSystems' = toposort fsBefore (attrValues config.fileSystems);
- fileSystems = if fileSystems' ? "result"
+ fileSystems = if fileSystems' ? result
then # use topologically sorted fileSystems everywhere
fileSystems'.result
else # the assertion below will catch this,
@@ -211,7 +211,7 @@ in
ls = sep: concatMapStringsSep sep (x: x.mountPoint);
notAutoResizable = fs: fs.autoResize && !(hasPrefix "ext" fs.fsType || fs.fsType == "f2fs");
in [
- { assertion = ! (fileSystems' ? "cycle");
+ { assertion = ! (fileSystems' ? cycle);
message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}";
}
{ assertion = ! (any notAutoResizable fileSystems);
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index ac06b6caee30c392b04450f34aca277316efb63e..2ed8c5aa2927dd3f77b286d5010a890e734df5b4 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -469,7 +469,7 @@ in
map createSyncService allPools ++
map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]);
- systemd.targets."zfs-import" =
+ systemd.targets.zfs-import =
let
services = map (pool: "zfs-import-${pool}.service") dataPools;
in
@@ -479,7 +479,7 @@ in
wantedBy = [ "zfs.target" ];
};
- systemd.targets."zfs".wantedBy = [ "multi-user.target" ];
+ systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
})
(mkIf enableAutoSnapshots {
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 6d34f897d189ae4b2d0d26e1356e394c2f494b17..c6ba998b19e63e30209944c4d2e7e55c435faf46 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -73,7 +73,7 @@ in
config = mkMerge [
(mkIf (!setVconsole) {
- systemd.services."systemd-vconsole-setup".enable = false;
+ systemd.services.systemd-vconsole-setup.enable = false;
})
(mkIf setVconsole (mkMerge [
@@ -83,7 +83,7 @@ in
# virtual consoles.
environment.etc."vconsole.conf".source = vconsoleConf;
# Provide kbd with additional packages.
- environment.etc."kbd".source = "${kbdEnv}/share";
+ environment.etc.kbd.source = "${kbdEnv}/share";
boot.initrd.preLVMCommands = mkBefore ''
kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
@@ -99,7 +99,7 @@ in
'') config.i18n.consoleColors}
'';
- systemd.services."systemd-vconsole-setup" =
+ systemd.services.systemd-vconsole-setup =
{ before = [ "display-manager.service" ];
after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf kbdEnv ];
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 2b8a7944dc36789ac449275d526ccced2b54aa45..1726d05115ea8600ecd85c2c98abc76c79b8ef81 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -498,8 +498,8 @@ let
// mapAttrs' createSitDevice cfg.sits
// mapAttrs' createVlanDevice cfg.vlans
// {
- "network-setup" = networkSetup;
- "network-local-commands" = networkLocalCommands;
+ network-setup = networkSetup;
+ network-local-commands = networkLocalCommands;
};
services.udev.extraRules =
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index fbca54978e5bdf0ec81e763da1b06d50e17bf460..f5a593211efca9c78f17a3d7a5ff22d533130953 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -160,14 +160,14 @@ in
(mapAttrsToList (k: _: k) do); "";
# get those driverOptions that have been set
filterSystemdOptions = filterAttrs (sysDOpt: kOpts:
- any (kOpt: do ? "${kOpt}") kOpts.optNames);
+ any (kOpt: do ? ${kOpt}) kOpts.optNames);
# build final set of systemd options to bond values
buildOptionSet = mapAttrs (_: kOpts: with kOpts;
# we simply take the first set kernel bond option
# (one option has multiple names, which is silly)
- head (map (optN: valTransform (do."${optN}"))
+ head (map (optN: valTransform (do.${optN}))
# only map those that exist
- (filter (o: do ? "${o}") optNames)));
+ (filter (o: do ? ${o}) optNames)));
in seq assertNoUnknownOption
(buildOptionSet (filterSystemdOptions driverOptionMapping));
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5ac753c92a78efed29ac4ad4567ac833da299d91..5bf7b0d227f02346cbec2ac6bf69630bd05dc69e 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -799,19 +799,19 @@ in
networking.wlanInterfaces = mkOption {
default = { };
example = literalExample {
- "wlan-station0" = {
+ wlan-station0 = {
device = "wlp6s0";
};
- "wlan-adhoc0" = {
+ wlan-adhoc0 = {
type = "ibss";
device = "wlp6s0";
mac = "02:00:00:00:00:01";
};
- "wlan-p2p0" = {
+ wlan-p2p0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:02";
};
- "wlan-ap0" = {
+ wlan-ap0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:03";
};
@@ -836,7 +836,7 @@ in
options = {
device = mkOption {
- type = types.string;
+ type = types.str;
example = "wlp6s0";
description = "The name of the underlying hardware WLAN device as assigned by udev.";
};
@@ -852,7 +852,7 @@ in
};
meshID = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = "MeshID of interface with type mesh.";
};
@@ -994,7 +994,7 @@ in
domainname "${cfg.domain}"
'';
- environment.etc."hostid" = mkIf (cfg.hostId != null)
+ environment.etc.hostid = mkIf (cfg.hostId != null)
{ source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
hi="${cfg.hostId}"
${if pkgs.stdenv.isBigEndian then ''
@@ -1007,7 +1007,7 @@ in
# static hostname configuration needed for hostnamectl and the
# org.freedesktop.hostname1 dbus service (both provided by systemd)
- environment.etc."hostname" = mkIf (cfg.hostName != "")
+ environment.etc.hostname = mkIf (cfg.hostName != "")
{
text = cfg.hostName + "\n";
};
@@ -1027,7 +1027,7 @@ in
# The network-interfaces target is kept for backwards compatibility.
# New modules must NOT use it.
- systemd.targets."network-interfaces" =
+ systemd.targets.network-interfaces =
{ description = "All Network Interfaces (deprecated)";
wantedBy = [ "network.target" ];
before = [ "network.target" ];
@@ -1162,13 +1162,13 @@ in
in
flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (device:
let
- interfaces = wlanListDeviceFirst device wlanDeviceInterfaces."${device}";
+ interfaces = wlanListDeviceFirst device wlanDeviceInterfaces.${device};
curInterface = elemAt interfaces 0;
newInterfaces = drop 1 interfaces;
in ''
# It is important to have that rule first as overwriting the NAME attribute also prevents the
# next rules from matching.
- ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface:
+ ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (interface:
''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')}
# Add the required, new WLAN interfaces to the default WLAN interface with the
diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix
index c63b971ead02b86c3211c9c3a958e25def6827ad..da5df35807346348ff82c69ac9e5919f0f8c62f5 100644
--- a/nixos/modules/virtualisation/anbox.nix
+++ b/nixos/modules/virtualisation/anbox.nix
@@ -56,7 +56,7 @@ in
dns = mkOption {
default = "1.1.1.1";
- type = types.string;
+ type = types.str;
description = ''
Container DNS server.
'';
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index 770cefbcd511228d5a0e6bc7a25c30567567f12b..036b1036f92aaab371ed7c4949bdfeb8f349058c 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -166,7 +166,6 @@ in
wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" "waagent.service" ];
- after = [ "local-fs.target" ];
path = [ pkgs.coreutils ];
script =
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index dd2108ccc379fecfa5f0c1601ee7880196b516d2..e91dd72ff5d430ad822f3c9fa1fe5b5de0b4cf86 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -26,7 +26,6 @@ in
wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" "waagent.service" ];
- after = [ "local-fs.target" ];
path = [ pkgs.coreutils ];
script =
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index e716982c510a76f85f76cb6de151a56f274e8ee3..d0efbcc808aa15bd7fcc6741e7ed2b36625b65f8 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -111,7 +111,7 @@ in
# Always include cryptsetup so that NixOps can use it.
environment.systemPackages = [ pkgs.cryptsetup ];
- systemd.services."fetch-ec2-data" =
+ systemd.services.fetch-ec2-data =
{ description = "Fetch EC2 Data";
wantedBy = [ "multi-user.target" "sshd.service" ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b61558b2201907d09b98e6e6ce35edc509b00360..9c9f8fc0c215423e4653e22a0bca026c70053449 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -337,7 +337,7 @@ let
networkOptions = {
hostBridge = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "br0";
description = ''
@@ -387,7 +387,7 @@ let
};
hostAddress6 = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "fc00::1";
description = ''
@@ -409,7 +409,7 @@ let
};
localAddress6 = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "fc00::2";
description = ''
@@ -565,7 +565,7 @@ in
};
interfaces = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = [ "eth1" "eth2" ];
description = ''
@@ -729,7 +729,7 @@ in
serviceConfig = serviceDirectives dummyConfig;
};
in {
- systemd.targets."multi-user".wants = [ "machines.target" ];
+ systemd.targets.multi-user.wants = [ "machines.target" ];
systemd.services = listToAttrs (filter (x: x.value != null) (
# The generic container template used by imperative containers
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index db3dd9949c1233235db3953ed6d328d3074831e5..82451787e8a1df5f40e314921b8e521cb38ccfbe 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -64,7 +64,7 @@ with lib;
serviceConfig.RemainAfterExit = true;
};
- systemd.services."print-host-key" =
+ systemd.services.print-host-key =
{ description = "Print SSH Host Key";
wantedBy = [ "multi-user.target" ];
after = [ "sshd.service" ];
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 79766970c757a7fc283427ac2fa4fe60038f7b1b..327324f2921da0e03add76331c249e6d33ca1680 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -21,7 +21,7 @@ in
boot.initrd.kernelModules = [ "virtio_scsi" ];
boot.kernelModules = [ "virtio_pci" "virtio_net" ];
- # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
+ # Generate a GRUB menu.
boot.loader.grub.device = "/dev/sda";
boot.loader.timeout = 0;
@@ -29,12 +29,16 @@ in
# way to select them anyway.
boot.loader.grub.configurationLimit = 0;
- # Allow root logins only using the SSH key that the user specified
- # at instance creation time.
+ # Allow root logins only using SSH keys
+ # and disable password authentication in general
services.openssh.enable = true;
services.openssh.permitRootLogin = "prohibit-password";
services.openssh.passwordAuthentication = mkDefault false;
+ # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on
+ # instance or project level
+ security.googleOsLogin.enable = true;
+
# Use GCE udev rules for dynamic disk volumes
services.udev.packages = [ gce ];
@@ -65,165 +69,80 @@ in
# GC has 1460 MTU
networking.interfaces.eth0.mtu = 1460;
- security.googleOsLogin.enable = true;
-
- systemd.services.google-clock-skew-daemon = {
- description = "Google Compute Engine Clock Skew Daemon";
- after = [
- "network.target"
- "google-instance-setup.service"
- "google-network-setup.service"
- ];
- requires = ["network.target"];
- wantedBy = ["multi-user.target"];
- serviceConfig = {
- Type = "simple";
- ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
- };
- };
-
systemd.services.google-instance-setup = {
description = "Google Compute Engine Instance Setup";
- after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"];
- before = ["sshd.service"];
- wants = ["local-fs.target" "network-online.target" "network.target"];
- wantedBy = [ "sshd.service" "multi-user.target" ];
- path = with pkgs; [ ethtool openssh ];
+ after = [ "network-online.target" "network.target" "rsyslog.service" ];
+ before = [ "sshd.service" ];
+ path = with pkgs; [ coreutils ethtool openssh ];
serviceConfig = {
- ExecStart = "${gce}/bin/google_instance_setup --debug";
+ ExecStart = "${gce}/bin/google_instance_setup";
+ StandardOutput="journal+console";
Type = "oneshot";
};
+ wantedBy = [ "sshd.service" "multi-user.target" ];
};
systemd.services.google-network-daemon = {
description = "Google Compute Engine Network Daemon";
- after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"];
- wants = ["local-fs.target" "network-online.target" "network.target"];
- requires = ["network.target"];
- partOf = ["network.target"];
- wantedBy = [ "multi-user.target" ];
+ after = [ "network-online.target" "network.target" "google-instance-setup.service" ];
path = with pkgs; [ iproute ];
serviceConfig = {
- ExecStart = "${gce}/bin/google_network_daemon --debug";
+ ExecStart = "${gce}/bin/google_network_daemon";
+ StandardOutput="journal+console";
+ Type="simple";
};
+ wantedBy = [ "multi-user.target" ];
};
+ systemd.services.google-clock-skew-daemon = {
+ description = "Google Compute Engine Clock Skew Daemon";
+ after = [ "network.target" "google-instance-setup.service" "google-network-daemon.service" ];
+ serviceConfig = {
+ ExecStart = "${gce}/bin/google_clock_skew_daemon";
+ StandardOutput="journal+console";
+ Type = "simple";
+ };
+ wantedBy = ["multi-user.target"];
+ };
+
+
systemd.services.google-shutdown-scripts = {
description = "Google Compute Engine Shutdown Scripts";
after = [
- "local-fs.target"
"network-online.target"
"network.target"
"rsyslog.service"
- "systemd-resolved.service"
"google-instance-setup.service"
"google-network-daemon.service"
];
- wants = [ "local-fs.target" "network-online.target" "network.target"];
- wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.coreutils}/bin/true";
- ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown";
- Type = "oneshot";
+ ExecStop = "${gce}/bin/google_metadata_script_runner --script-type shutdown";
RemainAfterExit = true;
- TimeoutStopSec = "infinity";
+ StandardOutput="journal+console";
+ TimeoutStopSec = "0";
+ Type = "oneshot";
};
+ wantedBy = [ "multi-user.target" ];
};
systemd.services.google-startup-scripts = {
description = "Google Compute Engine Startup Scripts";
after = [
- "local-fs.target"
"network-online.target"
"network.target"
"rsyslog.service"
"google-instance-setup.service"
"google-network-daemon.service"
];
- wants = ["local-fs.target" "network-online.target" "network.target"];
- wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
+ ExecStart = "${gce}/bin/google_metadata_script_runner --script-type startup";
KillMode = "process";
+ StandardOutput = "journal+console";
Type = "oneshot";
};
+ wantedBy = [ "multi-user.target" ];
};
-
- # Settings taken from https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf
- boot.kernel.sysctl = {
- # Turn on SYN-flood protections. Starting with 2.6.26, there is no loss
- # of TCP functionality/features under normal conditions. When flood
- # protections kick in under high unanswered-SYN load, the system
- # should remain more stable, with a trade off of some loss of TCP
- # functionality/features (e.g. TCP Window scaling).
- "net.ipv4.tcp_syncookies" = mkDefault "1";
-
- # ignores ICMP redirects
- "net.ipv4.conf.all.accept_redirects" = mkDefault "0";
-
- # ignores ICMP redirects
- "net.ipv4.conf.default.accept_redirects" = mkDefault "0";
-
- # ignores ICMP redirects from non-GW hosts
- "net.ipv4.conf.all.secure_redirects" = mkDefault "1";
-
- # ignores ICMP redirects from non-GW hosts
- "net.ipv4.conf.default.secure_redirects" = mkDefault "1";
-
- # don't allow traffic between networks or act as a router
- "net.ipv4.ip_forward" = mkDefault "0";
-
- # don't allow traffic between networks or act as a router
- "net.ipv4.conf.all.send_redirects" = mkDefault "0";
-
- # don't allow traffic between networks or act as a router
- "net.ipv4.conf.default.send_redirects" = mkDefault "0";
-
- # strict reverse path filtering - IP spoofing protection
- "net.ipv4.conf.all.rp_filter" = mkDefault "1";
-
- # strict path filtering - IP spoofing protection
- "net.ipv4.conf.default.rp_filter" = mkDefault "1";
-
- # ignores ICMP broadcasts to avoid participating in Smurf attacks
- "net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault "1";
-
- # ignores bad ICMP errors
- "net.ipv4.icmp_ignore_bogus_error_responses" = mkDefault "1";
-
- # logs spoofed, source-routed, and redirect packets
- "net.ipv4.conf.all.log_martians" = mkDefault "1";
-
- # log spoofed, source-routed, and redirect packets
- "net.ipv4.conf.default.log_martians" = mkDefault "1";
-
- # implements RFC 1337 fix
- "net.ipv4.tcp_rfc1337" = mkDefault "1";
-
- # randomizes addresses of mmap base, heap, stack and VDSO page
- "kernel.randomize_va_space" = mkDefault "2";
-
- # Reboot the machine soon after a kernel panic.
- "kernel.panic" = mkDefault "10";
-
- ## Not part of the original config
-
- # provides protection from ToCToU races
- "fs.protected_hardlinks" = mkDefault "1";
-
- # provides protection from ToCToU races
- "fs.protected_symlinks" = mkDefault "1";
-
- # makes locating kernel addresses more difficult
- "kernel.kptr_restrict" = mkDefault "1";
-
- # set ptrace protections
- "kernel.yama.ptrace_scope" = mkOverride 500 "1";
-
- # set perf only available to root
- "kernel.perf_event_paranoid" = mkDefault "2";
-
- };
-
+ environment.etc."sysctl.d/11-gce-network-security.conf".source = "${gce}/sysctl.d/11-gce-network-security.conf";
}
diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
index 289e26e17035b075e4762d665f75bfc8b57f08d2..36ef6d17df69df166b1c06fa702a45756eb36517 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -9,7 +9,7 @@ let
vgpuOptions = {
uuid = mkOption {
- type = types.string;
+ type = types.str;
description = "UUID of VGPU device. You can generate one with libossp_uuid.";
};
};
@@ -23,7 +23,7 @@ in {
'';
# multi GPU support is under the question
device = mkOption {
- type = types.string;
+ type = types.str;
default = "0000:00:02.0";
description = "PCI ID of graphics card. You can figure it with ls /sys/class/mdev_bus.";
};
@@ -35,7 +35,7 @@ in {
and find info about device via cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description
'';
example = {
- "i915-GVTg_V5_8" = {
+ i915-GVTg_V5_8 = {
uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
};
};
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 41bcb909fb5ccc46752443358080dca9bc396543..6081d4153a6c0be965b8b2b4f603e6e04cdb09df 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -122,7 +122,7 @@ in
# Since we lack the right setuid/setcap binaries, set up a host-only network by default.
} (mkIf cfg.addNetworkInterface {
- systemd.services."vboxnet0" =
+ systemd.services.vboxnet0 =
{ description = "VirtualBox vboxnet0 Interface";
requires = [ "dev-vboxnetctl.device" ];
after = [ "dev-vboxnetctl.device" ];
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index d18778f81588f3798b23f41b73a03e83e6575bc2..f418f849759f3d9476077230efde1561641f6bd8 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -33,7 +33,7 @@ in
serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
};
- environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*";
+ environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*";
services.xserver = mkIf (!cfg.headless) {
videoDrivers = mkOverride 50 [ "vmware" ];
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 70e575b6c0d2dc3f9f476ae6fab0e74ce9e93aba..06d5c63476f932236570afbac7678d6a1835661d 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -119,7 +119,7 @@ in
virtualisation.xen.domains = {
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description =
''
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ffa087bb6f28272df3cee316a6f930a9acc2b59c..9e2109d88b5fc3d78352ed4430f2fa17987c92ce 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -68,6 +68,7 @@ in rec {
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
+ (all nixos.tests.fontconfig-default-fonts)
(all nixos.tests.gnome3-xorg)
(all nixos.tests.gnome3)
(all nixos.tests.pantheon)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 557ee78df7c6904e1fd6a5e64b3ba48475e96b64..8ee4dfbf13bc567004c6bd481811151b03c6436b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -87,6 +87,7 @@ in
flatpak = handleTest ./flatpak.nix {};
flatpak-builder = handleTest ./flatpak-builder.nix {};
fluentd = handleTest ./fluentd.nix {};
+ fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
fsck = handleTest ./fsck.nix {};
fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64
gdk-pixbuf = handleTest ./gdk-pixbuf.nix {};
@@ -233,6 +234,7 @@ in
rabbitmq = handleTest ./rabbitmq.nix {};
radarr = handleTest ./radarr.nix {};
radicale = handleTest ./radicale.nix {};
+ redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
index 9c241fd2301a44e5c451219a2339a0983b13f81c..3465272f5599628bbadbc7adb0697332a10bb58f 100644
--- a/nixos/tests/beegfs.nix
+++ b/nixos/tests/beegfs.nix
@@ -23,7 +23,7 @@ let
}
];
- environment.etc."${connAuthFile}" = {
+ environment.etc.${connAuthFile} = {
enable = true;
text = "ThisIsALousySecret";
mode = "0600";
@@ -47,7 +47,7 @@ let
];
environment.systemPackages = with pkgs; [ beegfs ];
- environment.etc."${connAuthFile}" = {
+ environment.etc.${connAuthFile} = {
enable = true;
text = "ThisIsALousySecret";
mode = "0600";
@@ -57,7 +57,7 @@ let
services.beegfs.default = {
mgmtdHost = "mgmt";
connAuthFile = "/etc/${connAuthFile}";
- "${service}" = {
+ ${service} = {
enable = true;
storeDir = "/data";
};
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index fdb87dbea4383e3308677063096b745e598da0aa..165f64b0d6dcbd409c86e7b78be782ea37e5edc3 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -44,7 +44,7 @@ in {
client = { ... }: {
services.borgbackup.jobs = {
- local = rec {
+ local = {
paths = dataDir;
repo = localRepo;
preHook = ''
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
index 7408029c460e32ac666ef72b69eb50e114c1282b..8722ea33ec5e80200ae695d890ca8641fde7afcd 100644
--- a/nixos/tests/ceph.nix
+++ b/nixos/tests/ceph.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({pkgs, ...}: rec {
+import ./make-test.nix ({pkgs, ...}: {
name = "All-in-one-basic-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lejonet ];
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index e03bb9882540c04d10752ac57ea8cd8232fa55cd..6660eecf05b995030ac702494c9905c3d0ec5105 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -23,8 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
maintainers = [ ehmry ];
};
- nodes = rec
- { # Alice finds peers over over ETHInterface.
+ nodes = { # Alice finds peers over over ETHInterface.
alice =
{ ... }:
{ imports = [ basicConfig ];
diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix
index 56c624d8cf2f4f490b9122c99fbf94baf7935006..496283fddc7b0e389664e0364dcb6e915dbce527 100644
--- a/nixos/tests/cockroachdb.nix
+++ b/nixos/tests/cockroachdb.nix
@@ -100,7 +100,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
meta.maintainers = with pkgs.stdenv.lib.maintainers;
[ thoughtpolice ];
- nodes = rec {
+ nodes = {
node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null;
node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1";
node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1";
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 9726ca0cb0e7663d36d509d82bcbea1eb5240421..f41dea91b1e4bdc9f526ff5c9e71f4ec67672c5d 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -1,11 +1,11 @@
import ./make-test.nix ({ pkgs, lib, ...} :
let
- client_base = rec {
+ client_base = {
containers.test1 = {
autoStart = true;
config = {
- environment.etc."check".text = "client_base";
+ environment.etc.check.text = "client_base";
};
};
@@ -29,7 +29,7 @@ in {
imports = [ client_base ];
containers.test1.config = {
- environment.etc."check".text = lib.mkForce "client_c1";
+ environment.etc.check.text = lib.mkForce "client_c1";
services.httpd.enable = true;
services.httpd.adminAddr = "nixos@example.com";
};
@@ -38,7 +38,7 @@ in {
imports = [ client_base ];
containers.test1.config = {
- environment.etc."check".text = lib.mkForce "client_c2";
+ environment.etc.check.text = lib.mkForce "client_c2";
services.nginx.enable = true;
};
};
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index 0fb3b591e9f913435dc2ba86f65d5738f3242557..df15f5b2f455cab6cad1e2def874440ca7be494e 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -1,7 +1,7 @@
# Test for NixOS' container support.
let
- client_base = rec {
+ client_base = {
networking.firewall.enable = false;
containers.webserver = {
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 95371ef44436afc89cfa78af28d73148feb6af6a..e423f295a08471495089ce14584089cddad18091 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -178,13 +178,13 @@ let
'';
};
in mapAttrs mkElkTest {
- "ELK-5" = {
+ ELK-5 = {
elasticsearch = pkgs.elasticsearch5;
logstash = pkgs.logstash5;
kibana = pkgs.kibana5;
journalbeat = pkgs.journalbeat5;
};
- "ELK-6" =
+ ELK-6 =
if enableUnfree
then {
elasticsearch = pkgs.elasticsearch6;
@@ -198,7 +198,7 @@ in mapAttrs mkElkTest {
kibana = pkgs.kibana6-oss;
journalbeat = pkgs.journalbeat6;
};
- "ELK-7" =
+ ELK-7 =
if enableUnfree
then {
elasticsearch = pkgs.elasticsearch7;
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index 064c498204aecec3b8e21e8f6f8afdb51f30f68e..6c681905b19fd4bca8127fbb299fb68c700a9132 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
machine = { pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages;
- environment.etc."plainFile".text = ''
+ environment.etc.plainFile.text = ''
Hello World
'';
environment.etc."folder/with/file".text = ''
diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix
index 0b261a6847727e96891eaadca6cc0736694c23e0..9991c5eaa329ac8c5871532b20a635e18a8f1faf 100644
--- a/nixos/tests/flannel.nix
+++ b/nixos/tests/flannel.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : rec {
+import ./make-test.nix ({ pkgs, ...} : {
name = "flannel";
meta = with pkgs.stdenv.lib.maintainers; {
diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1991cec92189ffeeec22a5f3196e218361c9d8a8
--- /dev/null
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ lib, ... }:
+{
+ name = "fontconfig-default-fonts";
+
+ machine = { config, pkgs, ... }: {
+ fonts.enableDefaultFonts = true; # Background fonts
+ fonts.fonts = with pkgs; [
+ noto-fonts-emoji
+ cantarell-fonts
+ twitter-color-emoji
+ source-code-pro
+ gentium
+ ];
+ fonts.fontconfig.defaultFonts = {
+ serif = [ "Gentium Plus" ];
+ sansSerif = [ "Cantarell" ];
+ monospace = [ "Source Code Pro" ];
+ emoji = [ "Twitter Color Emoji" ];
+ };
+ };
+
+ testScript = ''
+ $machine->succeed("fc-match serif | grep '\"Gentium Plus\"'");
+ $machine->succeed("fc-match sans-serif | grep '\"Cantarell\"'");
+ $machine->succeed("fc-match monospace | grep '\"Source Code Pro\"'");
+ $machine->succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'");
+ '';
+})
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index ac733461932d4ae7633a7dbe71fb58025507e425..29978824870c50b13733ad712f3c811d3ff78c85 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
enable = true;
recommendedProxySettings = true;
virtualHosts = {
- "localhost" = {
+ localhost = {
locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
};
};
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 1ff329bd98dee50f148093d2ebad32666c60f48a..90f9793b370c437a5fc91b9e890fdfd58d611dde 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -28,7 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
let
- hardened-malloc-tests = pkgs.stdenv.mkDerivation rec {
+ hardened-malloc-tests = pkgs.stdenv.mkDerivation {
name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}";
src = pkgs.graphene-hardened-malloc.src;
buildPhase = ''
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix
index 78343f0e02f0f95a072631c025986779c8995f1b..885adebe149851cd89173770520a5fbf858dfbed 100644
--- a/nixos/tests/hocker-fetchdocker/machine.nix
+++ b/nixos/tests/hocker-fetchdocker/machine.nix
@@ -11,8 +11,8 @@
systemd.services.docker-load-fetchdocker-image = {
description = "Docker load hello-world-container";
wantedBy = [ "multi-user.target" ];
- wants = [ "docker.service" "local-fs.target" ];
- after = [ "docker.service" "local-fs.target" ];
+ wants = [ "docker.service" ];
+ after = [ "docker.service" ];
script = ''
${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index b2209f297a4f80b00ce2fd6701398ce554422af6..796c50c610e351c08b59cf77cc155db3caf366c6 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -6,7 +6,7 @@ import ../make-test.nix ({ lib, ... }:
maintainers = [ willibutz ];
};
- nodes = with lib; rec {
+ nodes = with lib; {
server =
{ config, ... }:
{
diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix
index 399a0c27232734bd1d83a4810c7ed2220e3a7368..c749c32ad04e19b1e8c41a6d5a9c3adc925ec3ab 100644
--- a/nixos/tests/jackett.nix
+++ b/nixos/tests/jackett.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "jackett";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index 212023859f6d249359fdd42a6bd5df607230ca0a..f5307f253a5134683649fac31d1dbcc7245e49c5 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -71,7 +71,7 @@ let
443 # kubernetes apiserver
];
})
- (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; }))
+ (optionalAttrs (machine ? extraConfiguration) (machine.extraConfiguration { inherit config pkgs lib nodes; }))
(optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; }))
]
) machines;
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index fe859876ed25db83f1cac5aa87bebb31ceb99fee..665b9ee09b55eb7637645ca41006127c9eac4f78 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -115,7 +115,7 @@ in
);
slapdDatabases = {
- "${dbSuffix}" = {
+ ${dbSuffix} = {
conf = ''
dn: olcBackend={1}mdb,cn=config
objectClass: olcBackendConfig
diff --git a/nixos/tests/lidarr.nix b/nixos/tests/lidarr.nix
index 58bf82503f8c38d11a82219ce4c0c23156a2b58b..85fcbd21d8c091aa8188380f2ee5e298d8b9e7b3 100644
--- a/nixos/tests/lidarr.nix
+++ b/nixos/tests/lidarr.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "lidarr";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix
index bd5447de15ff7b73248ca8ad016be2a89ebb5856..b4c897c3ab5db37b735ab9536f49bc5014bc3068 100644
--- a/nixos/tests/mosquitto.nix
+++ b/nixos/tests/mosquitto.nix
@@ -16,7 +16,7 @@ let
"-t ${topic}"
];
-in rec {
+in {
name = "mosquitto";
meta = with pkgs.stdenv.lib; {
maintainers = with maintainers; [ peterhoeg ];
@@ -34,7 +34,7 @@ in rec {
enable = true;
host = "0.0.0.0";
checkPasswords = true;
- users."${username}" = {
+ users.${username} = {
inherit password;
acl = [
"topic readwrite ${topic}"
diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix
index c53ff93a91f9faed33a00c7d112b8e1a5ba3cd16..6a6f602726dec7778e687e0a040e3743c9dae368 100644
--- a/nixos/tests/ndppd.nix
+++ b/nixos/tests/ndppd.nix
@@ -37,7 +37,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
services.ndppd = {
enable = true;
- proxies."eth1".rules."fd42::/112" = {};
+ proxies.eth1.rules."fd42::/112" = {};
};
containers.client = {
autoStart = true;
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 6ce64dcebea04e2f4da66904bf914f359fb7858d..7452768033abb9901179474954860276404037e0 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -440,12 +440,12 @@ let
virtual = {
name = "Virtual";
machine = {
- networking.interfaces."tap0" = {
+ networking.interfaces.tap0 = {
ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];
virtual = true;
};
- networking.interfaces."tun0" = {
+ networking.interfaces.tun0 = {
ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];
virtual = true;
@@ -561,7 +561,7 @@ let
name = "routes";
machine = {
networking.useDHCP = false;
- networking.interfaces."eth0" = {
+ networking.interfaces.eth0 = {
ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];
ipv6.routes = [
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index c0d347238b47e3d2c764308d13e2e97a6e87d06c..aaf37ee4c81011714183472c49d01cf18493a436 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -50,7 +50,7 @@ in {
'';
};
- systemd.services."nextcloud-setup"= {
+ systemd.services.nextcloud-setup= {
requires = ["mysql.service"];
after = ["mysql.service"];
};
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 8a840a60875341ab06cb7d9c6d5b5d6916fae59b..81c269c23788c7a8de5edc1f251239fb88e30cdf 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -51,7 +51,7 @@ in {
serviceConfig.PermissionsStartOnly = true;
};
- systemd.services."nextcloud-setup"= {
+ systemd.services.nextcloud-setup= {
requires = ["postgresql.service"];
after = [
"postgresql.service"
@@ -62,7 +62,7 @@ in {
# At the time of writing, redis creates its socket with the "nobody"
# group. I figure this is slightly less bad than making the socket world
# readable.
- systemd.services."chown-redis-socket" = {
+ systemd.services.chown-redis-socket = {
enable = true;
script = ''
until ${pkgs.redis}/bin/redis-cli ping; do
diff --git a/nixos/tests/nghttpx.nix b/nixos/tests/nghttpx.nix
index d41fa01aa9a8940b3d01acead3084ce1873c8892..11611bfe1063243364c12b60f26e8f5c38260763 100644
--- a/nixos/tests/nghttpx.nix
+++ b/nixos/tests/nghttpx.nix
@@ -15,7 +15,7 @@ in
services.nginx = {
enable = true;
- virtualHosts."server" = {
+ virtualHosts.server = {
locations."/".root = nginxRoot;
};
};
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
index 110cbd5c5b402b3dcd541939fd40c7229db52d7c..bacaf3f41588474d9519637302da43a5eed92943 100644
--- a/nixos/tests/pgmanage.nix
+++ b/nixos/tests/pgmanage.nix
@@ -21,7 +21,7 @@ in
pgmanage = {
enable = true;
connections = {
- "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
+ ${conn} = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
};
};
};
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index fbb798515e1afd0e45b62efffc40f0fb238de9cd..d3e59a32373f18a69fc0640c4d8dcd2ac8854fb9 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -4,7 +4,7 @@ let
# Build Quake with coverage instrumentation.
overrides = pkgs:
- rec {
+ {
quake3game = pkgs.quake3game.override (args: {
stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv;
});
@@ -42,7 +42,7 @@ rec {
{ server =
{ pkgs, ... }:
- { systemd.services."quake3-server" =
+ { systemd.services.quake3-server =
{ wantedBy = [ "multi-user.target" ];
script =
"${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " +
diff --git a/nixos/tests/radarr.nix b/nixos/tests/radarr.nix
index 6b9a909e44b5ba760f88b1c6a0045417ea54cbdd..9bc5607ccd5a301af24d57aaebe09bad1c01c87d 100644
--- a/nixos/tests/radarr.nix
+++ b/nixos/tests/radarr.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "radarr";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
new file mode 100644
index 0000000000000000000000000000000000000000..325d93424dd7d9f889bba1abb862dc22c10bde48
--- /dev/null
+++ b/nixos/tests/redis.nix
@@ -0,0 +1,26 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "redis";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ flokli ];
+ };
+
+ nodes = {
+ machine =
+ { pkgs, ... }:
+
+ {
+ services.redis.enable = true;
+ services.redis.unixSocket = "/run/redis/redis.sock";
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $machine->waitForUnit("redis");
+ $machine->waitForOpenPort("6379");
+
+ $machine->succeed("redis-cli ping | grep PONG");
+ $machine->succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG");
+ '';
+})
diff --git a/nixos/tests/sonarr.nix b/nixos/tests/sonarr.nix
index 3d5c3b19b6ea8a58a8ca7dcdf2a3b031b6c3429a..3e84445099abe004e4ac5a5c9e90f0e5dc342beb 100644
--- a/nixos/tests/sonarr.nix
+++ b/nixos/tests/sonarr.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "sonarr";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix
index 8bbebd4230032137fdf1f408702d0eee2affbc6c..9bab9349ea73632737f67e5c8c632f3c5ab0656f 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixos/tests/strongswan-swanctl.nix
@@ -65,16 +65,16 @@ in {
enable = true;
swanctl = {
connections = {
- "rw" = {
+ rw = {
local_addrs = [ moonIp ];
- local."main" = {
+ local.main = {
auth = "psk";
};
- remote."main" = {
+ remote.main = {
auth = "psk";
};
children = {
- "net" = {
+ net = {
local_ts = [ vlan0 ];
updown = "${strongswan}/libexec/ipsec/_updown iptables";
inherit esp_proposals;
@@ -85,8 +85,8 @@ in {
};
};
secrets = {
- ike."carol" = {
- id."main" = carolIp;
+ ike.carol = {
+ id.main = carolIp;
inherit secret;
};
};
@@ -107,19 +107,19 @@ in {
enable = true;
swanctl = {
connections = {
- "home" = {
+ home = {
local_addrs = [ carolIp ];
remote_addrs = [ moonIp ];
- local."main" = {
+ local.main = {
auth = "psk";
id = carolIp;
};
- remote."main" = {
+ remote.main = {
auth = "psk";
id = moonIp;
};
children = {
- "home" = {
+ home = {
remote_ts = [ vlan0 ];
start_action = "trap";
updown = "${strongswan}/libexec/ipsec/_updown iptables";
@@ -131,8 +131,8 @@ in {
};
};
secrets = {
- ike."moon" = {
- id."main" = moonIp;
+ ike.moon = {
+ id.main = moonIp;
inherit secret;
};
};
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index b94fed41341205d4625753b2c203ae94c632f706..28331720048443c657769aae4249b558558ada07 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -4,7 +4,7 @@
let
inherit (python2Packages) python dbus-python;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "a2jmidid";
version = "8";
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index a4aa642809757ddb27cc59088f07153f2ef225dc..ff3c456c36444c14fcc20dfc85ad949de2240120 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -6,21 +6,18 @@
, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
-let
+mkDerivation {
pname = "amarok";
- version = "2.9.0-20180618";
-
-in mkDerivation {
- name = "${pname}-${version}";
+ version = "2.9.0-20190731";
src = fetchgit {
# master has the Qt5 version as of April 2018 but a formal release has not
# yet been made so change this back to the proper upstream when such a
# release is out
url = git://anongit.kde.org/amarok.git;
- # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96";
- sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3";
+ # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ";
+ rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f";
+ sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 292f28554d0868a3d0ff84a489405aedc84eae92..bdbf6a45a6d4b5ff64a82df75f8a697593d760ee 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -35,7 +35,7 @@ let
withUdisks = (withTaglib && withDevices);
-in mkDerivation rec {
+in mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 9c2f17c5cc9c459fcb2b6f92313aca5552b2e3c1..1ab39311258b997b3cfe5c620b76e1eb24f9d169 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -4,7 +4,7 @@ let
version = "1.7.5";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "caudec";
inherit version;
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
index 51b88607208e1fba31fd04897e7d4c0af0811c0d..54f1050da466e2d869bba0eb6e320fd5cf7add13 100644
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-10-11";
pname = "cmusfm-unstable";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix
index df0fcb0ee9cd2d535286b43f6a0e5a53e1206128..5cc8d71383b7e45f0664070221a12baa8d11d5c5 100644
--- a/pkgs/applications/audio/csound/csound-manual/default.nix
+++ b/pkgs/applications/audio/csound/csound-manual/default.nix
@@ -4,7 +4,7 @@
libxslt
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "csound-manual";
version = "unstable-2019-02-22";
diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
index 97e054bda64c9284d4bb8dcdbe6a57c64b4f7051..699f9d86f68da18e5c26efef61fc97b81029c4e5 100644
--- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "deadbeef-lyricbar-plugin";
version = "unstable-2019-01-29";
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 6d56f53bd16f8072f470dde1a1f4811c4c8818da..1fcdda408966626b8374dc3cf38ee09e2370634e 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dirt-2018-01-01";
src = fetchFromGitHub {
repo = "Dirt";
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 4268a783c8d8fb5fc7da549aa0389e93faf34cda..3b6ca9e4053f98c7c2cb912664568e2a3b6cfa34 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -3,7 +3,7 @@
, bc, coreutils, which
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "faustlive";
version = "2017-12-05";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index fb5390cb46effd75db09fe41496240b3c9033d74..df3aa987c3fb554df482b02a6535ab5658258635 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libogg }:
stdenv.mkDerivation rec {
- name = "flac-1.3.2";
+ name = "flac-1.3.3";
src = fetchurl {
url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
- sha256 = "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi";
+ sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1";
};
buildInputs = [ libogg ];
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 404c9cc825e902376f8826c225cebea2b0dc24ec..bb86787a3cf0339e38d631b5c1a25ae3210de43e 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -19,7 +19,7 @@ in
with versionMap.${version};
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fluidsynth-${fluidsynthVersion}";
version = fluidsynthVersion;
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index dc163de8ade7523ea7c6fb5659e6e2b1093a1e78..5e95d71796894a1a9ed91bbd2dd131d606a84300 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fmsynth-unstable";
version = "2015-02-07";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 330ae56f13f0f040e9f4fef00273bc22bbc21ded..b17561e1567abe61017fb4fdb7613031de957e2e 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2015-05-21";
pname = "foo-yc20";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 3406f31788473a821704833e93ac828c9e490071..eeafdc80344de452730bb60b131fcb38bd696c6b 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -3,7 +3,7 @@
# TODO: build from git for easier updates
# rustPlatform.buildRustPackage rec {
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4.6";
pname = "gnome-podcasts";
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 94d0f5eb50f52e277f911e5acb7a9f265a15d3ba..c4a8f2fce02654091832230761b1c6b3a327a6b5 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -18,7 +18,7 @@
let
version = "7.2";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "gradio";
inherit version;
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index d32c55122c5fef2c26df97846d0bef73f9f031d0..64de722afe9eabca42153ce2b1ab5f983d4c3be0 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
, lv2, pkgconfig, libGLU_combined }:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
version = "0.9.0";
pname = "helm";
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index 1fd8531fb7f3d259611f3c5da31ed4560e02e46c..a893390d74edf44190857e2171116583334eadae 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "iannix";
version = "2016-01-31";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index 83644dd5ea511191891dc0a2722b14457dfac599..fe7c83dd56f1b013b7e14de7526a5c7e04fd4822 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "jackmix-0.5.2";
src = fetchurl {
url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz;
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index 7288d39ce779119d4a08bdf9708f33bf8923af4c..f1eddb626245c2abf614f062394cc1ac4bc4e25d 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lv2bm";
version = "git-2015-11-29";
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index 3fbe927be4bad0bfdfea85766a82eff1f1b02a52..c20f04ec9470f68dff435b0e8b0966c2a916aa46 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, lv2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mod-distortion-git";
version = "2016-08-19";
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 8582fd78192909f28e869b1ade1e8663fd8d9cc1..02b1d8ea5111cabfce8a1ed7b3fc0ede89ba208d 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -16,7 +16,7 @@
, gitAndTools
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "muse-sequencer";
version = "3.1pre1";
diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix
index 47370d4bc2f7f5b21436e8f5716d4c0aac3e300e..e7a9e22c2d680567f768d7461ebc12c872b08f93 100644
--- a/pkgs/applications/audio/musly/default.nix
+++ b/pkgs/applications/audio/musly/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "musly";
version = "unstable-2017-04-26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 94cf32f8f8234d9e509d9d70eed8b10a006eebe8..5f8c82b98d040840b8ecde445af5062908e1cd39 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -2,7 +2,7 @@
, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "non";
version = "2018-02-15";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index 91443bb1ef7f6a008d9321f2739d180f8ed0bd4b..0bb970500bdc54b38939a6d85444b69bcbec15a1 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2-2";
pname = "nova-filters";
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index 8116bcaf0bda9af86da4cf4fbef5471d6d767c6a..c9d69b5c7f23289c747177a793eef62e7ca59ec3 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -3,7 +3,7 @@
let
version = "0.4.1";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 4f76aefb5ed3d8e5c0aedfcc2ea62638523ce2ab..e7c4cab9af18f27f111d07dd140dbabd67bd1b6e 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -2,7 +2,7 @@
, gtkmm2, libjack2, pkgconfig, python2, wafHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "patchage";
version = "1.0.1";
src = fetchsvn {
diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index faa914e13287046058af082325103a25201179f6..6c7a4b03ef59db664eacf0310a30aca2c9e3ccfd 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, puredata }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "helmholtz";
src = fetchurl {
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
index 9e7de39218d532f491f19426a5763eecfc24e828..028a4667cb2da166128d303cef2ed74cea2cf14e 100644
--- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
+++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, puredata }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mrpeach";
version = "1.1";
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index c2c4672be12b69ea550f0d837e792fab6276be0b..448b219a1afaadfd5a284bafa7d69b1cc89161e8 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pianobooster";
version = "0.6.4b";
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
index 346387be7e3cf421250aa3abce3065e607eae9de..f444ad6cb3236f675297f9aa6ee289ebb9248c6e 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "plugin-torture";
version = "2016-07-25";
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index d414cb756114ee834edd2c549ef0caca7ed66312..a9f56cca0015ea6bbe175c2c4122e12a087a450e 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -17,7 +17,7 @@ assert vorbisSupport -> vorbisTools != null;
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
-in pythonPackages.buildPythonApplication rec {
+in pythonPackages.buildPythonApplication {
pname = "pulseaudio-dlna";
version = "2017-11-01";
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index c34b27edd96dcc602fcd02535813b542e2e75310..e3eb750496baef4be8ccbaabcac3c06879d8cc51 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -3,7 +3,7 @@
let
version = "unstable-2018-02-10";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "rhvoice";
inherit version;
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index dc8d95d2c490d1ca74af2eff540ad8aa9c434602..e3bfc60a40a5fa207f3a2171a2162ced141da516 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, flac }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "3.0.10";
pname = "shntool";
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index 01f0708d1157ec021cd41cc48eb8a1c56ba0eed6..30ff41da36958897e893d95abd3e2672ba2c3156 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -14,7 +14,7 @@
, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "soundscape-renderer-unstable";
version = "2016-11-03";
diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix
index 2401dc60b09a921c69b47e57214e774447aadff9..6598d24fb07a50a8e658c1edc1cd903f83da7c01 100644
--- a/pkgs/applications/audio/speech-denoiser/default.nix
+++ b/pkgs/applications/audio/speech-denoiser/default.nix
@@ -8,7 +8,7 @@ let
sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4";
};
- rnnoise-nu = stdenv.mkDerivation rec {
+ rnnoise-nu = stdenv.mkDerivation {
pname = "rnnoise-nu";
version = "unstable-07-10-2019";
src = speech-denoiser-src;
@@ -18,7 +18,7 @@ let
installTargets = [ "install-rnnoise-nu" ];
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "speech-denoiser";
version = "unstable-07-10-2019";
diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix
index 3447049099b1502d8e00dc70f8d722df4e0f28be..2380c8e5d9edcd101ec47cc2711828d488bd7ac6 100644
--- a/pkgs/applications/audio/spotifywm/default.nix
+++ b/pkgs/applications/audio/spotifywm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "spotifywm-unstable";
version = "2016-11-28";
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index d25e61c37f5d2d7d788499b37e468367349d38e7..8acd8e0b88b128efe94818bc9ba68e44bd340920 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "svox";
version = "2017-07-18";
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 0f70f956713165d685b0f9a1a5f694b8f8a86d68..9188003ce66dfd98bf22c5e2556b88e6af985a87 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -2,7 +2,7 @@
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "traverso";
version = "0.49.6";
diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index b5ff8e41fe0b5c9baf009eafe9465c6698484458..844eea11f514439ffd12f0b92203836bda625223 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -2,7 +2,7 @@
let
version = "2.13";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "uade123";
inherit version;
src = fetchurl {
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index cc04632cfb5cda67e380e459e26f28d5c5097566..eeeb8ae2ea449892947f7236c044e96cc36d5bc6 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "zam-plugins";
version = "3.11";
diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix
index a9647b11eeea4f153abea68f7f735cd940381fa2..d02aa4b8444f635349903b401e532bf4aa4c95a0 100644
--- a/pkgs/applications/backup/areca/default.nix
+++ b/pkgs/applications/backup/areca/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "areca-7.5";
src = fetchurl {
diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
deleted file mode 100644
index 7fa68ba4a38837ff5c059b07aeb94e15f5ee62a3..0000000000000000000000000000000000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./scripts/CrashPlanDesktop 2016-03-02 21:01:58.000000000 -0500
-+++ ./scripts/CrashPlanDesktop-1 2016-03-18 20:52:10.117686266 -0400
-@@ -11,7 +11,7 @@
- cd ${TARGETDIR}
-
- if [ "_${VERSION_5_UI}" == "_true" ]; then
-- ${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+ ${TARGETDIR}/electron/crashplan &
- else
-- ${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+ ${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop &
- fi
diff --git a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
deleted file mode 100644
index de2afe2da684792cf525cddd818fbeb71b1c9bcb..0000000000000000000000000000000000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./scripts/CrashPlanEngine 2014-02-19 23:17:19.000000000 +0000
-+++ ./scripts/CrashPlanEngine.1 2014-07-24 17:36:37.330333581 +0100
-@@ -11,7 +11,7 @@
-
- cd $TARGETDIR
-
-- nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log &
-+ nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log &
-
- if [[ $! -gt 0 ]]; then
- echo $! > $PIDFILE
-@@ -26,7 +26,7 @@
-
- echo "Using Ubuntu 9.04 startup"
-
-- start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log
-+ start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log
-
- # This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used.
- # We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value
-@@ -91,7 +91,6 @@
- DESC="CrashPlan Engine"
- NAME=CrashPlanEngine
- DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar
--PIDFILE="$TARGETDIR/${NAME}.pid"
-
- if [[ -f $TARGETDIR/install.vars ]]; then
- . $TARGETDIR/install.vars
-@@ -100,6 +99,8 @@
- exit 1
- fi
-
-+PIDFILE="$VARDIR/${NAME}.pid"
-+
- if [[ ! -f $DAEMON ]]; then
- echo "Could not find JAR file $DAEMON"
- exit 0
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
deleted file mode 100644
index 5db4badeb6c0a46b6a0e6908b0feb4c47567cdaf..0000000000000000000000000000000000000000
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
- procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
- fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
- libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
- libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
- maxRam ? "1024m" }:
-
-stdenv.mkDerivation rec {
- version = "6.7.0";
- rev = "1512021600670_4503";
- pname = "CrashPlanSmb";
- name = "${pname}_${version}_${rev}";
-
- src = fetchurl {
- url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
- sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
- };
-
- nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];
- buildInputs = [ getopt which ];
-
- vardir = "/var/lib/crashplan";
- manifestdir = "${vardir}/manifest";
-
- postPatch = ''
- # patch scripts/CrashPlanEngine
- substituteInPlace scripts/CrashPlanEngine \
- --replace /bin/ps ${procps}/bin/ps \
- --replace awk ${gawk}/bin/awk \
- --replace '`sed' '`${gnused}/bin/sed' \
- --replace grep ${gnugrep}/bin/grep \
- --replace TARGETDIR/log VARDIR/log \
- --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \
- --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \
- --replace \$VARDIR ${vardir}
-
- # patch scripts/CrashPlanDesktop
- substituteInPlace scripts/CrashPlanDesktop \
- --replace awk ${gawk}/bin/awk \
- --replace "\"\$SCRIPTDIR/..\"" "$out" \
- --replace "\$(dirname \$SCRIPT)" "$out" \
- --replace "\''${TARGETDIR}/log" ${vardir}/log \
- --replace "\''${TARGETDIR}" "$out"
- '';
-
- installPhase = ''
- mkdir $out
- zcat -v ${pname}_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
-
- install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
- install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
- install -D -m 644 scripts/run.conf $out/bin/run.conf
- install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
-
- # unpack, patch and repack app.asar to stop electron from creating /usr/local/crashplan/log to store the ui logs.
- asar e $out/app.asar $out/app.asar-unpacked
- rm -v $out/app.asar
- substituteInPlace $out/app.asar-unpacked/shared_modules/shell/platform_paths.js \
- --replace "getLogFileParentPath();" "\"$vardir/log\";"
- asar p $out/app.asar-unpacked $out/app.asar
-
- mv -v $out/*.asar $out/electron/resources
- chmod 755 "$out/electron/crashplan"
-
- rm -r $out/log
- mv -v $out/conf $out/conf.template
- ln -s $vardir/log $out/log
- ln -s $vardir/cache $out/cache
- ln -s $vardir/conf $out/conf
-
- substituteInPlace $out/bin/run.conf \
- --replace "-Xmx1024m" "-Xmx${maxRam}"
-
- echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
- echo "APP_BASENAME=CrashPlan" >> $out/install.vars
- echo "TARGETDIR=$out" >> $out/install.vars
- echo "BINSDIR=$out/bin" >> $out/install.vars
- echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
- echo "VARDIR=${vardir}" >> $out/install.vars
- echo "INITDIR=" >> $out/install.vars
- echo "RUNLVLDIR=" >> $out/install.vars
- echo "INSTALLDATE=" >> $out/install.vars
-
- '';
-
- postFixup = ''
- patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
- wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
- stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype
- fontconfig dbus gconf nss nspr alsaLib cups expat udev
- libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
- libXext libXfixes libXrender libXtst libXScrnSaver]}"
- '';
-
- meta = with stdenv.lib; {
- description = "An online backup solution";
- homepage = http://www.crashplan.com/business/;
- license = licenses.unfree;
- platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ xvapx ];
- broken = true; # 2018-12-06
- };
-}
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
deleted file mode 100644
index 2c76891b3f9edff7ec561beac002563baf14cade..0000000000000000000000000000000000000000
--- a/pkgs/applications/backup/crashplan/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }:
-
-stdenv.mkDerivation rec {
- version = "4.8.3";
- rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
- name = "crashplan-${version}-r${rev}";
-
- src = fetchurl {
- url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
- sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113";
- };
-
- meta = with stdenv.lib; {
- description = "An online/offline backup solution";
- homepage = http://www.crashplan.org;
- license = licenses.unfree;
- maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
- };
-
- buildInputs = [ makeWrapper cpio ];
-
- vardir = "/var/lib/crashplan";
-
- manifestdir = "${vardir}/manifest";
-
- patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ];
-
- installPhase = ''
- mkdir $out
- zcat -v CrashPlan_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
-
- # sed -i "s|manifest|${manifestdir}|g" $out/conf/default.service.xml
-
- # Fix for encoding troubles (CrashPlan ticket 178827)
- # Make sure the daemon is running using the same localization as
- # the (installing) user
- echo "" >> run.conf
- echo "LC_ALL=en_US.UTF-8" >> run.conf
-
- install -d -m 755 unpacked $out
-
- install -D -m 644 run.conf $out/bin/run.conf
- install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
- install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
- install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
-
- rm -r $out/log
- mv -v $out/conf $out/conf.template
- ln -s $vardir/log $out/log
- ln -s $vardir/cache $out/cache
- ln -s $vardir/backupArchives $out/backupArchives
- ln -s $vardir/conf $out/conf
-
- echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
- echo "APP_BASENAME=CrashPlan" >> $out/install.vars
- echo "TARGETDIR=${vardir}" >> $out/install.vars
- echo "BINSDIR=$out/bin" >> $out/install.vars
- echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
- echo "VARDIR=${vardir}" >> $out/install.vars
- echo "INITDIR=" >> $out/install.vars
- echo "RUNLVLDIR=" >> $out/install.vars
- echo "INSTALLDATE=" >> $out/install.vars
- '';
-
- postFixup = ''
- for f in $out/bin/CrashPlanDesktop $out/bin/CrashPlanEngine; do
- echo "substitutions in $f"
- substituteInPlace $f --replace /bin/ps ${procps}/bin/ps
- substituteInPlace $f --replace awk ${gawk}/bin/awk
- substituteInPlace $f --replace sed ${gnused}/bin/sed
- substituteInPlace $f --replace grep ${gnugrep}/bin/grep
- done
-
- substituteInPlace $out/share/applications/CrashPlan.desktop \
- --replace /usr/local $out \
- --replace crashplan/skin skin \
- --replace bin/CrashPlanDesktop CrashPlanDesktop
-
- wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk2 glib libXtst ]}"
- '';
-}
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index 2ff51db54041a3052b85760db1d0b57efbccf3a0..7120a1934f6e159ecaf652e07fedfaf89b43f9a7 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+ substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index a8846431f1efd27fd667d68416586bbef2b4f4f3..b20a6b3e8aa866c3f3ae5cb0a89428e041078480 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -4,17 +4,19 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "clightning";
- version = "0.7.1";
+ version = "0.7.2.1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
- sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85";
+ sha256 = "3be716948efc1208b5e6a41e3034e4e4eecc5abbdac769fd1d999a104ac3a2ec";
};
enableParallelBuilding = true;
nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip ];
- buildInputs = [ sqlite gmp zlib python3 ];
+ buildInputs =
+ let py3 = python3.withPackages (p: [ p.Mako ]);
+ in [ sqlite gmp zlib py3 ];
makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
@@ -23,7 +25,10 @@ stdenv.mkDerivation rec {
'';
postPatch = ''
- patchShebangs tools/generate-wire.py
+ patchShebangs \
+ tools/generate-wire.py \
+ tools/update-mocks.sh \
+ tools/mockup.sh
'';
doCheck = false;
diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index 21d69f14d7f3f7424203de2af68a13873898b661..5bc81a6daf66aad41ad69c4a8d96d6421ece5ee7 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "ethabi-${version}";
+ pname = "ethabi";
version = "7.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
index 4b6a88fd410a510cf2c5de91122ca2e714ca1aec..a936691bd79930561a170144862185c1256f4588 100644
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ b/pkgs/applications/blockchains/parity/beta.nix
@@ -1,6 +1,6 @@
let
- version = "2.6.1";
- sha256 = "0yvscs2ivy08zla3jhirxhwwaqsn9j5ml4sqbgx6h5rh19c941vh";
- cargoSha256 = "1s3c44cggajrmc504klf4cyb1s4l5ny48yihs9c3fc0n8d064017";
+ version = "2.6.2";
+ sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r";
+ cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 873f83190fde7f65ee2b376ab4b018824c573abb..9b5a72077d5c4bab97230ea11897b91761131b0a 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,6 @@
let
- version = "2.5.6";
- sha256 = "1qkrqkkgjvm27babd6bidhf1n6vdp8rac1zy5kf61nfzplxzr2dy";
+ version = "2.5.7";
+ sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj";
cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
index 79831f3304df4107593d3609b81ce2807f885d6b..7f28d97bf81a2d454a1218aaaa0891dc83ee8fb0 100644
--- a/pkgs/applications/blockchains/parity/parity.nix
+++ b/pkgs/applications/blockchains/parity/parity.nix
@@ -7,14 +7,13 @@
, fetchFromGitHub
, rustPlatform
-, pkgconfig
+, cmake
, openssl
+, pkgconfig
, systemd
-, cmake
-, perl
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "parity";
inherit version;
inherit cargoSha256;
@@ -26,10 +25,9 @@ rustPlatform.buildRustPackage rec {
inherit sha256;
};
- buildInputs = [
- pkgconfig cmake perl
- systemd.lib systemd.dev openssl openssl.dev
- ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ openssl systemd ];
cargoBuildFlags = [ "--features final" ];
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 26c9192ee6fadd768a1f72cc3a8f7bf5268b69cb..100c0f8ba41f78c8dcd8cce8ffc2a47bf3271f48 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -6,7 +6,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "polkadot-${version}";
+ pname = "polkadot";
version = "0.2.17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 3aeee7e6972f7a52e32f765dcad63d975093ddc6..634d4e8538a1507434da94107f021f6b3a2dc396 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "librustzcash-unstable-${version}";
+ pname = "librustzcash-unstable";
version = "2017-03-17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index 8302303a08e7a84fa77368d092798c1e1185d8e7..accdea3ae2d309fc5deafdd7d1284edfc3f9cc93 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -2,7 +2,7 @@
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2.1";
pname = "lightdm-enso-os-greeter";
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 61d65cb64b6bacfcef52bfb9e4920414b2558483..7aeed5d91cc9ac77d53ade5a6f235972c9ed22f3 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-tests"
- "--disable-static"
"--disable-dmrc"
] ++ optional withQt4 "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index fc61d43436da2c146f871fa707d2c3eec70fc821..526041124bccf258f0c627904eb8f97da73ff006 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -6,7 +6,7 @@
let
version = "0.18.1";
-in mkDerivation rec {
+in mkDerivation {
pname = "sddm";
inherit version;
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 9f7997860c616792aacf2c2b2714205fc1125418..71c3912a0fc7b9febddd16f75b01fc2b0096f35b 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,7 +18,7 @@ let
build = "192.5830636";
sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p";
};
-in rec {
+in {
# Attributes are named by their corresponding release channels
stable = mkStudio (stableVersion // {
diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix
index 038ff96ad3bd6ace461a02667b551c171542be95..8bf2adf484e23b9b85be32abc848337b8b84b637 100644
--- a/pkgs/applications/editors/aseprite/skia.nix
+++ b/pkgs/applications/editors/aseprite/skia.nix
@@ -7,7 +7,7 @@ let
# skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly'
depSrcs = import ./skia-deps.nix { inherit fetchgit; };
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "skia-aseprite-m71";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix
index acda484ba3a3f10474be35d647021f6d522df236..27c13c0cb3968f6f70f902c0ec6d4067c9ff9c2c 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/pkgs/applications/editors/edit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "edit-nightly";
version = "20160425";
diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index 078b8a03b5d99c2dd599339e90a025449e110235..4b7e4c8a3ca4310b8503986361f040a7c60e2508 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, fetchpatch, stdenv, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "elvis-2.2_0";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix
index ce9f57ef40b6782346f1aa0a258ba1b63ebc1926..3af53cda492f0317a2624d1b669562057bb8ccdd 100644
--- a/pkgs/applications/editors/emacs-modes/cedille/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix
@@ -1,6 +1,6 @@
{ stdenv, cedille, emacs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cedille-mode";
version = cedille.version;
diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix
deleted file mode 100644
index 495b1aca4b535328720f3dcd9c13b07942c33bba..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/emacs-modes/coffee/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
- name = "coffee-mode-0.4.1";
-
- src = fetchgit {
- url = "https://github.com/defunkt/coffee-mode.git";
- rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8";
- sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2";
- };
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs --batch -f batch-byte-compile coffee-mode.el
- '';
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Emacs major mode for CoffeeScript, unfancy JavaScript";
- homepage = https://github.com/defunkt/coffee-mode;
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index fb3de6ea3d9ea6157c7b7c80a1d8beff0e02b66e..3d34c7a462e3cad6d247b9f20956d8c5a11edb80 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -2,7 +2,7 @@
let
commit = "412713a0fcedd520d208a7b783fea03d710bcc61";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "color-theme-solarized-1.0.0";
src = fetchzip {
diff --git a/pkgs/applications/editors/emacs-modes/cua/builder.sh b/pkgs/applications/editors/emacs-modes/cua/builder.sh
deleted file mode 100644
index 6f7bb428c1a6d027b4e600e4ed02a4ef49863ef1..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/emacs-modes/cua/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-cp $src $out/emacs/site-lisp/cua.el
diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix
deleted file mode 100644
index 0305be28ad62ef8fa859d184e3d89fbdc6111f32..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
- name = "cua-mode-2.10";
- builder = ./builder.sh;
- src = fetchurl {
- url = http://tarballs.nixos.org/cua-mode-2.10.el;
- sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b";
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 5f0c863b586178b5a3047f3496826f449e351325..a6bea779eae01c7d8a593567b560bcad8e7fa1c4 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -36,13 +36,7 @@ self: let
super = removeAttrs imported [ "dash" ];
overrides = {
- # upstream issue: missing footer
- ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
- el-search = markBroken super.el-search; # requires emacs-25
- iterators = markBroken super.iterators; # requires emacs-25
- midi-kbd = markBroken super.midi-kbd; # requires emacs-25
rcirc-menu = markBroken super.rcirc-menu; # Missing file header
- stream = markBroken super.stream; # requires emacs-25
cl-lib = null; # builtin
tle = null; # builtin
advice = null; # builtin
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
deleted file mode 100644
index 23a9b3b19206a2676d54b31cb81f6702cc5c82df..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ clangStdenv, fetchgit, llvmPackages }:
-
-clangStdenv.mkDerivation {
- name = "emacs-clang-complete-async-20130218";
- src = fetchgit {
- url = "git://github.com/Golevka/emacs-clang-complete-async.git";
- rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
- sha256 = "01smjinrvx0w5z847a43fh2hyr6rrq1kaglfakbr6dcr313w89x9";
- };
-
- buildInputs = [ llvmPackages.llvm ];
-
- patches = [ ./fix-build.patch ];
-
- CFLAGS = "-I${llvmPackages.clang}/include";
- LDFLAGS = "-L${llvmPackages.clang}/lib";
-
- installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/share/emacs/site-lisp
- install -m 755 clang-complete $out/bin
- install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
- '';
-
- meta = {
- homepage = https://github.com/Golevka/emacs-clang-complete-async;
- description = "An emacs plugin to complete C and C++ code using libclang";
- license = clangStdenv.lib.licenses.gpl3Plus;
-
- # Fails with:
- # ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found
- # include
- broken = true;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
deleted file mode 100644
index 89de339a436b60a90f67d5068cdb3be431797a99..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/src/completion.h 2014-11-16 16:58:16.625150124 +0100
-+++ new/src/completion.h 2014-11-16 16:58:28.020207508 +0100
-@@ -3,6 +3,7 @@
-
-
- #include
-+#include
-
-
- typedef struct __completion_Session_struct
diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix
deleted file mode 100644
index 39e7d1abf386c61fd3e4e8ae9f6ecb29bde7f8b4..0000000000000000000000000000000000000000
--- a/pkgs/applications/editors/emacs-modes/gn/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation {
- name = "gn-mode-2017-09-21";
- src = fetchgit {
- url = "https://chromium.googlesource.com/chromium/src/tools/gn";
- rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
- sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
- };
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
- '';
-
- installPhase = ''
- mkdir -p $out/share/emacs/site-lisp/
- cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
- '';
-}
diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
index b28d0ae24a342eed818014f812fad5f29e896ed3..c6e1c5a50f4a43ec04c185f277076384eda4b24f 100644
--- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix
+++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
- name = "helm-words-20150413";
+ name = "helm-words-20190917";
src = fetchgit {
url = "https://github.com/pronobis/helm-words.git";
- rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185";
- sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
+ rev = "e6387ece1940a06695b9d910de3d90252efb8d29";
+ sha256 = "1ly0mbzlgc26fqvf7rxpmy698g0cf9qldrwrx022ar6r68l1h7xf";
};
installPhase = ''
diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix
index 73d66dc2b3c490999b4cf439226489331e71d7b3..0529fce2b16d65a581aae83689aa73051ef2ddc2 100644
--- a/pkgs/applications/editors/emacs-modes/libgenerated.nix
+++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix
@@ -53,7 +53,7 @@ in {
, sha256 ? null
, ... }@args:
let
- sourceArgs = args."${variant}";
+ sourceArgs = args.${variant};
version = sourceArgs.version or null;
deps = sourceArgs.deps or null;
error = sourceArgs.error or args.error or null;
@@ -78,7 +78,7 @@ in {
inherit sha256;
};
packageRequires = lib.optional (! isNull deps)
- (map (dep: pkgargs."${dep}" or self."${dep}" or null)
+ (map (dep: pkgargs.${dep} or self.${dep} or null)
deps);
meta = (sourceArgs.meta or {}) // {
inherit broken;
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index 92c9f96ed70ead1be7b148c38f999d78ff7e7f7a..545ad5a5e0c385bbb5c10aedc92ac9657859ff43 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -59,7 +59,7 @@
font-lock-plus = callPackage ./font-lock-plus { };
- ghc-mod = melpaBuild rec {
+ ghc-mod = melpaBuild {
pname = "ghc";
version = external.ghc-mod.version;
src = external.ghc-mod.src;
@@ -75,7 +75,7 @@
};
};
- haskell-unicode-input-method = melpaBuild rec {
+ haskell-unicode-input-method = melpaBuild {
pname = "emacs-haskell-unicode-input-method";
version = "20110905.2307";
src = pkgs.fetchFromGitHub {
@@ -104,7 +104,7 @@
icicles = callPackage ./icicles { };
- rtags = melpaBuild rec {
+ rtags = melpaBuild {
inherit (external.rtags) version src meta;
pname = "rtags";
@@ -130,8 +130,6 @@
railgun = callPackage ./railgun { };
- gn = callPackage ./gn { };
-
structured-haskell-mode = self.shm;
thingatpt-plus = callPackage ./thingatpt-plus { };
@@ -145,12 +143,9 @@
# From old emacsPackages (pre emacsPackagesNg)
cedet = callPackage ./cedet { };
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
- coffee = callPackage ./coffee { };
colorThemeSolarized = callPackage ./color-theme-solarized {
colorTheme = self.color-theme;
};
- cua = callPackage ./cua { };
- emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { };
emacsSessionManagement = callPackage ./session-management-for-emacs { };
hsc3-mode = callPackage ./hsc3 { };
hol_light_mode = callPackage ./hol_light { };
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 12cc2c571d8bb1439c9eeab21f902d890e628c5e..fe440c146ae8eb65228e08b0eda6a1170a9f6865 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -34,7 +34,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
overrides = rec {
- shared = {
+ shared = rec {
# Expects bash to be at /bin/bash
ac-rtags = markBroken super.ac-rtags;
@@ -42,8 +42,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) powerline;
};
- # upstream issue: missing file header
- bufshow = markBroken super.bufshow;
+ auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: {
+ buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
+ CFLAGS = "-I${external.llvmPackages.clang}/include";
+ LDFLAGS = "-L${external.llvmPackages.clang}/lib";
+ });
+ emacsClangCompleteAsync = auto-complete-clang-async;
# part of a larger package
caml = dontConfigure super.caml;
@@ -64,9 +68,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) easy-kill;
};
- # upstream issue: missing file header
- elmine = markBroken super.elmine;
-
elpy = super.elpy.overrideAttrs(old: {
propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ];
});
@@ -101,9 +102,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
flycheck-rtags = markBroken super.flycheck-rtags;
- # build timeout
- graphene = markBroken super.graphene;
-
pdf-tools = super.pdf-tools.overrideAttrs(old: {
nativeBuildInputs = [ external.pkgconfig ];
buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
@@ -123,12 +121,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
propagatedUserEnvPkgs = [ external.hindent ];
});
- # upstream issue: missing file header
- ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
-
- # upstream issue: missing file header
- initsplit = markBroken super.initsplit;
-
irony = super.irony.overrideAttrs (old: {
cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
@@ -162,12 +154,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
ivy-rtags = markBroken super.ivy-rtags;
- # upstream issue: missing file header
- jsfmt = markBroken super.jsfmt;
-
- # upstream issue: missing file header
- maxframe = markBroken super.maxframe;
-
magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -210,13 +196,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
- kubernetes = super.kubernetes.overrideAttrs (attrs: {
- # searches for Git at build time
- nativeBuildInputs =
- (attrs.nativeBuildInputs or []) ++ [ external.git ];
- });
+ kubernetes = super.kubernetes.overrideAttrs (attrs: {
+ # searches for Git at build time
+ nativeBuildInputs =
+ (attrs.nativeBuildInputs or []) ++ [ external.git ];
+ });
- # upstream issue: missing file header
+ # upstream issue: missing file header
mhc = super.mhc.override {
inherit (self.melpaPackages) calfw;
};
@@ -227,25 +213,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# part of a larger package
notmuch = dontConfigure super.notmuch;
- # missing OCaml
- ocp-indent = markBroken super.ocp-indent;
-
- # upstream issue: missing file header
- qiita = markBroken super.qiita;
-
- # upstream issue: missing file header
- speech-tagger = markBroken super.speech-tagger;
-
shm = super.shm.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
});
- # upstream issue: missing file header
- tawny-mode = markBroken super.tawny-mode;
-
# Telega has a server portion for it's network protocol
telega = super.telega.overrideAttrs(old: {
-
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
postBuild = ''
@@ -258,26 +231,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
mkdir -p $out/bin
install -m755 -Dt $out/bin ./source/server/telega-server
'';
-
});
- # upstream issue: missing file header
- textmate = markBroken super.textmate;
-
- # missing OCaml
- utop = markBroken super.utop;
-
vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
- # upstream issue: missing file header
- voca-builder = markBroken super.voca-builder;
-
- # upstream issue: missing file header
- window-numbering = markBroken super.window-numbering;
-
zmq = super.zmq.overrideAttrs(old: {
stripDebugList = [ "share" ];
preBuild = ''
@@ -317,9 +277,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
};
stable = shared // {
+
+ # upstream issue: missing file header
+ bufshow = markBroken super.bufshow;
+
# part of a larger package
# upstream issue: missing package version
- cmake-mode = markBroken (dontConfigure super.cmake-mode);
+ cmake-mode = dontConfigure super.cmake-mode;
# upstream issue: missing file header
connection = markBroken super.connection;
@@ -330,47 +294,48 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# missing git
egg = markBroken super.egg;
- # upstream issue: missing dependency redshank
- emr = markBroken super.emr;
-
- # upstream issue: doesn't build
- eterm-256color = markBroken super.eterm-256color;
+ # upstream issue: missing file header
+ elmine = markBroken super.elmine;
- # upstream issue: missing dependency highlight
- evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
+ # upstream issue: missing file header
+ ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
- # upstream issue: missing dependency highlight
- floobits = markBroken super.floobits;
+ # upstream issue: missing file header
+ initsplit = markBroken super.initsplit;
- # missing OCaml
- flycheck-ocaml = markBroken super.flycheck-ocaml;
+ # upstream issue: missing file header
+ jsfmt = markBroken super.jsfmt;
- # upstream issue: missing dependency
- fold-dwim-org = markBroken super.fold-dwim-org;
+ # upstream issue: missing file header
+ maxframe = markBroken super.maxframe;
- # build timeout
- graphene = markBroken super.graphene;
+ # upstream issue: doesn't build
+ eterm-256color = markBroken super.eterm-256color;
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
+ # upstream issue: missing file header
+ qiita = markBroken super.qiita;
+
+ # upstream issue: missing file header
+ speech-tagger = markBroken super.speech-tagger;
+
+ # upstream issue: missing file header
+ textmate = markBroken super.textmate;
+
# upstream issue: missing file header
link = markBroken super.link;
- # missing OCaml
- merlin = markBroken super.merlin;
+ # upstream issue: missing file header
+ voca-builder = markBroken super.voca-builder;
# upstream issue: missing file header
- po-mode = markBroken super.po-mode;
+ window-numbering = markBroken super.window-numbering;
- # upstream issue: truncated file
- powershell = markBroken super.powershell;
};
unstable = shared // {
- # upstream issue: mismatched filename
- ack-menu = markBroken super.ack-menu;
-
editorconfig = super.editorconfig.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
});
@@ -392,9 +357,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
- # upstream issue: mismatched filename
- helm-lobsters = markBroken super.helm-lobsters;
-
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
@@ -410,9 +372,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
HOME = "/tmp";
});
- # upstream issue: mismatched filename
- processing-snippets = markBroken super.processing-snippets;
-
racer = super.racer.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace racer.el \
@@ -420,9 +379,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
'';
});
- # upstream issue: missing file footer
- seoul256-theme = markBroken super.seoul256-theme;
-
spaceline = super.spaceline.override {
inherit (self.melpaPackages) powerline;
};
@@ -462,7 +418,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
};
});
- in pkgs.stdenv.mkDerivation rec {
+ in pkgs.stdenv.mkDerivation {
inherit (super.vterm) name version src;
nativeBuildInputs = [ pkgs.cmake ];
@@ -495,6 +451,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
};
};
- in super // overrides."${variant}");
+ in super // overrides.${variant});
in generateMelpa { }
diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
index 1937a94cad11cabf77f7e95a945cca8a3e44b482..241ec3b42c9e40492d9125302bee2a7eb3f170f5 100644
--- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "org-mac-link-1.2";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
index 97d063d452cd5315273a3577cafad0929d92d392..9f251f54d6aa96cfc1ee58e97ffd24716a387fc3 100644
--- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
+++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "perl-completion";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index 1f218439a5ffe8a5346a36d83bed1924a232e948..54e5a89dd9f689a98099f131057375737ad122c4 100644
--- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rect-mark-1.4";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index f5aeb35d18407e2cce0001c92bb4ad628a793b47..165e0c13c8fe6bb46abf2ae0e3368c5b649ed82b 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "session-management-for-emacs-2.2a";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index aa27e302e5d63929c8367594a5bf1b697f71e038..fcb37e7ebad358161918b84a6fe97da660e76f02 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchgit, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "sunrise-commander-6r435";
src = fetchgit {
diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix
index b0cfe997908161458247994529346da7e51b7dd5..3b746c293d88cda474a11a843a64507d24357e84 100644
--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, emacs, texinfo }:
stdenv.mkDerivation rec {
- name = "tramp-2.3.0";
+ name = "tramp-2.4.2";
src = fetchurl {
url = "mirror://gnu/tramp/${name}.tar.gz";
- sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi";
+ sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61";
};
buildInputs = [ emacs texinfo ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
index e147fd53b2297c43a04a0d9fb0adb10ddb63f04c..209a99245ecd6e04db6675196ae7adf7448f4303 100644
--- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
+++ b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "yaoddmuse-0.1.2";
src = fetchurl {
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index ec05f0f8262205733eab8ceffc58f912eb47f865..3abe2834db468ddc40ed29e2abcdf3e7696d1eab 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -4,7 +4,7 @@
let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "gobby-unstable-2018-04-03";
src = fetchFromGitHub {
owner = "gobby";
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 92355552fceccc7b49490eddab426578203c19d0..a33b9531730f8579d1845a049d171bf012d4e0cf 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -11,7 +11,7 @@ let
# Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass, ... }:
- lib.overrideDerivation (mkJetBrainsProduct rec {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "CLion";
meta = with stdenv.lib; {
@@ -121,7 +121,7 @@ let
});
buildIdea = { name, version, src, license, description, wmClass, ... }:
- (mkJetBrainsProduct rec {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "IDEA";
meta = with stdenv.lib; {
@@ -156,7 +156,7 @@ let
});
buildPycharm = { name, version, src, license, description, wmClass, ... }:
- (mkJetBrainsProduct rec {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "PyCharm";
meta = with stdenv.lib; {
@@ -183,7 +183,7 @@ let
};
buildRider = { name, version, src, license, description, wmClass, ... }:
- lib.overrideDerivation (mkJetBrainsProduct rec {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "Rider";
meta = with stdenv.lib; {
@@ -209,7 +209,7 @@ let
});
buildRubyMine = { name, version, src, license, description, wmClass, ... }:
- (mkJetBrainsProduct rec {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "RubyMine";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix
index 4a079625d1832953673b12f06bf135d70f23818d..205c32d5f806a7e6830c5b4f9b01a75e3783a3d0 100644
--- a/pkgs/applications/editors/jupyter/kernel.nix
+++ b/pkgs/applications/editors/jupyter/kernel.nix
@@ -26,7 +26,7 @@ in
# Definitions is an attribute set.
- create = { definitions ? default }: with lib; stdenv.mkDerivation rec {
+ create = { definitions ? default }: with lib; stdenv.mkDerivation {
name = "jupyter-kernels";
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index df46cb12338617b80196b82ee7b4a7bb7b4b30e2..a106c316674709cf5bb9805ea0bf36ae48c2f5dc 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -20,7 +20,7 @@ let
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "kodestudio";
inherit version;
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index ff824d8b45bf9fa8e6e966c1381152e79d65b3d4..bd433436eb02319ea6c39e801aaa79d385c71c77 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper python3 ];
propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ];
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "leo-editor";
exec = "leo %U";
icon = "leoapp32";
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
index 7902ddc410cf886c097115a16a7fc20759c3c890..eab37fba19a74a22dd432c842a0366c77ef018f1 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nanorc";
version = "2018-09-05";
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index 82c89ebdca6ec9cd0c4ac88dc96f4966dd0c9b05..a7a6b35a24a060f57d31929972a8aebfe095e48b 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nvi-1.79";
src = fetchurl {
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index a7dc02a9a6369671e2e6eda56a823d40c682f051..dd49b0a1cf776ddb8f05e369a2ac36ddbb927c22 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -8,7 +8,7 @@ let
version = "7.0.4";
python = let
packageOverrides = self: super: {
- markdown = super.markdown.overridePythonAttrs(old: rec {
+ markdown = super.markdown.overridePythonAttrs(old: {
src = super.fetchPypi {
version = "3.0.1";
pname = "Markdown";
@@ -16,7 +16,7 @@ let
};
});
- chardet = super.chardet.overridePythonAttrs(old: rec {
+ chardet = super.chardet.overridePythonAttrs(old: {
src = super.fetchPypi {
version = "2.3.0";
pname = "chardet";
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 2dceee0a37dfa881c7bd926a9035f58c77d75693..78dd0d095414a0a1023fab8a3f77bd24b371e779 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "scite";
version = "4.0.5";
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index 629bd9d019d2772a8d73ee412535a69c1245e559..5a13d91aef2cc9cb3075a4b9af9638b92b2b9842 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -4,17 +4,17 @@ let
version = "3.0.15";
plat = {
- "i386-linux" = "i386";
- "x86_64-linux" = "x86_64";
+ i386-linux = "i386";
+ x86_64-linux = "x86_64";
}.${stdenv.hostPlatform.system};
sha256 = {
- "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a";
- "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh";
+ i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a";
+ x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh";
}.${stdenv.hostPlatform.system};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "standardnotes";
inherit version;
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index b8fef39d3ea23e14f29ede513ffd37e93d940129..82d92ba2fe1185ef0d5b593807fa8c3c4a794d74 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -3,7 +3,7 @@
let
common = opts: callPackage (import ./common.nix opts);
in
- rec {
+ {
sublime3-dev = common {
buildVersion = "3208";
dev = true;
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index efbca2949dd427a4007056b1b6ea472905f020a9..6714f917315c801aadfa3376944f6c8ba43ae9f1 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2014-08-20";
pname = "supertux-editor";
diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix
index fad4e82d37ffe32b4f4cc2161c1177118f9744db..0a2df6b6d4bb31c4bcd7987f3e84a867e8cec3dd 100644
--- a/pkgs/applications/editors/uemacs/default.nix
+++ b/pkgs/applications/editors/uemacs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "uemacs";
version = "2014-12-08";
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 63d8add3a01250c804e1ab10b5a8d3b78ee66bb7..8438e2f4c27d2afa9cec7c31ba5945c45fd67401 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.1.1547";
+ version = "8.1.1866";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "01v35wq8wjrbzmdf5r02gp0sfa9yyfswsi3fqzn94cd68qhskkpr";
+ sha256 = "00db529ynin71b5drch9rd9l85bcqdpbsl3mcc0xnv770f97sa0w";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 1d65be3e73dd7dcbc692c43f08fd16fc334c7e70..d21d0ad5ee00a86e4ad196040576fe9a6ad3a57e 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
src = builtins.getAttr source {
- "default" = common.src; # latest release
+ default = common.src; # latest release
};
patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch;
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 732bfbf0bfd3949abb2329564f25e356db7976ff..ae4e9ac8a9c9955cce292f6fb85cabf1f532e026 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -12,7 +12,7 @@
let
common = callPackage ./common.nix {};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vim";
inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 82977c2e6bc53a41fcfff636de2569027ff38727..6081bbc8b0ca28bb254976eaa082e4278d992855 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -24,7 +24,7 @@ let
'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "macvim";
version = "8.1.1722";
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 5b9548df7f178d6b14474fee85205f56bdb704b4..1bda6958206b78c98ecf2cefd648c82d1ba4b3a9 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
'';
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "vis";
exec = "vis %U";
type = "Application";
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index e42ca8a0bbf8bacc6ba637feca0cda36d116f636..7b7209a5e1f4ca4a612fc90230817aedd447b6ec 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -11,7 +11,7 @@
let
inherit (stdenv.hostPlatform) system;
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
inherit pname version src sourceRoot;
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 369ed7728909d10a711e71938fff021464704969..31338e6f5acb328c6ee8c1f3322941dd838e919f 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -4,8 +4,8 @@ let
inherit (stdenv.hostPlatform) system;
plat = {
- "x86_64-linux" = "linux-x64";
- "x86_64-darwin" = "darwin";
+ x86_64-linux = "linux-x64";
+ x86_64-darwin = "darwin";
}.${system};
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 49472fde464be8ee4940cc6363f2532ecade79ae..ea0d29317167f4b3f73a6928a71be4bf5074c2c2 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -4,8 +4,8 @@ let
inherit (stdenv.hostPlatform) system;
plat = {
- "x86_64-linux" = "linux-x64";
- "x86_64-darwin" = "darwin";
+ x86_64-linux = "linux-x64";
+ x86_64-darwin = "darwin";
}.${system};
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index 100e64fc1975808415637975b213228762b35f6f..fe5fcc1724b4b0d0720e737a92377ba919f1daae 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -8,7 +8,7 @@ let
yiEnv = haskellPackages.ghcWithPackages
(self: [ self.yi ] ++ extraPackages self);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "yi-custom";
version = "0.0.0.1";
dontUnpack = true;
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 1ae1221a330cb10e0078680b85d04a3eb5e15d02..feb79f444b815e4f1dfc3aa48616bbdd6721f038 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,7 +2,7 @@
libharu, opencv, vigra, postgresql, Cocoa,
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "saga";
version = "7.3.0";
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index d82bdc6654980526d5a5e574285d781050146e0c..4c7f9cde5ce79957178b2e4de042fdbce1065cfb 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, rustPlatform , fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
- name = "whitebox_tools-${version}";
+ pname = "whitebox_tools";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index cbd930668f99c21beee38f6e7147d27c01749904..654363d36f24bcdcdf6108fb6e1eacaf69a0397e 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -19,7 +19,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "imagemagick";
inherit (cfg) version;
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 59f471ab4e34851c3fcd42a8b236791e372fda9c..993d4ba7ecdb5ac5d6f8416e2c49b4b57978d5b9 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -31,7 +31,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "imagemagick";
inherit (cfg) version;
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 7d800d57b631ab9bfdb633170d11976d122b31f4..3c39aadda98eb6459042f1f0d636aaaf565c6031 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -8,7 +8,7 @@ let
gitBranch = "develop";
gitTag = "0.9.3";
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "antimony";
version = "2018-10-20";
diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix
index 31ee0ff0d07bb6da0e6345c89bece3edd8cb5f4e..0f53965786b9d5196b73bde62df7a89e245bf6f4 100644
--- a/pkgs/applications/graphics/autotrace/autofig.nix
+++ b/pkgs/applications/graphics/autotrace/autofig.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "autofig-0.1";
src = fetchurl {
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index 43f8f561e2f1f58c167013f60b252c360808751e..b827a12f81c8248194544675f0821f684acb0293 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -22,7 +22,7 @@ let
install -D bin-linux/QtnPEG $out/bin/QtnPEG
'';
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "awesomebump";
inherit version;
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index 4e864d953dfde3488ebc44de523fbfa17933f092..ad86e66204b22ba9dcbb9f5cac89ee605337dfef 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, cmake, itk, Cocoa }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "c3d";
version = "2018-10-04";
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index b0e32678a141c0c86f4625d40bbaca4c1d731f92..a1f96337d74347490be3377a6218391b66914ecf 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -3,7 +3,7 @@ libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
gtk-mac-integration-gtk2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dia";
version = "0.97.3.20170622";
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 5f866d00b3e1f28a1894d5219a121aa7e9c921b9..ee7586709dcbafe3bf29ff0e7cdf5865f823f99d 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts
-, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu
-, soqt, libf2c, libGLU, makeWrapper, pkgconfig
-, mpi ? null }:
+{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode
+, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
+, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
+, makeWrapper, pkgconfig, mpi ? null }:
assert mpi != null;
@@ -19,13 +19,20 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
- libGLU libXmu
- ] ++ (with qt5; [
- qtbase qttools qtwebkit
- ]) ++ (with pythonPackages; [
+ libGLU libXmu qtbase qttools qtwebkit
+ ] ++ (with pythonPackages; [
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
]);
+ # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
+ # remove in versions >= 0.19
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch";
+ sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h";
+ })
+ ];
+
cmakeFlags = [
"-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"
diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix
index be8885caff1fe55f9c6235667d3c312c5a3b34d4..9517aa78ee461a94fb1b07e81dffb3b54320daf9 100644
--- a/pkgs/applications/graphics/graphicsmagick/compat.nix
+++ b/pkgs/applications/graphics/graphicsmagick/compat.nix
@@ -1,6 +1,6 @@
{ stdenv, graphicsmagick }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "graphicsmagick-imagemagick-compat";
inherit (graphicsmagick) version;
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
index 7d5a9013035945d1618c3e2d1b4d781220bda07b..6472712bcb400a1a4b963e6b423a4a69b1426107 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -7,7 +7,7 @@
# on linux systems, but we here do not attempt to fix it.)
let
- imagej150 = stdenv.mkDerivation rec {
+ imagej150 = stdenv.mkDerivation {
pname = "imagej";
version = "150";
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index 5fdd20825cd53483bed3f7f004e7ff4ef09cd901..49868bbd831f1c38da46988de267b481959bce8a 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libX11, libXinerama, imlib2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "imlibsetroot";
version = "1.2";
src = fetchurl {
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix
index b5664d51a1443ffb19a2ad92d1523cf988238110..97c15d2eec09de9685d7ef839f6a489d8f8bfec8 100644
--- a/pkgs/applications/graphics/jpeg-archive/default.nix
+++ b/pkgs/applications/graphics/jpeg-archive/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "jpeg-archive";
version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index c25c1277ee0b96c82b28822ea2d6da921bf325df..7ad8c388a203b1db6f1c4bdf60d0c735de47c682 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "meh-unstable-2015-04-11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 5ad5ab6acc61aadbe661e71132e700844fee85dd..1b51732b918c491988a9ca4d685c94a04e605bfc 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -3,7 +3,7 @@
let
inherit (python2Packages) python pycairo pygobject3 numpy;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "mypaint";
version = "1.2.1";
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index e4393726483662f5f897901c54997a1a64825d31..62fae518b9291ab320ab8ff7b46369e53c51e62d 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,9 +1,8 @@
{ stdenv
+, mkDerivation
, fetchFromGitHub
, cmake
, pkgconfig
-, wrapGAppsHook
-, gsettings-desktop-schemas
, qtbase
, qttools
@@ -16,7 +15,7 @@
, quazip
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "nomacs";
version = "3.12";
@@ -38,8 +37,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [cmake
- pkgconfig
- wrapGAppsHook];
+ pkgconfig];
buildInputs = [qtbase
qttools
@@ -48,13 +46,13 @@ stdenv.mkDerivation rec {
opencv
libraw
libtiff
- quazip
- gsettings-desktop-schemas];
+ quazip];
cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"
"-DENABLE_TIFF=ON"
"-DENABLE_QUAZIP=ON"
+ "-DENABLE_TRANSLATIONS=ON"
"-DUSE_SYSTEM_QUAZIP=ON"];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index a0aaed49c9c0dc8ba2f87a8416800da5394da60b..78f6d8bcbaff8e9653eec5b2379bf80c6dc4a4bc 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-08-15";
pname = "pbrt-v3";
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 6bd2fa98b1bb0ad92cba6c9ae75c28f6c477d51e..09b5bd378397f57d61d5c3c71db0b26430b61356 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16,
lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "photivo-2014-01-25";
src = fetchhg {
diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix
index 395179ff70aedccfe03f6a269dfc550d7efaa243..14efe48f30dbe06782ab9e8daeae4168534f0c2d 100644
--- a/pkgs/applications/graphics/scantailor/default.nix
+++ b/pkgs/applications/graphics/scantailor/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "scantailor-0.9.12.1";
src = fetchurl {
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 527a21f93fe3e7b24fb74dd5644ddde8c2d062fd..957692b4ba17a659f5f6d834334fefbf9748172a 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -13,7 +13,7 @@ let
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "shutter-0.94.3";
src = fetchurl {
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 34294d2712923688167ace1f6a2932e847b08f02..188f7cb29343a9f0c0ffffc07380c20f56322db4 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -6,7 +6,7 @@
let
version = "1.0.2";
- ETL = stdenv.mkDerivation rec {
+ ETL = stdenv.mkDerivation {
name = "ETL-0.04.19";
src = fetchFromGitHub {
@@ -21,7 +21,7 @@ let
nativeBuildInputs = [ autoreconfHook ];
};
- synfig = stdenv.mkDerivation rec {
+ synfig = stdenv.mkDerivation {
pname = "synfig";
inherit version;
@@ -47,7 +47,7 @@ let
meta.broken = true;
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "synfigstudio";
inherit version;
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 39b4640dc4311126e24b2eb23ebb428b0cdbf909..131d83f0d58eabffc717d045e5e8ec2af236131c 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -24,7 +24,7 @@
assert withGimpPlugin -> gimp != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ufraw";
version = "unstable-2019-06-12";
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 6027d8daa9d4189bf77b9868c9cbf98e17e50508..9b146aa50364713bf7feab66c4f089796c915853 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -38,7 +38,7 @@ let
let
inherit (args) name;
sname = args.sname or name;
- inherit (srcs."${sname}") src version;
+ inherit (srcs.${sname}) src version;
mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
@@ -129,6 +129,7 @@ let
kmix = callPackage ./kmix.nix {};
kmplot = callPackage ./kmplot.nix {};
knotes = callPackage ./knotes.nix {};
+ kolf = callPackage ./kolf.nix {};
kolourpaint = callPackage ./kolourpaint.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f9fa31b665b2f31e4cadc9c6ce48d11ed4ded653
--- /dev/null
+++ b/pkgs/applications/kde/kolf.nix
@@ -0,0 +1,16 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, libkdegames, kconfig, kio, ktextwidgets
+}:
+
+mkDerivation {
+ name = "kolf";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ libkdegames kio ktextwidgets ];
+ meta = {
+ license = with lib.licenses; [ gpl2 ];
+ maintainers = with lib.maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
index f21438dfcec59d3396a50015d43f72f04e29e1be..8108b9e4ddb4c93504c48a876d1e0f54dd6ddbfb 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "antfs-cli";
version = "unstable-2017-02-11";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 791e2d0f52e824f1b983b8b28f7042e80a1e0aca..b03d2aa208b552e8d282472f22360c741807d39b 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,6 +1,6 @@
{ stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "artha";
version = "1.0.3";
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 444a8da7036d47ef967292e1cd034118dcc406c4..b00686fb24f67848e769db7abd64ec0a162d5832 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "autospotting";
version = "unstable-2018-11-17";
goPackagePath = "github.com/AutoSpotting/AutoSpotting";
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 4227b4155acfedc273e812eba15d94b8e7e957ae..165bee76b69b68b097a4851ae64d0e857d0e2ae6 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,6 +1,6 @@
{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "avrdudess-2.2.20140102";
src = fetchurl {
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix
index 89c32668be9ca86982204f9f7875afd474d1e6d1..8945ffbb384f558b47d19966d18e6a13a41ceeb6 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/pkgs/applications/misc/bemenu/default.nix
@@ -9,7 +9,7 @@ assert ncursesSupport -> ncurses != null;
assert waylandSupport -> wayland != null;
assert x11Support -> xlibs != null && xorg != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bemenu";
version = "0.1.0";
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 39fdc8e5e1cfcb196b259ed88ddc82f22953189c..b4c8bbb3f311102f52cee970060f1be05746187c 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
mkDerivation rec {
pname = "calibre";
- version = "3.46.0";
+ version = "3.47.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
- sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9";
+ sha256 = "0mjj47w9pa7ihycialijrfq2qk107dcxwcwriz3b2mg4lixlawy4";
};
patches = [
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index dae6e404a9dd3112ccff3e61e9fd7895f389a973..5f4e24f4d3cca4d97cba1006242e3da65a097c63 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -10,7 +10,7 @@
, sha256
, rev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
pname = "cataract";
diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix
index 75f5ab406fe0b26a7e1e01c1527d60c90724ce81..09c36f9eb2f11197c808096a7a235e55bdd0ab7a 100644
--- a/pkgs/applications/misc/catclock/default.nix
+++ b/pkgs/applications/misc/catclock/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, xlibsWrapper, motif }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "catclock-2015-10-04";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 04f32a67b84c72381ccdad41b068e24fb54c7c61..c05c7423d9a565ee1b067f4cac8cf0336346f41d 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "3.7.2";
pname = "cgminer";
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
index 589111df78b819776ac5df790f4de51f25d000aa..4d32328af8b2b11c480238282a9df5337253e532 100644
--- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "libarcus";
version = "3.6.18";
format = "other";
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
index 7a1781f62ce70616e4d992aa073336f86b1ad598..f8ffbf041bda7f6c03068846ee9e3fb893c28051 100644
--- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "libsavitar-lulzbot";
name = "libsavitar-lulzbot";
version = "3.6.18";
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix
index 43869a0edc62a22344369053198c138f2e49f4e0..1ad755cdfbdd392f99d2792b385ffd7026c8f8b6 100644
--- a/pkgs/applications/misc/cura/lulzbot/uranium.nix
+++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix
@@ -1,7 +1,7 @@
{ stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
-buildPythonPackage rec {
+buildPythonPackage {
version = "3.6.18";
pname = "uranium";
name = "uraniumLulzbot";
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 283b66318ea56d429fff99f0cb706ecc434597b6..0016f89746d63a64369684b2b459406a48df65af 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -7,7 +7,7 @@ let
else
[ wxGTK ];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "diff-pdf";
version = "2017-12-30";
diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix
index 20c802a1cbdf8216a32e3cb90fcd65c4d5d4a767..d72a5b848261df44f0407f9b0ee452abeaaa67b8 100644
--- a/pkgs/applications/misc/doing/default.nix
+++ b/pkgs/applications/misc/doing/default.nix
@@ -1,7 +1,7 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript
}:
-bundlerEnv rec {
+bundlerEnv {
pname = "doing";
version = (import ./gemset.nix).doing.version;
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index 8cfadd77ece94a4d91d07ea75410ae1d4b9c2818..1332b265d54c78d34cf7cde01120e7baaf2aed71 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,6 +1,6 @@
{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "doomseeker";
version = "2018-03-05";
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index 98ed10b0c7ccf8fe9d3756153f09eaf9189f5ffb..8ba562de1cb7c8fd6b8ac382d29448f148384797 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -2,7 +2,7 @@
python2Packages.buildPythonApplication rec {
version = "2.9.3.1";
- name = "electrum-dash-${version}";
+ pname = "electrum-dash";
src = fetchurl {
url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz";
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 5233aaf8fcdbdcf6ced88727db016052755c2da1..c48d458567dc1743fcd9a455df65e6f637ac8793 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1
+{ stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1
, enableQt ? !stdenv.isDarwin
@@ -40,7 +40,7 @@ let
};
in
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "electrum";
inherit version;
@@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec {
cp -ar ${tests} $sourceRoot/electrum/tests
'';
+ nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
+
propagatedBuildInputs = with python3Packages; [
aiorpcx
aiohttp
@@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec {
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
+
+ '';
+
+ postFixup = stdenv.lib.optionalString enableQt ''
+ wrapQtApp $out/bin/electrum
'';
checkInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index d1161aa68226b34f6851ad28f960243ee8c5fc7f..984ade077a8a9dc6c69296418da194ee93fcfa1b 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -3,7 +3,7 @@
configH ? ""
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "evilvte";
version = "0.5.2-20140827";
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 3d715a1d16bd30054637f30b415c392a3aac97bb..8982c41e1ca9786892dbc4f6c14aa59c0f3932e4 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "evtest-1.33";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index e2cf8245ce67f688e0590102c457a766c54f6d8f..7a918d961f63b0891d455b364a5f982f1ed41eee 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnome15-2016-06-10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 6a5f4c9ce0344858caedf16c10b8e88183eec100..e917cc024d5bc1b8c8badc6424eb54c410c6745b 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
-mkDerivation rec {
+mkDerivation {
name = "goldendict-2019-08-01";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 308f084bd5864c236491b9eadb28e8b8c78ea886..d86db7adb9d024321d7d1e8d2a031b56ea51a85e 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "green-pdfviewer";
version = "nightly-2014-04-22";
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 37352915cb847e0a7105a4ad8ef12dc7ce66703a..97303c43fb1a53c1da9c72deec76db60537c42cb 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -3,7 +3,7 @@
let
version = "3.6.3";
-in python3.pkgs.buildPythonApplication rec {
+in python3.pkgs.buildPythonApplication {
name = "guake-${version}";
format = "other";
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
index a2d2e8ad735c2d7108c8347ba3b04b12e6d5fe34..a5a9187ab0f27fa7957eb151980fb967bd207a10 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -1,6 +1,6 @@
{ stdenv, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "example-unfree-package";
version = "1.0";
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 607dff2931895b5c5deea1e181d356306ef27803..ce35e91d9278c4a30d96e5d2cdd5437acef16ab4 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -2,7 +2,7 @@
let
houdini-runtime = callPackage ./runtime.nix { };
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
name = "houdini-${houdini-runtime.version}";
extraBuildCommands = ''
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 9ae9ab254e80ab72487a844a4d461cd08c0b8d32..4d4dd248bc53789fbb7efe8492e50b24156fe758 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -21,7 +21,7 @@ let
# Else: Don't modify the arguments:
exec ${ruby}/bin/ruby "$@"
'';
-in bundlerApp rec {
+in bundlerApp {
pname = "jekyll";
exes = [ "jekyll" ];
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 89778f670ff3f17b319a2689efe14f2e65b3b305..898186b714b69433c653b623aca1463fa6b8dd2c 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
"--disable-staticbins"
];
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 38078d11931b336394cae91f503c36bf66d600d1..e9dba4bcf4694b899617b9d8a6a3984b6c165c05 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -29,7 +29,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lilyterm";
inherit (stuff) src version;
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 291e225d6c4fc35844934e58bd37873081ec3922..f84ac6d600a69b1b845a835ee502cc7ecdd1350d 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -3,7 +3,7 @@ let
py = python27Packages;
python = py.python;
in
-py.buildPythonApplication rec {
+py.buildPythonApplication {
name = "loxodo-0.20150124";
src = fetchgit {
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 42905fa3cb41d92e3808eb5dcf2ef0d00a8d7eab..61151cb15506195d7331f0973dffbc44b749a7dc 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, libusb1, pkgconfig, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ltwheelconf";
version = "0.2.7";
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 8ce353e85b91d4a8bb162cda44de10e6debcb01f..0802a32d92b18a316a6965359eba701a5b243fc6 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -4,7 +4,7 @@
let version = "0.3.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lxterminal";
inherit version;
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 318c7c2524271705407524f5adade6e9c99debf9..a81aec9d0364c8c180ea78223e00ff2dfee83c77 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -2,7 +2,7 @@
, python27, python2Packages
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "metamorphose2";
version = "0.9.0beta";
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 6c1dcd5e150584f60aec6405383abf36658dbf2d..2eee9ad40c16818ec768319c3fea69dce3d57852 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "milu-nightly";
version = "2016-05-09";
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
index 95ceaddb4f03e75083500c7fc55e687ed4105a57..eff93c8e99c11c838aafd0dfa6f69bb91415a69b 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, dpkg, makeWrapper, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.2";
pname = "minergate-cli";
src = fetchurl {
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index fdd1238d87002a9807154342f884a7438f5d6873..a8402d9759319dc4d576b7db7bc1407376822d56 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.1";
pname = "minergate";
src = fetchurl {
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index d3e7f9e8cd46716dae6abc2dc02e3ddadfa8642c..303b9fe5e8bced4ab82728f4468508fb1ca53733 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
install -D -t $out/share/applications $desktopItem/share/applications/*
'';
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "mlterm";
exec = "mlterm %U";
icon = "mlterm";
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index 0f4e72502bbafea91a23d82420930ff1f1f499ad..e734e44a2e0467dacf994d13c0c3ac3ece181dda 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "moolticute-${version}";
+ pname = "moolticute";
version = "0.30.8";
src = fetchurl {
diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix
index fffa95952622d7d48d8da5d0c7c78786562d2040..35de284c0baa76f27cea2974f9f269b04cf2e9ad 100644
--- a/pkgs/applications/misc/mpvc/default.nix
+++ b/pkgs/applications/misc/mpvc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, socat, fetchFromGitHub, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mpvc-unstable-2017-03-18";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
index 411b318a3925cf38d3414a3d761c4b79c5ad2dc7..27d7ad8730b6a8b290a7cd0337e13f5b2543c80d 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, jdk, makeWrapper}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "4.3.0";
pname = "omegat";
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index de2f86e9f9a2273d777718772961770bef39a827..79e3317e64daa031206d8150d43a48e108c09998 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -29,14 +29,22 @@
}:
let
- customHunspell = hunspellWithDicts [hunspellDicts.en-us];
+
+ customHunspell = hunspellWithDicts [
+ hunspellDicts.en-us
+ ];
+
majorVersion = "1.4";
+
+in
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "onboard";
version = "${majorVersion}.1";
-in python3.pkgs.buildPythonApplication rec {
- name = "onboard-${version}";
+
src = fetchurl {
- url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz";
- sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865";
+ url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
+ sha256 = "0r9q38ikmr4in4dwqd8m9gh9xjbgxnfxglnjbfcapw8ybfnf3jh1";
};
patches = [
@@ -48,62 +56,62 @@ in python3.pkgs.buildPythonApplication rec {
./hunspell-use-xdg-datadirs.patch
];
- # For tests
- LC_ALL = "en_US.UTF-8";
- doCheck = false;
- checkInputs = [
- # for Onboard.SpellChecker.aspell_cmd doctests
- (aspellWithDicts (dicts: with dicts; [ en ]))
-
- # for Onboard.SpellChecker.hunspell_cmd doctests
- customHunspell
-
- # for Onboard.SpellChecker.hunspell doctests
- hunspellDicts.en-us
- hunspellDicts.es-es
- hunspellDicts.it-it
-
- python3.pkgs.nose
- ];
-
- propagatedBuildInputs = [
- glib
- python3
- python3.pkgs.dbus-python
- python3.pkgs.distutils_extra
- python3.pkgs.pyatspi
- python3.pkgs.pycairo
- python3.pkgs.pygobject3
- python3.pkgs.systemd
+ nativeBuildInputs = [
+ gobject-introspection
+ intltool
+ pkgconfig
+ wrapGAppsHook
];
buildInputs = [
bash
+ glib
gnome3.dconf
gsettings-desktop-schemas
gtk3
hunspell
isocodes
libcanberra-gtk3
+ libxkbcommon
mousetweaks
udev
- libxkbcommon
- wrapGAppsHook
xorg.libXtst
xorg.libxkbfile
] ++ stdenv.lib.optional atspiSupport at-spi2-core;
- nativeBuildInputs = [
- glibcLocales
- gobject-introspection # populate GI_TYPELIB_PATH
- intltool
- pkgconfig
+ propagatedBuildInputs = with python3.pkgs; [
+ dbus-python
+ distutils_extra
+ pyatspi
+ pycairo
+ pygobject3
+ systemd
];
propagatedUserEnvPkgs = [
gnome3.dconf
];
+ checkInputs = [
+ # for Onboard.SpellChecker.aspell_cmd doctests
+ (aspellWithDicts (dicts: with dicts; [ en ]))
+
+ # for Onboard.SpellChecker.hunspell_cmd doctests
+ customHunspell
+
+ # for Onboard.SpellChecker.hunspell doctests
+ hunspellDicts.en-us
+ hunspellDicts.es-es
+ hunspellDicts.it-it
+
+ python3.pkgs.nose
+ ];
+
+ # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
+ doCheck = false;
+
preBuild = ''
# Unnecessary file, has been removed upstream
# https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062
@@ -118,6 +126,9 @@ in python3.pkgs.buildPythonApplication rec {
patchShebangs .
+ substituteInPlace setup.py \
+ --replace "/etc" "$out/etc"
+
substituteInPlace ./Onboard/LanguageSupport.py \
--replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
--replace "/usr/bin/yelp" "${yelp}/bin/yelp"
@@ -149,16 +160,22 @@ in python3.pkgs.buildPythonApplication rec {
--replace '"killall",' '"${procps}/bin/pkill", "-x",'
'';
- postInstall = ''
- cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
+ installPhase = ''
+ ${python3.interpreter} setup.py install --prefix="$out"
+ cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
glib-compile-schemas $out/share/glib-2.0/schemas/
'';
- meta = {
+ # Remove ubuntu icons.
+ postFixup = ''
+ rm -rf $out/share/icons/ubuntu-mono-*
+ '';
+
+ meta = with stdenv.lib; {
homepage = https://launchpad.net/onboard;
- description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users.";
- maintainers = with stdenv.lib.maintainers; [ johnramsden ];
- license = stdenv.lib.licenses.gpl3;
+ description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users";
+ maintainers = with maintainers; [ johnramsden ];
+ license = licenses.gpl3;
};
}
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index 4cbd7cb71190162a8170c0339fc52361b1e3f854..2dfbb7a23705d3ebb35d74ff348c98c96b706f1c 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -16,7 +16,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "osmctools";
version = "0.8.5plus1.4.0";
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index bc6f5965e89b26818c04bd0f80e08fb5506fcbac..9756d9b42b0a2c0cc8b237296c283e7645c185cc 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
pname = "pdf-quench";
version = "1.0.5";
diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index e8ddec91e62a4725e5a81d80d2194a1a7cf10330..6fb70f1c9a267474c76960a100a8a7660082b924 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, pythonPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "phwmon";
version = "2017-04-10";
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 16c49d5f946c6ed190e3580150c9e5fe13b95cc2..bd3796a572b0ab59c65abbf9acc5aa059df0b1ea 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pmenu";
version = "2018-01-01";
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 45db856dbb9e6427f61a5e236c5f8766dc137745..7209ee3e4009073595a0c4af00b0532f2dc9e815 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "posterazor-1.5.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index ecc372dc674ccf5fa3951790ae3ae1526cca67f1..ab15855b910b7f276982a37800f156e444160a7f 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase
, qtmultimedia, qttools, qtwebengine }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qolibri";
version = "2018-11-14";
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix
index 47b4641234f3ceb918e74489d8d4f5dad1861cf6..702cadfdaa91bface095e6006204943df2056fc9 100644
--- a/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/pkgs/applications/misc/qt-box-editor/default.nix
@@ -7,7 +7,7 @@
, tesseract
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qt-box-editor";
version = "unstable-2019-07-12";
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 17cea90ac27cf90651c75350f6d1f78775c01f94..b6676a0bf70ec3387bc4f7c895a1ef16185b5953 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -18,7 +18,7 @@ let
};
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}";
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index 114404c2597dc4df6ef0bbb464f0db24404c82c8..e81c0b99264e777580a03edb5b9f85b1f7a488ee 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, undmg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sequel-pro";
version = "1.1.2";
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index cb2cd3f1e62fa81e0533c79ca470499eb886da8c..f2e1aa6bdb6864191f0e42c61ea79f793e6bc43e 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -3,7 +3,7 @@
# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of
# adding this to services.udev.packages on NixOS
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "solaar-unstable";
version = "2019-01-30";
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix
index eb408eaf6ee3ed3f40d2a5726fd7d441bd2986f5..bb1655b44632f018554feacd06e0494d3feb64f5 100644
--- a/pkgs/applications/misc/ssocr/default.nix
+++ b/pkgs/applications/misc/ssocr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, imlib2, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ssocr";
version = "unstable-2018-08-11";
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index 1fc96e551ac7a1a0088d06b29672917345037cf3..e051132c4e47a5c5b6cad1d7854c6a0886ded276 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stupidterm";
version = "2019-03-26";
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index a29dad2c4447980f82a5a237b4cc12d03355cc6e..960b7b9eeef5ee37978d154e4c4f64e3190caf89 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -6,7 +6,7 @@
let
version = "4.8.2";
- libdc = stdenv.mkDerivation rec {
+ libdc = stdenv.mkDerivation {
pname = "libdivecomputer-ssrf";
inherit version;
@@ -66,7 +66,7 @@ let
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "subsurface";
inherit version;
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index ee42c1389fcd5706f9b09f99f29e722313997191..9dcdf8fd2b0e28c4ce107db22e11fbd72bdbc209 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -71,7 +71,7 @@ let
d2u = stdenv.lib.replaceChars ["."] ["_"];
-in rec {
+in {
application = mkSweetHome3D rec {
version = "6.2";
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
index e65ab3451a62dce5e0be87402856e0dc1e2ec7b1..deeeac106943a70ee8b58415b66d574797cdb53a 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
+++ b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
@@ -1,5 +1,5 @@
{
- "mail" = {
+ mail = {
version = "2.6.3";
source = {
type = "gem";
@@ -9,14 +9,14 @@
"mime-types"
];
};
- "mime-types" = {
+ mime-types = {
version = "2.6.1";
source = {
type = "gem";
sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
};
};
- "taskjuggler" = {
+ taskjuggler = {
version = "3.5.0";
source = {
type = "gem";
@@ -27,7 +27,7 @@
"term-ansicolor"
];
};
- "term-ansicolor" = {
+ term-ansicolor = {
version = "1.3.2";
source = {
type = "gem";
@@ -37,7 +37,7 @@
"tins"
];
};
- "tins" = {
+ tins = {
version = "1.6.0";
source = {
type = "gem";
diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix
index 9f1773b191d240eaed79f58439e8486828b19f7e..847092356d28b2961ffc0c28b7fa858a345a8356 100644
--- a/pkgs/applications/misc/taskopen/default.nix
+++ b/pkgs/applications/misc/taskopen/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, makeWrapper, which, perl, perlPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "taskopen-1.1.4";
src = fetchurl {
url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz";
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix
index 15ee275c0e196c6fc5680010ffd3067eae6c46ce..547eea4f2d23e1b7c2acff7ef0bcd7f51afac985 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/pkgs/applications/misc/tdrop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, xwininfo, xdotool, xprop }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tdrop";
version = "unstable-2018-11-13";
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 095681d136d8a78a978ce4c3ac4f89e174e64446..aae17905cb715d788d71e1bfabad25d956a219c2 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -19,7 +19,7 @@
, hicolor-icon-theme
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tilix";
version = "unstable-2019-08-03";
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 5bb2b5b94616914a72362ad5d9867cf73ab1b62f..93f233a4f9252999b7d953a87bccfe71784e1ded 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "todiff-${version}";
+ pname = "todiff";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index 413f082fb22a1f9b75faa5b59715d35a9985836a..4ccf204357ca08a23fde2ea8e7bcfe14e6bf935a 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -7,7 +7,7 @@
let
pname = "tootle";
version = "0.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 04c6cc3606e308a64e367b51debf715eccf1fb98..2aef45748cac912dff1b8d7ef811828fca158ef7 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "twmn-git-2018-10-01";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index f0900a99e5d1b0ade2c43f144aa7c02040ae41b1..9639cee2d8c752f4b50e023a91d0a6a625028942 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
+{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "veracrypt";
version = "1.23";
+ minorVersion = "-Hotfix-2";
src = fetchurl {
- url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
- sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1";
+ url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip";
+ sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259";
};
sourceRoot = "src";
nativeBuildInputs = [ makeself pkgconfig yasm ];
- buildInputs = [ fuse lvm2 wxGTK ];
+ buildInputs = [ fuse lvm2 unzip wxGTK ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index e482e7e7c02dd750e902cb27fd4dea223bc86588..3561135ce618cf15007e1cdf91b91d876b27a380 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
, dbus-glib, autoreconfHook, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "volnoti-unstable";
version = "2013-09-23";
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 9040bb4318d5bd457b651e939f3f949cf7e1e0e1..295d721d3c5f694b474264496bfac2976dfacc97 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -3,7 +3,7 @@
, qtSupport ? true, qt4
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.31";
pname = "xautoclick";
src = fetchurl {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 0661a625e97f9d12d085206c154a573c1bd36ce8..f3bbbf42d5bc4fedc64514db95f0f2371fab5320 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xneur";
version = "0.20.0";
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
index fe65004b32ae360f05f97f91af4fc32170990732..244a2c43a155f77cfe17d441365415ed0ccaffdf 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xrq-unstable-2016-01-15";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index 06e12416baa019890dfe0410b9f0947f06b4e927..f2da2957bd3e45fda61236e2f5c85bcd4e23bc96 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -23,7 +23,7 @@ let
gtk2
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2017-12-01";
pname = "yarssr";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 45c125985120231b7fd724aa90ede63cf974af1b..a3645e97e255fc4f83578d18413b80969ddd7373 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -150,21 +150,11 @@ let
] ++ optionals (useVaapi) [
# source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi
./patches/chromium-vaapi.patch
- ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [
- ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" )
- ] ++ optional stdenv.isAarch64
- (if (versionOlder version "71") then
- fetchpatch {
- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
- sha256 = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab";
- }
- else
- fetchpatch {
- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
- postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
- sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
- }
- );
+ ] ++ optional stdenv.isAarch64 (fetchpatch {
+ url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
+ postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
+ sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
+ });
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index 2334dc6a71e4339bfdacc49b2e4b1d0985abc26a..6dff17c69ddb9b164b58993771fd602b8bb1e72f 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -35,7 +35,7 @@ let
"http://repo.fdzh.org/chrome/deb/pool/main/g"
];
-in rec {
+in {
getChannel = channel: let
chanAttrs = builtins.getAttr channel sources;
in {
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index f8e56937021ad47168ff880b1621e52b030500cc..14799e9f96cc35ed421fb502fc7b0782d27597fa 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11";
- sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04";
- version = "76.0.3809.87";
+ sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w";
+ sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp";
+ version = "77.0.3865.42";
};
dev = {
- sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw";
- sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95";
- version = "77.0.3860.5";
+ sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
+ sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6";
+ version = "78.0.3887.7";
};
stable = {
- sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc";
- sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx";
- version = "76.0.3809.100";
+ sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm";
+ sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk";
+ version = "76.0.3809.132";
};
}
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 4f4741ce0bdf60e320ff7bca5f5eba1c361f98e3..da6a7bc471551b91a97006b6e600f02752431951 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -10,7 +10,7 @@
assert enableGuile -> guile != null;
assert enablePython -> python != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "elinks-0.12pre6";
src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index dea752874ddb1084f21f8a1b6f7f93e67efc71d7..537a30c01a2e20a561e657b4d0036b10686354ef 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -58,8 +58,8 @@ let
inherit (generated) version sources;
mozillaPlatforms = {
- "i686-linux" = "linux-i686";
- "x86_64-linux" = "linux-x86_64";
+ i686-linux = "linux-i686";
+ x86_64-linux = "linux-x86_64";
};
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 20509439d2fbcf600c9dc726e4569a0cfb94409d..c74ac2f8dab6e173c87d8941cb86c190fd8221f4 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -159,7 +159,7 @@ rec {
};
});
-in rec {
+in {
icecat = iccommon rec {
ffversion = "60.3.0";
@@ -249,7 +249,7 @@ in rec {
in rec {
- tor-browser-7-5 = (tbcommon rec {
+ tor-browser-7-5 = (tbcommon {
ffversion = "52.9.0esr";
tbversion = "7.5.6";
@@ -265,7 +265,7 @@ in rec {
gtk3Support = false;
};
- tor-browser-8-5 = tbcommon rec {
+ tor-browser-8-5 = tbcommon {
ffversion = "60.8.0esr";
tbversion = "8.5.4";
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 977b40e4a7e3093d1a765541bdd628e92238bfb5..9f49925b2672511e6ccf3e5ab3ce0d9244662702 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -64,7 +64,7 @@ let
suffix = if channel != "stable" then "-" + channel else "";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
name = "google-chrome${suffix}-${version}";
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index 69beeb167590ed6ca48432c76355fa1d2f753ce2..d679eb56f5bde978ae5d664cdebc1c11f2fbdcc4 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
# TODO: why is not this the default? The test runner adds
# ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
# scripts don't add an equivalent
- export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua"
- export LUA_CPATH="$NIX_LUA_CPATH"
+ export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua"
'';
makeFlags = [
@@ -49,8 +48,8 @@ stdenv.mkDerivation rec {
in ''
gappsWrapperArgs+=(
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
- --prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH"
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
+ --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
)
'';
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 2d2d2a6910069da38fc91a2e4b0398c8b3468c38..c603dc6cf9f01fe55a6ba48c8de7012fabb93669 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -48,7 +48,7 @@
, debug ? false
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "flashplayer-standalone";
version = "32.0.0.238";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index fa455eb0b7a418fd0d0585831cc7c8becc47cb30..10ae0eb1da601b175f517e63763f625f69ea8419 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -9,7 +9,7 @@ let
url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (srcData) name version;
src = fetchurl{
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index fc3cc2e89a91b2f259f8a628aacb2ec1a30ae410..c0cb85eb17770a1bb35085bc63d4f9c6303a2766 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -94,7 +94,7 @@ let
lang = "en-US";
srcs = {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
@@ -102,7 +102,7 @@ let
sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z";
};
- "i686-linux" = fetchurl {
+ i686-linux = fetchurl {
urls = [
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
pname = "tor-browser-bundle-bin";
inherit version;
- src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
preferLocalBuild = true;
allowSubstitutes = false;
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index f15bf165e826e654f99a10af1c25c06d5203b2cf..7ff099853e29797a598e7368ff3dc445479dce9e 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -71,7 +71,7 @@ let
ffmpeg
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tor-browser-bundle";
version = tor-browser-unwrapped.version;
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 136c14d34d48625d863c5909b5dd9ba0f5912347..373fa43c72c3e773f1aee9f0568fcd3b875bb19e 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null;
with stdenv.lib;
let
- mktable = buildPackages.stdenv.mkDerivation rec {
+ mktable = buildPackages.stdenv.mkDerivation {
name = "w3m-mktable";
inherit (w3m) src;
nativeBuildInputs = [ pkgconfig boehmgc ];
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 09be379b2409fed75dce492ea869fe061daa19a1..4c1f7ea77492d13f3eceed3e1f91fdaeb6ffa103 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -20,7 +20,7 @@ let
startupNotify = "true";
};
- in stdenv.mkDerivation rec {
+ in stdenv.mkDerivation {
pname = "charles";
inherit version;
@@ -54,7 +54,7 @@ let
};
};
-in rec {
+in {
charles4 = (generic {
version = "4.2.8";
sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080";
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index bd8eb5451526abb12446876755477c909df6763c..f4d6fce3545e365087fceac825060b4f7a90f504 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "click-${version}";
+ pname = "click";
version = "0.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 0c210dcc535b7ad7bfbcd3bbc338d5e70c77f5c0..9bf801ee93d72bbbc6075e18d2b49cf461c060c8 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "habitat-${version}";
+ pname = "habitat";
version = "0.30.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 438fdfb2ebac83aa3f09dcac2f0b82f73afc6ddf..5fc35e6a0af11f354d21f2e6277eb8c43121c787 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -65,7 +65,7 @@ let
installPhase = "mv hadoop-dist/target/hadoop-${version} $out";
};
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "hadoop";
inherit version;
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 982f36def691024774c0392a95ab59dca98ea0db..89d06474509f4b536888df6b0cd69db095538496 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -4,7 +4,7 @@ let
# Cache schema as a package so network calls are not
# necessary at runtime, allowing use in package builds
- schema = stdenv.mkDerivation rec {
+ schema = stdenv.mkDerivation {
name = "kubeval-schema";
src = fetchFromGitHub {
owner = "garethr";
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 256bce9b6ec2413606aa0d45e17ab9e814c133f5..8c0265d14914916a216d4fa1d7fdcb7d20694d42 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
-buildGoModule rec {
+buildGoModule {
pname = "linkerd-unstablle";
version = "2019-07-26";
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ce7b9beb4f8af355bc2de9ce46c88213ca25172f..a4236a9408cca3318f43fbe7c72bc68eebe5d134 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "nomad";
- version = "0.9.4";
+ version = "0.9.5";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -10,14 +10,26 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "hashicorp";
- repo = "nomad";
+ repo = pname;
inherit rev;
- sha256 = "1jgvnmmrz7ffpm6aamdrvklj94n7b43swk9cycqhlfbnzijianpn";
+ sha256 = "01491470idb11z0ab4anb5caw46vy9s94a17l92j0z2f3f4k6xfl";
};
- # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
- # Ref: https://github.com/hashicorp/nomad/issues/5535
- buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";
+ # ui:
+ # Nomad release commits include the compiled version of the UI, but the file
+ # is only included if we build with the ui tag.
+ # nonvidia:
+ # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
+ # Ref: https://github.com/hashicorp/nomad/issues/5535
+ preBuild = let
+ tags = ["ui"]
+ ++ stdenv.lib.optional stdenv.isLinux "nonvidia";
+ tagsString = stdenv.lib.concatStringsSep " " tags;
+ in ''
+ export buildFlagsArray=(
+ -tags="${tagsString}"
+ )
+ '';
meta = with stdenv.lib; {
homepage = https://www.nomadproject.io/;
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index c74f5789d84fe83a41235e595c751388ed54ca03..d71b863f881fb99d054ecf1a9888ee34784c807d 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -2,7 +2,7 @@
with lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "droopy";
version = "20160830";
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index d820d40f7a34abc9ce4cdd9a13d23e525f353822..9a05a92cfb3146089ae3409edacc6e43b5851425 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -10,8 +10,8 @@ let
version = "73.4.118";
arch = {
- "x86_64-linux" = "x86_64";
- "i686-linux" = "x86";
+ x86_64-linux = "x86_64";
+ i686-linux = "x86";
}.${stdenv.hostPlatform.system};
installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index a5b4c577b4cb102edd8b8663f10d271a0f9c637e..640421bef8f5d7892eb1c50182336b81b21ad791 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "cfdyndns-${version}";
+ pname = "cfdyndns";
version = "0.0.1";
src = fetchFromGitHub {
owner = "colemickens";
diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix
index bb3ab98d1a4c08c447e7e39ce3015fe202214d08..59b48df1cd0398df016c2ff1c109b5d8ce9cbbc4 100644
--- a/pkgs/applications/networking/enhanced-ctorrent/default.nix
+++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "3.3.2";
pname = "enhanced-ctorrent-dhn";
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 708d3c1ed800d1ff35042934394daa33518ec401..2535d0dc31db1516e6f0c9fef77591b2e0cebdf0 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "esniper-2.35.0-15-g91d2665";
src = fetchgit {
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 2795ac4e46e4055a6b0af3e1807217464f603cde..f7a9521c9937b93815bdcb7cac363c8a06304511 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -2,11 +2,11 @@
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
rustPlatform.buildRustPackage rec {
- name = "newsboat-${version}";
+ pname = "newsboat";
version = "2.16.1";
src = fetchurl {
- url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
+ url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz";
sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0";
};
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 6bdaf2ffaf48af9f9f31602ed2c577f80b8dfb7d..7304fd2f654bed5f64eac5f159f82179da232b08 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "rawdog-${version}";
+ pname = "rawdog";
version = "2.23";
src = fetchurl {
- url = "https://offog.org/files/${name}.tar.gz";
+ url = "https://offog.org/files/${pname}-${version}.tar.gz";
sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp";
};
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index c0a6185309ae1885a438b902e9e73682bbcce04f..3e7909c91c056d5b47dc9346401a053a126c4172 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cppcheck, libmrss }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rsstail";
version = "2.1";
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix
index 63c18d6e0929caa9c123fb8b3ea3a7403c8c1ca8..2bebf4b09601afe978a7e2e6083f95d81490391c 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/applications/networking/flent/http-getter.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake
, curl, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "http-getter";
version = "unstable-2018-06-06";
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 94d5be030da64dc543a13b5b13d728416b0812c9..c5cf7a7c2ee972cafbc9bd5e683df8216c465e13 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -2,7 +2,7 @@
let
stableVersion = "2.1.21";
- previewVersion = "2.2.0rc3";
+ previewVersion = "2.2.0rc4";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -18,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
- sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99";
+ sha256Hash = "14fzjaanaxya97wrya2lybxz6qv72fk4ws8i92zvjz4jkvjdk9n3";
};
serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
- sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d";
+ sha256Hash = "03s2kq5f8whk14rhprg9yp3918641b1cwj6djcbjw8xpz0n3w022";
};
}
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index c333ae7ddcb0b54b2fbb74669fed9dfc1005890f..38d37d84c1776c1f929dc1bae8a1248f1829da6e 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -14,8 +14,8 @@
, icu
}:
-stdenv.mkDerivation rec {
- name = "dino-unstable-2019-08-27";
+stdenv.mkDerivation {
+ name = "dino-unstable-2019-03-07";
src = fetchFromGitHub {
owner = "dino";
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index f04afb6f1f7123c16e59beb376dd57e24a5d001f..2db13e1586baaa571f8cecf751df001369558bd5 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -4,7 +4,7 @@
let
version = "5.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "franz";
inherit version;
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index e2203dfe6eedecb253f8217214cb3e24d034015d..169ddf65b29cd72860225af5bbebc89de943f7d7 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -2,7 +2,7 @@
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "jackline";
version = "2019-08-08";
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index 7b76154021aba8063d6e388b6584e6fe11bfab4a..7122a509215dfa33a6d1d4485122132c02c5e5f8 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitLab }:
-buildGoPackage rec {
+buildGoPackage {
pname = "mm";
version = "2016.11.04";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
index 9a1e46e5ac55885ac405b4263b4842d708d058ed..bb51adfbfee0e4f29568a972c5506e5bf44bd01f 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -3,7 +3,7 @@
let
version = "54b2992";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pidgin-mra";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 34755809e392ba1d57c2ab47cc1db230724880b7..057e447eb1c866d48c863b8d670a8494bfa95a67 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pidgin-opensteamworks";
version = "unstable-2018-08-02";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
index 936974a1a8807a54267ecd8ae8bbf3d1c73365fc..7302ba89a715f81c04806db9faf99bac10545096 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
@@ -3,7 +3,7 @@
let
version = "0.8";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pidgin-xmpp-receipts";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index 1e998bcc80651a4fae4abb4f450cbd84e8e9a508..6695f8cb69b84fda4e905ba78e4d85957376529f 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "purple-discord";
version = "unstable-2018-04-10";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
index d226490b275502607270f56e9e1528db15791686..5d2292b50ad0c7aec413a6070afc847dd0a4b486 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "purple-hangouts-hg";
version = "2018-12-02";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index 3c4169274877fb76e3de32f1079446bb5babed1c..310d419718fe7f39eb741a881f7c47f4c2784282 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -3,7 +3,7 @@
let
version = "2018-08-03";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "purple-matrix-unstable";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
index 22554a4abf8ba303e4ecf58d2385393ff10585a9..9f73dba2d99d3bb939fe79b34be592f0c36c6294 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
@@ -3,7 +3,7 @@
let
version = "40ddb6d";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "purple-vk-plugin";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
index 8990aeee8ec01fd8ef0500fe73162398620a0d1f..83904531753b3c63fa405178e18191fa3ed50903 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, pidgin, glib, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "purple-xmpp-upload-2017-12-31";
src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 6a43344fbd3ccf0a7c849f059500700421f3c5b9..a78e5d1c2d12e6975a5102e0cbe90dd0c1513a94 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -10,7 +10,7 @@ let
version = "1.16.3";
rev = "v${version}";
-in mkDerivation rec {
+in mkDerivation {
pname = "qtox";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 65562830897133263a53c0c4452cef6588fea6b4..569c7b68edc63f179e70a0409210d98d48723eb6 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -3,7 +3,7 @@
, libqmatrixclient_0_5 }:
let
- generic = version: sha256: prefix: library: mkDerivation rec {
+ generic = version: sha256: prefix: library: mkDerivation {
pname = "quaternion";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index 97c722f093545ae5c39f29553a4f1e8b32ded956..30b12963b337dcb5e846f85a9045701d24b52679 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -14,7 +14,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
pname = "sencha-bare";
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index add337d3f0856467b5af06eae9bf5efa3d040c17..3768ecd137fb5fb6ba6c1d3412a29369c4fed6a2 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
let
configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "ratox-0.4.20180303";
src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 8dc053631e92396675cde544e7d4f5e3cd4745eb..97c00924d6cffe835b8e45172d6cd70936405f7e 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -78,7 +78,7 @@ let
CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000";
});
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ring-daemon";
version = "2017-07-11";
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index d1f1c033361631a1b837f16504c2222dfd71f083..d4298a3d32f3e79d10b0be27f9f6e3b5011f37ea 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -6,7 +6,7 @@
, patches
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "restbed";
version = "2016-09-15";
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 72069ec81c1af1f0f680ba08bd95c59149d4ccd7..29b314417c76cc11b8ce10735e590b79134e70ec 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -18,7 +18,7 @@ let
qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "spectral";
version = "2019-03-03";
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index cd5109320c794032658e850020025d8366eac605..923ce3737532b7c0bb791e1522518e1f3defc33c 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -3,7 +3,7 @@
, xorgproto, libX11, libXScrnSaver
, xz, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vacuum-im";
version = "1.3.0.20160104";
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index b0824c780225f6510ba6046b84d1aa5c0b024235..1b3e1c8ad81a63b75d5707826803076d646287b7 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -3,7 +3,7 @@
libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "viber";
version = "7.0.0.1035";
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index da4c5073000a3c3b4ee07b2213cf162d5e076f4c..9dbff13aca6c77cc0d4b8a70d5f5d4af7119235e 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -21,7 +21,7 @@ let
tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "wavebox";
inherit version;
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 36bd10781dc50047ef70bc7bd74cabd17844f159..af253a5e03f91310dbd6c6dac2b90f2673fb8cc6 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -102,7 +102,7 @@ let
'';
};
- darwin = stdenv.mkDerivation rec {
+ darwin = stdenv.mkDerivation {
inherit pname version meta;
src = fetchurl {
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index 39631bfc5c878d5c61457b0162bb22402bb62e0d..dc646f9471e103223e6269e57932e72be46c309a 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "ipfs-migrator";
version = "7";
diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index d1a0b2d4b0292495afedd974c85ff60fdef06a76..d2d9a67fb4d999cb18adbcc15d15685552f37728 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, ncurses}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "iptraf-3.0.1";
src = fetchurl {
diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix
index 5648d027d9e2bf4ce34f541ee2f4c9a8d62a080c..93ab9f828f6448fc6f71d4b2f9d954217d196016 100644
--- a/pkgs/applications/networking/irc/irccloud/default.nix
+++ b/pkgs/applications/networking/irc/irccloud/default.nix
@@ -14,7 +14,7 @@ let
inherit name src;
};
-in appimageTools.wrapType2 rec {
+in appimageTools.wrapType2 {
inherit name src;
extraPkgs = pkgs: with pkgs; [ at-spi2-core ];
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 0f11d9a6df05a9d138a4f190744d73488c16c16d..b37e0b00ce76f1eeef8fb70ee17303a80473e539 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
python2Packages.buildPythonApplication rec {
- name = "mailpile-${version}";
+ pname = "mailpile";
version = "1.0.0rc2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 88e573f6cf42ab40d2529d48c0bce55ce29bac21..fc8c167e98496ebf2419571ceb1f131bfeba2675 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -5,7 +5,7 @@ let
name = "msgviewer-${version}";
uname = "MSGViewer-${version}";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name;
src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
index b87728dd2cd1b1e9e80afaa0d379ce2fc39dc508..fcf1464ba239dc33a20d87d9c099d4b506aacd61 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "notbit";
version = "2018-01-09";
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 67c673bc913c7187e734ae4c330d558e7f7e7b9d..86aef501134219122934c5ee0ec6338a36ad1297 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -3,7 +3,7 @@
let
version = "9";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "notmuch-addrlookup";
inherit version;
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index f6e6a8d747eb0889166be50c760cc542c5984458..01081ebfb3e247d6e6f4ccf8668ac9a62d4cfff7 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.28.4"; # not really, git
+ version = "0.29.1";
pname = "notmuch";
passthru = {
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz";
- sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
+ url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
+ sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq";
};
nativeBuildInputs = [ pkgconfig ];
@@ -40,16 +40,12 @@ stdenv.mkDerivation rec {
patchShebangs configure
patchShebangs test/
- for src in \
- util/crypto.c \
- notmuch-config.c
- do
- substituteInPlace "$src" \
- --replace \"gpg\" \"${gnupg}/bin/gpg\"
- done
-
substituteInPlace lib/Makefile.local \
--replace '-install_name $(libdir)' "-install_name $out/lib"
+
+ substituteInPlace emacs/notmuch-emacs-mua \
+ --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
+ --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
'';
configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];
@@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
in ''
ln -s ${test-database} test/test-databases/database-v1.tar.xz
'';
- doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0");
+ doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
checkTarget = "test";
checkInputs = [
which dtach openssl bash
@@ -83,7 +79,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ flokli the-kenny ];
+ maintainers = with maintainers; [ flokli puckipedia the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index b3001c960574943555a1b1f3439fc923b0dce86d..c2a84971bc294da9d5157e8ded4ec6ee01dcec31 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,6 +1,6 @@
{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "netperf";
version = "20180613";
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
index 58e1fffdbdadebd06ec7745f107db856bdb59a7c..96bdc0b1dfa441e185f59745c4d2e5ae632ed177 100644
--- a/pkgs/applications/networking/nntp-proxy/default.nix
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nntp-proxy";
version = "2014-01-06";
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
index 9428b2764585f5cf24c3b46b39aad8cd6a00d89a..c9e2f8f671402479fdd8cd18dff9f50b178ab34b 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -7,7 +7,7 @@
let
rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnunet-git-${rev}";
src = fetchgit {
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 629e748fcacf054a2a4751eb1fe0d5710feaa9dc..0ead4b7e3ec4c08696446890b8d01329d6c5fffa 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "mldonkey-3.1.6";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index bcfe8f01e4a4c0e81af6c69ffa2aca31066d9738..704c439bb27d7ecaed275e527c1f2b9f000a2243 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -17,7 +17,7 @@ let
mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
srcs = {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz";
sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6";
};
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
pname = "soulseekqt";
inherit version;
- src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
dontBuild = true;
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix
index 305aceec62b51a3f71b3e068020adbff6a25ea88..7fdb062ef805438b96eb7946da2cda1118302068 100644
--- a/pkgs/applications/networking/protocol/default.nix
+++ b/pkgs/applications/networking/protocol/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonApplication, fetchFromGitHub }:
-buildPythonApplication rec {
+buildPythonApplication {
pname = "protocol";
version = "20171226";
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index bf8e7a16a4f3ba6949e6c6153ee750f86acd7386..60ea01ae451248794c17a7814d4e9ad164f757bf 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -21,7 +21,7 @@ let
categories = "Utility;Security;Network;Email";
};
-in mkDerivation rec {
+in mkDerivation {
pname = "protonmail-bridge";
inherit version;
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index be4cc5830d5438d1520f648105fcc9caba66ce47..d75f92cb25c7f63abaf58aa0c561b8e5cf4b53a8 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "unstable-2018-10-18";
pname = "ps2client";
diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix
index 571df924e1f8f89ea22f18bafa26a097e5a10bd9..66470bf8f3147274fbd8d3f76c655ed0f682788a 100644
--- a/pkgs/applications/networking/pyload/beautifulsoup.nix
+++ b/pkgs/applications/networking/pyload/beautifulsoup.nix
@@ -1,6 +1,6 @@
{ pythonPackages, isPy3k, pkgs }:
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
name = "beautifulsoup-3.2.1";
disabled = isPy3k;
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 5255b492ec66239da6dd45d4ed6c26bf87b37b82..30130f60028ca9b627ea0ce6ebdf076c7b5355fd 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -4,18 +4,18 @@
let
sha256 = {
- "x86_64-linux" = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2";
- "i686-linux" = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2";
- }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
+ x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2";
+ i686-linux = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2";
+ }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
arch = {
- "x86_64-linux" = "amd64";
- "i686-linux" = "i686";
- }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
+ x86_64-linux = "amd64";
+ i686-linux = "i686";
+ }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
description = "Desktop sharing application, providing remote support and online meetings";
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "anydesk";
exec = "@out@/bin/anydesk";
icon = "anydesk";
diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d253e766284fe39de8c4a294c9cd512923527acb
--- /dev/null
+++ b/pkgs/applications/networking/remote/waypipe/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitLab
+, meson, ninja, pkgconfig, scdoc
+, wayland, wayland-protocols, openssh
+, mesa, lz4, zstd, ffmpeg_4, libva
+}:
+
+stdenv.mkDerivation rec {
+ pname = "waypipe-unstable";
+ version = "0.6.1";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "mstoeckl";
+ repo = "waypipe";
+ rev = "v${version}";
+ sha256 = "13kp5snkksli0sj5ldkgybcs1s865f0qdak2w8796xvy8dg9jda8";
+ };
+
+ postPatch = ''
+ substituteInPlace src/waypipe.c \
+ --replace "/usr/bin/ssh" "${openssh}/bin/ssh"
+ '';
+
+ nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+
+ buildInputs = [
+ wayland wayland-protocols
+ # Optional dependencies:
+ mesa lz4 zstd ffmpeg_4 libva
+ ];
+
+ enableParallelBuilding = true;
+
+ mesonFlags = [ "-Dwerror=false" ]; # TODO: Report warnings upstream
+
+ meta = with stdenv.lib; {
+ description = "A network proxy for Wayland clients (applications)";
+ longDescription = ''
+ waypipe is a proxy for Wayland clients. It forwards Wayland messages and
+ serializes changes to shared memory buffers over a single socket. This
+ makes application forwarding similar to ssh -X feasible.
+ '';
+ homepage = https://mstoeckl.com/notes/gsoc/blog.html;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 2cfbfb1b201eeacedc272e2a28ae1d8625d94a75..13bcbf9b57e11384be7b2bae7a2dd345b20ab464 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
-mkDerivation rec {
+mkDerivation {
pname = "x2goclient";
version = "unstable-2019-07-24";
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index ecce7172defa72ad5f0a8e9cdbda23e760484505..e9d0727d31cf1cd4617034dcc31a72e3847fe18e 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -2,8 +2,8 @@
let
arch = {
- "x86_64-linux" = "x64";
- "i686-linux" = "i386";
+ x86_64-linux = "x64";
+ i686-linux = "i386";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
@@ -14,8 +14,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
- "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
- "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83";
+ x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
+ i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83";
}.${stdenv.hostPlatform.system};
};
diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index a38a9140b4909c3d02c1ca030bb503fcbd70a784..158e6c5dad154e49f7ef9030581ddd2de2507561 100644
--- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-python27Packages.buildPythonApplication rec {
+python27Packages.buildPythonApplication {
pname = "nicotine-plus";
version = "1.4.1";
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index c70723284fd8e8a02811ba189605fbe33329094a..74a02f47c3bff7a2e0ee5c6a2d88ccd98593f0cd 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -5,7 +5,7 @@
glibc, systemd
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.12.0";
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index fb47d9bc5101fe3df9c98096d680a39a14f2d59a..b72ddc8bae63b8e080ccc798ba713b90199b80a7 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -1,6 +1,6 @@
{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (backintime-common) version src installFlags;
pname = "backintime-qt4";
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 1eb5e44ba24f7578c8520a0d732f47929d5f2d33..cdec695d90f29547d7325ac208e3717c9fd8b880 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -7,7 +7,7 @@
, glibcLocales, rsync
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "casync";
version = "2-152-ge4a3c5e";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 12f992d44a5a634595ed265ba11ab589782809ab..19e2eaa5fa235c7c75984effc763b0afcb08b152 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -3,7 +3,7 @@
let
base = import ./base.nix { inherit stdenv fetchurl; };
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rrsync-${base.version}";
src = base.src;
diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index 46649c069111c39a6fd81121e8a5ed34df32c760..a3cde14f34c0ed59e7e4c8b8bbee290330745837 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -18,7 +18,7 @@
let
pname = "Transporter";
version = "1.3.3";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index fce885a259411ffead90edf4824361d2db802101..54e148f0833e69140df49e1bde7200a1b56fd292 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -15,7 +15,7 @@ let
passthru.module_name = module_name;
});
-in rec {
+in {
backlog = zncDerivation rec {
name = "znc-backlog-${version}";
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 9eec315217cbb59d7be84479f3fffe739913795b..aefd696ae4e35544e4599bf5e13062231893dd01 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bean-add-2018-01-08";
src = fetchFromGitHub {
diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix
index 0d2341113b4878d916c5c22d530c43c66bb7948d..fb9578c909dfde77d55763484b7a9bd88435c442 100644
--- a/pkgs/applications/office/docear/default.nix
+++ b/pkgs/applications/office/docear/default.nix
@@ -3,7 +3,7 @@
, antialiasFont ? true
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "docear";
version = "1.2";
diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix
index df8298579e8f346d603c0cc26329dc2dc9aec586..0a8f68bc09617448a0eccce0c2c0ef3ecc620093 100644
--- a/pkgs/applications/office/ledger-web/default.nix
+++ b/pkgs/applications/office/ledger-web/default.nix
@@ -3,7 +3,7 @@
, withSqlite ? false, sqlite
}:
-bundlerApp rec {
+bundlerApp {
pname = "ledger_web";
gemdir = ./.;
exes = [ "ledger_web" ];
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 6b4a3869af9fe31a019f4abacd401bd80114ab2b..103288c03c6213868d0efcb5e70e725fac029dd2 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -18,7 +18,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "moneyplex";
version = "16.0.22424";
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index dd7f0ace26c95bbfc2730113a075e119125796e1..050222451cf6472f9800aeb50f567a87175d790f 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -2,7 +2,7 @@
let
version = "1.44.55";
-in mkDerivation rec {
+in mkDerivation {
pname = "mytetra";
inherit version;
src = fetchurl {
diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
index d3668d057ee4418f4445260c62b42a07b3e002ea..c1e0f7da30f6ef510dbee74697694915a7bc3cbc 100644
--- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
+++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytest, pytest-django, django }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "django-crispy-forms";
version = "2019.04.21";
diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
index bbf252d28923bf4b2800f0ca053b3fd232abfed2..fa2d59392180c055900e9cc14f6dced15c69e641 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/pkgs/applications/office/timetable/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "timetable";
- version = "1.0.6";
+ version = "1.0.8";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0";
+ sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 6f4f9c43b0ffbb6efcda4f07fcd4f12b84062dc1..b76e09d4d1d6ee19c129e5e760ba16eb98a3ff69 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -7,15 +7,15 @@
krunner, kwallet
}:
-mkDerivation rec {
+mkDerivation {
pname = "zanshin";
- version = "2017-11-25";
+ version = "2019-07-28";
src = fetchFromGitHub {
owner = "KDE";
repo = "zanshin";
- rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
- sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
+ rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378";
+ sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 5221add8ff684bb0f5209d57d88e0974fe5eef24..334a380d9147a06a5adec3fc908fbc6ecb3f25c0 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
'';
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "zotero-${version}";
exec = "zotero -url %U";
icon = "zotero";
diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix
index c9dbc59323ef45f3ec9e27fc0df0d6743550b81e..401e207ba4f626b0d6f733680d6b628583a9f01b 100644
--- a/pkgs/applications/radio/dabtools/default.nix
+++ b/pkgs/applications/radio/dabtools/default.nix
@@ -2,7 +2,7 @@
, libusb1, rtl-sdr, fftw
} :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dabtools";
version = "20180405";
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix
index 6b23858aee48ec9745626d42e9e6c0301345cd4d..c26d3e77c70d842caf769c37910f871b20e84dbf 100644
--- a/pkgs/applications/radio/gnuradio/ais.nix
+++ b/pkgs/applications/radio/gnuradio/ais.nix
@@ -5,7 +5,7 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gr-ais";
version = "2015-12-20";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
owner = "bistromath";
repo = "gr-ais";
# Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054
- "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
- "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
+ rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
+ sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix
index 80583c0ff3bb0a993ee840bbd0835a6c40ebf161..27cdfc74aab3198b2fe1630b96938851f2003b1b 100644
--- a/pkgs/applications/radio/gnuradio/gsm.nix
+++ b/pkgs/applications/radio/gnuradio/gsm.nix
@@ -5,7 +5,7 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gr-gsm";
version = "2016-08-25";
diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix
index d56994e46ff5e866c6905888b556b2eb6510e8c8..ec1b802c659bdd16746ab47fe6291a0a19c88ba0 100644
--- a/pkgs/applications/radio/gnuradio/limesdr.nix
+++ b/pkgs/applications/radio/gnuradio/limesdr.nix
@@ -7,7 +7,7 @@ assert pythonSupport -> python != null && swig != null;
let
version = "2.0.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "gr-limesdr";
inherit version;
diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix
index d357db9134471fd85ea7e5700b7361d33330b076..3026c81e8eff7f2ebfb0b78af0b7be458e7ea099 100644
--- a/pkgs/applications/radio/gnuradio/nacl.nix
+++ b/pkgs/applications/radio/gnuradio/nacl.nix
@@ -5,7 +5,7 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gr-nacl";
version = "2017-04-10";
diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix
index b8cc60544c99f6f531564766fd90e85dbba96574..3bb632a819c5d6948ff03e471c44490d8bb9cacf 100644
--- a/pkgs/applications/radio/gnuradio/osmosdr.nix
+++ b/pkgs/applications/radio/gnuradio/osmosdr.nix
@@ -12,7 +12,7 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gr-osmosdr";
version = "2018-08-15";
diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix
index e2232c4b2ec824b0289d65cd50c0d8121840306b..ef4bd6129a84b13a747d9e0e28065263ec6f3c60 100644
--- a/pkgs/applications/radio/inspectrum/default.nix
+++ b/pkgs/applications/radio/inspectrum/default.nix
@@ -9,7 +9,7 @@
, liquid-dsp
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "inspectrum-unstable-2017-05-31";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix
index 0bd6f573ead08641b8fe9405c886ea33a678fdd2..3964a8c373703c6509d9334534e465608c6f66fb 100644
--- a/pkgs/applications/radio/kalibrate-hackrf/default.nix
+++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kalibrate-hackrf-unstable-20160827";
# There are no tags/releases, so use the latest commit from git master.
diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix
index 19ebd05e23c1dccaa80f3bb46c73db0224ce85da..879cd6e3aac9428f905bc580c2b5aff8a129ecca 100644
--- a/pkgs/applications/radio/kalibrate-rtl/default.nix
+++ b/pkgs/applications/radio/kalibrate-rtl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kalibrate-rtl-20131214";
# There are no tags/releases, so use the latest commit from git master.
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index a06ac2d7a03871f58f2dd7fd649f2a0e4ef8ae1a..3d519255ab48e3463d5b18ef0563c3c1c721420a 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -2,7 +2,7 @@
, libusb1, rtl-sdr, soapysdr-with-plugins
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "18.12";
pname = "rtl_433";
diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix
index 56de61da1c5ac8fe5b531ecd42515c7aeee6a8b8..1ebfa2fca57a1119f1b6b39509b3c823288cdc5f 100644
--- a/pkgs/applications/science/biology/cmtk/default.nix
+++ b/pkgs/applications/science/biology/cmtk/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, cmake}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cmtk-3.3.1";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix
index 854e91b2fcbb67d74c6b0d0ce0cba8f71b88da53..c1d20a11ca96a35a1e1763a4897a645a58833a93 100644
--- a/pkgs/applications/science/biology/diamond/default.nix
+++ b/pkgs/applications/science/biology/diamond/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "diamond-0.8.36";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 16639db17816359cbf3ffa321fbbdc1744667d53..de93ae5d78291ab4a915bc30b4b3e71f0afdad7e 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -1,25 +1,28 @@
-{ stdenv, fetchFromGitHub, cmake, hdf5, zlib }:
+{ stdenv, fetchFromGitHub, autoconf, cmake, hdf5, zlib }:
stdenv.mkDerivation rec {
pname = "kallisto";
- version = "0.43.1";
+ version = "0.46.0";
src = fetchFromGitHub {
repo = "kallisto";
owner = "pachterlab";
rev = "v${version}";
- sha256 = "04697pf7jvy7vw126s1rn09q4iab9223jvb1nb0jn7ilwkq7pgwz";
+ sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9";
};
- nativeBuildInputs = [ cmake ];
-
+ nativeBuildInputs = [ autoconf cmake ];
+
buildInputs = [ hdf5 zlib ];
+ # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
- description = "kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
- homepage = https://pachterlab.github.io/kallisto;
+ description = "Kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
+ homepage = "https://pachterlab.github.io/kallisto";
license = licenses.bsd2;
platforms = platforms.linux;
- maintainers = [ maintainers.arcadio ];
+ maintainers = with maintainers; [ arcadio ];
};
}
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
index fc6cfbb158c3396bf739fe21a9eafab77d090907..6907c6e3ec82ec26e3896c147e45aac0385d43f2 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -2,7 +2,7 @@
let python = python27.withPackages (ps: with ps; [ cython ]);
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "platypus-unstable";
version = "2018-07-22";
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index a27355afdc8e3d73eca3088ab05e85b99fc061af..9d7880f57df5a4780a986603d3e8af6f59e2f0c7 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -3,7 +3,7 @@
, mpi ? null, scalapack
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "4.1-b3";
pname = "siesta";
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index b351c892c2cf5f8ff635b616996ddf1c540b1e86..c863fe6aea85619b7b9d41427bc8f690663e7b44 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--prefix=$(out)"
- "--disable-static"
];
preConfigure = ''
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
index 58e01f4f9f4986e22a19592d8533c88c5e204a79..11e1ed524ed281a41ccdd6987deb897ef05c9883 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -110,7 +110,7 @@ in {
proto = let
toolName = "bitscope-proto";
version = "0.9.FG13B";
- in mkBitscope rec {
+ in mkBitscope {
inherit toolName version;
# NOTE: this is meant as a demo by BitScope
# NOTE: clicking on logo produces error
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
index 8aa8275510c942ca75f0f57d843803e79778bddd..c2cfc69c50c82d4d768d798e8e26cca200409ce9 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
@@ -3,7 +3,7 @@ glib, libzip, libserialport, check, libusb, libftdi,
systemd, alsaLib, dsview
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (dsview) version src;
pname = "libsigrok4dsl";
diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
index 12d375cf88aa31c51237530d1f78de369ff18347..b7fe5140864c970cfac67df2960ce94e6791e63b 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
@@ -2,7 +2,7 @@
glib, check, python3, dsview
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (dsview) version src;
pname = "libsigrokdecode4dsl";
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix
index a3b2945ac3d9b1f4a854203fb0d5394726b984ea..97812ce0bbf60e3d8b919d06d797b7caf4716847 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/pkgs/applications/science/electronics/fped/default.nix
@@ -4,7 +4,7 @@
}:
with lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fped";
version = "unstable-2017-05-11";
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index 71101d7cd74a334695572f2d267d631a93c2bf11..1aaa5496ff37c90d326dcfc0ff45b4d8fc72e90d 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "geda";
version = "1.8.2-20130925";
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index 3f61a13eab8c4eb98b048a8cf76f66765e0b6e11..fa5bdbbebdb6e079b464d2250b0ec13fbcde83ea 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gerbv";
version = "2015-10-08";
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 110552d1d64504f85164236cd633a808205cff34..fb931ec916223e31e5caad35dff4757305b69099 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qttools, qmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "librepcb";
version = "0.1.0";
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index fd50fc825a06b59a204fd877a3c32752d62b43f6..c832d12627a02302e81ba15255368a8a308cd688 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, stdenv, readline, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "abc-verifier";
version = "2018-07-08";
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index bf8d3cf03b830d643af2e0834f96ad9e35fa42bb..d6190942efaba976523a553de929aa0907e13ffb 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -7,7 +7,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "aspino-unstable-2017-03-09";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
index 668fd9fea72d6ae6d729ac74241e2e3cf4525f59..9b59828ddab7a85a7cfc76a1a9174a5e21bbd171 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, cmake, zlib, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "avy";
version = "2017.10.16";
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix
index 9d6c866faea36963b8afd89d67e976542c2c7cdc..2d00e9f30464f9b1d93d26b6adea277ff8b1f157 100644
--- a/pkgs/applications/science/logic/btor2tools/default.nix
+++ b/pkgs/applications/science/logic/btor2tools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "btor2tools";
version = "pre55_8c150b39";
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix
index e2f48b34029218a563d205c3cef9ef195950c75d..0319069660edd9bbdcf380c2448aba5d09631c71 100644
--- a/pkgs/applications/science/logic/clprover/clprover.nix
+++ b/pkgs/applications/science/logic/clprover/clprover.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "clprover";
version = "1.0.3";
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index dfe1277d5ac9807536cafa9bf4f3a63eb0a48bd4..a04ec0bb16ce07d07132d9cd4ca65a2a18eea18e 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -29,7 +29,7 @@ let
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
"8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal";
- }."${version}";
+ }.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10")
diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix
index 50454847baf1b7d92c6ffd47f7378b193826737c..4c4ea0f14ce1bc175f93011b959ef75f05f6e2fe 100644
--- a/pkgs/applications/science/logic/drat-trim/default.nix
+++ b/pkgs/applications/science/logic/drat-trim/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "drat-trim-2017-08-31";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index bc4f526bb3a4aaf21cee2d9f96908050ade0b673..f9a911d8210833af64aca513a06aeee124ac4ded 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "elan-${version}";
+ pname = "elan";
version = "0.7.5";
cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd";
diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix
index 21ce6be3e6c141309c0b6be874062af63ebdf806..ed757e444b7cf5a0d5ec6b5ff8c0e1f9977dc5fb 100644
--- a/pkgs/applications/science/logic/fast-downward/default.nix
+++ b/pkgs/applications/science/logic/fast-downward/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fast-downward-2019-05-13";
src = fetchhg {
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 22177798647be95a48438ca8c42f7f5034510c12..8cc50bb5e29574080adc211d30c6dd8caa5f5d68 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python
, gperftools, ninja, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lean2";
version = "2017-07-22";
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix
index dbd34f1da6e6db7cc92358b39d56150314af4f2b..287dbd36eabff0be42206629b9b3d95a0e0180c5 100644
--- a/pkgs/applications/science/logic/lingeling/default.nix
+++ b/pkgs/applications/science/logic/lingeling/default.nix
@@ -2,7 +2,7 @@
, aiger
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lingeling";
# This is the version used in satcomp2018, which was
# relicensed, and also known as version 'bcj'
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 7e46dbeb0743107f178157d98f42e99403adb4fe..ed1218c401b327095491b63838de5bb92c399411 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, perl, mlton }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "metis-prover";
version = "2.3.20160713";
diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix
index f1a42f8215e30c51e816e52bcbdca45b4c273b6e..ef46c694acb7463696322e585067dca71cd3a0ee 100644
--- a/pkgs/applications/science/logic/minisat/unstable.nix
+++ b/pkgs/applications/science/logic/minisat/unstable.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, zlib, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "minisat-unstable-2013-09-25";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
index 54bedc7c5e97166a6c6b3743e23115afc2c7e557..30d47687a3eb76f11aa7e755901da71f3c1720c2 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -20,7 +20,7 @@ let
inherit rev sha256;
};
- core = stdenv.mkDerivation rec {
+ core = stdenv.mkDerivation {
name = "${pname}-${version}";
inherit src;
buildInputs = [ cmake zlib gmp jdk8 ];
diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix
index 48546a86112bad469ecf83845c542272c72f6e2c..32ce9fde0c31222132ddd16e3d53343629242410 100644
--- a/pkgs/applications/science/logic/open-wbo/default.nix
+++ b/pkgs/applications/science/logic/open-wbo/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, zlib, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "open-wbo-2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 3f8305ff4030f46343e82abca7aab05f7c1fc0c7..d357bef2c7a03a66829ad472e91a888b56ab8263 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -22,7 +22,7 @@ let
sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "saw-tools";
version = "0.1.1-20150731";
diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix
index 2645aa102d9228d3cc9c6f4e879d7ec808cfbbb5..ece6f0b9f6a855dc8e77ed01a351d75e6ba44742 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/pkgs/applications/science/logic/spass/default.nix
@@ -8,7 +8,7 @@ let
+ " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "spass";
version = "${baseVersion}.${minorVersion}";
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 58674a4cacf2f6a48a5440773ea14f52cd9e5a17..ed66c77dcabf0466b997994a672ebbcfbb6398e1 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "symbiyosys";
version = "2019.08.13";
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/sby \
--replace "##yosys-sys-path##" \
"sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
+ substituteInPlace $out/share/yosys/python3/sby_core.py \
+ --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"'
'';
meta = {
description = "Tooling for Yosys-based verification flows";
diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index a04ab46c669be6a37f0f9610d2e051d1eff0676a..2c68191b800e41f004cbd175455c44b4099259f4 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "veriT";
version = "2016";
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 3cb14d7da21e4c72b82ca77e13888c22b2f1c3dd..6f338f2147839433215bc27c62a81be98e55a0d4 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -1,7 +1,7 @@
{ callPackage, fetchurl, stdenv
, ocamlPackages, coqPackages, rubber, hevea, emacs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "why3";
version = "1.2.0";
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
index 340073b016e32dffddf303a1e43e91c223fe973a..4469e7f06e03b56b34b04800421f63adab6c0ee7 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python2Packages, fetchurl }:
python2Packages.buildPythonApplication rec {
- name = "labelImg-${version}";
+ pname = "labelImg";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 9c4f24021430f2a3d4d024a4463492b1e97ac061..73272df9922195d088fe2fd4bae3c2f3d9f647da 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -94,7 +94,7 @@ let
# rockspec = "lua-cjson-2.1devel-1.rockspec";
# };
- lua-cjson = stdenv.mkDerivation rec {
+ lua-cjson = stdenv.mkDerivation {
name = "lua-cjson";
src = "${distro_src}/extra/lua-cjson";
@@ -179,7 +179,7 @@ let
rockspec = "rocks/${name}-scm-1.rockspec";
};
- sys = buildLuaRocks rec {
+ sys = buildLuaRocks {
name = "sys";
luadeps = [torch];
buildInputs = [readline cmake];
@@ -190,14 +190,14 @@ let
'';
};
- xlua = buildLuaRocks rec {
+ xlua = buildLuaRocks {
name = "xlua";
luadeps = [torch sys];
src = "${distro_src}/pkg/xlua";
rockspec = "xlua-1.0-0.rockspec";
};
- nn = buildLuaRocks rec {
+ nn = buildLuaRocks {
name = "nn";
luadeps = [torch luaffifb];
buildInputs = [cmake];
@@ -208,7 +208,7 @@ let
'';
};
- graph = buildLuaRocks rec {
+ graph = buildLuaRocks {
name = "graph";
luadeps = [ torch ];
buildInputs = [cmake];
@@ -219,7 +219,7 @@ let
'';
};
- nngraph = buildLuaRocks rec {
+ nngraph = buildLuaRocks {
name = "nngraph";
luadeps = [ torch nn graph ];
buildInputs = [cmake];
@@ -229,7 +229,7 @@ let
'';
};
- image = buildLuaRocks rec {
+ image = buildLuaRocks {
name = "image";
luadeps = [ torch dok sys xlua ];
buildInputs = [cmake libjpeg libpng];
@@ -240,7 +240,7 @@ let
'';
};
- optim = buildLuaRocks rec {
+ optim = buildLuaRocks {
name = "optim";
luadeps = [ torch ];
buildInputs = [cmake];
@@ -251,7 +251,7 @@ let
'';
};
- gnuplot = buildLuaRocks rec {
+ gnuplot = buildLuaRocks {
name = "gnuplot";
luadeps = [ torch paths ];
runtimeDeps = [ pkgs_gnuplot less ];
@@ -259,7 +259,7 @@ let
rockspec = "rocks/gnuplot-scm-1.rockspec";
};
- unsup = buildLuaRocks rec {
+ unsup = buildLuaRocks {
name = "unsup";
luadeps = [ torch xlua optim ];
buildInputs = [ cmake ];
@@ -275,7 +275,7 @@ let
meta.broken = true;
};
- trepl = buildLuaRocks rec {
+ trepl = buildLuaRocks {
name = "trepl";
luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup];
runtimeDeps = [ ncurses readline ];
@@ -285,7 +285,7 @@ let
};
};
- lbase64 = buildLuaRocks rec {
+ lbase64 = buildLuaRocks {
name = "lbase64";
src = fetchgit {
url = "https://github.com/LuaDist2/lbase64";
@@ -295,7 +295,7 @@ let
meta.broken = true; # 2018-04-11
};
- luuid = stdenv.mkDerivation rec {
+ luuid = stdenv.mkDerivation {
name = "luuid";
src = fetchgit {
url = "https://github.com/LuaDist/luuid";
@@ -314,7 +314,7 @@ let
};
# Doesn't work due to missing deps (according to luarocs).
- itorch = buildLuaRocks rec {
+ itorch = buildLuaRocks {
name = "itorch";
luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot
optim sys dok lbase64 lua-cjson luuid];
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix
index 6909cfd8ef650af1b1736e831931a32375fbfe19..d59ec57c1a859fa63eb2818b723e216eabaa0df9 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/pkgs/applications/science/math/LiE/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl
, bison, readline }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.2.2";
# The current version of LiE is 2.2.2, which is more or less unchanged
# since about the year 2000. Minor bugfixes do get applied now and then.
diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix
index eb42315f015bfbe62d4ae572e5f22d0ca5a97dcc..0dbafebf2c06a2b2fa46754225445f0e8cb08266 100644
--- a/pkgs/applications/science/math/form/default.nix
+++ b/pkgs/applications/science/math/form/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gmp, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "4.2.1";
pname = "form";
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index 1023e7ca3d5c217773860d7ee6b1467ed9ba4c07..aaa1c02ec0a0a250554e93cee9a1107391e06936 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
name = "mathematica-9.0.0";
- src = requireFile rec {
+ src = requireFile {
name = "Mathematica_9.0.0_LINUX.sh";
message = ''
This nix expression requires that Mathematica_9.0.0_LINUX.sh is
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index c86354234e3fc380b2516a268092cc32ac863915..bd116b02e29e683c9d00e874db2017d827fd6e54 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
# Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
- "default" = [ "--disable-clz" "--disable-popcnt" ];
- "westmere" = [ "--disable-clz" ];
- "sandybridge" = [ "--disable-clz" ];
- "ivybridge" = [ "--disable-clz" ];
+ default = [ "--disable-clz" "--disable-popcnt" ];
+ westmere = [ "--disable-clz" ];
+ sandybridge = [ "--disable-clz" ];
+ ivybridge = [ "--disable-clz" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
buildInputs = [];
installPhase = ''
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 856d604d7518eca4e3fe93795ef0cc11568f3e9d..93ec1e33cf69920739cde5fdb63f0a4f1dcf6708 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -23,7 +23,7 @@ let
relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute
testFileList = lib.concatStringsSep " " (map relpathToArg files);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = src.version;
pname = "sage-tests";
inherit src;
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index 21ce53e70c5183f997ca51fd59c9f2de45f46213..8e85cece9b286a344e8e7f4ee09b16f282a4484c 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -15,7 +15,7 @@ let
else
badArch;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name;
src = fetchurl {
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index 17b2fe27f2970b172dff3e54749259b97a55e1cd..577c8ecfa058642c16c24b64795f357fa1f5b2fd 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -27,7 +27,7 @@ let
outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gephi";
inherit version;
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
index 59f5afb2f437683071ef57d4734aa36b63e87a26..f86bed854a2bf327fe94c8dffc89de293616809c 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, ocaml, makeWrapper, ncurses }:
let version = "0.92"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "megam";
inherit version;
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 43d57feab71bd662f7ee62a02598f0f2c9782095..bb067fbca7a9cb85ef65de6b598139b24748da7c 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -2,7 +2,7 @@
, eigen, opencv, ceres-solver, cgal, boost, vcg
, gmp, mpfr, glog, gflags, libjpeg_turbo }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "openmvs-unstable-2018-05-26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index daa8b4943227d6c97aad1f13e83c9d61422ac428..0dfcbfda00245ee70e917cc68f5aaa96164d31be 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
version = "0.4.4";
- name = "rink-${version}";
+ pname = "rink";
src = fetchFromGitHub {
owner = "tiffany352";
diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
index c7692dde13aa8abdfd4582c02ee0c3b5b6193d49..b0ed5e9463790eed18bbb3bba1e1ff4e3d1de8e9 100644
--- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
@@ -2,7 +2,7 @@
, gfortran, mpi
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.10";
pname = "DL_POLY_Classic";
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index dd092a2ce9a9e529789fa0d21fb13d0af5a70591..80417f0fcc18419f28826749d80e0e4c17493e22 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sacrifice";
version = "1.0.0";
diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/pkgs/applications/science/robotics/gazebo/6.nix
index 0d1aa4a9085fe2ae702f23eaad4d31b90ab35807..80c52b49e47f201a649d05c6e3f6f130018615cc 100644
--- a/pkgs/applications/science/robotics/gazebo/6.nix
+++ b/pkgs/applications/science/robotics/gazebo/6.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args:
-callPackage ./default.nix (args // rec {
+callPackage ./default.nix (args // {
version = "6.5.1";
src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908";
sdformat = gazeboSimulator.sdformat3;
diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix
index f3fc1e24401d529f56074b98e878b5af031aa6e6..bad8d35623c090d708ae8783112cc2a4a3393269 100644
--- a/pkgs/applications/search/grepm/default.nix
+++ b/pkgs/applications/search/grepm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perlPackages, mutt }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "grepm";
version = "0.6";
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index d16ea2710503887e885813636c6d488122a5d181..0dfa19882028b11436071d6fe519e9b1248e0879 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "bzr-tools-${version}";
+ pname = "bzr-tools";
version = "2.6.0";
src = fetchurl {
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index a2ebb8195db48263befba6f9b7e36c778e0dd551..4c818060d2204e9e5ad3a706fb061c0da35f4b84 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -4,11 +4,11 @@
}:
python2Packages.buildPythonApplication rec {
- name = "cvs2svn-${version}";
+ pname = "cvs2svn";
version = "2.5.0";
src = fetchurl {
- url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz";
+ url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz";
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
};
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 0e28258915f2e82793dcb679471d5e9e0bcdcb73..454458cdec662b657e7f817b8b7ef12b7d128968 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "darcs-to-git";
version = "2015-06-04";
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 3c0653529ceab723e8a2e77d3c2af5e85321182c..b73825737dffad0214b4aa288e60c6049d703afa 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "ghq";
- version = "0.10.2";
+ version = "0.12.6";
goPackagePath = "github.com/motemen/ghq";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "1i7zmgv7760nrw8sayag90b8vvmbsiifgiqki5s3gs3ldnvlki5w";
+ sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
index be99aee64a5e63637b9855c7e8d9a6bce1f4cb83..dde1b19b4c3b2e31ac490e823eeb7a03c1f3654b 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
@@ -1,12 +1,12 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
- goPackagePath = "github.com/blang/semver";
+ goPackagePath = "github.com/Songmu/gitconfig";
fetch = {
type = "git";
- url = "https://github.com/blang/semver";
- rev = "v3.5.1";
- sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
+ url = "https://github.com/Songmu/gitconfig";
+ rev = "v0.0.2";
+ sha256 = "0w1xd1mzxzwh755l6lgpn6psjp959kvx89l39zhc8lag9jh7rc44";
};
}
{
@@ -18,24 +18,6 @@
sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk";
};
}
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.2.0";
- sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
- };
- }
{
goPackagePath = "github.com/golangplus/bytes";
fetch = {
@@ -63,15 +45,6 @@
sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc";
};
}
- {
- goPackagePath = "github.com/hpcloud/tail";
- fetch = {
- type = "git";
- url = "https://github.com/hpcloud/tail";
- rev = "v1.0.0";
- sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
- };
- }
{
goPackagePath = "github.com/motemen/go-colorine";
fetch = {
@@ -81,24 +54,6 @@
sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118";
};
}
- {
- goPackagePath = "github.com/onsi/ginkgo";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/ginkgo";
- rev = "v1.6.0";
- sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
- };
- }
- {
- goPackagePath = "github.com/onsi/gomega";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/gomega";
- rev = "v1.5.0";
- sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
- };
- }
{
goPackagePath = "github.com/urfave/cli";
fetch = {
@@ -122,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "4829fb13d2c6";
- sha256 = "05nwpw41d7xsdln5rj381n8j9dsbq5ng1wp52bxslqc4x0l5s9fj";
+ rev = "3ec191127204";
+ sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3";
};
}
{
@@ -131,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
- rev = "1d60e4601c6f";
- sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
@@ -154,30 +109,21 @@
};
}
{
- goPackagePath = "gopkg.in/check.v1";
+ goPackagePath = "golang.org/x/xerrors";
fetch = {
type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "20d25e280405";
- sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ url = "https://go.googlesource.com/xerrors";
+ rev = "3ee3066db522";
+ sha256 = "12xyaa116bq9zy25fwk7zzi83v8aab9lm91pqg0c3jrfkjdbr255";
};
}
{
- goPackagePath = "gopkg.in/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify.v1";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "gopkg.in/tomb.v1";
+ goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
- url = "https://gopkg.in/tomb.v1";
- rev = "dd632973f1e7";
- sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
};
}
{
@@ -185,8 +131,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 2d171df8bf2405acfbe17c6c261cad1eb5bb9077..32b9c8a980dcdb9677236bf2c6a561e09ebae784 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -4,8 +4,6 @@ python2Packages.buildPythonApplication rec {
pname = "git-big-picture";
version = "0.10.1";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "esc";
repo = pname;
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index e502c73adfd4d08c6d2c4018ea2a5ed1d6ef255c..5edf9a7b5a53b88b2c0519f21ad68948b1879d34 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -2,7 +2,7 @@
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
, pythonPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "git-bz";
version = "3.2015-09-08";
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index fbbb2d9524222c15bbb5d8f4a060099928536826..418cf2e5866f0326be9df0e3fb38fee0020b5340 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "git-codeowners-${version}";
+ pname = "git-codeowners";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 90b8b54434bdcab914101a6f01fc88010f0b4d04..77fc04281153eaecf587ab459d0ef0108787dc09 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -16,7 +16,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "git-dit-${version}";
+ pname = "git-dit";
version = "0.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
index 2d6de24167bda66bf7f49ec4cc2fce9f558b349a..f4aa4878f62f23d91fc666b6efdd3251339b9d14 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
@@ -1,6 +1,6 @@
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
-bundlerEnv rec {
+bundlerEnv {
inherit ruby;
pname = "git_fame";
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index e8eaf885c71ff12b14b90ea79290f377e5a4e945..ae40e011f858bc00385a08c63fa5af9f6c844ad1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, ... }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "git-stree";
version = "0.4.5";
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 3a4fcc09934022f1614134bebb95595522f87804..47da7f7a1d7f10e2d8909e30b6af5e2ebd8e5a04 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.22.1";
+ version = "2.23.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac";
+ sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3";
};
outputs = [ "out" ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index 1de631e8b6ad63c7464ee32e4a14d1c81684f7d3..8cf9662d8f9410d8bbae83594c08d3deb9fd6a73 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -1,6 +1,6 @@
{callPackage, stdenv, fetchFromGitHub, ...}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gitstatus";
version = "unstable-2019-05-06";
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 22f35e22fb540cb006a567adc8223baa82fd4aea..0ff7fae2878fb3c6e1b382926326a4e85f1586dc 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -1,6 +1,6 @@
{fetchFromGitHub, libgit2, ...}:
-libgit2.overrideAttrs (oldAttrs: rec {
+libgit2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DUSE_BUNDLED_ZLIB=ON"
"-DUSE_ICONV=OFF"
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index ecc054df47e733f0d03df482c158e38f5b4f0359..3a7f8632d2ccfcc380d20b87469e4d26c2ea5734 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -8,7 +8,7 @@ pythonPackages.buildPythonApplication rec {
# upstream repository (and we are installing from tarball instead)
PBR_VERSION = "${version}";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "openstack-infra";
repo = pname;
rev = version;
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 45c97868c4bf8cbac95e583e6c89f6eec7570739..ba0625c433de9fe0ac0de5e423adc61ed5fb348e 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -2,10 +2,10 @@
python2Packages.buildPythonApplication rec {
version = "1.4.2";
- name = "git-up-${version}";
+ pname = "git-up";
src = fetchurl {
- url = "mirror://pypi/g/git-up/${name}.zip";
+ url = "mirror://pypi/g/git-up/${pname}-${version}.zip";
sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
};
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 2428c6cebddd3be5abbb9043a74f425f03f15ef0..4467e9746ce9e74ab99b34758c846709beeb9b46 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, python2Packages}:
python2Packages.buildPythonApplication rec {
- name = "gitinspector-${version}";
+ pname = "gitinspector";
version = "0.4.4";
namePrefix = "";
src = fetchzip {
url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz";
sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m";
- name = name + "-src";
+ name = "${pname}-${version}" + "-src";
};
checkInputs = with python2Packages; [
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 20f0937274ed199210686dc6c0fbc2e7a04a417b..35ac8a18c451c05bd1a74c09c69bb275d0479ddd 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -44,7 +44,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}";
src = sources.gitlab;
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 0aa8afa936194a0ff287bdd1b89a2da32e2c89b0..92bc9f51cac7f58a805cb922ec004689e1567131 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
let version = "1.0-mtn-head"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "guitone";
inherit version;
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 23278e9e748c585ccba07a58cf7bb3b4581c35e5..a4632399df042e4285ada3ab12695236272f79aa 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mr";
version = "1.20180726";
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 180664d33863646a1aa03469acf649be7f9c56f4..6d0e39d47bf4ceeebffba5a02da29b72b168fb91 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "pijul-${version}";
+ pname = "pijul";
version = "0.12.0";
src = fetchurl {
- url = "https://pijul.org/releases/${name}.tar.gz";
+ url = "https://pijul.org/releases/${pname}-${version}.tar.gz";
sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
};
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index d3b027fada68b4c602fe0e8278780781690f1536..e9950c32549a4016102b4e74902842f55759887f 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
python2Packages.buildPythonApplication rec {
- name = "rabbitvcs-${version}";
+ pname = "rabbitvcs";
version = "0.17.1";
namePrefix = "";
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 7d655bfc5d3be0b992599c3a899c4f6fd28db79e..a225c23ceebccb63d8c2d67705779cbc9ab86519 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -3,7 +3,7 @@
libiconv, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
- name = "sit-${version}";
+ pname = "sit";
version = "0.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index c68cc928848dd3cd48c71340e370b1fee21e3b11..c769ec0a66d6e5ba335620423614c33ad0026c6d 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "tailor-${version}";
+ pname = "tailor";
version = "0.9.35";
src = fetchurl {
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index a6cdf2e4373edd679020b16250f72e8b9bbf32d6..779c33627e8f0ff24b4fba0df4a4833da0ff97a2 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -21,7 +21,7 @@ let
};
};
-in python2Packages.buildPythonApplication rec {
+in python2Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index 577f2f014168cd5438b9030dbc27eb12cff3b055..8a014a633930109bd7546f74729ce1a41c855575 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, which, git, ronn, perlPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.20170915"; # date of commit we're pulling
pname = "vcsh";
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index 3d598086329649f039b969acd662cc3b244755e0..f16f655b95db36e2e7e0b92d803503b7d608812d 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -7,7 +7,7 @@ let
inherit (stdenv.lib) enableFeature optional;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "avxsynth";
version = "2015-04-07";
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index 0f1b185ed220b1b21c39f3a386019ae9ece67b30..10685a72f1098cbcc9c5ffc88bd1ef66b5201ac7 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2.3.alpha";
pname = "byzanz";
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 10a8f4019fca3ac4be4a6ce96e40c11fe145f3cb..a2de52468f29f08ea14a962f3cdcef350f64019d 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394
, SDL, automake, GConf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coriander-2.0.1";
src = fetchurl {
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index d614523f5345c1123b689fa2a6ddeed36249611b..388476cbf8e713a062453a162f50be76237e3bc3 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -4,7 +4,7 @@
let
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
-in buildPythonApplication rec {
+in buildPythonApplication {
name = "devede-4.8.8";
namePrefix = "";
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 73bcdadbc5948dc2991a2d189bd5535119c077c9..f022722584cda856f186be73eceb781b6f105668 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -143,7 +143,7 @@ let
postPatch = cmakeProtoPatch;
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}";
src = kodi_src;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 1cb510780691415687d271cac646f73993e58a3c..dad52ccb9a7c66f6444f1f2b46aa97e84f5972a3 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -51,7 +51,7 @@ let self = rec {
};
mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
- toKodiPlugin (stdenv.mkDerivation (rec {
+ toKodiPlugin (stdenv.mkDerivation ({
name = "kodi-plugin-${plugin}-${version}";
dontStrip = true;
@@ -70,7 +70,7 @@ let self = rec {
mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],
extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:
- toKodiPlugin (stdenv.mkDerivation (rec {
+ toKodiPlugin (stdenv.mkDerivation ({
name = "kodi-plugin-${plugin}-${version}";
dontStrip = true;
@@ -172,7 +172,7 @@ let self = rec {
};
mkController = controller: {
- "${controller}" = mkKodiPlugin rec {
+ ${controller} = mkKodiPlugin rec {
plugin = pname + "-" + controller;
namespace = "game.controller." + controller;
sourceDir = "addons/" + namespace;
@@ -310,7 +310,7 @@ let self = rec {
};
- steam-launcher = mkKodiPlugin rec {
+ steam-launcher = mkKodiPlugin {
plugin = "steam-launcher";
namespace = "script.steam.launcher";
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 0dc97410f5479bb814e5396f1b25babc84780398..1ab7e2c991b99a203dfc0ef458c17c9746eb9ea6 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -76,7 +76,7 @@ let
};
# Lightworks expects some files in /usr/share/lightworks
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
name = lightworks.name;
targetPkgs = pkgs: [
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 14db747d2ce7bc4cf803aa0b29fc8ea829d59fb2..d1efae4a92441b5b1dddadbb8804cc70e5c5abea 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, libjpeg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mjpg-streamer";
version = "unstable-2019-05-24";
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index c77486a30cf10ced9dec5dfb15f9487988f44db8..28f734fa7ee7c3eba89f00bfd66c6ca8eb8a0759 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -88,7 +88,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mplayer-1.3.0";
src = fetchurl {
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index d59b02d4b0ae27e82fc72933d9dc7c4642f52010..cf02825501f585964327fed131c21cdbc153c549 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -4,7 +4,7 @@
let
binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "gtk-recordmydesktop";
version = "0.3.8-svn${recordmydesktop.rev}";
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index 0864edfcf38e3ef5c785673931cde8e8f2e4566f..573a18f62ce9ed171e681c8e90d9b5d55024acfd 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -4,7 +4,7 @@
let
binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "qt-recordmydesktop";
version = "0.3.8-svn${recordmydesktop.rev}";
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix
index 32bd731f16e9403e514b0c605b0f19b2269735d0..36a92f0f1afb6318402d44753bb578d1fa93dbcd 100644
--- a/pkgs/applications/video/subdl/default.nix
+++ b/pkgs/applications/video/subdl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "subdl-0.0pre.2017.11.06";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 03fc1f5399af3884642f66c6dbdadd610868ed1c..7396b3d6e7a2c9159743cd4d1230239800bca1ad 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -7,7 +7,7 @@ let
version = "0.54.0";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "subtitleeditor";
inherit version;
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix
index dd595baa52e820228c53d5420d0fc6253eaf9dcb..f52ffa923d28a21ded48e8c6467f299e72586353 100644
--- a/pkgs/applications/video/uvccapture/default.nix
+++ b/pkgs/applications/video/uvccapture/default.nix
@@ -8,7 +8,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "uvccapture-0.5";
src = fetchurl {
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 022f4382a4925a3c89734333036c53133a582e4f..2ee196baccc7720a6939140e884184265134c957 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -201,7 +201,7 @@ in {
};
- text2skin = stdenv.mkDerivation rec {
+ text2skin = stdenv.mkDerivation {
name = "vdr-text2skin-1.3.4-20170702";
src = fetchgit {
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index ba72763cdaf280a749ee678d4ef28888373de5b9..3c4c59a0ee8f93b4286d6811d76a51ba0fa8dccf 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xscast-unstable";
version = "2016-07-26";
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 6e61ef098f357b3aee997c149dde4f3bcb9d014c..e16fcb84b0552e1c72af6e0533e7eb7d9a4ad7a1 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -4,7 +4,7 @@
assert sdlSupport -> (SDL != null);
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "8086tiny";
version = "1.25";
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 23084c6286a4fd70ab8a8fa0f2a0922acac50f0a..13afe0a4261956bc16f767e7a22e418dd0629576 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "cntr-${version}";
+ pname = "cntr";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index a1125f25e816a0220b5439fa67e3b5805922e959..72b885b79e7d819d84d513ed7b20c0b0aa73b4b8 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -15,7 +15,7 @@ rec {
, tiniRev, tiniSha256
} :
let
- docker-runc = runc.overrideAttrs (oldAttrs: rec {
+ docker-runc = runc.overrideAttrs (oldAttrs: {
name = "docker-runc-${version}";
inherit version;
src = fetchFromGitHub {
@@ -28,7 +28,7 @@ rec {
patches = [];
});
- docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+ docker-containerd = containerd.overrideAttrs (oldAttrs: {
name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub {
@@ -41,7 +41,7 @@ rec {
hardeningDisable = [ "fortify" ];
});
- docker-tini = tini.overrideAttrs (oldAttrs: rec {
+ docker-tini = tini.overrideAttrs (oldAttrs: {
name = "docker-init-${version}";
inherit version;
src = fetchFromGitHub {
@@ -60,7 +60,7 @@ rec {
];
});
in
- stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec {
+ stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) {
inherit docker-runc docker-containerd docker-proxy docker-tini;
@@ -70,7 +70,7 @@ rec {
++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
++ optional (libseccomp != null) "seccomp";
- }) // rec {
+ }) // {
inherit version rev;
name = "docker-${version}";
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index b58a5108ebad0fb535c9a6477f352de436307568..e11ca04f6b36da61ee610f6989570f6c6f0a57c9 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -24,7 +24,7 @@ with lib; let
sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
};
- nvidia-container-runtime-hook = buildGoPackage rec {
+ nvidia-container-runtime-hook = buildGoPackage {
pname = "nvidia-container-runtime-hook";
version = "1.4.0";
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 0a139448cb3abe877d6813bc3bcefde34108265f..bce25406142132ac21a191833f61385d30a5186a 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, rustPlatform, libseccomp }:
rustPlatform.buildRustPackage rec {
- name = "railcar-${version}";
+ pname = "railcar";
version = "1.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 382ebba3c57e96ba48e36ec58f7cf53fe8f73afc..9fc167f5e9de41102330eec3ca05b3e85ec4d280 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "virt-top";
version = "2017-11-18-unstable";
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index f3055fc79c35aa574e588691155a7edb305d42e9..042b01e86780fe98630174a56b020d159f1828d5 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -47,7 +47,7 @@ callPackage (import ./generic.nix (rec {
# Sources needed to build tools and firmwares.
xenfiles = optionalAttrs withInternalQemu {
- "qemu-xen" = {
+ qemu-xen = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
# rev = "refs/tags/qemu-xen-${version}";
@@ -67,7 +67,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
- "qemu-xen-traditional" = {
+ qemu-xen-traditional = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
# rev = "refs/tags/xen-${version}";
@@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of iPXE";
};
} // optionalAttrs withLibHVM {
- "xen-libhvm-dir-remote" = {
+ xen-libhvm-dir-remote = {
src = fetchgit {
name = "xen-libhvm";
url = https://github.com/michalpalka/xen-libhvm;
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 64704f73e7b1f99a30db514409197de08774d12e..af4721516eca5781afeac6aca8a9d7f20947fa22 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -50,7 +50,7 @@ callPackage (import ./generic.nix (rec {
# Sources needed to build tools and firmwares.
xenfiles = optionalAttrs withInternalQemu {
- "qemu-xen" = {
+ qemu-xen = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
rev = "refs/tags/qemu-xen-${version}";
@@ -86,7 +86,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
- "qemu-xen-traditional" = {
+ qemu-xen-traditional = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
rev = "refs/tags/xen-${version}";
@@ -152,7 +152,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of iPXE";
};
} // optionalAttrs withLibHVM {
- "xen-libhvm-dir-remote" = {
+ xen-libhvm-dir-remote = {
src = fetchgit {
name = "xen-libhvm";
url = https://github.com/ts468/xen-libhvm;
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 8ad8edde8cc8d709e3666680d658f00c83dcf936..1608fabf4b299731d0ef1dd68e09afaa68f9f2ca 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -64,7 +64,7 @@ callPackage (import ./generic.nix (rec {
# Sources needed to build tools and firmwares.
xenfiles = optionalAttrs withInternalQemu {
- "qemu-xen" = {
+ qemu-xen = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
rev = "refs/tags/qemu-xen-${version}";
@@ -78,7 +78,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
- "qemu-xen-traditional" = {
+ qemu-xen-traditional = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
rev = "refs/tags/xen-${version}";
@@ -123,7 +123,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of iPXE";
};
} // optionalAttrs withLibHVM {
- "xen-libhvm-dir-remote" = {
+ xen-libhvm-dir-remote = {
src = fetchgit {
name = "xen-libhvm";
url = https://github.com/michalpalka/xen-libhvm;
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 727546b69fb02966ad0ea3569180b21b2d758d05..de692820d8f74be88cad98271e3eb95ad9886120 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -5,7 +5,7 @@ let
url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
inherit sha256;
});
-in rec {
+in {
# 4.5
XSA_190 = (xsaPatch {
name = "190-4.5";
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
index 09c7c8e0e088b2f649be39a8db13e29538566853..eeadfa248d75c3dac0303baa1413ad0bd4f97292 100644
--- a/pkgs/applications/window-managers/bspwm/unstable.nix
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bspwm-unstable-2016-09-30";
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
index cc00f1e4b6e949be037ee4ddcfbb3442ae60e4eb..e2c39887a32151bd2b0669356a6ebd19c8db4f9c 100644
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "clfswm";
src = fetchgit {
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index 0b611906a46699dd82c6ed921a150a229323c287..1354171dcfacd6c1aba553a183a0dcffb363c2ec 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cwm-5.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index eac15ca714189295dc0ca09ac20196ec95679d82..1787e40eb96c768646ffe380b6b5b47af3bc9ffe 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -8,7 +8,7 @@ let
in
rustPlatform.buildRustPackage rec {
- name = "dwm-status-${version}";
+ pname = "dwm-status";
version = "1.6.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix
index 7bc76d5c2bfbcdc467a0f9306f4dd112af7001be..96dcfb938004116b083da2f85cb2ba6372a8f590 100644
--- a/pkgs/applications/window-managers/dzen2/default.nix
+++ b/pkgs/applications/window-managers/dzen2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dzen2-0.9.5";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 2246d77173a04ceb7f2c4be0e56a39514e67a8fe..ef03216d499bc027e21d77070c7f2910d9f6a5f6 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "i3blocks";
version = "unstable-2019-02-07";
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index 7df2847669f56bc819a88289a1de56d1a7f6a1bc..db33b27ddd81fb11b700d3f7cf8e37124ab836c4 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "jwm-settings-manager";
version = "2018-10-19";
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
index 08b79927d21e866d16544f29cfebeda8b7c51a19..bcfcbe3c5f525459cec0505b835ac1b0bbcc7945 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "kbdd";
version = "unstable-2017-01-29";
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
index ed34e75f35dbb36499345d4d4e4b8c41ba31dd33..9d6e0f27f934267abb22725ce37510309a267e3c 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, libxcb }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "lemonbar-1.3";
src = fetchurl {
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index a1334112cf985cdc0c6a1045d54ea945362a60aa..ff34f1dfee78c52076f5cfe0c4aee8d4dcfc514b 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, perl, libxcb, libXft }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "lemonbar-xft-unstable-2016-02-17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 7233ff2410bd19baf563069f94b03c4c1ec78efa..ba43403d9bbb0ed4c910c08d0a6685f1f99e9163 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -12,7 +12,7 @@
, stdenv
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "spectrwm";
version = "2.7.2";
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix
index a6f2961ed3fc86ffd4346f4355f4e070850f3aaa..00f4b95b3f27374b1480711076ffa9df7a251055 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/pkgs/applications/window-managers/stumpish/default.nix
@@ -1,6 +1,6 @@
{ stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stumpish";
version = "0.0.1";
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 3ed7f4325f24364948aa3a723104c8dffaffd5ce..b39585092edd7665e651695e3362a4cff53b6ab1 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -10,7 +10,7 @@ let
sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc";
});
versionSpec = {
- "latest" = {
+ latest = {
name = "1.0.0";
rev = "refs/tags/1.0.0";
sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb";
@@ -22,7 +22,7 @@ let
sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
patches = [ ./fix-module-path.patch ];
};
- "git" = {
+ git = {
name = "git-20170203";
rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
@@ -30,7 +30,7 @@ let
};
}.${version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "stumpwm-${versionSpec.name}";
src = fetchgit {
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 0943881da28fa2ee289b909ca3792ed08e8d6b68..c391532376e317490558caf9775935af0880b6fb 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tabbed-20180310";
src = fetchgit {
diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix
index 955dfe9b44a17a54fb3385db265411da8a2b1e20..01638c6332c82de57e736185cf76ef749dfa9066 100644
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix
@@ -20,7 +20,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({
aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true);
memchr."${deps.aho_corasick."0.5.3".memchr}".default = true;
}) [
@@ -39,7 +39,7 @@ rec {
sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
features = mkFeatures (features."bitflags"."0.4.0" or {});
};
- features_.bitflags."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.4.0" = deps: f: updateFeatures f ({
bitflags."0.4.0".default = (f.bitflags."0.4.0".default or true);
}) [];
@@ -54,7 +54,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
};
- features_.bitflags."0.6.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.6.0" = deps: f: updateFeatures f ({
bitflags."0.6.0".default = (f.bitflags."0.6.0".default or true);
}) [];
@@ -69,7 +69,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
};
- features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.7.0" = deps: f: updateFeatures f ({
bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true);
}) [];
@@ -107,7 +107,7 @@ rec {
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
};
- features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
}) [];
@@ -122,7 +122,7 @@ rec {
authors = [ "Guillaume Gomez " ];
sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
};
- features_.c_vec."1.2.1" = deps: f: updateFeatures f (rec {
+ features_.c_vec."1.2.1" = deps: f: updateFeatures f ({
c_vec."1.2.1".default = (f.c_vec."1.2.1".default or true);
}) [];
@@ -284,7 +284,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
};
- features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({
cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
}) [];
@@ -336,7 +336,7 @@ rec {
(crates."pkg_config"."${deps."dbus"."0.4.1"."pkg_config"}" deps)
]);
};
- features_.dbus."0.4.1" = deps: f: updateFeatures f (rec {
+ features_.dbus."0.4.1" = deps: f: updateFeatures f ({
dbus."0.4.1".default = (f.dbus."0.4.1".default or true);
libc."${deps.dbus."0.4.1".libc}".default = true;
pkg_config."${deps.dbus."0.4.1".pkg_config}".default = true;
@@ -359,7 +359,7 @@ rec {
(crates."dbus"."${deps."dbus_macros"."0.0.6"."dbus"}" deps)
]);
};
- features_.dbus_macros."0.0.6" = deps: f: updateFeatures f (rec {
+ features_.dbus_macros."0.0.6" = deps: f: updateFeatures f ({
dbus."${deps.dbus_macros."0.0.6".dbus}".default = true;
dbus_macros."0.0.6".default = (f.dbus_macros."0.0.6".default or true);
}) [
@@ -381,7 +381,7 @@ rec {
]);
features = mkFeatures (features."dlib"."0.3.1" or {});
};
- features_.dlib."0.3.1" = deps: f: updateFeatures f (rec {
+ features_.dlib."0.3.1" = deps: f: updateFeatures f ({
dlib."0.3.1".default = (f.dlib."0.3.1".default or true);
libloading."${deps.dlib."0.3.1".libloading}".default = true;
}) [
@@ -403,7 +403,7 @@ rec {
]);
features = mkFeatures (features."dlib"."0.4.1" or {});
};
- features_.dlib."0.4.1" = deps: f: updateFeatures f (rec {
+ features_.dlib."0.4.1" = deps: f: updateFeatures f ({
dlib."0.4.1".default = (f.dlib."0.4.1".default or true);
libloading."${deps.dlib."0.4.1".libloading}".default = true;
}) [
@@ -421,7 +421,7 @@ rec {
authors = [ "David Tolnay " ];
sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
};
- features_.dtoa."0.4.3" = deps: f: updateFeatures f (rec {
+ features_.dtoa."0.4.3" = deps: f: updateFeatures f ({
dtoa."0.4.3".default = (f.dtoa."0.4.3".default or true);
}) [];
@@ -441,7 +441,7 @@ rec {
(crates."wayland_sys"."${deps."dummy_rustwlc"."0.7.1"."wayland_sys"}" deps)
]);
};
- features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f (rec {
+ features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f ({
bitflags."${deps.dummy_rustwlc."0.7.1".bitflags}".default = true;
dummy_rustwlc."0.7.1".default = (f.dummy_rustwlc."0.7.1".default or true);
libc."${deps.dummy_rustwlc."0.7.1".libc}".default = true;
@@ -498,7 +498,7 @@ rec {
authors = [ "bluss" ];
sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1";
};
- features_.fixedbitset."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.fixedbitset."0.1.9" = deps: f: updateFeatures f ({
fixedbitset."0.1.9".default = (f.fixedbitset."0.1.9".default or true);
}) [];
@@ -517,7 +517,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -537,7 +537,7 @@ rec {
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
- features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
}) [];
@@ -712,7 +712,7 @@ rec {
(crates."unicode_width"."${deps."getopts"."0.2.18"."unicode_width"}" deps)
]);
};
- features_.getopts."0.2.18" = deps: f: updateFeatures f (rec {
+ features_.getopts."0.2.18" = deps: f: updateFeatures f ({
getopts."0.2.18".default = (f.getopts."0.2.18".default or true);
unicode_width."${deps.getopts."0.2.18".unicode_width}".default = true;
}) [
@@ -1033,7 +1033,7 @@ rec {
sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
features = mkFeatures (features."itoa"."0.3.4" or {});
};
- features_.itoa."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.itoa."0.3.4" = deps: f: updateFeatures f ({
itoa."0.3.4".default = (f.itoa."0.3.4".default or true);
}) [];
@@ -1051,7 +1051,7 @@ rec {
(crates."rustc_serialize"."${deps."json_macro"."0.1.1"."rustc_serialize"}" deps)
]);
};
- features_.json_macro."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.json_macro."0.1.1" = deps: f: updateFeatures f ({
json_macro."0.1.1".default = (f.json_macro."0.1.1".default or true);
rustc_serialize."${deps.json_macro."0.1.1".rustc_serialize}".default = true;
}) [
@@ -1078,7 +1078,7 @@ rec {
(crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
]);
};
- features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -1199,7 +1199,7 @@ rec {
(crates."target_build_utils"."${deps."libloading"."0.3.4"."target_build_utils"}" deps)
]);
};
- features_.libloading."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.libloading."0.3.4" = deps: f: updateFeatures f ({
kernel32_sys."${deps.libloading."0.3.4".kernel32_sys}".default = true;
lazy_static."${deps.libloading."0.3.4".lazy_static}".default = true;
libloading."0.3.4".default = (f.libloading."0.3.4".default or true);
@@ -1231,7 +1231,7 @@ rec {
(crates."cc"."${deps."libloading"."0.5.0"."cc"}" deps)
]);
};
- features_.libloading."0.5.0" = deps: f: updateFeatures f (rec {
+ features_.libloading."0.5.0" = deps: f: updateFeatures f ({
cc."${deps.libloading."0.5.0".cc}".default = true;
libloading."0.5.0".default = (f.libloading."0.5.0".default or true);
winapi = fold recursiveUpdate {} [
@@ -1340,7 +1340,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.6" or {});
};
- features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.6" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
log."0.4.6".default = (f.log."0.4.6".default or true);
}) [
@@ -1361,7 +1361,7 @@ rec {
(crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps)
]);
};
- features_.memchr."0.1.11" = deps: f: updateFeatures f (rec {
+ features_.memchr."0.1.11" = deps: f: updateFeatures f ({
libc."${deps.memchr."0.1.11".libc}".default = true;
memchr."0.1.11".default = (f.memchr."0.1.11".default or true);
}) [
@@ -1392,7 +1392,7 @@ rec {
]);
features = mkFeatures (features."nix"."0.6.0" or {});
};
- features_.nix."0.6.0" = deps: f: updateFeatures f (rec {
+ features_.nix."0.6.0" = deps: f: updateFeatures f ({
bitflags."${deps.nix."0.6.0".bitflags}".default = true;
cfg_if."${deps.nix."0.6.0".cfg_if}".default = true;
libc."${deps.nix."0.6.0".libc}".default = true;
@@ -1426,7 +1426,7 @@ rec {
(crates."void"."${deps."nix"."0.9.0"."void"}" deps)
]);
};
- features_.nix."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.nix."0.9.0" = deps: f: updateFeatures f ({
bitflags."${deps.nix."0.9.0".bitflags}".default = true;
cfg_if."${deps.nix."0.9.0".cfg_if}".default = true;
libc."${deps.nix."0.9.0".libc}".default = true;
@@ -1453,7 +1453,7 @@ rec {
(crates."num_traits"."${deps."num_traits"."0.1.43"."num_traits"}" deps)
]);
};
- features_.num_traits."0.1.43" = deps: f: updateFeatures f (rec {
+ features_.num_traits."0.1.43" = deps: f: updateFeatures f ({
num_traits = fold recursiveUpdate {} [
{ "${deps.num_traits."0.1.43".num_traits}".default = true; }
{ "0.1.43".default = (f.num_traits."0.1.43".default or true); }
@@ -1620,7 +1620,7 @@ rec {
(crates."phf_shared"."${deps."phf_codegen"."0.7.23"."phf_shared"}" deps)
]);
};
- features_.phf_codegen."0.7.23" = deps: f: updateFeatures f (rec {
+ features_.phf_codegen."0.7.23" = deps: f: updateFeatures f ({
phf_codegen."0.7.23".default = (f.phf_codegen."0.7.23".default or true);
phf_generator."${deps.phf_codegen."0.7.23".phf_generator}".default = true;
phf_shared."${deps.phf_codegen."0.7.23".phf_shared}".default = true;
@@ -1644,7 +1644,7 @@ rec {
(crates."rand"."${deps."phf_generator"."0.7.23"."rand"}" deps)
]);
};
- features_.phf_generator."0.7.23" = deps: f: updateFeatures f (rec {
+ features_.phf_generator."0.7.23" = deps: f: updateFeatures f ({
phf_generator."0.7.23".default = (f.phf_generator."0.7.23".default or true);
phf_shared."${deps.phf_generator."0.7.23".phf_shared}".default = true;
rand."${deps.phf_generator."0.7.23".rand}".default = true;
@@ -1669,7 +1669,7 @@ rec {
]);
features = mkFeatures (features."phf_shared"."0.7.23" or {});
};
- features_.phf_shared."0.7.23" = deps: f: updateFeatures f (rec {
+ features_.phf_shared."0.7.23" = deps: f: updateFeatures f ({
phf_shared."0.7.23".default = (f.phf_shared."0.7.23".default or true);
siphasher."${deps.phf_shared."0.7.23".siphasher}".default = true;
}) [
@@ -1687,7 +1687,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
};
- features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
+ features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({
pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
}) [];
@@ -2004,7 +2004,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
};
- features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({
regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true);
}) [];
@@ -2057,7 +2057,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
};
- features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f (rec {
+ features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f ({
rustc_serialize."0.3.24".default = (f.rustc_serialize."0.3.24".default or true);
}) [];
@@ -2075,7 +2075,7 @@ rec {
(crates."semver"."${deps."rustc_version"."0.1.7"."semver"}" deps)
]);
};
- features_.rustc_version."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.rustc_version."0.1.7" = deps: f: updateFeatures f ({
rustc_version."0.1.7".default = (f.rustc_version."0.1.7".default or true);
semver."${deps.rustc_version."0.1.7".semver}".default = true;
}) [
@@ -2131,7 +2131,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
};
- features_.semver."0.1.20" = deps: f: updateFeatures f (rec {
+ features_.semver."0.1.20" = deps: f: updateFeatures f ({
semver."0.1.20".default = (f.semver."0.1.20".default or true);
}) [];
@@ -2225,7 +2225,7 @@ rec {
authors = [ "Frank Denis " ];
sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
};
- features_.siphasher."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.siphasher."0.2.3" = deps: f: updateFeatures f ({
siphasher."0.2.3".default = (f.siphasher."0.2.3".default or true);
}) [];
@@ -2282,7 +2282,7 @@ rec {
(crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps)
]);
};
- features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec {
+ features_.thread_id."2.0.0" = deps: f: updateFeatures f ({
kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true;
libc."${deps.thread_id."2.0.0".libc}".default = true;
thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true);
@@ -2305,7 +2305,7 @@ rec {
(crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps)
]);
};
- features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.2.7" = deps: f: updateFeatures f ({
thread_id."${deps.thread_local."0.2.7".thread_id}".default = true;
thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true);
}) [
@@ -2323,7 +2323,7 @@ rec {
authors = [ "Victor Berger " ];
sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
};
- features_.token_store."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.token_store."0.1.2" = deps: f: updateFeatures f ({
token_store."0.1.2".default = (f.token_store."0.1.2".default or true);
}) [];
@@ -2339,7 +2339,7 @@ rec {
sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
features = mkFeatures (features."unicode_width"."0.1.5" or {});
};
- features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({
unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
}) [];
@@ -2354,7 +2354,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
};
- features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({
utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true);
}) [];
@@ -2542,7 +2542,7 @@ rec {
(crates."xml_rs"."${deps."wayland_scanner"."0.12.5"."xml_rs"}" deps)
]);
};
- features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f (rec {
+ features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f ({
wayland_scanner."0.12.5".default = (f.wayland_scanner."0.12.5".default or true);
xml_rs."${deps.wayland_scanner."0.12.5".xml_rs}".default = true;
}) [
@@ -2737,7 +2737,7 @@ rec {
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
- features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.2.8" = deps: f: updateFeatures f ({
winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
}) [];
@@ -2760,7 +2760,7 @@ rec {
]) else []);
features = mkFeatures (features."winapi"."0.3.6" or {});
};
- features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.3.6" = deps: f: updateFeatures f ({
winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -2781,7 +2781,7 @@ rec {
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
};
- features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
}) [];
@@ -2797,7 +2797,7 @@ rec {
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
};
- features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -2813,7 +2813,7 @@ rec {
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
};
- features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -2992,7 +2992,7 @@ rec {
(crates."bitflags"."${deps."xml_rs"."0.7.0"."bitflags"}" deps)
]);
};
- features_.xml_rs."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.xml_rs."0.7.0" = deps: f: updateFeatures f ({
bitflags."${deps.xml_rs."0.7.0".bitflags}".default = true;
xml_rs."0.7.0".default = (f.xml_rs."0.7.0".default or true);
}) [
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index 9ebb0b5ffcfb9c142c7e2d965a785e4922a50945..7bc6ac7002049760fce79b040ac8c2f51ef52d7b 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -16,23 +16,23 @@ let
# https://nest.pijul.com/pmeunier/carnix/discussions/22
version = "0.8.1";
deps = (callPackage ./way-cooler.nix {}).deps;
- way_cooler_ = f: cratesIO.crates.way_cooler."${version}" deps {
- features = cratesIO.features_.way_cooler."${version}" deps {
- "way_cooler"."${version}" = f;
+ way_cooler_ = f: cratesIO.crates.way_cooler.${version} deps {
+ features = cratesIO.features_.way_cooler.${version} deps {
+ way_cooler.${version} = f;
};
};
way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
crateOverrides = defaultCrateOverrides // {
way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; };
- };}).overrideAttrs (oldAttrs: rec {
+ };}).overrideAttrs (oldAttrs: {
postBuild = ''
mkdir -p $out/etc
cp -r config $out/etc/way-cooler
'';
});
- wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
+ wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: {
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
@@ -47,7 +47,7 @@ let
crateOverrides = defaultCrateOverrides // {
wc-lock = attrs: { buildInputs = [ pam ]; };
- };}).overrideAttrs (oldAttrs: rec {
+ };}).overrideAttrs (oldAttrs: {
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
@@ -87,7 +87,7 @@ let
sleep 5
${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
'';
-in symlinkJoin rec {
+in symlinkJoin {
inherit version;
name = "way-cooler-with-extensions-${version}";
paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
index 4d527715c5f27829a75a31a1d39061076251168e..a797e7aacdefa222d94fa0c8cbfe8ac0ef49e629 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
@@ -508,7 +508,7 @@ rec {
inherit dependencies buildDependencies features;
};
ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
- ansi_term_0_9_0_features = f: updateFeatures f (rec {
+ ansi_term_0_9_0_features = f: updateFeatures f ({
ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
}) [];
atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ {
@@ -516,7 +516,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- atty_0_2_3_features = f: updateFeatures f (rec {
+ atty_0_2_3_features = f: updateFeatures f ({
atty_0_2_3.default = (f.atty_0_2_3.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_32.default = (f.libc_0_2_32.default or false);
@@ -524,7 +524,7 @@ rec {
winapi_0_2_8.default = true;
}) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
+ bitflags_0_7_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
@@ -631,25 +631,25 @@ rec {
dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]);
features = mkFeatures (features.coco_0_1_1 or {});
};
- coco_0_1_1_features = f: updateFeatures f (rec {
+ coco_0_1_1_features = f: updateFeatures f ({
coco_0_1_1.default = (f.coco_0_1_1.default or true);
either_1_2_0.default = true;
scopeguard_0_3_2.default = true;
}) [ either_1_2_0_features scopeguard_0_3_2_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
- color_quant_1_0_0_features = f: updateFeatures f (rec {
+ color_quant_1_0_0_features = f: updateFeatures f ({
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ {
dependencies = mapFeatures features ([ libloading_0_3_4 ]);
features = mkFeatures (features.dlib_0_3_1 or {});
};
- dlib_0_3_1_features = f: updateFeatures f (rec {
+ dlib_0_3_1_features = f: updateFeatures f ({
dlib_0_3_1.default = (f.dlib_0_3_1.default or true);
libloading_0_3_4.default = true;
}) [ libloading_0_3_4_features ];
dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {};
- dtoa_0_4_2_features = f: updateFeatures f (rec {
+ dtoa_0_4_2_features = f: updateFeatures f ({
dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true);
}) [];
either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ {
@@ -665,7 +665,7 @@ rec {
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
};
- enum_primitive_0_1_1_features = f: updateFeatures f (rec {
+ enum_primitive_0_1_1_features = f: updateFeatures f ({
enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false);
}) [ num_traits_0_1_40_features ];
@@ -698,14 +698,14 @@ rec {
fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ {
dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]);
};
- fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec {
+ fuchsia_zircon_0_2_1_features = f: updateFeatures f ({
fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true);
fuchsia_zircon_sys_0_2_0.default = true;
}) [ fuchsia_zircon_sys_0_2_0_features ];
fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
};
- fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec {
+ fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = true;
fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true);
}) [ bitflags_0_7_0_features ];
@@ -741,7 +741,7 @@ rec {
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
- glob_0_2_11_features = f: updateFeatures f (rec {
+ glob_0_2_11_features = f: updateFeatures f ({
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ {
@@ -828,13 +828,13 @@ rec {
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
};
- inflate_0_1_1_features = f: updateFeatures f (rec {
+ inflate_0_1_1_features = f: updateFeatures f ({
inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
}) [];
itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ {
features = mkFeatures (features.itoa_0_3_4 or {});
};
- itoa_0_3_4_features = f: updateFeatures f (rec {
+ itoa_0_3_4_features = f: updateFeatures f ({
itoa_0_3_4.default = (f.itoa_0_3_4.default or true);
}) [];
jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ {
@@ -855,7 +855,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -890,7 +890,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]);
};
- libloading_0_3_4_features = f: updateFeatures f (rec {
+ libloading_0_3_4_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
lazy_static_0_2_9.default = true;
libloading_0_3_4.default = (f.libloading_0_3_4.default or true);
@@ -911,7 +911,7 @@ rec {
dependencies = mapFeatures features ([ libc_0_2_32 ]);
buildDependencies = mapFeatures features ([ cc_1_0_0 ]);
};
- miniz_sys_0_1_10_features = f: updateFeatures f (rec {
+ miniz_sys_0_1_10_features = f: updateFeatures f ({
cc_1_0_0.default = true;
libc_0_2_32.default = true;
miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
@@ -940,14 +940,14 @@ rec {
num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
};
- num_integer_0_1_35_features = f: updateFeatures f (rec {
+ num_integer_0_1_35_features = f: updateFeatures f ({
num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
num_traits_0_1_40.default = true;
}) [ num_traits_0_1_40_features ];
num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]);
};
- num_iter_0_1_34_features = f: updateFeatures f (rec {
+ num_iter_0_1_34_features = f: updateFeatures f ({
num_integer_0_1_35.default = true;
num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
num_traits_0_1_40.default = true;
@@ -978,13 +978,13 @@ rec {
rustc_serialize_0_3_24.default = true;
}) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ];
num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {};
- num_traits_0_1_40_features = f: updateFeatures f (rec {
+ num_traits_0_1_40_features = f: updateFeatures f ({
num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true);
}) [];
num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ {
dependencies = mapFeatures features ([ libc_0_2_32 ]);
};
- num_cpus_1_7_0_features = f: updateFeatures f (rec {
+ num_cpus_1_7_0_features = f: updateFeatures f ({
libc_0_2_32.default = true;
num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true);
}) [ libc_0_2_32_features ];
@@ -1007,7 +1007,7 @@ rec {
phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ {
dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]);
};
- phf_codegen_0_7_21_features = f: updateFeatures f (rec {
+ phf_codegen_0_7_21_features = f: updateFeatures f ({
phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true);
phf_generator_0_7_21.default = true;
phf_shared_0_7_21.default = true;
@@ -1015,7 +1015,7 @@ rec {
phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ {
dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]);
};
- phf_generator_0_7_21_features = f: updateFeatures f (rec {
+ phf_generator_0_7_21_features = f: updateFeatures f ({
phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true);
phf_shared_0_7_21.default = true;
rand_0_3_17.default = true;
@@ -1024,7 +1024,7 @@ rec {
dependencies = mapFeatures features ([ siphasher_0_2_2 ]);
features = mkFeatures (features.phf_shared_0_7_21 or {});
};
- phf_shared_0_7_21_features = f: updateFeatures f (rec {
+ phf_shared_0_7_21_features = f: updateFeatures f ({
phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true);
siphasher_0_2_2.default = true;
}) [ siphasher_0_2_2_features ];
@@ -1065,14 +1065,14 @@ rec {
rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ {
dependencies = mapFeatures features ([ rayon_core_1_2_1 ]);
};
- rayon_0_8_2_features = f: updateFeatures f (rec {
+ rayon_0_8_2_features = f: updateFeatures f ({
rayon_0_8_2.default = (f.rayon_0_8_2.default or true);
rayon_core_1_2_1.default = true;
}) [ rayon_core_1_2_1_features ];
rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ {
dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]);
};
- rayon_core_1_2_1_features = f: updateFeatures f (rec {
+ rayon_core_1_2_1_features = f: updateFeatures f ({
coco_0_1_1.default = true;
futures_0_1_16.default = true;
lazy_static_0_2_9.default = true;
@@ -1082,24 +1082,24 @@ rec {
rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true);
}) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ];
redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {};
- redox_syscall_0_1_31_features = f: updateFeatures f (rec {
+ redox_syscall_0_1_31_features = f: updateFeatures f ({
redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.default or true);
}) [];
redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
dependencies = mapFeatures features ([ redox_syscall_0_1_31 ]);
};
- redox_termios_0_1_1_features = f: updateFeatures f (rec {
+ redox_termios_0_1_1_features = f: updateFeatures f ({
redox_syscall_0_1_31.default = true;
redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
}) [ redox_syscall_0_1_31_features ];
rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {};
- rustc_serialize_0_3_24_features = f: updateFeatures f (rec {
+ rustc_serialize_0_3_24_features = f: updateFeatures f ({
rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true);
}) [];
scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ {
features = mkFeatures (features.scoped_threadpool_0_1_8 or {});
};
- scoped_threadpool_0_1_8_features = f: updateFeatures f (rec {
+ scoped_threadpool_0_1_8_features = f: updateFeatures f ({
scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true);
}) [];
scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ {
@@ -1159,11 +1159,11 @@ rec {
siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
dependencies = mapFeatures features ([]);
};
- siphasher_0_2_2_features = f: updateFeatures f (rec {
+ siphasher_0_2_2_features = f: updateFeatures f ({
siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
}) [];
strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
+ strsim_0_6_0_features = f: updateFeatures f ({
strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
}) [];
target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ {
@@ -1188,7 +1188,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- tempfile_2_2_0_features = f: updateFeatures f (rec {
+ tempfile_2_2_0_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
libc_0_2_32.default = true;
rand_0_3_17.default = true;
@@ -1226,7 +1226,7 @@ rec {
dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_32 ]) else [])
++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []);
};
- termion_1_5_1_features = f: updateFeatures f (rec {
+ termion_1_5_1_features = f: updateFeatures f ({
libc_0_2_32.default = true;
redox_syscall_0_1_31.default = true;
redox_termios_0_1_1.default = true;
@@ -1235,7 +1235,7 @@ rec {
textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ {
dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]);
};
- textwrap_0_8_0_features = f: updateFeatures f (rec {
+ textwrap_0_8_0_features = f: updateFeatures f ({
term_size_0_3_0.default = true;
textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true);
unicode_width_0_1_4.default = true;
@@ -1243,7 +1243,7 @@ rec {
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
@@ -1264,7 +1264,7 @@ rec {
way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ {
dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]);
};
- way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec {
+ way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({
way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true);
wayland_client_0_9_10.cursor = true;
wayland_client_0_9_10.default = true;
@@ -1309,7 +1309,7 @@ rec {
wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ {
dependencies = mapFeatures features ([ xml_rs_0_6_1 ]);
};
- wayland_scanner_0_9_10_features = f: updateFeatures f (rec {
+ wayland_scanner_0_9_10_features = f: updateFeatures f ({
wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true);
xml_rs_0_6_1.default = true;
}) [ xml_rs_0_6_1_features ];
@@ -1339,7 +1339,7 @@ rec {
dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]);
buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]);
};
- wc_bg_0_3_0_features = f: updateFeatures f (rec {
+ wc_bg_0_3_0_features = f: updateFeatures f ({
byteorder_0_5_3.default = true;
clap_2_26_2.default = true;
image_0_10_4.default = true;
@@ -1355,17 +1355,17 @@ rec {
wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true);
}) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ {
dependencies = mapFeatures features ([ bitflags_0_9_1 ]);
};
- xml_rs_0_6_1_features = f: updateFeatures f (rec {
+ xml_rs_0_6_1_features = f: updateFeatures f ({
bitflags_0_9_1.default = true;
xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true);
}) [ bitflags_0_9_1_features ];
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
index 6f936eb2e4325019cbf4d38239be330425808b40..3264357b2fdb9549bb8cc1dff1fb110c1254d527 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
@@ -305,25 +305,25 @@ rec {
inherit dependencies buildDependencies features;
};
adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {};
- adler32_1_0_0_features = f: updateFeatures f (rec {
+ adler32_1_0_0_features = f: updateFeatures f ({
adler32_1_0_0.default = (f.adler32_1_0_0.default or true);
}) [];
ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
- ansi_term_0_9_0_features = f: updateFeatures f (rec {
+ ansi_term_0_9_0_features = f: updateFeatures f ({
ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
}) [];
atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- atty_0_2_2_features = f: updateFeatures f (rec {
+ atty_0_2_2_features = f: updateFeatures f ({
atty_0_2_2.default = (f.atty_0_2_2.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_21.default = true;
winapi_0_2_8.default = true;
}) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
+ bitflags_0_7_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ {
@@ -402,7 +402,7 @@ rec {
vec_map_0_7_0.default = true;
}) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
- color_quant_1_0_0_features = f: updateFeatures f (rec {
+ color_quant_1_0_0_features = f: updateFeatures f ({
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ {
@@ -410,7 +410,7 @@ rec {
buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]);
features = mkFeatures (features.dbus_0_5_2 or {});
};
- dbus_0_5_2_features = f: updateFeatures f (rec {
+ dbus_0_5_2_features = f: updateFeatures f ({
dbus_0_5_2.default = (f.dbus_0_5_2.default or true);
libc_0_2_21.default = true;
metadeps_1_1_1.default = true;
@@ -418,7 +418,7 @@ rec {
deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ {
dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]);
};
- deflate_0_7_5_features = f: updateFeatures f (rec {
+ deflate_0_7_5_features = f: updateFeatures f ({
adler32_1_0_0.default = true;
byteorder_1_0_0.default = true;
deflate_0_7_5.default = (f.deflate_0_7_5.default or true);
@@ -426,14 +426,14 @@ rec {
deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ {
dependencies = mapFeatures features ([ rand_0_3_15 ]);
};
- deque_0_3_1_features = f: updateFeatures f (rec {
+ deque_0_3_1_features = f: updateFeatures f ({
deque_0_3_1.default = (f.deque_0_3_1.default or true);
rand_0_3_15.default = true;
}) [ rand_0_3_15_features ];
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- enum_primitive_0_1_1_features = f: updateFeatures f (rec {
+ enum_primitive_0_1_1_features = f: updateFeatures f ({
enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
}) [ num_traits_0_1_37_features ];
@@ -470,7 +470,7 @@ rec {
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
- glob_0_2_11_features = f: updateFeatures f (rec {
+ glob_0_2_11_features = f: updateFeatures f ({
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ {
@@ -557,7 +557,7 @@ rec {
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
};
- inflate_0_1_1_features = f: updateFeatures f (rec {
+ inflate_0_1_1_features = f: updateFeatures f ({
inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
}) [];
jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ {
@@ -578,7 +578,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -606,7 +606,7 @@ rec {
metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ {
dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]);
};
- metadeps_1_1_1_features = f: updateFeatures f (rec {
+ metadeps_1_1_1_features = f: updateFeatures f ({
error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false);
metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true);
pkg_config_0_3_9.default = true;
@@ -615,14 +615,14 @@ rec {
num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- num_integer_0_1_33_features = f: updateFeatures f (rec {
+ num_integer_0_1_33_features = f: updateFeatures f ({
num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true);
num_traits_0_1_37.default = true;
}) [ num_traits_0_1_37_features ];
num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ {
dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]);
};
- num_iter_0_1_33_features = f: updateFeatures f (rec {
+ num_iter_0_1_33_features = f: updateFeatures f ({
num_integer_0_1_33.default = true;
num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true);
num_traits_0_1_37.default = true;
@@ -649,18 +649,18 @@ rec {
num_traits_0_1_37.default = true;
}) [ num_integer_0_1_33_features num_traits_0_1_37_features ];
num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
- num_traits_0_1_37_features = f: updateFeatures f (rec {
+ num_traits_0_1_37_features = f: updateFeatures f ({
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
}) [];
num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
};
- num_cpus_1_3_0_features = f: updateFeatures f (rec {
+ num_cpus_1_3_0_features = f: updateFeatures f ({
libc_0_2_21.default = true;
num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true);
}) [ libc_0_2_21_features ];
pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
- pkg_config_0_3_9_features = f: updateFeatures f (rec {
+ pkg_config_0_3_9_features = f: updateFeatures f ({
pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
}) [];
png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ {
@@ -686,7 +686,7 @@ rec {
rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
};
- rand_0_3_15_features = f: updateFeatures f (rec {
+ rand_0_3_15_features = f: updateFeatures f ({
libc_0_2_21.default = true;
rand_0_3_15.default = (f.rand_0_3_15.default or true);
}) [ libc_0_2_21_features ];
@@ -694,7 +694,7 @@ rec {
dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]);
features = mkFeatures (features.rayon_0_6_0 or {});
};
- rayon_0_6_0_features = f: updateFeatures f (rec {
+ rayon_0_6_0_features = f: updateFeatures f ({
deque_0_3_1.default = true;
libc_0_2_21.default = true;
num_cpus_1_3_0.default = true;
@@ -704,11 +704,11 @@ rec {
scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ {
features = mkFeatures (features.scoped_threadpool_0_1_7 or {});
};
- scoped_threadpool_0_1_7_features = f: updateFeatures f (rec {
+ scoped_threadpool_0_1_7_features = f: updateFeatures f ({
scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true);
}) [];
strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
+ strsim_0_6_0_features = f: updateFeatures f ({
strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
}) [];
term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ {
@@ -750,13 +750,13 @@ rec {
unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ {
features = mkFeatures (features.unicode_segmentation_1_1_0 or {});
};
- unicode_segmentation_1_1_0_features = f: updateFeatures f (rec {
+ unicode_segmentation_1_1_0_features = f: updateFeatures f ({
unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true);
}) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ {
@@ -777,18 +777,18 @@ rec {
wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ {
dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]);
};
- wc_grab_0_3_0_features = f: updateFeatures f (rec {
+ wc_grab_0_3_0_features = f: updateFeatures f ({
clap_2_22_0.default = true;
dbus_0_5_2.default = true;
image_0_12_3.default = true;
wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true);
}) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
index 1b9e3df3508e36a115565903cc0a4df03aa30aa9..6ffc5779a0b6455976ac7368edba301c784754a6 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
@@ -557,21 +557,21 @@ rec {
inherit dependencies buildDependencies features;
};
ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
- ansi_term_0_9_0_features = f: updateFeatures f (rec {
+ ansi_term_0_9_0_features = f: updateFeatures f ({
ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
}) [];
atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- atty_0_2_2_features = f: updateFeatures f (rec {
+ atty_0_2_2_features = f: updateFeatures f ({
atty_0_2_2.default = (f.atty_0_2_2.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
winapi_0_2_8.default = true;
}) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
+ bitflags_0_7_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ {
@@ -674,20 +674,20 @@ rec {
dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]);
features = mkFeatures (features.coco_0_1_1 or {});
};
- coco_0_1_1_features = f: updateFeatures f (rec {
+ coco_0_1_1_features = f: updateFeatures f ({
coco_0_1_1.default = (f.coco_0_1_1.default or true);
either_1_2_0.default = true;
scopeguard_0_3_2.default = true;
}) [ either_1_2_0_features scopeguard_0_3_2_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
- color_quant_1_0_0_features = f: updateFeatures f (rec {
+ color_quant_1_0_0_features = f: updateFeatures f ({
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ {
dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]);
features = mkFeatures (features.dbus_0_5_4 or {});
};
- dbus_0_5_4_features = f: updateFeatures f (rec {
+ dbus_0_5_4_features = f: updateFeatures f ({
dbus_0_5_4.default = (f.dbus_0_5_4.default or true);
libc_0_2_23.default = true;
libdbus_sys_0_1_1.default = true;
@@ -696,12 +696,12 @@ rec {
dependencies = mapFeatures features ([ libloading_0_3_4 ]);
features = mkFeatures (features.dlib_0_3_1 or {});
};
- dlib_0_3_1_features = f: updateFeatures f (rec {
+ dlib_0_3_1_features = f: updateFeatures f ({
dlib_0_3_1.default = (f.dlib_0_3_1.default or true);
libloading_0_3_4.default = true;
}) [ libloading_0_3_4_features ];
dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {};
- dtoa_0_4_1_features = f: updateFeatures f (rec {
+ dtoa_0_4_1_features = f: updateFeatures f ({
dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true);
}) [];
either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ {
@@ -717,7 +717,7 @@ rec {
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- enum_primitive_0_1_1_features = f: updateFeatures f (rec {
+ enum_primitive_0_1_1_features = f: updateFeatures f ({
enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
}) [ num_traits_0_1_37_features ];
@@ -765,7 +765,7 @@ rec {
fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ {
dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]);
};
- fs2_0_2_5_features = f: updateFeatures f (rec {
+ fs2_0_2_5_features = f: updateFeatures f ({
fs2_0_2_5.default = (f.fs2_0_2_5.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
@@ -814,7 +814,7 @@ rec {
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
- glob_0_2_11_features = f: updateFeatures f (rec {
+ glob_0_2_11_features = f: updateFeatures f ({
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ {
@@ -901,11 +901,11 @@ rec {
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
};
- inflate_0_1_1_features = f: updateFeatures f (rec {
+ inflate_0_1_1_features = f: updateFeatures f ({
inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
}) [];
itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {};
- itoa_0_3_1_features = f: updateFeatures f (rec {
+ itoa_0_3_1_features = f: updateFeatures f ({
itoa_0_3_1.default = (f.itoa_0_3_1.default or true);
}) [];
jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ {
@@ -926,7 +926,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -958,7 +958,7 @@ rec {
}) [];
libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ {
buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);};
- libdbus_sys_0_1_1_features = f: updateFeatures f (rec {
+ libdbus_sys_0_1_1_features = f: updateFeatures f ({
libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true);
metadeps_1_1_2.default = true;
}) [ metadeps_1_1_2_features ];
@@ -967,7 +967,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]);
};
- libloading_0_3_4_features = f: updateFeatures f (rec {
+ libloading_0_3_4_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
lazy_static_0_2_8.default = true;
libloading_0_3_4.default = (f.libloading_0_3_4.default or true);
@@ -987,7 +987,7 @@ rec {
memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ {
dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]);
};
- memmap_0_4_0_features = f: updateFeatures f (rec {
+ memmap_0_4_0_features = f: updateFeatures f ({
fs2_0_2_5.default = true;
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
@@ -997,7 +997,7 @@ rec {
metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ {
dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]);
};
- metadeps_1_1_2_features = f: updateFeatures f (rec {
+ metadeps_1_1_2_features = f: updateFeatures f ({
error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false);
metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true);
pkg_config_0_3_9.default = true;
@@ -1007,7 +1007,7 @@ rec {
dependencies = mapFeatures features ([ libc_0_2_23 ]);
buildDependencies = mapFeatures features ([ cc_1_0_0 ]);
};
- miniz_sys_0_1_10_features = f: updateFeatures f (rec {
+ miniz_sys_0_1_10_features = f: updateFeatures f ({
cc_1_0_0.default = true;
libc_0_2_23.default = true;
miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
@@ -1036,14 +1036,14 @@ rec {
num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- num_integer_0_1_35_features = f: updateFeatures f (rec {
+ num_integer_0_1_35_features = f: updateFeatures f ({
num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
num_traits_0_1_37.default = true;
}) [ num_traits_0_1_37_features ];
num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]);
};
- num_iter_0_1_34_features = f: updateFeatures f (rec {
+ num_iter_0_1_34_features = f: updateFeatures f ({
num_integer_0_1_35.default = true;
num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
num_traits_0_1_37.default = true;
@@ -1074,13 +1074,13 @@ rec {
rustc_serialize_0_3_24.default = true;
}) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ];
num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
- num_traits_0_1_37_features = f: updateFeatures f (rec {
+ num_traits_0_1_37_features = f: updateFeatures f ({
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
}) [];
num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ {
dependencies = mapFeatures features ([ libc_0_2_23 ]);
};
- num_cpus_1_6_2_features = f: updateFeatures f (rec {
+ num_cpus_1_6_2_features = f: updateFeatures f ({
libc_0_2_23.default = true;
num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true);
}) [ libc_0_2_23_features ];
@@ -1103,7 +1103,7 @@ rec {
phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ {
dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]);
};
- phf_codegen_0_7_21_features = f: updateFeatures f (rec {
+ phf_codegen_0_7_21_features = f: updateFeatures f ({
phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true);
phf_generator_0_7_21.default = true;
phf_shared_0_7_21.default = true;
@@ -1111,7 +1111,7 @@ rec {
phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ {
dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]);
};
- phf_generator_0_7_21_features = f: updateFeatures f (rec {
+ phf_generator_0_7_21_features = f: updateFeatures f ({
phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true);
phf_shared_0_7_21.default = true;
rand_0_3_15.default = true;
@@ -1120,12 +1120,12 @@ rec {
dependencies = mapFeatures features ([ siphasher_0_2_2 ]);
features = mkFeatures (features.phf_shared_0_7_21 or {});
};
- phf_shared_0_7_21_features = f: updateFeatures f (rec {
+ phf_shared_0_7_21_features = f: updateFeatures f ({
phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true);
siphasher_0_2_2.default = true;
}) [ siphasher_0_2_2_features ];
pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
- pkg_config_0_3_9_features = f: updateFeatures f (rec {
+ pkg_config_0_3_9_features = f: updateFeatures f ({
pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
}) [];
png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ {
@@ -1151,21 +1151,21 @@ rec {
rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
dependencies = mapFeatures features ([ libc_0_2_23 ]);
};
- rand_0_3_15_features = f: updateFeatures f (rec {
+ rand_0_3_15_features = f: updateFeatures f ({
libc_0_2_23.default = true;
rand_0_3_15.default = (f.rand_0_3_15.default or true);
}) [ libc_0_2_23_features ];
rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ {
dependencies = mapFeatures features ([ rayon_core_1_2_1 ]);
};
- rayon_0_8_2_features = f: updateFeatures f (rec {
+ rayon_0_8_2_features = f: updateFeatures f ({
rayon_0_8_2.default = (f.rayon_0_8_2.default or true);
rayon_core_1_2_1.default = true;
}) [ rayon_core_1_2_1_features ];
rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ {
dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]);
};
- rayon_core_1_2_1_features = f: updateFeatures f (rec {
+ rayon_core_1_2_1_features = f: updateFeatures f ({
coco_0_1_1.default = true;
futures_0_1_16.default = true;
lazy_static_0_2_8.default = true;
@@ -1175,20 +1175,20 @@ rec {
rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true);
}) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ];
rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {};
- rustc_serialize_0_3_24_features = f: updateFeatures f (rec {
+ rustc_serialize_0_3_24_features = f: updateFeatures f ({
rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true);
}) [];
rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ {
dependencies = mapFeatures features ([ semver_0_1_20 ]);
};
- rustc_version_0_1_7_features = f: updateFeatures f (rec {
+ rustc_version_0_1_7_features = f: updateFeatures f ({
rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true);
semver_0_1_20.default = true;
}) [ semver_0_1_20_features ];
scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ {
features = mkFeatures (features.scoped_threadpool_0_1_8 or {});
};
- scoped_threadpool_0_1_8_features = f: updateFeatures f (rec {
+ scoped_threadpool_0_1_8_features = f: updateFeatures f ({
scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true);
}) [];
scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ {
@@ -1202,7 +1202,7 @@ rec {
(scopeguard_0_3_2.default or false);
}) [];
semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {};
- semver_0_1_20_features = f: updateFeatures f (rec {
+ semver_0_1_20_features = f: updateFeatures f ({
semver_0_1_20.default = (f.semver_0_1_20.default or true);
}) [];
serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ {
@@ -1252,11 +1252,11 @@ rec {
siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
dependencies = mapFeatures features ([]);
};
- siphasher_0_2_2_features = f: updateFeatures f (rec {
+ siphasher_0_2_2_features = f: updateFeatures f ({
siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
}) [];
strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
+ strsim_0_6_0_features = f: updateFeatures f ({
strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
}) [];
target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ {
@@ -1281,7 +1281,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]);
};
- tempfile_2_1_5_features = f: updateFeatures f (rec {
+ tempfile_2_1_5_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
rand_0_3_15.default = true;
@@ -1328,13 +1328,13 @@ rec {
unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ {
features = mkFeatures (features.unicode_segmentation_1_2_0 or {});
};
- unicode_segmentation_1_2_0_features = f: updateFeatures f (rec {
+ unicode_segmentation_1_2_0_features = f: updateFeatures f ({
unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.default or true);
}) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
@@ -1355,7 +1355,7 @@ rec {
way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ {
dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]);
};
- way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec {
+ way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({
way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true);
wayland_client_0_9_6.cursor = true;
wayland_client_0_9_6.default = true;
@@ -1400,7 +1400,7 @@ rec {
wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]);
};
- wayland_kbd_0_9_0_features = f: updateFeatures f (rec {
+ wayland_kbd_0_9_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = true;
dlib_0_3_1.default = true;
lazy_static_0_2_8.default = true;
@@ -1411,7 +1411,7 @@ rec {
wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ {
dependencies = mapFeatures features ([ xml_rs_0_3_6 ]);
};
- wayland_scanner_0_9_6_features = f: updateFeatures f (rec {
+ wayland_scanner_0_9_6_features = f: updateFeatures f ({
wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true);
xml_rs_0_3_6.default = true;
}) [ xml_rs_0_3_6_features ];
@@ -1441,7 +1441,7 @@ rec {
dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]);
buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]);
};
- wc_lock_0_2_1_features = f: updateFeatures f (rec {
+ wc_lock_0_2_1_features = f: updateFeatures f ({
byteorder_0_5_3.default = true;
clap_2_24_2.default = true;
dbus_0_5_4.default = true;
@@ -1462,17 +1462,17 @@ rec {
wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true);
}) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
};
- xml_rs_0_3_6_features = f: updateFeatures f (rec {
+ xml_rs_0_3_6_features = f: updateFeatures f ({
bitflags_0_7_0.default = true;
xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true);
}) [ bitflags_0_7_0_features ];
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 99416fcf778a117223bf1c37833d05f13298a87e..34ad2bcc732f2fb42907a7396f525eef3d00599a 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
-, colord, lcms2
+, colord, lcms2, pipewire ? null
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default
@@ -10,11 +10,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "weston";
- version = "6.0.1";
+ version = "7.0.0";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
- sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
+ sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols
- colord lcms2
+ colord lcms2 pipewire
];
mesonFlags= [
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"-Dbackend-rdp=${boolToString (freerdp != null)}"
"-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
"-Dremoting=false" # TODO
+ "-Dpipewire=${boolToString (pipewire != null)}"
"-Dimage-webp=${boolToString (libwebp != null)}"
"-Dsimple-dmabuf-drm=" # Disables all drivers
"-Ddemo-clients=false"
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix
index ad611f8dabe184f7268c673e258e57d5ce4ef84a..2013096d6fea94b50c1d6c5e91d1434de727cf6a 100644
--- a/pkgs/applications/window-managers/wmfs/default.nix
+++ b/pkgs/applications/window-managers/wmfs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, gnumake,
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "wmfs";
version = "201902";
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 60d3e61fdf969c9df5b5bcbb822387db470c4b11..36ca00b776bbe58d57e9b6c9720d613db1b03143 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
name = "wtftw-0.0pre20170921";
src = fetchFromGitHub {
owner = "kintaro";
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e1ec09bc95a16db1aee69d71b47c4bf70168e980..e02e77de45e47bb61aad987c4678f165f98b7929 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -180,10 +180,10 @@ stdenv.mkDerivation {
else if targetPlatform.isx86_64 then "x86-64"
else if targetPlatform.isx86_32 then "i386"
else if targetPlatform.isMips then {
- "mips" = "btsmipn32"; # n32 variant
- "mipsel" = "ltsmipn32"; # n32 variant
- "mips64" = "btsmip";
- "mips64el" = "ltsmip";
+ mips = "btsmipn32"; # n32 variant
+ mipsel = "ltsmipn32"; # n32 variant
+ mips64 = "btsmip";
+ mips64el = "ltsmip";
}.${targetPlatform.parsed.cpu.name}
else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
else if targetPlatform.isSparc then "sparc"
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index bbd2bae46df553311e55a406fa8096bd53e44663..57d2e4ad82d2d9d9f3ab0d150a365847f129b03b 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -37,8 +37,8 @@ let
repositories =
writeText "repositories" (builtins.toJSON {
- "${repoTag1}" = {
- "${tag}" = lib.last layers;
+ ${repoTag1} = {
+ ${tag} = lib.last layers;
};
});
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1ca1e45f2fbb12105dc37926a4c824adcb886d70..ec7d289996b3e6d61353d5272a633aada73ad9a9 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -1,4 +1,4 @@
-rec {
+{
# Content-addressable Nix mirrors.
hashedMirrors = [
diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index f7ea07baccbe1aa4c34beac6624d8fd5163bada7..71eb63b850d5b124af2cd84b6fcd3e891002db54 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -15,7 +15,7 @@ let
mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}";
in
-stdenv.mkDerivation ( rec {
+stdenv.mkDerivation ( {
inherit name src;
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index 068cc5a9884376234924c64964925b80ec4a5218..ab9b0a13ae77b3dbe5c8d3bd93cf92872ce06b3a 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -44,7 +44,7 @@ rec {
alloc_no_stdlib_1_3_0 = { features?(alloc_no_stdlib_1_3_0_features {}) }: alloc_no_stdlib_1_3_0_ {
features = mkFeatures (features.alloc_no_stdlib_1_3_0 or {});
};
- alloc_no_stdlib_1_3_0_features = f: updateFeatures f (rec {
+ alloc_no_stdlib_1_3_0_features = f: updateFeatures f ({
alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true);
}) [];
brotli_2_5_0 = { features?(brotli_2_5_0_features {}) }: brotli_2_5_0_ {
@@ -52,20 +52,20 @@ rec {
features = mkFeatures (features.brotli_2_5_0 or {});
};
brotli_2_5_0_features = f: updateFeatures f (rec {
- alloc_no_stdlib_1_3_0."no-stdlib" =
- (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
- (brotli_2_5_0."no-stdlib" or false) ||
- (f.brotli_2_5_0."no-stdlib" or false);
+ alloc_no_stdlib_1_3_0.no-stdlib =
+ (f.alloc_no_stdlib_1_3_0.no-stdlib or false) ||
+ (brotli_2_5_0.no-stdlib or false) ||
+ (f.brotli_2_5_0.no-stdlib or false);
alloc_no_stdlib_1_3_0.default = true;
brotli_2_5_0.default = (f.brotli_2_5_0.default or true);
- brotli_decompressor_1_3_1."disable-timer" =
- (f.brotli_decompressor_1_3_1."disable-timer" or false) ||
- (brotli_2_5_0."disable-timer" or false) ||
- (f.brotli_2_5_0."disable-timer" or false);
- brotli_decompressor_1_3_1."no-stdlib" =
- (f.brotli_decompressor_1_3_1."no-stdlib" or false) ||
- (brotli_2_5_0."no-stdlib" or false) ||
- (f.brotli_2_5_0."no-stdlib" or false);
+ brotli_decompressor_1_3_1.disable-timer =
+ (f.brotli_decompressor_1_3_1.disable-timer or false) ||
+ (brotli_2_5_0.disable-timer or false) ||
+ (f.brotli_2_5_0.disable-timer or false);
+ brotli_decompressor_1_3_1.no-stdlib =
+ (f.brotli_decompressor_1_3_1.no-stdlib or false) ||
+ (brotli_2_5_0.no-stdlib or false) ||
+ (f.brotli_2_5_0.no-stdlib or false);
brotli_decompressor_1_3_1.benchmark =
(f.brotli_decompressor_1_3_1.benchmark or false) ||
(brotli_2_5_0.benchmark or false) ||
@@ -81,10 +81,10 @@ rec {
features = mkFeatures (features.brotli_decompressor_1_3_1 or {});
};
brotli_decompressor_1_3_1_features = f: updateFeatures f (rec {
- alloc_no_stdlib_1_3_0."no-stdlib" =
- (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
- (brotli_decompressor_1_3_1."no-stdlib" or false) ||
- (f.brotli_decompressor_1_3_1."no-stdlib" or false);
+ alloc_no_stdlib_1_3_0.no-stdlib =
+ (f.alloc_no_stdlib_1_3_0.no-stdlib or false) ||
+ (brotli_decompressor_1_3_1.no-stdlib or false) ||
+ (f.brotli_decompressor_1_3_1.no-stdlib or false);
alloc_no_stdlib_1_3_0.default = true;
alloc_no_stdlib_1_3_0.unsafe =
(f.alloc_no_stdlib_1_3_0.unsafe or false) ||
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix
index 9dd2da28ad5b6c01a7b32af8f8a8ae04f990bd0e..66f98cd991210f9d431dcd25d1fbf85218d26f6e 100644
--- a/pkgs/build-support/rust/crates-io.nix
+++ b/pkgs/build-support/rust/crates-io.nix
@@ -19,7 +19,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.6.10" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.6.10" = deps: f: updateFeatures f ({
aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true);
memchr."${deps.aho_corasick."0.6.10".memchr}".default = true;
}) [
@@ -42,7 +42,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.6.8" = deps: f: updateFeatures f ({
aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true);
memchr."${deps.aho_corasick."0.6.8".memchr}".default = true;
}) [
@@ -62,7 +62,7 @@ rec {
(crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps)
]) else []);
};
- features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec {
+ features_.ansi_term."0.11.0" = deps: f: updateFeatures f ({
ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true);
winapi = fold recursiveUpdate {} [
{ "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; }
@@ -186,7 +186,7 @@ rec {
(crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps)
]) else []);
};
- features_.atty."0.2.11" = deps: f: updateFeatures f (rec {
+ features_.atty."0.2.11" = deps: f: updateFeatures f ({
atty."0.2.11".default = (f.atty."0.2.11".default or true);
libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false);
termion."${deps.atty."0.2.11".termion}".default = true;
@@ -215,7 +215,7 @@ rec {
authors = [ "Josh Stone " ];
sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3";
};
- features_.autocfg."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.autocfg."0.1.2" = deps: f: updateFeatures f ({
autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true);
}) [];
@@ -461,7 +461,7 @@ rec {
(crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps)
]);
};
- features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec {
+ features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f ({
backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true);
cc."${deps.backtrace_sys."0.1.24".cc}".default = true;
libc."${deps.backtrace_sys."0.1.24".libc}".default = true;
@@ -489,7 +489,7 @@ rec {
(crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps)
]);
};
- features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f (rec {
+ features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f ({
backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true);
cc."${deps.backtrace_sys."0.1.28".cc}".default = true;
libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false);
@@ -509,7 +509,7 @@ rec {
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
};
- features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
}) [];
@@ -582,7 +582,7 @@ rec {
(crates."url"."${deps."carnix"."0.10.0"."url"}" deps)
]);
};
- features_.carnix."0.10.0" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.10.0" = deps: f: updateFeatures f ({
carnix."0.10.0".default = (f.carnix."0.10.0".default or true);
clap."${deps.carnix."0.10.0".clap}".default = true;
dirs."${deps.carnix."0.10.0".dirs}".default = true;
@@ -645,7 +645,7 @@ rec {
(crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps)
]);
};
- features_.carnix."0.9.1" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.9.1" = deps: f: updateFeatures f ({
carnix."0.9.1".default = (f.carnix."0.9.1".default or true);
clap."${deps.carnix."0.9.1".clap}".default = true;
dirs."${deps.carnix."0.9.1".dirs}".default = true;
@@ -704,7 +704,7 @@ rec {
(crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps)
]);
};
- features_.carnix."0.9.2" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.9.2" = deps: f: updateFeatures f ({
carnix."0.9.2".default = (f.carnix."0.9.2".default or true);
clap."${deps.carnix."0.9.2".clap}".default = true;
dirs."${deps.carnix."0.9.2".dirs}".default = true;
@@ -764,7 +764,7 @@ rec {
(crates."url"."${deps."carnix"."0.9.8"."url"}" deps)
]);
};
- features_.carnix."0.9.8" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.9.8" = deps: f: updateFeatures f ({
carnix."0.9.8".default = (f.carnix."0.9.8".default or true);
clap."${deps.carnix."0.9.8".clap}".default = true;
dirs."${deps.carnix."0.9.8".dirs}".default = true;
@@ -854,7 +854,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
};
- features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({
cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
}) [];
@@ -869,7 +869,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig";
};
- features_.cfg_if."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.7" = deps: f: updateFeatures f ({
cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true);
}) [];
@@ -1001,7 +1001,7 @@ rec {
authors = [ "Cesar Eduardo Barros " ];
sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd";
};
- features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f ({
constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true);
}) [];
@@ -1024,7 +1024,7 @@ rec {
(crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps)
]) else []);
};
- features_.dirs."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.dirs."1.0.4" = deps: f: updateFeatures f ({
dirs."1.0.4".default = (f.dirs."1.0.4".default or true);
libc."${deps.dirs."1.0.4".libc}".default = true;
redox_users."${deps.dirs."1.0.4".redox_users}".default = true;
@@ -1062,7 +1062,7 @@ rec {
(crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps)
]) else []);
};
- features_.dirs."1.0.5" = deps: f: updateFeatures f (rec {
+ features_.dirs."1.0.5" = deps: f: updateFeatures f ({
dirs."1.0.5".default = (f.dirs."1.0.5".default or true);
libc."${deps.dirs."1.0.5".libc}".default = true;
redox_users."${deps.dirs."1.0.5".redox_users}".default = true;
@@ -1359,7 +1359,7 @@ rec {
]);
features = mkFeatures (features."failure_derive"."0.1.3" or {});
};
- features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.failure_derive."0.1.3" = deps: f: updateFeatures f ({
failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true);
proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true;
quote."${deps.failure_derive."0.1.3".quote}".default = true;
@@ -1392,7 +1392,7 @@ rec {
]);
features = mkFeatures (features."failure_derive"."0.1.5" or {});
};
- features_.failure_derive."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.failure_derive."0.1.5" = deps: f: updateFeatures f ({
failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true);
proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true;
quote."${deps.failure_derive."0.1.5".quote}".default = true;
@@ -1417,7 +1417,7 @@ rec {
edition = "2018";
sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9";
};
- features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f ({
fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true);
}) [];
@@ -1435,7 +1435,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -1454,7 +1454,7 @@ rec {
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
- features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
}) [];
@@ -1472,7 +1472,7 @@ rec {
(crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps)
]);
};
- features_.humantime."1.1.1" = deps: f: updateFeatures f (rec {
+ features_.humantime."1.1.1" = deps: f: updateFeatures f ({
humantime."1.1.1".default = (f.humantime."1.1.1".default or true);
quick_error."${deps.humantime."1.1.1".quick_error}".default = true;
}) [
@@ -1494,7 +1494,7 @@ rec {
(crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps)
]);
};
- features_.humantime."1.2.0" = deps: f: updateFeatures f (rec {
+ features_.humantime."1.2.0" = deps: f: updateFeatures f ({
humantime."1.2.0".default = (f.humantime."1.2.0".default or true);
quick_error."${deps.humantime."1.2.0".quick_error}".default = true;
}) [
@@ -1516,7 +1516,7 @@ rec {
(crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps)
]);
};
- features_.idna."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.idna."0.1.5" = deps: f: updateFeatures f ({
idna."0.1.5".default = (f.idna."0.1.5".default or true);
matches."${deps.idna."0.1.5".matches}".default = true;
unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true;
@@ -1730,7 +1730,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.5" or {});
};
- features_.log."0.4.5" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.5" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.5".cfg_if}".default = true;
log."0.4.5".default = (f.log."0.4.5".default or true);
}) [
@@ -1752,7 +1752,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.6" or {});
};
- features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.6" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
log."0.4.6".default = (f.log."0.4.6".default or true);
}) [
@@ -1770,7 +1770,7 @@ rec {
sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv";
libPath = "lib.rs";
};
- features_.matches."0.1.8" = deps: f: updateFeatures f (rec {
+ features_.matches."0.1.8" = deps: f: updateFeatures f ({
matches."0.1.8".default = (f.matches."0.1.8".default or true);
}) [];
@@ -2004,7 +2004,7 @@ rec {
sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
libPath = "lib.rs";
};
- features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({
percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true);
}) [];
@@ -2077,7 +2077,7 @@ rec {
authors = [ "Paul Colomiets " "Colin Kiegel " ];
sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5";
};
- features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec {
+ features_.quick_error."1.2.2" = deps: f: updateFeatures f ({
quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true);
}) [];
@@ -2362,7 +2362,7 @@ rec {
++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([
]) else []);
};
- features_.rand_os."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.rand_os."0.1.3" = deps: f: updateFeatures f ({
cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true;
fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true;
libc."${deps.rand_os."0.1.3".libc}".default = true;
@@ -2426,7 +2426,7 @@ rec {
sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
libName = "syscall";
};
- features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.40" = deps: f: updateFeatures f ({
redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true);
}) [];
@@ -2442,7 +2442,7 @@ rec {
sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip";
libName = "syscall";
};
- features_.redox_syscall."0.1.51" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.51" = deps: f: updateFeatures f ({
redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true);
}) [];
@@ -2460,7 +2460,7 @@ rec {
(crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
]);
};
- features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({
redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
}) [
@@ -2483,7 +2483,7 @@ rec {
(crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps)
]);
};
- features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec {
+ features_.redox_users."0.2.0" = deps: f: updateFeatures f ({
argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false);
failure."${deps.redox_users."0.2.0".failure}".default = true;
rand."${deps.redox_users."0.2.0".rand}".default = true;
@@ -2513,7 +2513,7 @@ rec {
(crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps)
]);
};
- features_.redox_users."0.3.0" = deps: f: updateFeatures f (rec {
+ features_.redox_users."0.3.0" = deps: f: updateFeatures f ({
argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false);
failure."${deps.redox_users."0.3.0".failure}".default = true;
rand_os."${deps.redox_users."0.3.0".rand_os}".default = true;
@@ -2626,7 +2626,7 @@ rec {
(crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps)
]);
};
- features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.6.2" = deps: f: updateFeatures f ({
regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true);
ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true;
}) [
@@ -2647,7 +2647,7 @@ rec {
(crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps)
]);
};
- features_.regex_syntax."0.6.5" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.6.5" = deps: f: updateFeatures f ({
regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true);
ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true;
}) [
@@ -2667,7 +2667,7 @@ rec {
(crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
]) else []);
};
- features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({
remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
winapi = fold recursiveUpdate {} [
{ "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
@@ -2692,7 +2692,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6";
};
- features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f (rec {
+ features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f ({
rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true);
}) [];
@@ -2706,7 +2706,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax";
};
- features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f ({
rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true);
}) [];
@@ -2724,7 +2724,7 @@ rec {
]);
features = mkFeatures (features."ryu"."0.2.6" or {});
};
- features_.ryu."0.2.6" = deps: f: updateFeatures f (rec {
+ features_.ryu."0.2.6" = deps: f: updateFeatures f ({
ryu."0.2.6".default = (f.ryu."0.2.6".default or true);
}) [];
@@ -2743,7 +2743,7 @@ rec {
]);
features = mkFeatures (features."ryu"."0.2.7" or {});
};
- features_.ryu."0.2.7" = deps: f: updateFeatures f (rec {
+ features_.ryu."0.2.7" = deps: f: updateFeatures f ({
ryu."0.2.7".default = (f.ryu."0.2.7".default or true);
}) [];
@@ -2758,7 +2758,7 @@ rec {
sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v";
features = mkFeatures (features."scoped_threadpool"."0.1.9" or {});
};
- features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f ({
scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true);
}) [];
@@ -2876,7 +2876,7 @@ rec {
]);
features = mkFeatures (features."serde_derive"."1.0.80" or {});
};
- features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec {
+ features_.serde_derive."1.0.80" = deps: f: updateFeatures f ({
proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true;
quote."${deps.serde_derive."1.0.80".quote}".default = true;
serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true);
@@ -2908,7 +2908,7 @@ rec {
]);
features = mkFeatures (features."serde_derive"."1.0.89" or {});
};
- features_.serde_derive."1.0.89" = deps: f: updateFeatures f (rec {
+ features_.serde_derive."1.0.89" = deps: f: updateFeatures f ({
proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true;
quote."${deps.serde_derive."1.0.89".quote}".default = true;
serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true);
@@ -3024,7 +3024,7 @@ rec {
authors = [ "Danny Guo " ];
sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
};
- features_.strsim."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.7.0" = deps: f: updateFeatures f ({
strsim."0.7.0".default = (f.strsim."0.7.0".default or true);
}) [];
@@ -3176,7 +3176,7 @@ rec {
]);
features = mkFeatures (features."synstructure"."0.10.0" or {});
};
- features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec {
+ features_.synstructure."0.10.0" = deps: f: updateFeatures f ({
proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true;
quote."${deps.synstructure."0.10.0".quote}".default = true;
syn = fold recursiveUpdate {} [
@@ -3211,7 +3211,7 @@ rec {
]);
features = mkFeatures (features."synstructure"."0.10.1" or {});
};
- features_.synstructure."0.10.1" = deps: f: updateFeatures f (rec {
+ features_.synstructure."0.10.1" = deps: f: updateFeatures f ({
proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true;
quote."${deps.synstructure."0.10.1".quote}".default = true;
syn = fold recursiveUpdate {} [
@@ -3242,7 +3242,7 @@ rec {
(crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps)
]);
};
- features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec {
+ features_.tempdir."0.3.7" = deps: f: updateFeatures f ({
rand."${deps.tempdir."0.3.7".rand}".default = true;
remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true;
tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true);
@@ -3264,7 +3264,7 @@ rec {
(crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps)
]) else []);
};
- features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.termcolor."1.0.4" = deps: f: updateFeatures f ({
termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true);
wincolor."${deps.termcolor."1.0.4".wincolor}".default = true;
}) [
@@ -3288,7 +3288,7 @@ rec {
(crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
]) else []);
};
- features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+ features_.termion."1.5.1" = deps: f: updateFeatures f ({
libc."${deps.termion."1.5.1".libc}".default = true;
redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
@@ -3312,7 +3312,7 @@ rec {
(crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps)
]);
};
- features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec {
+ features_.textwrap."0.10.0" = deps: f: updateFeatures f ({
textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true);
unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true;
}) [
@@ -3332,7 +3332,7 @@ rec {
(crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps)
]);
};
- features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.3.6" = deps: f: updateFeatures f ({
lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true;
thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true);
}) [
@@ -3352,7 +3352,7 @@ rec {
(crates."serde"."${deps."toml"."0.4.10"."serde"}" deps)
]);
};
- features_.toml."0.4.10" = deps: f: updateFeatures f (rec {
+ features_.toml."0.4.10" = deps: f: updateFeatures f ({
serde."${deps.toml."0.4.10".serde}".default = true;
toml."0.4.10".default = (f.toml."0.4.10".default or true);
}) [
@@ -3372,7 +3372,7 @@ rec {
(crates."serde"."${deps."toml"."0.4.8"."serde"}" deps)
]);
};
- features_.toml."0.4.8" = deps: f: updateFeatures f (rec {
+ features_.toml."0.4.8" = deps: f: updateFeatures f ({
serde."${deps.toml."0.4.8".serde}".default = true;
toml."0.4.8".default = (f.toml."0.4.8".default or true);
}) [
@@ -3420,7 +3420,7 @@ rec {
(crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps)
]);
};
- features_.toml2nix."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.toml2nix."0.1.1" = deps: f: updateFeatures f ({
toml."${deps.toml2nix."0.1.1".toml}".default = true;
toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true);
}) [
@@ -3437,7 +3437,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
};
- features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.ucd_util."0.1.1" = deps: f: updateFeatures f ({
ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true);
}) [];
@@ -3452,7 +3452,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15";
};
- features_.ucd_util."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.ucd_util."0.1.3" = deps: f: updateFeatures f ({
ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true);
}) [];
@@ -3502,7 +3502,7 @@ rec {
authors = [ "kwantam " ];
sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
};
- features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f ({
unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true);
}) [];
@@ -3520,7 +3520,7 @@ rec {
(crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps)
]);
};
- features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f (rec {
+ features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f ({
smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true;
unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true);
}) [
@@ -3538,7 +3538,7 @@ rec {
sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
features = mkFeatures (features."unicode_width"."0.1.5" or {});
};
- features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({
unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
}) [];
@@ -3553,7 +3553,7 @@ rec {
sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
features = mkFeatures (features."unicode_xid"."0.1.0" or {});
};
- features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.unicode_xid."0.1.0" = deps: f: updateFeatures f ({
unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true);
}) [];
@@ -3604,7 +3604,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp";
};
- features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f ({
utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true);
}) [];
@@ -3619,7 +3619,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281";
};
- features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f ({
utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true);
}) [];
@@ -3656,7 +3656,7 @@ rec {
authors = [ "Sergio Benitez " ];
sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd";
};
- features_.version_check."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.version_check."0.1.5" = deps: f: updateFeatures f ({
version_check."0.1.5".default = (f.version_check."0.1.5".default or true);
}) [];
@@ -3678,7 +3678,7 @@ rec {
]) else []);
features = mkFeatures (features."winapi"."0.3.6" or {});
};
- features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.3.6" = deps: f: updateFeatures f ({
winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -3698,7 +3698,7 @@ rec {
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
};
- features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -3715,7 +3715,7 @@ rec {
(crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps)
]) else []);
};
- features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_util."0.1.1" = deps: f: updateFeatures f ({
winapi = fold recursiveUpdate {} [
{ "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; }
{ "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; }
@@ -3747,7 +3747,7 @@ rec {
(crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps)
]) else []);
};
- features_.winapi_util."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.winapi_util."0.1.2" = deps: f: updateFeatures f ({
winapi = fold recursiveUpdate {} [
{ "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; }
{ "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; }
@@ -3777,7 +3777,7 @@ rec {
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
};
- features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -3795,7 +3795,7 @@ rec {
(crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps)
]);
};
- features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.wincolor."1.0.1" = deps: f: updateFeatures f ({
winapi = fold recursiveUpdate {} [
{ "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; }
{ "${deps.wincolor."1.0.1".winapi}"."wincon" = true; }
@@ -4104,7 +4104,7 @@ rec {
dependencies = mapFeatures features ([
]);
};
- features_.bytesize."1.0.0" = deps: f: updateFeatures f (rec {
+ features_.bytesize."1.0.0" = deps: f: updateFeatures f ({
bytesize."1.0.0".default = (f.bytesize."1.0.0".default or true);
}) [];
@@ -4549,7 +4549,7 @@ rec {
build = "build.rs";
features = mkFeatures (features."core_foundation_sys"."0.6.2" or {});
};
- features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f (rec {
+ features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f ({
core_foundation_sys."0.6.2".default = (f.core_foundation_sys."0.6.2".default or true);
}) [];
@@ -4576,7 +4576,7 @@ rec {
(crates."url"."${deps."crates_io"."0.23.0"."url"}" deps)
]);
};
- features_.crates_io."0.23.0" = deps: f: updateFeatures f (rec {
+ features_.crates_io."0.23.0" = deps: f: updateFeatures f ({
crates_io."0.23.0".default = (f.crates_io."0.23.0".default or true);
curl."${deps.crates_io."0.23.0".curl}".default = true;
failure."${deps.crates_io."0.23.0".failure}".default = true;
@@ -4670,7 +4670,7 @@ rec {
(crates."smallvec"."${deps."crossbeam_channel"."0.3.8"."smallvec"}" deps)
]);
};
- features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f (rec {
+ features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f ({
crossbeam_channel."0.3.8".default = (f.crossbeam_channel."0.3.8".default or true);
crossbeam_utils."${deps.crossbeam_channel."0.3.8".crossbeam_utils}".default = true;
smallvec."${deps.crossbeam_channel."0.3.8".smallvec}".default = true;
@@ -4737,7 +4737,7 @@ rec {
(crates."winapi"."${deps."crypto_hash"."0.3.3"."winapi"}" deps)
]) else []);
};
- features_.crypto_hash."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.crypto_hash."0.3.3" = deps: f: updateFeatures f ({
commoncrypto."${deps.crypto_hash."0.3.3".commoncrypto}".default = true;
crypto_hash."0.3.3".default = (f.crypto_hash."0.3.3".default or true);
hex."${deps.crypto_hash."0.3.3".hex}".default = true;
@@ -4929,7 +4929,7 @@ rec {
(crates."strsim"."${deps."docopt"."1.1.0"."strsim"}" deps)
]);
};
- features_.docopt."1.1.0" = deps: f: updateFeatures f (rec {
+ features_.docopt."1.1.0" = deps: f: updateFeatures f ({
docopt."1.1.0".default = (f.docopt."1.1.0".default or true);
lazy_static."${deps.docopt."1.1.0".lazy_static}".default = true;
regex."${deps.docopt."1.1.0".regex}".default = true;
@@ -4989,7 +4989,7 @@ rec {
(crates."libc"."${deps."filetime"."0.2.4"."libc"}" deps)
]) else []);
};
- features_.filetime."0.2.4" = deps: f: updateFeatures f (rec {
+ features_.filetime."0.2.4" = deps: f: updateFeatures f ({
cfg_if."${deps.filetime."0.2.4".cfg_if}".default = true;
filetime."0.2.4".default = (f.filetime."0.2.4".default or true);
libc."${deps.filetime."0.2.4".libc}".default = true;
@@ -5078,7 +5078,7 @@ rec {
sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip";
libPath = "lib.rs";
};
- features_.fnv."1.0.6" = deps: f: updateFeatures f (rec {
+ features_.fnv."1.0.6" = deps: f: updateFeatures f ({
fnv."1.0.6".default = (f.fnv."1.0.6".default or true);
}) [];
@@ -5096,7 +5096,7 @@ rec {
(crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps)
]);
};
- features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({
foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true);
foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true;
}) [
@@ -5114,7 +5114,7 @@ rec {
authors = [ "Steven Fackler " ];
sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
};
- features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({
foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true);
}) [];
@@ -5135,7 +5135,7 @@ rec {
(crates."winapi"."${deps."fs2"."0.4.3"."winapi"}" deps)
]) else []);
};
- features_.fs2."0.4.3" = deps: f: updateFeatures f (rec {
+ features_.fs2."0.4.3" = deps: f: updateFeatures f ({
fs2."0.4.3".default = (f.fs2."0.4.3".default or true);
libc."${deps.fs2."0.4.3".libc}".default = true;
winapi = fold recursiveUpdate {} [
@@ -5167,7 +5167,7 @@ rec {
(crates."termcolor"."${deps."fwdansi"."1.0.1"."termcolor"}" deps)
]);
};
- features_.fwdansi."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.fwdansi."1.0.1" = deps: f: updateFeatures f ({
fwdansi."1.0.1".default = (f.fwdansi."1.0.1".default or true);
memchr."${deps.fwdansi."1.0.1".memchr}".default = true;
termcolor."${deps.fwdansi."1.0.1".termcolor}".default = true;
@@ -5279,7 +5279,7 @@ rec {
(crates."url"."${deps."git2_curl"."0.9.0"."url"}" deps)
]);
};
- features_.git2_curl."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.git2_curl."0.9.0" = deps: f: updateFeatures f ({
curl."${deps.git2_curl."0.9.0".curl}".default = true;
git2."${deps.git2_curl."0.9.0".git2}".default = (f.git2."${deps.git2_curl."0.9.0".git2}".default or false);
git2_curl."0.9.0".default = (f.git2_curl."0.9.0".default or true);
@@ -5303,7 +5303,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
};
- features_.glob."0.2.11" = deps: f: updateFeatures f (rec {
+ features_.glob."0.2.11" = deps: f: updateFeatures f ({
glob."0.2.11".default = (f.glob."0.2.11".default or true);
}) [];
@@ -5326,7 +5326,7 @@ rec {
]);
features = mkFeatures (features."globset"."0.4.3" or {});
};
- features_.globset."0.4.3" = deps: f: updateFeatures f (rec {
+ features_.globset."0.4.3" = deps: f: updateFeatures f ({
aho_corasick."${deps.globset."0.4.3".aho_corasick}".default = true;
bstr = fold recursiveUpdate {} [
{ "${deps.globset."0.4.3".bstr}"."std" = true; }
@@ -5360,7 +5360,7 @@ rec {
]);
features = mkFeatures (features."hashbrown"."0.1.8" or {});
};
- features_.hashbrown."0.1.8" = deps: f: updateFeatures f (rec {
+ features_.hashbrown."0.1.8" = deps: f: updateFeatures f ({
byteorder."${deps.hashbrown."0.1.8".byteorder}".default = (f.byteorder."${deps.hashbrown."0.1.8".byteorder}".default or false);
hashbrown."0.1.8".default = (f.hashbrown."0.1.8".default or true);
scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default = (f.scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default or false);
@@ -5381,7 +5381,7 @@ rec {
sha256 = "0hs0xfb4x67y4ss9mmbjmibkwakbn3xf23i21m409bw2zqk9b6kz";
features = mkFeatures (features."hex"."0.3.2" or {});
};
- features_.hex."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.hex."0.3.2" = deps: f: updateFeatures f ({
hex."0.3.2".default = (f.hex."0.3.2".default or true);
}) [];
@@ -5400,7 +5400,7 @@ rec {
(crates."winapi"."${deps."home"."0.3.4"."winapi"}" deps)
]) else []);
};
- features_.home."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.home."0.3.4" = deps: f: updateFeatures f ({
home."0.3.4".default = (f.home."0.3.4".default or true);
scopeguard."${deps.home."0.3.4".scopeguard}".default = true;
winapi = fold recursiveUpdate {} [
@@ -5434,7 +5434,7 @@ rec {
(crates."itoa"."${deps."http"."0.1.17"."itoa"}" deps)
]);
};
- features_.http."0.1.17" = deps: f: updateFeatures f (rec {
+ features_.http."0.1.17" = deps: f: updateFeatures f ({
bytes."${deps.http."0.1.17".bytes}".default = true;
fnv."${deps.http."0.1.17".fnv}".default = true;
http."0.1.17".default = (f.http."0.1.17".default or true);
@@ -5524,7 +5524,7 @@ rec {
(crates."rustc_version"."${deps."im_rc"."12.3.4"."rustc_version"}" deps)
]);
};
- features_.im_rc."12.3.4" = deps: f: updateFeatures f (rec {
+ features_.im_rc."12.3.4" = deps: f: updateFeatures f ({
im_rc."12.3.4".default = (f.im_rc."12.3.4".default or true);
rustc_version."${deps.im_rc."12.3.4".rustc_version}".default = true;
sized_chunks."${deps.im_rc."12.3.4".sized_chunks}".default = true;
@@ -5552,7 +5552,7 @@ rec {
(crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps)
]) else []);
};
- features_.iovec."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.iovec."0.1.2" = deps: f: updateFeatures f ({
iovec."0.1.2".default = (f.iovec."0.1.2".default or true);
libc."${deps.iovec."0.1.2".libc}".default = true;
winapi."${deps.iovec."0.1.2".winapi}".default = true;
@@ -5609,7 +5609,7 @@ rec {
(crates."rand"."${deps."jobserver"."0.1.13"."rand"}" deps)
]) else []);
};
- features_.jobserver."0.1.13" = deps: f: updateFeatures f (rec {
+ features_.jobserver."0.1.13" = deps: f: updateFeatures f ({
jobserver."0.1.13".default = (f.jobserver."0.1.13".default or true);
libc."${deps.jobserver."0.1.13".libc}".default = true;
log."${deps.jobserver."0.1.13".log}".default = true;
@@ -5640,7 +5640,7 @@ rec {
(crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
]);
};
- features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -5790,7 +5790,7 @@ rec {
(crates."cc"."${deps."libnghttp2_sys"."0.1.1"."cc"}" deps)
]);
};
- features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f ({
cc."${deps.libnghttp2_sys."0.1.1".cc}".default = true;
libc."${deps.libnghttp2_sys."0.1.1".libc}".default = true;
libnghttp2_sys."0.1.1".default = (f.libnghttp2_sys."0.1.1".default or true);
@@ -5827,7 +5827,7 @@ rec {
(crates."pkg_config"."${deps."libssh2_sys"."0.2.11"."pkg_config"}" deps)
]);
};
- features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f (rec {
+ features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f ({
cc."${deps.libssh2_sys."0.2.11".cc}".default = true;
libc."${deps.libssh2_sys."0.2.11".libc}".default = true;
libssh2_sys."0.2.11".default = (f.libssh2_sys."0.2.11".default or true);
@@ -5865,7 +5865,7 @@ rec {
]);
features = mkFeatures (features."libz_sys"."1.0.25" or {});
};
- features_.libz_sys."1.0.25" = deps: f: updateFeatures f (rec {
+ features_.libz_sys."1.0.25" = deps: f: updateFeatures f ({
cc."${deps.libz_sys."1.0.25".cc}".default = true;
libc."${deps.libz_sys."1.0.25".libc}".default = true;
libz_sys."1.0.25".default = (f.libz_sys."1.0.25".default or true);
@@ -5891,7 +5891,7 @@ rec {
]);
features = mkFeatures (features."lock_api"."0.1.5" or {});
};
- features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.lock_api."0.1.5" = deps: f: updateFeatures f ({
lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true);
scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false);
}) [
@@ -5913,7 +5913,7 @@ rec {
(crates."rawpointer"."${deps."matrixmultiply"."0.1.15"."rawpointer"}" deps)
]);
};
- features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f (rec {
+ features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f ({
matrixmultiply."0.1.15".default = (f.matrixmultiply."0.1.15".default or true);
rawpointer."${deps.matrixmultiply."0.1.15".rawpointer}".default = true;
}) [
@@ -5941,7 +5941,7 @@ rec {
(crates."cc"."${deps."miniz_sys"."0.1.11"."cc"}" deps)
]);
};
- features_.miniz_sys."0.1.11" = deps: f: updateFeatures f (rec {
+ features_.miniz_sys."0.1.11" = deps: f: updateFeatures f ({
cc."${deps.miniz_sys."0.1.11".cc}".default = true;
libc."${deps.miniz_sys."0.1.11".libc}".default = true;
miniz_sys."0.1.11".default = (f.miniz_sys."0.1.11".default or true);
@@ -5964,7 +5964,7 @@ rec {
(crates."adler32"."${deps."miniz_oxide"."0.2.1"."adler32"}" deps)
]);
};
- features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f ({
adler32."${deps.miniz_oxide."0.2.1".adler32}".default = true;
miniz_oxide."0.2.1".default = (f.miniz_oxide."0.2.1".default or true);
}) [
@@ -6039,7 +6039,7 @@ rec {
(crates."winapi"."${deps."miow"."0.3.3"."winapi"}" deps)
]);
};
- features_.miow."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.miow."0.3.3" = deps: f: updateFeatures f ({
miow."0.3.3".default = (f.miow."0.3.3".default or true);
socket2."${deps.miow."0.3.3".socket2}".default = true;
winapi = fold recursiveUpdate {} [
@@ -6200,7 +6200,7 @@ rec {
(crates."libc"."${deps."num_cpus"."1.10.0"."libc"}" deps)
]);
};
- features_.num_cpus."1.10.0" = deps: f: updateFeatures f (rec {
+ features_.num_cpus."1.10.0" = deps: f: updateFeatures f ({
libc."${deps.num_cpus."1.10.0".libc}".default = true;
num_cpus."1.10.0".default = (f.num_cpus."1.10.0".default or true);
}) [
@@ -6253,7 +6253,7 @@ rec {
(crates."winapi"."${deps."opener"."0.3.2"."winapi"}" deps)
]) else []);
};
- features_.opener."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.opener."0.3.2" = deps: f: updateFeatures f ({
failure."${deps.opener."0.3.2".failure}".default = true;
failure_derive."${deps.opener."0.3.2".failure_derive}".default = true;
opener."0.3.2".default = (f.opener."0.3.2".default or true);
@@ -6321,7 +6321,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a";
};
- features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({
openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true);
}) [];
@@ -6339,7 +6339,7 @@ rec {
(crates."cc"."${deps."openssl_src"."111.2.1+1.1.1b"."cc"}" deps)
]);
};
- features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f (rec {
+ features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f ({
cc."${deps.openssl_src."111.2.1+1.1.1b".cc}".default = true;
openssl_src."111.2.1+1.1.1b".default = (f.openssl_src."111.2.1+1.1.1b".default or true);
}) [
@@ -6518,7 +6518,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
};
- features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
+ features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({
pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
}) [];
@@ -6705,7 +6705,7 @@ rec {
(crates."autocfg"."${deps."rand_chacha"."0.1.1"."autocfg"}" deps)
]);
};
- features_.rand_chacha."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.rand_chacha."0.1.1" = deps: f: updateFeatures f ({
autocfg."${deps.rand_chacha."0.1.1".autocfg}".default = true;
rand_chacha."0.1.1".default = (f.rand_chacha."0.1.1".default or true);
rand_core."${deps.rand_chacha."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.1".rand_core}".default or false);
@@ -6728,7 +6728,7 @@ rec {
(crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps)
]);
};
- features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({
rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false);
rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true);
}) [
@@ -6896,7 +6896,7 @@ rec {
authors = [ "bluss" ];
sha256 = "0hblv2cv310ixf5f1jw4nk9w5pb95wh4dwqyjv07g2xrshbw6j04";
};
- features_.rawpointer."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rawpointer."0.1.0" = deps: f: updateFeatures f ({
rawpointer."0.1.0".default = (f.rawpointer."0.1.0".default or true);
}) [];
@@ -6912,7 +6912,7 @@ rec {
sha256 = "1ndcp7brnvii87ndcd34fk846498r07iznphkslcy0shic9cp4rr";
libName = "syscall";
};
- features_.redox_syscall."0.1.54" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.54" = deps: f: updateFeatures f ({
redox_syscall."0.1.54".default = (f.redox_syscall."0.1.54".default or true);
}) [];
@@ -6974,7 +6974,7 @@ rec {
(crates."ucd_util"."${deps."regex_syntax"."0.6.6"."ucd_util"}" deps)
]);
};
- features_.regex_syntax."0.6.6" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.6.6" = deps: f: updateFeatures f ({
regex_syntax."0.6.6".default = (f.regex_syntax."0.6.6".default or true);
ucd_util."${deps.regex_syntax."0.6.6".ucd_util}".default = true;
}) [
@@ -7020,7 +7020,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0arpdp472j4lrwxbmf4z21d8kh95rbbphnzccf605pqq2rvczv3p";
};
- features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f (rec {
+ features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f ({
rustc_workspace_hack."1.0.0".default = (f.rustc_workspace_hack."1.0.0".default or true);
}) [];
@@ -7038,7 +7038,7 @@ rec {
(crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps)
]);
};
- features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({
rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true);
semver."${deps.rustc_version."0.2.3".semver}".default = true;
}) [
@@ -7063,7 +7063,7 @@ rec {
(crates."serde_json"."${deps."rustfix"."0.4.5"."serde_json"}" deps)
]);
};
- features_.rustfix."0.4.5" = deps: f: updateFeatures f (rec {
+ features_.rustfix."0.4.5" = deps: f: updateFeatures f ({
failure."${deps.rustfix."0.4.5".failure}".default = true;
log."${deps.rustfix."0.4.5".log}".default = true;
rustfix."0.4.5".default = (f.rustfix."0.4.5".default or true);
@@ -7092,7 +7092,7 @@ rec {
(crates."winapi_util"."${deps."same_file"."1.0.4"."winapi_util"}" deps)
]) else []);
};
- features_.same_file."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.same_file."1.0.4" = deps: f: updateFeatures f ({
same_file."1.0.4".default = (f.same_file."1.0.4".default or true);
winapi_util."${deps.same_file."1.0.4".winapi_util}".default = true;
}) [
@@ -7114,7 +7114,7 @@ rec {
(crates."winapi"."${deps."schannel"."0.1.15"."winapi"}" deps)
]);
};
- features_.schannel."0.1.15" = deps: f: updateFeatures f (rec {
+ features_.schannel."0.1.15" = deps: f: updateFeatures f ({
lazy_static."${deps.schannel."0.1.15".lazy_static}".default = true;
schannel."0.1.15".default = (f.schannel."0.1.15".default or true);
winapi = fold recursiveUpdate {} [
@@ -7199,7 +7199,7 @@ rec {
authors = [ "Steve Klabnik " ];
sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
};
- features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({
semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true);
}) [];
@@ -7258,7 +7258,7 @@ rec {
]);
features = mkFeatures (features."serde_derive"."1.0.90" or {});
};
- features_.serde_derive."1.0.90" = deps: f: updateFeatures f (rec {
+ features_.serde_derive."1.0.90" = deps: f: updateFeatures f ({
proc_macro2."${deps.serde_derive."1.0.90".proc_macro2}".default = true;
quote."${deps.serde_derive."1.0.90".quote}".default = true;
serde_derive."1.0.90".default = (f.serde_derive."1.0.90".default or true);
@@ -7286,7 +7286,7 @@ rec {
(crates."serde"."${deps."serde_ignored"."0.0.4"."serde"}" deps)
]);
};
- features_.serde_ignored."0.0.4" = deps: f: updateFeatures f (rec {
+ features_.serde_ignored."0.0.4" = deps: f: updateFeatures f ({
serde."${deps.serde_ignored."0.0.4".serde}".default = true;
serde_ignored."0.0.4".default = (f.serde_ignored."0.0.4".default or true);
}) [
@@ -7304,7 +7304,7 @@ rec {
authors = [ "Steven Fackler " ];
sha256 = "02ik28la039b8anx0sx8mbdp2yx66m64mjrjyy6x0dgpbmfxmc24";
};
- features_.shell_escape."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.shell_escape."0.1.4" = deps: f: updateFeatures f ({
shell_escape."0.1.4".default = (f.shell_escape."0.1.4".default or true);
}) [];
@@ -7323,7 +7323,7 @@ rec {
(crates."typenum"."${deps."sized_chunks"."0.1.3"."typenum"}" deps)
]);
};
- features_.sized_chunks."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.sized_chunks."0.1.3" = deps: f: updateFeatures f ({
sized_chunks."0.1.3".default = (f.sized_chunks."0.1.3".default or true);
typenum."${deps.sized_chunks."0.1.3".typenum}".default = true;
}) [
@@ -7352,7 +7352,7 @@ rec {
]) else []);
features = mkFeatures (features."socket2"."0.3.8" or {});
};
- features_.socket2."0.3.8" = deps: f: updateFeatures f (rec {
+ features_.socket2."0.3.8" = deps: f: updateFeatures f ({
cfg_if."${deps.socket2."0.3.8".cfg_if}".default = true;
libc."${deps.socket2."0.3.8".libc}".default = true;
redox_syscall."${deps.socket2."0.3.8".redox_syscall}".default = true;
@@ -7383,7 +7383,7 @@ rec {
authors = [ "Danny Guo " ];
sha256 = "0d3jsdz22wgjyxdakqnvdgmwjdvkximz50d9zfk4qlalw635qcvy";
};
- features_.strsim."0.8.0" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.8.0" = deps: f: updateFeatures f ({
strsim."0.8.0".default = (f.strsim."0.8.0".default or true);
}) [];
@@ -7402,7 +7402,7 @@ rec {
(crates."ndarray"."${deps."strsim"."0.9.1"."ndarray"}" deps)
]);
};
- features_.strsim."0.9.1" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.9.1" = deps: f: updateFeatures f ({
hashbrown."${deps.strsim."0.9.1".hashbrown}".default = true;
ndarray."${deps.strsim."0.9.1".ndarray}".default = true;
strsim."0.9.1".default = (f.strsim."0.9.1".default or true);
@@ -7539,7 +7539,7 @@ rec {
(crates."winapi"."${deps."tempfile"."3.0.7"."winapi"}" deps)
]) else []);
};
- features_.tempfile."3.0.7" = deps: f: updateFeatures f (rec {
+ features_.tempfile."3.0.7" = deps: f: updateFeatures f ({
cfg_if."${deps.tempfile."3.0.7".cfg_if}".default = true;
libc."${deps.tempfile."3.0.7".libc}".default = true;
rand."${deps.tempfile."3.0.7".rand}".default = true;
@@ -7575,7 +7575,7 @@ rec {
(crates."unicode_width"."${deps."textwrap"."0.11.0"."unicode_width"}" deps)
]);
};
- features_.textwrap."0.11.0" = deps: f: updateFeatures f (rec {
+ features_.textwrap."0.11.0" = deps: f: updateFeatures f ({
textwrap."0.11.0".default = (f.textwrap."0.11.0".default or true);
unicode_width."${deps.textwrap."0.11.0".unicode_width}".default = true;
}) [
@@ -7595,7 +7595,7 @@ rec {
build = "build/main.rs";
features = mkFeatures (features."typenum"."1.10.0" or {});
};
- features_.typenum."1.10.0" = deps: f: updateFeatures f (rec {
+ features_.typenum."1.10.0" = deps: f: updateFeatures f ({
typenum."1.10.0".default = (f.typenum."1.10.0".default or true);
}) [];
@@ -7614,7 +7614,7 @@ rec {
(crates."url"."${deps."url_serde"."0.2.0"."url"}" deps)
]);
};
- features_.url_serde."0.2.0" = deps: f: updateFeatures f (rec {
+ features_.url_serde."0.2.0" = deps: f: updateFeatures f ({
serde."${deps.url_serde."0.2.0".serde}".default = true;
url."${deps.url_serde."0.2.0".url}".default = true;
url_serde."0.2.0".default = (f.url_serde."0.2.0".default or true);
@@ -7634,7 +7634,7 @@ rec {
authors = [ "Jim McGrath " ];
sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x";
};
- features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec {
+ features_.vcpkg."0.2.6" = deps: f: updateFeatures f ({
vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true);
}) [];
@@ -7656,7 +7656,7 @@ rec {
(crates."winapi_util"."${deps."walkdir"."2.2.7"."winapi_util"}" deps)
]) else []);
};
- features_.walkdir."2.2.7" = deps: f: updateFeatures f (rec {
+ features_.walkdir."2.2.7" = deps: f: updateFeatures f ({
same_file."${deps.walkdir."2.2.7".same_file}".default = true;
walkdir."2.2.7".default = (f.walkdir."2.2.7".default or true);
winapi = fold recursiveUpdate {} [
@@ -7682,7 +7682,7 @@ rec {
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
- features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.2.8" = deps: f: updateFeatures f ({
winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
}) [];
@@ -7732,7 +7732,7 @@ rec {
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
};
- features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
}) [];
@@ -7747,7 +7747,7 @@ rec {
authors = [ "Remi Rampin " ];
sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb";
};
- features_.adler32."1.0.3" = deps: f: updateFeatures f (rec {
+ features_.adler32."1.0.3" = deps: f: updateFeatures f ({
adler32."1.0.3".default = (f.adler32."1.0.3".default or true);
}) [];
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 09802d56d34c5ed9dc0cfcbd363bf0404b5e4204..ce1bf8002767e8c18d661d482746c89937ff1af5 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -44,8 +44,8 @@ let
hostConfig = stdenv.hostPlatform.config;
rustHostConfig = {
- "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu";
- }."${hostConfig}" or hostConfig;
+ x86_64-pc-mingw32 = "x86_64-pc-windows-gnu";
+ }.${hostConfig} or hostConfig;
ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix
index d93001884982f80bb4561aaeae62bb7093dfdb8c..30465c740e537f0a0556eaf2b3b78f702dee7815 100644
--- a/pkgs/build-support/templaterpm/default.nix
+++ b/pkgs/build-support/templaterpm/default.nix
@@ -1,6 +1,6 @@
{stdenv, makeWrapper, python, toposort, rpm}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nix-template-rpm";
version = "0.1";
diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/pkgs/build-support/upstream-updater/attrset-to-dir.nix
index bdf44b7a5bf30f683023dabb528deca62740bc75..24f7b735c2e203093776df6360f7243e2f1c9d1b 100644
--- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix
+++ b/pkgs/build-support/upstream-updater/attrset-to-dir.nix
@@ -1,5 +1,5 @@
a :
-a.stdenv.mkDerivation rec {
+a.stdenv.mkDerivation {
buildCommand = ''
mkdir -p "$out/attributes"
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index a59da3a8745b476015704cab54c398204ee1738f..371ab13c528196aa1d14671c0b33d8369a179506 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -741,7 +741,7 @@ rec {
# Note: no i386 release for Fedora >= 26
fedora26x86_64 =
let version = "26";
- in rec {
+ in {
name = "fedora-${version}-x86_64";
fullName = "Fedora ${version} (x86_64)";
packagesList = fetchurl rec {
@@ -756,7 +756,7 @@ rec {
fedora27x86_64 =
let version = "27";
- in rec {
+ in {
name = "fedora-${version}-x86_64";
fullName = "Fedora ${version} (x86_64)";
packagesList = fetchurl rec {
@@ -816,7 +816,7 @@ rec {
/* The set of supported Dpkg-based distributions. */
- debDistros = rec {
+ debDistros = {
# Interestingly, the SHA-256 hashes provided by Ubuntu in
# http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index d0d85fce3662d61fe76e7be5af3335fe8c6c8d4f..698503032671950f6932173a2637b341b6b93354 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -1,7 +1,7 @@
with import ../../.. {};
with vmTools;
-rec {
+{
# Run the PatchELF derivation in a VM.
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index ae7b42449fb347c9e8238cb10dfa1e785e7d8e67..8dbe0dbdbd03365c0d4e19d4e5df9bfaf9620b9e 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -10,12 +10,12 @@ rec {
# makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
- assert lib.or (types.path.check content) (types.string.check content);
+ assert lib.or (types.path.check content) (types.str.check content);
let
name = last (builtins.split "/" nameOrPath);
in
- pkgs.runCommand name (if (types.string.check content) then {
+ pkgs.runCommand name (if (types.str.check content) then {
inherit content interpreter;
passAsFile = [ "content" ];
} else {
@@ -42,11 +42,11 @@ rec {
# writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
makeBinWriter = { compileScript }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
- assert lib.or (types.path.check content) (types.string.check content);
+ assert lib.or (types.path.check content) (types.str.check content);
let
name = last (builtins.split "/" nameOrPath);
in
- pkgs.runCommand name (if (types.string.check content) then {
+ pkgs.runCommand name (if (types.str.check content) then {
inherit content;
passAsFile = [ "content" ];
} else {
diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix
index a53ead29c1e8f0187d4442314525de8983ea707b..7297d18df277e27616ee99f19114c0bc02e6996b 100644
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, python, zip, fop }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bgnet";
version = "3.0.21";
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index d90fa99dd7026362c415670cd0443eca3eb3df54..b3b2b956de8721e8686c53f31396233f79a51196 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "std-man-pages-4.4.0";
src = fetchurl {
diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix
index ee85ee5988273160b086ede5b28d9681c6c02aa9..4961a5e7449daf8304733947b956674da03fec5e 100644
--- a/pkgs/data/fonts/aileron/default.nix
+++ b/pkgs/data/fonts/aileron/default.nix
@@ -6,7 +6,7 @@ let
pname = "aileron";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix
index 53f4d94b38fea27039019b8b6a92c92aa254bb6c..0b6340d1ba9425e089ec3c3b4d34a5a67181f1d8 100644
--- a/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/pkgs/data/fonts/ankacoder/condensed.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "1.100"; in
-fetchzip rec {
+fetchzip {
name = "ankacoder-condensed-${version}";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip";
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix
index 52e2d4a42330dd1af4c417af0d2e074cc0f4e7dd..3a57d08dbc28ead2feb7869a01442736ce0bede6 100644
--- a/pkgs/data/fonts/ankacoder/default.nix
+++ b/pkgs/data/fonts/ankacoder/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "1.100"; in
-fetchzip rec {
+fetchzip {
name = "ankacoder-${version}";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip";
diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix
index 8b4228ec423507f8870d5891cae4e1ee1ad0e730..a0fcd5f7bbf53c0e09fb55545fb06bb5d0aeea23 100644
--- a/pkgs/data/fonts/behdad-fonts/default.nix
+++ b/pkgs/data/fonts/behdad-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "behdad-fonts";
version = "0.0.3";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "font-store";
repo = "BehdadFont";
diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix
index 29bd001f80893c3e403777afce632a1d87b0406d..b1f9312a7e9c3bb1097a45f3b803783967967cff 100644
--- a/pkgs/data/fonts/caladea/default.nix
+++ b/pkgs/data/fonts/caladea/default.nix
@@ -2,7 +2,7 @@
let
version = "20130214";
-in fetchzip rec {
+in fetchzip {
name = "caladea-${version}";
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix
index 3c0e314579defb98ba619c61055dc7c5ff3c41b3..79913bb83980e6190ded67177af5dd4e738a84b1 100644
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/pkgs/data/fonts/carlito/default.nix
@@ -2,7 +2,7 @@
let
version = "20130920";
-in fetchzip rec {
+in fetchzip {
name = "carlito-${version}";
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
index 061bbb445fb2466b09a2f7d43bb7f57d597cd9e6..eff0c579a7073561b54d4f9f3f804e139aeb94f2 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.92";
pname = "dina-font-pcf";
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 8638ec74f77a6b52721e8bc1c7bcee7d1917bca3..0d4cd286219ed38b2cdec439c3a4a59241f7a335 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -2,7 +2,7 @@
let
version = "2.92";
-in fetchzip rec {
+in fetchzip {
name = "dina-font-${version}";
# `meta.homepage` has no direct download link
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
index 0e31231d05fccdd3585b618a733ea0e74ba33b50..351a0617ddc81cbb13b4fcbc5ccd24c457a631a8 100644
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "envypn-font-1.7.1";
src = fetchurl {
diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix
index 55250156fcd0961497de7a9e8623b4e64e4d60d6..de68b17d6ebb394836b7aa0d0f9f00da49a8e227 100644
--- a/pkgs/data/fonts/eunomia/default.nix
+++ b/pkgs/data/fonts/eunomia/default.nix
@@ -6,7 +6,7 @@ let
pname = "eunomia";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix
index 28969f02364a5db7b47d81aa67fdfac77d52568c..175648198cee0056a186d54fc06cab0f2b9c1b86 100644
--- a/pkgs/data/fonts/f5_6/default.nix
+++ b/pkgs/data/fonts/f5_6/default.nix
@@ -6,7 +6,7 @@ let
pname = "f5_6";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix
index ec3f3218ea5603c82ff4bef199b09095c6513ee0..fe40252ab23de42c22f72ad40b0bcac833f2ea83 100644
--- a/pkgs/data/fonts/ferrum/default.nix
+++ b/pkgs/data/fonts/ferrum/default.nix
@@ -6,7 +6,7 @@ let
pname = "ferrum";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index 422258f84d112b231b3781d2e8b07fb62bbb67c2..bcf02f1328e68d076db3e9508e4e1c55c78469e7 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
let
- font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec {
+ font-awesome = { version, sha256, rev ? version}: fetchFromGitHub {
name = "font-awesome-${version}";
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 707beb41231d94e537513ca3c6707639a9c2c9b0..7c1af485a989f652f806170b294a7702ed8823d3 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "google-fonts";
version = "2019-07-14";
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index ef0df1ba67f6002ebf637135452abc381bf6344c..3c49bf7f56560e378ce503830131cebd43ab56ff 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -2,7 +2,7 @@
let
version = "3.003";
-in fetchzip rec {
+in fetchzip {
name = "hack-font-${version}";
url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip";
diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
index 759d2c2db1d27b87f3dc71be9c81d41f455f0698..23f6fb29be07aa34f1c1680d311a0354ac8a7bef 100644
--- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
+++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
@@ -2,7 +2,7 @@
let
version = "2013.06.07"; # date of most recent file in distribution
-in fetchzip rec {
+in fetchzip {
name = "helvetica-neue-lt-std-${version}";
url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip";
diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix
index 362781c05bb5f36e353e24aac7a298657b831cb1..726fbab95bd81276ba8baed5f882c7190207abb1 100644
--- a/pkgs/data/fonts/hyperscrypt/default.nix
+++ b/pkgs/data/fonts/hyperscrypt/default.nix
@@ -5,7 +5,7 @@ let
pname = "HyperScrypt";
in
-fetchzip rec {
+fetchzip {
name = "${lib.toLower pname}-font-${version}";
url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip";
sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m";
diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix
index a042a31f1d02ed4f880095be6fc11063ed40b62b..1d910ed54a4b141bd90aa6b22833e97b8ab5888b 100644
--- a/pkgs/data/fonts/ia-writer-duospace/default.nix
+++ b/pkgs/data/fonts/ia-writer-duospace/default.nix
@@ -2,7 +2,7 @@
let
version = "20180721";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "ia-writer-duospace-${version}";
owner = "iaolo";
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 7e1014da2102625eaca912ab0cd9a45f1405c2b7..7401c5694624a29b7f53d8d9109d04f6e55ea462 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -2,7 +2,7 @@
let
version = "2.0.0";
-in fetchzip rec {
+in fetchzip {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
postFetch = ''
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 94c43b11285ee8d3c22a90074ab5156502b72eb6..a170a0780a489a6edbe91c65a84238fcee92cfaa 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,6 +1,6 @@
{ stdenv, google-fonts }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "inconsolata";
inherit (google-fonts) src version;
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index d079ae59b0d6f6de6c52df34757f8774c7b7d378..3bc836fa4e4867f1389adc680a7643c30aac231d 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -1,6 +1,6 @@
{ stdenv, requireFile, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "input-fonts";
version = "2017-08-10"; # date of the download and checksum
diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix
index 52c28db639ef9a7b4cc757c714e96d238b1108a9..5a8e3476bf802aa978cf6db61268d6be666619b5 100644
--- a/pkgs/data/fonts/inriafonts/default.nix
+++ b/pkgs/data/fonts/inriafonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "inriafonts";
version = "1.200";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "BlackFoundry";
repo = "InriaFonts";
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 0676d3c0e1f6492a774618c773e62b368d94b129..3e5dda85dccd91901042ee0ba12c434a3ff73df4 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -2,7 +2,7 @@
let
version = "2.2.1";
-in fetchzip rec {
+in fetchzip {
name = "iosevka-bin-${version}";
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix
index 4a7be92e7375adc315b941198eaebeff83e69353..546482cc0d26261437b1bc259e6f1d05f60b17a3 100644
--- a/pkgs/data/fonts/iosevka/package-lock.nix
+++ b/pkgs/data/fonts/iosevka/package-lock.nix
@@ -14,58 +14,58 @@ let
0;
chars = stringToCharacters (substring 0 (len - padding) str);
table = {
- "A" = [0 0 0];
- "B" = [0 0 1];
- "C" = [0 0 2];
- "D" = [0 0 3];
- "E" = [0 1 0];
- "F" = [0 1 1];
- "G" = [0 1 2];
- "H" = [0 1 3];
- "I" = [0 2 0];
- "J" = [0 2 1];
- "K" = [0 2 2];
- "L" = [0 2 3];
- "M" = [0 3 0];
- "N" = [0 3 1];
- "O" = [0 3 2];
- "P" = [0 3 3];
- "Q" = [1 0 0];
- "R" = [1 0 1];
- "S" = [1 0 2];
- "T" = [1 0 3];
- "U" = [1 1 0];
- "V" = [1 1 1];
- "W" = [1 1 2];
- "X" = [1 1 3];
- "Y" = [1 2 0];
- "Z" = [1 2 1];
- "a" = [1 2 2];
- "b" = [1 2 3];
- "c" = [1 3 0];
- "d" = [1 3 1];
- "e" = [1 3 2];
- "f" = [1 3 3];
- "g" = [2 0 0];
- "h" = [2 0 1];
- "i" = [2 0 2];
- "j" = [2 0 3];
- "k" = [2 1 0];
- "l" = [2 1 1];
- "m" = [2 1 2];
- "n" = [2 1 3];
- "o" = [2 2 0];
- "p" = [2 2 1];
- "q" = [2 2 2];
- "r" = [2 2 3];
- "s" = [2 3 0];
- "t" = [2 3 1];
- "u" = [2 3 2];
- "v" = [2 3 3];
- "w" = [3 0 0];
- "x" = [3 0 1];
- "y" = [3 0 2];
- "z" = [3 0 3];
+ A = [0 0 0];
+ B = [0 0 1];
+ C = [0 0 2];
+ D = [0 0 3];
+ E = [0 1 0];
+ F = [0 1 1];
+ G = [0 1 2];
+ H = [0 1 3];
+ I = [0 2 0];
+ J = [0 2 1];
+ K = [0 2 2];
+ L = [0 2 3];
+ M = [0 3 0];
+ N = [0 3 1];
+ O = [0 3 2];
+ P = [0 3 3];
+ Q = [1 0 0];
+ R = [1 0 1];
+ S = [1 0 2];
+ T = [1 0 3];
+ U = [1 1 0];
+ V = [1 1 1];
+ W = [1 1 2];
+ X = [1 1 3];
+ Y = [1 2 0];
+ Z = [1 2 1];
+ a = [1 2 2];
+ b = [1 2 3];
+ c = [1 3 0];
+ d = [1 3 1];
+ e = [1 3 2];
+ f = [1 3 3];
+ g = [2 0 0];
+ h = [2 0 1];
+ i = [2 0 2];
+ j = [2 0 3];
+ k = [2 1 0];
+ l = [2 1 1];
+ m = [2 1 2];
+ n = [2 1 3];
+ o = [2 2 0];
+ p = [2 2 1];
+ q = [2 2 2];
+ r = [2 2 3];
+ s = [2 3 0];
+ t = [2 3 1];
+ u = [2 3 2];
+ v = [2 3 3];
+ w = [3 0 0];
+ x = [3 0 1];
+ y = [3 0 2];
+ z = [3 0 3];
"0" = [3 1 0];
"1" = [3 1 1];
"2" = [3 1 2];
diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix
index 1501e0fb7fa278ef090cd39a6d5c0b6e8382f266..eef3883506efeb3d4ff3b85cfd20356a9a5d276a 100644
--- a/pkgs/data/fonts/ir-standard-fonts/default.nix
+++ b/pkgs/data/fonts/ir-standard-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "ir-standard-fonts";
version = "unstable-2017-01-21";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "morealaz";
repo = pname;
diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index f54838d5a646e2a5743510b8011251d6e5457476..fc6481e9a89ea7bfcb861457ee8c40b9ed4e985b 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/pkgs/data/fonts/joypixels/default.nix
@@ -1,13 +1,7 @@
{ stdenv, fetchurl }:
-let
- fontconfig = fetchurl {
- name = "75-joypixels.conf";
- url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/75-joypixels.conf?h=packages/ttf-joypixels&id=b2b38f8393ec56ed7338c256f5b85f3439a2dfc3";
- sha256 = "065y2fmf86zzvna1hrvcg46cnr7a76xd2mwa26nss861dsx6pnd6";
- };
-in stdenv.mkDerivation rec {
- pname = "emojione";
+stdenv.mkDerivation rec {
+ pname = "joypixels";
version = "5.0.2";
src = fetchurl {
@@ -19,7 +13,6 @@ in stdenv.mkDerivation rec {
installPhase = ''
install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf
- install -Dm644 ${fontconfig} $out/etc/fonts/conf.d/75-joypixels.conf
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index c1de2806ef187c44962cc887f519c071f5f0304b..f6a031c7faf03fe9102e06a70ec949cc11b7aaf8 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "kawkab-mono-20151015";
url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip";
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index 2152b960cdc2dd33747bafb46da2a3013f7300f9..eb0a47e13d9620c35cdc29d72bb4a3cc56203816 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fontforge }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "linux-libertine-5.3.0";
src = fetchurl {
diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix
index fe733359f3a834e033d5a2bcfc62f8259e72d480..7e5a69a2c1f7d4f2943ee33580b7520e06d1e9c5 100644
--- a/pkgs/data/fonts/luculent/default.nix
+++ b/pkgs/data/fonts/luculent/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "2.0.0"; in
-fetchzip rec {
+fetchzip {
name = "luculent-${version}";
url = http://www.eastfarthing.com/luculent/luculent.tar.xz;
diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix
index 024e6049a38692fa6b365a511d4bc62ec5fd72be..c94046f085f910c6ed88b83bb89d8f9bd73569f3 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/pkgs/data/fonts/medio/default.nix
@@ -6,7 +6,7 @@ let
pname = "medio";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
index c4cf4f142516a261819f5ddd3f5dc27495865505..06fb7499b81b43c57ad72fac56d3050d7dcf6a24 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python, fontforge }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "monoid";
version = "2016-07-21";
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index 03bc8a0db4dabe9278d50a58c7e21ebdf6cdb463..75e8899e664a269b126c8fffb86040e44e977e71 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -2,7 +2,7 @@
let
version = "063a";
-in fetchzip rec {
+in fetchzip {
name = "mplus-${version}";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix
index f3be8857284c0389ce4b7119ed52b0945acc78f9..444d526f5ae1b6dbddab1acbb84c746c9b4eff03 100644
--- a/pkgs/data/fonts/myrica/default.nix
+++ b/pkgs/data/fonts/myrica/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
-fetchFromGitHub rec {
+fetchFromGitHub {
name = "myrica-2.011.20160403";
owner = "tomokuni";
diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix
index b39a59d1ba7ac8b097a755f0cb1397e3bd90a2d0..d2aaadc42794d92fb1f9c97228d0db2d6bebcbda 100644
--- a/pkgs/data/fonts/nafees/default.nix
+++ b/pkgs/data/fonts/nafees/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nafees";
srcs = [(fetchurl {
diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix
index f6b8210290e784baa40bf35e8eb80660b4ac8543..7d908b62cc6d2c9252b2afe3eaf64b0c3d8dad78 100644
--- a/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix
@@ -4,7 +4,7 @@ let
version = "VER2.5";
fullName = "NanumGothicCoding-2.5";
-in fetchzip rec {
+in fetchzip {
name = "nanum-gothic-coding";
url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip";
diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix
index c6bdbd40248a41df658a49cb0e1ba88b6cfdec1a..3f58bc5f93362295adf770d02b6eec46415398a8 100644
--- a/pkgs/data/fonts/nika-fonts/default.nix
+++ b/pkgs/data/fonts/nika-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "nika-fonts";
version = "1.0.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "font-store";
repo = "NikaFont";
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix
index 0de5aa8fdf3e5c8141da3536187d38169bf814cd..ae70c74c3e49f70babeb02e14670f2f3ce3259fb 100644
--- a/pkgs/data/fonts/norwester/default.nix
+++ b/pkgs/data/fonts/norwester/default.nix
@@ -3,7 +3,7 @@
let
version = "1.2";
pname = "norwester";
-in fetchzip rec {
+in fetchzip {
name = "${pname}-${version}";
url = "http://jamiewilson.io/norwester/assets/norwester.zip";
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 0acb8e2c7bed32dd61b2525ce31e221b68b39f65..bd0d39c7f29e304f1f2a1b9081ae56d572dedbb4 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -46,7 +46,7 @@ let
};
in
-rec {
+{
noto-fonts = mkNoto {
name = "noto-fonts";
weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix
index dfe1426d697a005f5bdb40d6924090bec9e49960..0c1293ebda3f35ef408137a0fe05c200563de0da 100644
--- a/pkgs/data/fonts/open-sans/default.nix
+++ b/pkgs/data/fonts/open-sans/default.nix
@@ -3,7 +3,7 @@
let
pname = "open-sans";
version = "1.11";
-in fetchFromGitLab rec {
+in fetchFromGitLab {
name = "${pname}-${version}";
domain = "salsa.debian.org";
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix
index d02925e3a37572a27e0fb94c023875eb316d620c..d297baddc4d78ed4e2801dde9ad6a48290c49afe 100644
--- a/pkgs/data/fonts/parastoo-fonts/default.nix
+++ b/pkgs/data/fonts/parastoo-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "parastoo-fonts";
version = "1.0.0-alpha5";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix
index e6f0776daea0b8eb45c634547d366ce9dec889e5..6b619d232016f728c5addbdd3f43358f5e57c74b 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "paratype-pt-mono";
url = [
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index 1e6610e8e44d8c0f7d679aeb66e23118ad1e304b..a36928090264709025c220a7fa6d23112dde4302 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "paratype-pt-sans";
url = [
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix
index f4da6508f083cdafc0cc027289e31b3f478141c4..d74295571e002663be45562c2528283b1aa4661d 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "paratype-pt-serif";
url = [
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 144ec3bab8505039a11aed33d64ca20d23a0a5f7..1fc252421de6bcf7a5bcc1d3be1b580614e7e217 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -4,7 +4,7 @@ let
version = "5.4";
in
-fetchurl rec {
+fetchurl {
name = "pecita-${version}";
url = "http://pecita.eu/b/Pecita.otf";
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix
index 57395c507fe041bea2b8e7434abc25849b8cd0b1..784f9d2573efe8a5cdaa10a54c7e80939ae9a0fa 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/pkgs/data/fonts/penna/default.nix
@@ -6,7 +6,7 @@ let
pname = "penna";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix
index c28c9283a9bcd097b6269599438ff9c28f6409b2..89565910f7a5420306fa06d55db4b234b1335fe0 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/data/fonts/profont/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "profont";
url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
index b2207e01df1a1392db094f61b167193135d9442d..580ea61a2df55464bc7dbc19642df676f3024f80 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -2,7 +2,7 @@
# adapted from https://aur.archlinux.org/packages/proggyfonts/
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "proggyfonts-0.1";
src = fetchurl {
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index 14c66fb39b227fb8feaf371e0e8e17dab33699cc..46ebe4dd4b271910e074f262625a9a98e0043f94 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -2,7 +2,7 @@
let
version = "1.005";
-in fetchzip rec {
+in fetchzip {
name = "public-sans-${version}";
url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 61206ca5d14bbed299f6fb18feb75a1cc6acfacc..6d075424bc52c9763310b0599cdaaeff24c5fb0d 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -50,13 +50,13 @@ let
};
in {
- liberation_ttf_v1 = common rec {
+ liberation_ttf_v1 = common {
repo = "liberation-1.7-fonts";
version = "1.07.5";
nativeBuildInputs = [ fontforge ];
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
};
- liberation_ttf_v2 = common rec {
+ liberation_ttf_v2 = common {
repo = "liberation-fonts";
version = "2.00.4";
nativeBuildInputs = [ fontforge fonttools ];
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix
index c05b9c69aef5633faaf9bdc13a04bb9d1a8c4f4a..33321a2c7fe181589344dc89f2e8639ac2b58c97 100644
--- a/pkgs/data/fonts/redhat-official/default.nix
+++ b/pkgs/data/fonts/redhat-official/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "2.2.0"; in
-fetchzip rec {
+fetchzip {
name = "redhat-official-${version}";
url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip";
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index d55e3b753dd75706d0b51e2de484f6b2a3065548..cfd4e3808aa36d9d2ed346ec9dc5f33f067f4a1c 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -4,7 +4,7 @@ let
# last commit on the directory containing the fonts in the upstream repository
commit = "883939708704a19a295e0652036369d22469e8dc";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "roboto-mono";
version = "2016-01-11";
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index 548414152ddb195151bd74caf3a524cc82c1282d..f9f6ec342e9136c089a32aee778e083b0ca15cd0 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -4,7 +4,7 @@ let
# last commit on the directory containing the fonts in the upstream repository
commit = "883939708704a19a295e0652036369d22469e8dc";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "roboto-slab";
version = "2016-01-11";
diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix
index 707d31ac531a6059b5b350726472c262030d4085..50629c5f977355ecca196b01e61d5b54fdb936e7 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/pkgs/data/fonts/roboto/default.nix
@@ -2,7 +2,7 @@
let
version = "2.138";
-in fetchzip rec {
+in fetchzip {
name = "roboto-${version}";
url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix
index 1b8d4e60653ca46aec7a328715d102b5ad232af7..cbc89c550b3cc41fd233b18104cc0ab355e74cb9 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/pkgs/data/fonts/route159/default.nix
@@ -6,7 +6,7 @@ let
pname = "route159";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix
index 0b90a43ca3e29edc86e265b4647136d00f6eda8e..029ed33611f41a4da251c3fbff207a664ffa1e61 100644
--- a/pkgs/data/fonts/sahel-fonts/default.nix
+++ b/pkgs/data/fonts/sahel-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "sahel-fonts";
version = "1.0.0-alpha22";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix
index dd4a01c782eed5d02065780fcb5f7b7b926a413b..d8d3d0d3b5ae0ab745e0d9608839e42e1e2b3323 100644
--- a/pkgs/data/fonts/samim-fonts/default.nix
+++ b/pkgs/data/fonts/samim-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "samim-fonts";
version = "3.1.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index f46fda0dd3103e1c805c4fbbfaaeb619e5916660..2d9fbfdae0508df588e117b97701a8425c8caf9f 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -2,7 +2,7 @@
let
version = "0.8.0";
-in fetchurl rec {
+in fetchurl {
name = "sarasa-gothic-${version}";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix
index af3c5dd25ee0a17343eca198dd80c99330195f76..71483a04cbb7a76bacebfa064a04073ef5e1628a 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/pkgs/data/fonts/seshat/default.nix
@@ -6,7 +6,7 @@ let
pname = "seshat";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix
index 89bca56a53ef1e37645d83930b52a6f033e9d48b..5834b797eeab1906167cc755dddf24463be85f23 100644
--- a/pkgs/data/fonts/shabnam-fonts/default.nix
+++ b/pkgs/data/fonts/shabnam-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "shabnam-fonts";
version = "4.0.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 873528b8bde159c0e9fa97dda9e2f8eb520c822f..2964b8692dcc016d0129df5951b1772f7fe9e852 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -3,7 +3,7 @@
let
pname = "spleen";
version = "1.0.5";
-in fetchurl rec {
+in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix
index f5d15439079d5bbd3842dc98fd704aa7c5ed96f1..f3ff9600f5deca0e7913d208be2c0685bd47378d 100644
--- a/pkgs/data/fonts/stix-otf/default.nix
+++ b/pkgs/data/fonts/stix-otf/default.nix
@@ -2,7 +2,7 @@
let
version = "1.1.1";
-in fetchzip rec {
+in fetchzip {
name = "stix-otf-${version}";
url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip";
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index bfc66a77207f1d792c90b9ba58cf9ed001e0f30a..d4192631c2adb0cd9cc5b96763c68f6f3a25fb68 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -2,7 +2,7 @@
let
version = "0.37";
-in fetchzip rec {
+in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099";
diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix
index 958af414ff092c608cb7a772389bc8ca60b18433..09ea566e738210c1bdb6e7a697ec725f91dcb883 100644
--- a/pkgs/data/fonts/tenderness/default.nix
+++ b/pkgs/data/fonts/tenderness/default.nix
@@ -6,7 +6,7 @@ let
pname = "tenderness";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index 211cc73cc9de40a42324abf6b31d6d88c9aef70a..bdd0fd7762b633c45833fa2308337398806521a4 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -2,7 +2,7 @@
let
version = "4.47.0";
-in fetchzip rec {
+in fetchzip {
name = "terminus-font-ttf-${version}";
url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix
index 5f072f90f0555713c7e34a56842842a418de894b..7c90c16d4d1efb99328cd94e1f66027272126467 100644
--- a/pkgs/data/fonts/ubuntu-font-family/default.nix
+++ b/pkgs/data/fonts/ubuntu-font-family/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "ubuntu-font-family-0.83";
url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip";
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index f1545e3d5b45f075249d58874e5e54139b59f9bc..0ea0363763dcee6256620282eee59a8ce2a157ac 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ucs-fonts";
version = "20090406";
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index 35551e929e64cca5eef629a7cf349a9f5e17e3b4..f9045794fe157b6ffa4b48814fec1b447cc6a1c1 100644
--- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -3,7 +3,7 @@
let
version = "1.0";
in
-fetchzip rec {
+fetchzip {
name = "ultimate-oldschool-pc-font-pack-${version}";
url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y";
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
index d004e75571b72bfac385e21b74d0ccb3c57fa279..f398675380992967d7ba777dcfdb193a906cba9d 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "vazir-fonts";
version = "19.2.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix
index 01a4072099ad1c7a9da358487c200fcd7da281af..fd74897077f36459723afd00ef20153d721565d4 100644
--- a/pkgs/data/fonts/vdrsymbols/default.nix
+++ b/pkgs/data/fonts/vdrsymbols/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "vdrsymbols-20100612";
url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz;
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
index 0e996da2fc7c90d14da3cabf5ad9d83d468e1d03..e5dd11db72a7bc4e16262b2f52a479c5b7021945 100644
--- a/pkgs/data/fonts/xkcd-font/default.nix
+++ b/pkgs/data/fonts/xkcd-font/default.nix
@@ -3,7 +3,7 @@
let
pname = "xkcd-font";
version = "unstable-2017-08-24";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "ipython";
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index 49d289cac3910c8aca593258bc0b8a53672a712a..a623af206048a4c61016a373db275b2d1babbc62 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "maia-icon-theme";
version = "2018-02-24";
diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix
index 26b06b4e652ed2e8eb96ac472b8e0650a6de3656..fe9e83492e42971e23fa641a1ccd050094541efe 100644
--- a/pkgs/data/machine-learning/mnist/default.nix
+++ b/pkgs/data/machine-learning/mnist/default.nix
@@ -20,7 +20,7 @@ let
};
in
stdenvNoCC.mkDerivation rec {
- name = "mnist-${version}";
+ pname = "mnist";
version = "2018-11-16";
installPhase = ''
mkdir -p $out
diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix
index 54b54d278ffb3d142fa6af8036f5e4453eac863d..f1e0604acf86fe8f4a8b9952e5c4d3d547b6f138 100644
--- a/pkgs/data/misc/brise/default.nix
+++ b/pkgs/data/misc/brise/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, librime }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "brise-unstable-2017-09-16";
src = fetchFromGitHub {
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index a99df2e7bd65bd028df558e6da435055c05e80a6..99739646a8ba6b35b45c6f385c2e8801ea2244c2 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -15,7 +15,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nss-cacert-${nss.version}";
src = nss.src;
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 38662bef0af330e3ede39e7e4b83465195a9f0ad..8cbd526f3d3bc4bc72e306e0f9e29677eea93165 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -6,7 +6,7 @@ let
url = "https://geolite.maxmind.com/download/geoip/database/${src}";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "geolite-legacy";
version = "2017-12-02";
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index 71fe32c1066581051a30c7a19f4cc21212a43cce..4814232fbfe7b6d9e69a84db0bd7189265708756 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,5 +1,5 @@
{ callPackage }:
-rec {
+{
wallpapers = callPackage ./wallpapers.nix { };
}
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
index 1b6b60f104e0537c4aff359ad147821bd930b777..2535e8cfc2509cfb7e0e9ba60c558f3c0a464a84 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -2,7 +2,7 @@
, fetchurl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "20080411";
pname = "pari-galdata";
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
index 2d3d52f697ed3a5c0d8651a735010eccca17d862..3470a0804f749669b8d030f91f89a3969907e4ab 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -2,7 +2,7 @@
, fetchurl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "20090618";
pname = "pari-seadata-small";
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix
index b5414ab18b4d5f7cdb78e7c7491ff782ec610cb3..ca79e251f28a1e5ed4278a47bf892d82e06eb39c 100644
--- a/pkgs/data/misc/publicsuffix-list/default.nix
+++ b/pkgs/data/misc/publicsuffix-list/default.nix
@@ -3,7 +3,7 @@
let
pname = "publicsuffix-list";
version = "2019-05-24";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "publicsuffix";
repo = "list";
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 79924c4832f652d7d0ff5a715997c7e7ca6ddfcc..6952d2da6bad1a85d7cd983c693d6edd73848923 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -2,7 +2,7 @@
, libxml2, glib}:
let version = "1.12"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "shared-mime-info";
inherit version;
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index c1f9153c5854191fb647f71a0e5c270c737596a2..b2363b4b549e1bc1b4c8c4ad6125c6e00ef2e44b 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "tzdata";
- version = "2019a";
+ version = "2019b";
srcs =
[ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
- sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh";
+ sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
- sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7";
+ sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf";
})
];
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 09ca8897a21610f1c7f4e6d5d2ba6a78c545dc3e..db0b4ec661047e4c81f189baeefea12804bec013 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "matcha";
version = "2019-06-22";
diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 4d91b60960b390d9288691e9306457150e585d12..6461697b04f21996c5e2a16b1b40bc870fa500b2 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qogir-theme";
- version = "2019-05-03";
+ version = "2019-08-31";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd";
+ sha256 = "1pqfnqc2c6f5cidg6c3y492hqlyn5ma4b7ra2lchw7g2dxfvq8w1";
};
buildInputs = [ gdk-pixbuf librsvg ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
installPhase = ''
patchShebangs .
mkdir -p $out/share/themes
- name= ./Install -d $out/share/themes
+ name= ./install.sh -d $out/share/themes
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index 8d0fed6b3d859fee7078103b28a0ed6d51276955..2739b9a2517fe7ead2143536829ab2c2ca58d52f 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -1,5 +1,5 @@
{ callPackage, pkgs }:
-rec {
+{
#### CORE EFL
efl = callPackage ./efl.nix {
openjpeg = pkgs.openjpeg_1;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 5978fb217e87e690a27f401e6eeabdb4c0378d63..920343a60241c965ce3c3d27ecb22d749cd33838 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -6,7 +6,7 @@
let
version = "3.32.2";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "gnome-notes";
inherit version;
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index dda45a71fe2090bb7c6c1b51cf8e8d637874a7c0..0048b02581a77ec2cb4d51054258eb06ae9b5e63 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
];
prePatch = ''
- substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \
- --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas"
+ substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
+ --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas}
patches="$patches $PWD/hardcode-gsettings.patch"
'';
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 76121660012026efaae63ca07bd0d187c57568b2..3d37040828c5d220cbf5caf4a9261261129d48fc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# Fixup adapted from export-zips.sh in the source.
extensiondir=$out/share/gnome-shell/extensions
- schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/
+ schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
glib-compile-schemas $schemadir
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 7e1f696c58d1a6d4d7475fd79b8d2880c9d9a843..262383bdda945506ca20113b4b25169fae7482b9 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-x"
- "--disable-static"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 444c144cfab82c65ccc2e9a23dae45e03bcc52e8..e18f4de68d6c4ad6a5d583b87977632bf55d3e42 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -28,7 +28,7 @@
, telepathy-glib ? null
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vino";
version = "unstable-2019-07-08";
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 0d9d54167ff27a8749ecfb1fe19c9aec1e74fc83..cff0db665bbae3353d5937495852d33126b7d369 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
(substituteAll {
src = ./fix-paths.patch;
gapplication = "${glib.bin}/bin/gapplication";
- mutter_gsettings_path = "${gnome3.mutter}/share/gsettings-schemas/${gnome3.mutter.name}/glib-2.0/schemas";
+ mutter_gsettings_path = glib.getSchemaPath gnome3.mutter;
})
];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib"
- "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
+ "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}"
"-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
"-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
"-Dopenssl_path=${openssl}/bin/openssl"
diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
index f09822415a6eb9d2c26d12671e2c7905eeee1810..10175719e46c01679789bdcd5c42eaecf90768e8 100644
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gnome-shell-extensions-mediaplayer";
version = "unstable-2019-03-21";
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index d8a78686e4917d77a2765901501ec402a7b566dd..46ca01c1a1a19d048ea0112f9d490a1a0b6b8569 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/gnome-shell/prefs.js \
--subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
substituteInPlace src/libgpaste/settings/gpaste-settings.c \
- --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas"
+ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
'';
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 5e7db35a7276b6b7f9092edb5b566499c2149150..64e9332a3066b6bf46b5d717d8b71f509a0e044c 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -4,7 +4,7 @@ let
version = "2.7.0";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gnustep-make";
inherit version;
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ae6583c467203f8b416a8906dec8674be97474da..0decbbc6c7a6c35a1894674db7ef6eca5eddd2ea 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -10,6 +10,7 @@
, desktop-file-utils
, libcanberra
, gtk3
+, glib
, libgee
, granite
, libnotify
@@ -82,7 +83,7 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
substituteInPlace filechooser-module/FileChooserDialog.vala \
- --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+ --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index a03594b7b18be509c0d2a1d2b96117d88f9c23a9..3b85b123fd036616d32e4b62dd2a9f3c3d650ccc 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, substituteAll
, fetchFromGitHub
, pantheon
, meson
@@ -9,6 +10,7 @@
, granite
, gtk3
, switchboard
+, onboard
}:
stdenv.mkDerivation rec {
@@ -22,6 +24,13 @@ stdenv.mkDerivation rec {
sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd";
};
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit onboard;
+ })
+ ];
+
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4d69390f39d90aa463c3c3666eb0b9fa9e06b9d9
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala
+index b4ae8b0..5b8fd7e 100644
+--- a/src/Panes/Typing.vala
++++ b/src/Panes/Typing.vala
+@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane {
+
+ onboard_settings_label.clicked.connect (() => {
+ try {
+- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
++ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
+ appinfo.launch (null, null);
+ } catch (Error e) {
+ warning ("%s\n", e.message);
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 00579c545254e26be21e972fe3ddb41d11eb42c7..c3a88f47af092e1e4682590a55d69ebc6ba0830d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -10,6 +10,7 @@
, gtk3
, switchboard
, elementary-settings-daemon
+, glib
}:
stdenv.mkDerivation rec {
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/Views/General.vala \
- --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
+ --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon}
'';
passthru = {
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ glib
granite
gtk3
libgee
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index b9fad17c2f752abed30f198b75792906fca1f621..a6462150f53a0ac9dca266fde35638cc3eaa7ea8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
, gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }:
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
+ elementary-settings-daemon
gexiv2
+ glib
gnome-desktop
- elementary-settings-daemon
granite
gtk3
libgee
@@ -51,9 +52,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/Views/Appearance.vala \
- --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas
+ --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/Appearance.vala \
- --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas
+ --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
'';
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 461ddcd3764a5bf78626d80fdd221b2b9d6f7d8c..3e43ad61a32235842a98225294ff04b9a9174e2e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -11,6 +11,7 @@
, elementary-settings-daemon
, granite
, gtk3
+, glib
, dbus
, polkit
, switchboard
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
dbus
+ glib
granite
gtk3
libgee
@@ -59,9 +61,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/MainView.vala \
- --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas
+ --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper}
substituteInPlace src/MainView.vala \
- --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
+ --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon}
'';
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 19967c3bce05376ae4b42cf6ba453192907b4334..eb50dafb2100e98bbe6afa68d9ad225a9d0be954 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -9,6 +9,7 @@
, libgee
, granite
, gtk3
+, glib
, polkit
, zeitgeist
, switchboard
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ glib
granite
gtk3
libgee
@@ -60,9 +62,9 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
substituteInPlace src/Views/LockPanel.vala \
- --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas
+ --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker}
substituteInPlace src/Views/FirewallPanel.vala \
- --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+ --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
index 76bdcf643f8fee3bd35a2db9a08a2af24ae6a5b6..df2475ce82a312c2ed644565e08114bcf4cd0641 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
@@ -3,7 +3,7 @@
, pantheon
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "elementary-redacted-script";
version = "unstable-2016-06-03";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index b273bbece9690a6c726eab8b4c6a406f88e41e8c..9fc4418e7ca12326e771a3d1dc96b5aa7e983e1b 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -33,16 +33,17 @@ with stdenv.lib;
# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
runCommand "elementary-gsettings-desktop-schemas" {}
''
- mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
- cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+ schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
- ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages}
+ mkdir -p $schema_dir
+ cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir
+
+ ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages}
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
- cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \
- $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+ cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override $schema_dir
- cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
+ cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background]
picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
primary-color='#000000'
@@ -50,5 +51,5 @@ runCommand "elementary-gsettings-desktop-schemas" {}
${extraGSettingsOverrides}
EOF
- ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
+ ${glib.dev}/bin/glib-compile-schemas $schema_dir
''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index c262fb37dbc549c9651ccf2a2fe5008eb1368c47..df12fba645f218468dcc11e82045082d6f960ea0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -7,6 +7,7 @@
, gnome-session
, wingpanel
, orca
+, onboard
, at-spi2-core
, elementary-default-settings
, writeShellScriptBin
@@ -85,9 +86,9 @@ stdenv.mkDerivation rec {
cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
mkdir -p $out/etc/xdg/autostart
- cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart
- cp -av ${orca}/etc/xdg/autostart/* $out/etc/xdg/autostart
- cp -av ${at-spi2-core}/etc/xdg/autostart/* $out/etc/xdg/autostart
+ for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do
+ cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart
+ done
cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix
index 7e9aacc0c2b27e3c79351bef3e256c1606f9c366..3bc432c5d32509da7a78dbeb8c79c748f126caf3 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/pkgs/desktops/pantheon/update.nix
@@ -31,6 +31,6 @@ let
throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release).";
- versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag;
+ versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag;
in [ updateScript versionFlag repoName attrPath ]
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 07c6805c689a93f4f90b81ad64f1021b841463ee..e188e4e3fcdd4832cb731aeb79552cf5ab46e04a 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -72,7 +72,7 @@ let
let
inherit (args) name;
sname = args.sname or name;
- inherit (srcs."${sname}") src version;
+ inherit (srcs.${sname}) src version;
outputs = args.outputs or [ "out" ];
hasBin = lib.elem "bin" outputs;
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 32bd5f3a9f288960f11ae15f95ef0e363b78d1d8..4183b38ba493551d9820f24c591f5b39e18aed4e 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -15,7 +15,7 @@
plasma-workspace, xf86inputlibinput
}:
-mkDerivation rec {
+mkDerivation {
name = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix
index b0dcec78765d0f28ca0005cec04e2ddd54a160c7..59ab5823314ee3fb3df05515d7c7ce29c2fbdb79 100644
--- a/pkgs/desktops/xfce4-14/exo/default.nix
+++ b/pkgs/desktops/xfce4-14/exo/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3
, libxfce4ui, libxfce4util }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "exo";
version = "0.12.8";
diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix
index d4e7e2ffc809198ab3de90287771e726da70bc75..0d6cb8c410e0696912ee8af9882bfdbcae55f1cd 100644
--- a/pkgs/desktops/xfce4-14/garcon/default.nix
+++ b/pkgs/desktops/xfce4-14/garcon/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "garcon";
version = "0.6.4";
diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix
index 6939e8859ac992b9439a0a8f6121cedbd588c9dc..5b25e474af27c4fc62bdfe6d607bdf358d5e7fc9 100644
--- a/pkgs/desktops/xfce4-14/gigolo/default.nix
+++ b/pkgs/desktops/xfce4-14/gigolo/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, gvfs, glib }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "gigolo";
version = "0.5.0";
diff --git a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
index 2ea6d195d6fd6c7638ca2d8b8242ee17fef02645..79c8ec74b62680ee3e359c93491e6dd4e35c73bb 100644
--- a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
@@ -1,7 +1,7 @@
{ lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM
, libstartup_notification, libxfce4util, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "libxfce4ui";
version = "4.14.1";
diff --git a/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix
index 99fe59583aa4e2c1cc15ca9d99dac87276f4a431..4540d2352511c8f1480c918e3b0403dbb89c73ff 100644
--- a/pkgs/desktops/xfce4-14/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce4-14/libxfce4util/default.nix
@@ -1,6 +1,6 @@
{ lib, mkXfceDerivation, gobject-introspection }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "libxfce4util";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
index cf4b5eb3cdc6c3bec8f6767e23f34b3e5a885315..b7dc8322569663e7cf3b23b3e68c4f7086b210fd 100644
--- a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
@@ -12,7 +12,7 @@ let
concatAttrLists = attrsets:
zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets;
- template = rec {
+ template = {
name = "${pname}-${version}";
nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ];
diff --git a/pkgs/desktops/xfce4-14/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix
index ca80fd8bf53e1652c520959fb5cd6964821f6d08..77559aaf329f3f344feb7a3d6fe493b3ea41786e 100644
--- a/pkgs/desktops/xfce4-14/mousepad/default.nix
+++ b/pkgs/desktops/xfce4-14/mousepad/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "mousepad";
version = "0.4.2";
diff --git a/pkgs/desktops/xfce4-14/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix
index 8c453aa96a25c58d3aee85e1e12d49ab2db00291..7bb10c2fd94b5811525f44bbe99d7bd2f86f3e83 100644
--- a/pkgs/desktops/xfce4-14/orage/default.nix
+++ b/pkgs/desktops/xfce4-14/orage/default.nix
@@ -7,7 +7,7 @@ let
inherit (lib) optionals;
in
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "orage";
version = "4.12.1";
diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix
index 578be8329b0c93bb24c50bdaa16f280adc7b8ed3..ed3979072ed3dfb2416e01db935e886f841404f3 100644
--- a/pkgs/desktops/xfce4-14/parole/default.nix
+++ b/pkgs/desktops/xfce4-14/parole/default.nix
@@ -5,7 +5,7 @@
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "parole";
version = "1.0.4";
diff --git a/pkgs/desktops/xfce4-14/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix
index 1c09d3a0c00849f01d61d52f349b58d489ac9a56..4a24bf905328e8ecf22fa75c37d99014e0b373a1 100644
--- a/pkgs/desktops/xfce4-14/ristretto/default.nix
+++ b/pkgs/desktops/xfce4-14/ristretto/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif
, libxfce4ui, libxfce4util, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "ristretto";
version = "0.10.0";
diff --git a/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix
index 1fa714c7ff1b621a435412ffabd6b58cba04017b..11b29c64b33f8b9f4ae5e7077dbd8793938816a5 100644
--- a/pkgs/desktops/xfce4-14/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar-volman/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "thunar-volman";
version = "0.9.5";
diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix
index ed0be442023260dd53d7af00b4705ffef90c8bfc..12a1a62991a72aa0ccf9ecf7f2be63bfa597a1ea 100644
--- a/pkgs/desktops/xfce4-14/thunar/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev
, libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "thunar";
version = "1.8.9";
diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix
index 81b0080833668923b49e70952fac4276ca35cf69..ecbc62d8ffbf62293a9d3d5b5746675988f4b9b8 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-14/tumbler/default.nix
@@ -11,7 +11,7 @@
# TODO: add libopenraw
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "tumbler";
version = "0.2.7";
diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix
index 97d0863665650c1cc180f37fc0e63879925c1db1..27fae12981ca23fc1b0be6ea880536d8dff54747 100644
--- a/pkgs/desktops/xfce4-14/xfburn/default.nix
+++ b/pkgs/desktops/xfce4-14/xfburn/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfburn";
version = "0.5.5";
diff --git a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
index 312e64cdbbe90d6f00b9a78c2e391ab362a71a96..6c4af66c8666be384d6b285aacba40ad98a680f4 100644
--- a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-appfinder";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
index 84cb74276997fc2d537cff8ea3c30f1e1dfa7106..22793963df3d0cbf254c909e4bedf1eec77a393f 100644
--- a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-cpufreq-plugin";
version = "1.2.1";
diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
index b18f3fd45d62e3884958f5f9f9fb0c940f4d7118..38fe82ffb0114e303aff69f998b9b07b482f1dbe 100644
--- a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, autoreconfHook, autoconf, automake
, glib, gtk-doc, intltool, libtool }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-dev-tools";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
index 603863264efcd5251ded3a7ed4e87e5c02de40e5..66ca7affa481708c5db3845bfa881921db641f6f 100644
--- a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-dict";
version = "0.8.2";
diff --git a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
index a99c3ecb98446858fb3128e856924dfc34d411d3..e468fea637e80ea763d86ad50a1fe395b4d61f64 100644
--- a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
, xfce4-panel, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-notifyd";
version = "0.4.4";
diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
index 27acb3bee587c3dfd97b10a7ff5dc1c6b97a82f2..c571666e5c4b7281f6000d2fc1ec9f62c53c8f82 100644
--- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-panel";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
index 115668334c3cfb4ba7ee0469b5610d0d738d1edb..985146c82571c53160ee4951c439f5aedcadbb14 100644
--- a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify
, libxfce4ui, libxfce4util, upower, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-power-manager";
version = "1.6.5";
diff --git a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
index 185494c254394dd5b33babb67dbe7a045b552744..6fca6069d1e8a51bf482674f676bf069bf27a7e8 100644
--- a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, automakeAddFlags, dbus-glib, dbus, gtk3, libpulseaudio
, libnotify, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-pulseaudio-plugin";
version = "0.4.1";
diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
index 0f74a78e8f2cc2ad7f3d191232394f47f0d8f33b..f13a8fba6d0a51055c5cb00b5571a4b93abfcaaa 100644
--- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-screenshooter";
version = "1.9.5";
diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
index 070f40b52d5c58f3a210f068772946002c964ba6..055da7f245bb50813ed5641580e492108047ae98 100644
--- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-session";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
index 21aaef5fd081f0152c61cd07899a06a256825cee..8cda66359e34977bdfaccaf9f8bf2f70a94f4826 100644
--- a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
@@ -2,7 +2,7 @@
, libnotify, libxfce4ui, libxfce4util, libxklavier
, upower, xfconf, xf86inputlibinput }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
index e62332343ba75b10dc69bb4f7ffbb4143faa9434..78e98e9ea7de31e4c018f483660d936743ae9811 100644
--- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-terminal";
version = "0.8.8";
diff --git a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
index b1405910021a9f4e735e247a87ec471b2e5c2664..97a00e9b67faa067e477f9a01967ad90abc417ff 100644
--- a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
@@ -1,6 +1,6 @@
{ lib, mkXfceDerivation, gtk3, libnotify, libpulseaudio, keybinder3, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-volumed-pulse";
version = "0.2.3";
diff --git a/pkgs/desktops/xfce4-14/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix
index 8e56e0f8b37d3e02996f86f77f30709d5cb3675e..a9d6ceaf46956f39153719bc5ab418e0e4affcec 100644
--- a/pkgs/desktops/xfce4-14/xfconf/default.nix
+++ b/pkgs/desktops/xfce4-14/xfconf/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, libxfce4util }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfconf";
version = "4.14.1";
diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
index c4b7d738b3297e16c0fc4908606275341adc5d9e..afcd0d19dc33f23e1bc2d68927f371dd9cbbdead 100644
--- a/pkgs/desktops/xfce4-14/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfdesktop";
version = "4.14.1";
diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix
index b84487c09ae02da21c191c1f274050bb54bb2a2c..358e99c893f1ae45ad7f4d2896cdd0e260cacc39 100644
--- a/pkgs/desktops/xfce4-14/xfwm4/default.nix
+++ b/pkgs/desktops/xfce4-14/xfwm4/default.nix
@@ -2,7 +2,7 @@
, libstartup_notification, libxfce4ui, libxfce4util, libwnck3
, libXpresent, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfwm4";
version = "4.14.0";
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index fcdd2eb518116986919d977d23f3a4bdbbce39ce..02aa6567c1a97cbdf98c3030cc90b297f1b0c38b 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -12,31 +12,31 @@ let
# than we do. We don't just use theirs because ours are less ambiguous and
# some builds need that clarity.
ndkInfoFun = { config, ... }: {
- "x86_64-apple-darwin" = {
+ x86_64-apple-darwin = {
double = "darwin-x86_64";
};
- "x86_64-unknown-linux-gnu" = {
+ x86_64-unknown-linux-gnu = {
double = "linux-x86_64";
};
- "i686-unknown-linux-android" = {
+ i686-unknown-linux-android = {
triple = "i686-linux-android";
arch = "x86";
toolchain = "x86";
gccVer = "4.9";
};
- "x86_64-unknown-linux-android" = {
+ x86_64-unknown-linux-android = {
triple = "x86_64-linux-android";
arch = "x86_64";
toolchain = "x86_64";
gccVer = "4.9";
};
- "armv7a-unknown-linux-androideabi" = {
+ armv7a-unknown-linux-androideabi = {
arch = "arm";
triple = "arm-linux-androideabi";
toolchain = "arm-linux-androideabi";
gccVer = "4.9";
};
- "aarch64-unknown-linux-android" = {
+ aarch64-unknown-linux-android = {
arch = "arm64";
triple = "aarch64-linux-android";
toolchain = "aarch64-linux-android";
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index e35444ed516e827a2fd928e129a11082ebe5a7a8..7bb779d1d13873ec29caaf1a2d7d27ef703cc0bb 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -1,7 +1,7 @@
{ androidenv, buildPackages, pkgs, targetPackages
}:
-rec {
+{
"18b" =
let
ndkVersion = "18.1.5063045";
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix
index 45186914604dd334964f43efd298977bc41ba197..280fd496650cde2f824213bcc1b71c9a2f4b5512 100644
--- a/pkgs/development/arduino/platformio/default.nix
+++ b/pkgs/development/arduino/platformio/default.nix
@@ -4,7 +4,7 @@
let
callPackage = newScope self;
- self = rec {
+ self = {
platformio-chrootenv = callPackage ./chrootenv.nix { };
};
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
index 18abe1055b5ba31bca5e7c996f9b1431f6d1f4bb..6edee5d8bc65f312ec16d13de6933c687dfc8bd7 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -6,7 +6,7 @@ let
buildInputs = [ drv ];
};
- pkg = self: buildRebar3 rec {
+ pkg = self: buildRebar3 {
name = "pgsql";
version = "25+beta.2";
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index 4de7e3cc01ea316db64910263bc50bd8c3dc25db..b6695029f34cba9218946550eb9a5f833b85263f 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -6,7 +6,7 @@ let
buildInputs = [ drv ];
};
- pkg = self: stdenv.mkDerivation rec {
+ pkg = self: stdenv.mkDerivation {
name = "webdriver";
version = "0.0.0+build.18.7ceaf1f";
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 40b690048eba3cf55545c3d24c124b803a574e69..22a3c9cf4686c2b7eb0b1c730b441b42565f2bff 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -6,14 +6,15 @@ import re
import requests
import sys
-releases = ["openjdk11"]
-oses = ["mac", "linux"]
-types = ["jre", "jdk"]
-impls = ["hotspot", "openj9"]
+releases = ("openjdk8", "openjdk11")
+oses = ("mac", "linux")
+types = ("jre", "jdk")
+impls = ("hotspot", "openj9")
arch_to_nixos = {
- "x64": "x86_64",
- "aarch64": "aarch64",
+ "x64": ("x86_64",),
+ "aarch64": ("aarch64",),
+ "arm": ("armv6l", "armv7l"),
}
def get_sha256(url):
@@ -23,7 +24,6 @@ def get_sha256(url):
sys.exit(1)
return resp.text.strip().split(" ")[0]
-RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
def generate_sources(release, assets):
out = {}
for asset in assets:
@@ -33,7 +33,8 @@ def generate_sources(release, assets):
if asset["heap_size"] != "normal": continue
if asset["architecture"] not in arch_to_nixos: continue
- version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
+ # examples: 11.0.1+13, 8.0.222+10
+ version, build = asset["version_data"]["semver"].split("+")
type_map = out.setdefault(asset["os"], {})
impl_map = type_map.setdefault(asset["binary_type"], {})
@@ -42,12 +43,13 @@ def generate_sources(release, assets):
"vmType": asset["openjdk_impl"],
})
- arch_map[arch_to_nixos[asset["architecture"]]] = {
- "url": asset["binary_link"],
- "sha256": get_sha256(asset["checksum_link"]),
- "version": version,
- "build": build,
- }
+ for nixos_arch in arch_to_nixos[asset["architecture"]]:
+ arch_map[nixos_arch] = {
+ "url": asset["binary_link"],
+ "sha256": get_sha256(asset["checksum_link"]),
+ "version": version,
+ "build": build,
+ }
return out
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 7b16d6ad9dbca5d6126b9e5c2056eb15df8e23c7..03857627952d5be666f9b2fd641103e92b2fca62 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -6,7 +6,7 @@ sourcePerArch:
}:
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
- result = stdenv.mkDerivation rec {
+ result = stdenv.mkDerivation {
name = if sourcePerArch.packageType == "jdk"
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
@@ -46,9 +46,6 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
passthru.home = result;
- # for backward compatibility
- passthru.architecture = "";
-
meta = with stdenv.lib; {
license = licenses.gpl2Classpath;
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index a837c6f1e8515226ab646b43a2e722c69192ef50..509050209fb22f221c0b437568aeaff55d13e927 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -1,48 +1,17 @@
sourcePerArch:
-{ swingSupport ? true
-, stdenv
+{ stdenv
+, lib
, fetchurl
-, file
-, xorg ? null
-, glib
-, libxml2
-, ffmpeg_2
-, libxslt
-, libGL
+, autoPatchelfHook
+, alsaLib
, freetype
, fontconfig
-, gtk2
-, pango
-, cairo
-, alsaLib
-, atk
-, gdk-pixbuf
, zlib
-, elfutils
+, xorg
}:
-assert swingSupport -> xorg != null;
-
let
- rSubPaths = [
- "lib/jli"
- "lib/server"
- "lib/compressedrefs" # OpenJ9
- "lib/j9vm" # OpenJ9
- "lib"
- ];
-
- libraries = [
- stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
- xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf
- atk zlib elfutils
- ] ++ (stdenv.lib.optionals swingSupport [
- xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
- xorg.libXrender
- stdenv.cc.cc
- ]);
-
cpuName = stdenv.hostPlatform.parsed.cpu.name;
in
@@ -57,7 +26,12 @@ let result = stdenv.mkDerivation rec {
inherit (sourcePerArch.${cpuName}) url sha256;
};
- nativeBuildInputs = [ file ];
+ buildInputs = [
+ alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst
+ xorg.libXi xorg.libXrender
+ ];
+
+ nativeBuildInputs = [ autoPatchelfHook ];
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
@@ -74,45 +48,31 @@ let result = stdenv.mkDerivation rec {
# Remove embedded freetype to avoid problems like
# https://github.com/NixOS/nixpkgs/issues/57733
- rm $out/lib/libfreetype.so
-
- # for backward compatibility
- ln -s $out $out/jre
+ find "$out" -name 'libfreetype.so*' -delete
mkdir -p $out/nix-support
# Set JAVA_HOME automatically.
- cat <> $out/nix-support/setup-hook
+ cat <> "$out/nix-support/setup-hook"
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
- postFixup = ''
- rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
-
- # set all the dynamic linkers
- find $out -type f -perm -0100 \
- -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$rpath" {} \;
-
- find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+ preFixup = ''
+ find "$out" -name libfontmanager.so -exec \
+ patchelf --add-needed libfontconfig.so {} \;
'';
- rpath = stdenv.lib.strings.makeLibraryPath libraries;
-
# FIXME: use multiple outputs or return actual JRE package
passthru.jre = result;
passthru.home = result;
- # for backward compatibility
- passthru.architecture = "";
-
meta = with stdenv.lib; {
license = licenses.gpl2Classpath;
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
- platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
- maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
+ maintainers = with lib.maintainers; [ taku0 ];
};
}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a170e0141cf0a8c4c986f2bd6aade2cfd3e5b01a
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot;
+ jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot;
+ jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9;
+ jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9;
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4937eace490329d7d78be5713ff8e796f0191075
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot;
+ jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot;
+ jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9;
+ jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9;
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 03febb6aa3559e6e564fd02dd06abe35c8f39e6c..403bd96efb0edc60b3fd89ebd1c769bf0ae31650 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -4,56 +4,68 @@
"jdk": {
"hotspot": {
"aarch64": {
+ "build": "11",
+ "sha256": "10e33e1862638e11a9158947b3d7b461727d8e396e378b171be1eb4dfe12f1ed",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
+ },
+ "armv6l": {
+ "build": "7",
+ "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
+ "version": "11.0.3"
+ },
+ "armv7l": {
"build": "7",
- "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz",
+ "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
"version": "11.0.3"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "90c33cf3f2ed0bd773f648815de7347e69cfbb3416ef3bf41616ab1c4aa0f5a8",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "7012edd56fc958070bc4747073de14ea08eb43081eb6ea19bdbf4763186e2d17",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "b1099cccc80a3f434728c9bc3b8a90395793b625f4680ca05267cf635143d64d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "7",
- "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "5f7b5c110fc0f344a549cb11784a6d76838061a2b6f654f7841f60e0cd286c6a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "d2df8bc799b09c8375f79bf646747afac3d933bb1f65de71d6c78e7466ff8fe4",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "70d2cc675155476f1d8516a7ae6729d44681e4fad5a6fc8dfa65cab36a67b7e0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "14c660294832c7b2deb2845d96dce83df677e204b4f0f1fee0052764c4a56720",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "c2601e7cb22af7a910e03883280cee805074656104d6d3dcaaf30e3bbb832690",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
}
}
}
@@ -64,20 +76,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "5ca2a24f1827bd7c110db99854693bf418f51ee3093c31332db5cd605278faad",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "a50b211f475b9497311c9b65594764d7b852b1653f249582bb20fc3c302846a5",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "01045a99ff23bda354f82c0fd3fa6e8222e4a5acce7494e82495f47b30bc5e18",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "7c09678d9c2d9dd0366693c6ab27bed39c76a23e7ac69b8a25c794e99dcf3ba7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
}
}
},
@@ -86,20 +98,126 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "9523b97288ff5d50e404565d346ed8ea8f19dd155092951af88d4be6b8414776",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "1647fded28d25e562811f7bce2092eb9c21d30608843b04250c023b40604ff26",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "150c4065a57ec368b692276e8e3320b183ee17b402b7db07e676dff5837f0c52",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "1a8e84bae517a848aa5f25c7b04f26ab3a3bfffaa7fdf9be24e1f83325e46766",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
+ }
+ }
+ }
+ }
+ },
+ "openjdk8": {
+ "linux": {
+ "jdk": {
+ "hotspot": {
+ "aarch64": {
+ "build": "10",
+ "sha256": "652776586ede124189dc218174b5922cc97feac81021ad81905900b349a352d2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ },
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "37356281345b93feb4212e6267109b4409b55b06f107619dde4960e402bafa77",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "20cff719c6de43f8bb58c7f59e251da7c1fa2207897c9a4768c8c669716dc819",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "aarch64": {
+ "build": "10",
+ "sha256": "dfaf5a121f7606c54bd6232793677a4267eddf65d29cde352b84d84edbccbb51",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ },
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "a418ce895c8bf3ca2e7b2f423f038b8b093941684c9430f2e40da0982e12b52d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "ae56994a7c8e8c19939c0c2ff8fe5a850eb2f23845c499aa5ede26deb3d5ad28",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
+ }
+ }
+ }
+ },
+ "mac": {
+ "jdk": {
+ "hotspot": {
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "9605fd00d2960934422437f601c7a9a1c5537309b9199d5bc75f84f20cd29a76",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "df185e167756332163633a826b329db067f8a721f7d5d27f0b353a35fc415de0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "b3ac2436534cea932ccf665b317dbf5ffc0ee065efca808b22b6c2d795ca1b90",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_mac_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "d5754413d7bc3a3233aaa7f8465451fbdabaf2a0c2a91743155bf135a3047ec8",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
}
}
}
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index c0e6c4b50044a4e5eb8aef8bf695e534ee9eb1f1..664335c3dade34a6b4f6156ade3a7f65a60c2d69 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -5,7 +5,7 @@ let
# Map from git revs to SHA256 hashes
sha256s = {
- "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
+ version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
};
in
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
index 65f0481a8010ec5df806c7b3cfddaa13dbd28903..235ec4090391532a27322dc7ed52d7d1431e8554 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/pkgs/development/compilers/carp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
-haskellPackages.mkDerivation rec {
+haskellPackages.mkDerivation {
pname = "carp";
version = "unstable-2018-09-15";
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 6fac183125f55a6e417f4f1ae642af516672d1bb..ec166352267e4700c7e3192084546ecf8ba56034 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -29,7 +29,7 @@ let
};
armv6l-linux = armv7l-linux;
};
- cfg = options."${stdenv.hostPlatform.system}" or (throw "missing source url for platform ${stdenv.hostPlatform.system}");
+ cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index 91c163fd343a9a82ac713c38d2580c31727a319b..03a5cec5004126b02e7b7c2a13158916293d1af0 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "clean-3.0";
src =
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index dab724ea607c44d736b15ff4761a95318c28d1c6..9a01519a881242ab57a7a4d59ffc60fa2c9df3b1 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cmdstan-2.17.1";
src = fetchurl {
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0c79b3d394ff2f3824fc5b93a84088ab7ed368cf..409ac03d92f71a36e7ab0bbe1e2aa209087c4910 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -13,12 +13,12 @@
let
archs = {
- "x86_64-linux" = "linux-x86_64";
- "i686-linux" = "linux-i686";
- "x86_64-darwin" = "darwin-x86_64";
+ x86_64-linux = "linux-x86_64";
+ i686-linux = "linux-i686";
+ x86_64-darwin = "darwin-x86_64";
};
- arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+ arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported");
checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ];
@@ -29,7 +29,7 @@ let
src = fetchurl {
url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
- sha256 = sha256s."${stdenv.system}";
+ sha256 = sha256s.${stdenv.system};
};
buildCommand = ''
@@ -153,27 +153,27 @@ in rec {
binaryCrystal_0_26 = genericBinary {
version = "0.26.1";
sha256s = {
- "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
- "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
- "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
+ x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
+ i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
+ x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
};
};
binaryCrystal_0_27 = genericBinary {
version = "0.27.2";
sha256s = {
- "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm";
- "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9";
- "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g";
+ x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm";
+ i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9";
+ x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g";
};
};
binaryCrystal_0_29 = genericBinary {
version = "0.29.0";
sha256s = {
- "x86_64-linux" = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna";
- "i686-linux" = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2";
- "x86_64-darwin" = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd";
+ x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna";
+ i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2";
+ x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd";
};
};
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 332ded31df6a5747115ebd6d63aac0c063b27308..6cae1fa073b349e8551054a805295b11d3fd584d 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -13,7 +13,7 @@ let
dmdConfFile = writeTextFile {
name = "dmd.conf";
text = (lib.generators.toINI {} {
- "Environment" = {
+ Environment = {
DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
};
});
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 1ffd758ac82ee5ecf28a708f4d81e8da4dabcd47..870ad900210a268c9f0d3d7b05d9e0137d24a13a 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 44d784133f5f0ed089209046b4c3ad93e390a782..5353862424a0bf688214fcd0a90f3a2302b9b762 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -1,7 +1,7 @@
{ stdenvNoCC, lib, fetchurl }:
stdenvNoCC.mkDerivation rec {
- name = "fasm-bin-${version}";
+ pname = "fasm-bin";
version = "1.73.16";
diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix
index 4b20c4051a82e14bb90d6bdb621573a3d2976d8d..f17d18bf92a62396c4fc5b4f5ffae766737dd24c 100644
--- a/pkgs/development/compilers/fasm/default.nix
+++ b/pkgs/development/compilers/fasm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fasm-bin, isx86_64 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (fasm-bin) version src meta;
pname = "fasm";
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index eca2cba7775fadcbe7f673e6e9003dae0cb68bbf..f00a8b6efc91e7a4e56d8f8343a4f08ce64ae383 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoconf, ... }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gambit-bootstrap";
version = "4.9.3";
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 1c3df80645a8a1afc580a6a580e0a493e3bf5f34..f4f63bc9b19f1916f3b572ff51d0e7b2692d1838 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -7,7 +7,7 @@ assert stdenv.cc.isGNU ;
assert stdenv.cc ? libc ;
assert stdenv.cc.libc != null ;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gcl";
version = "2.6.13pre50";
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 9fe3a7d9dba30d93b3f55aaf44e2309e31ab2b04..d68bf7e24b5e0cbe9a840e191f3dad7ab9b135f0 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -29,23 +29,23 @@ stdenv.mkDerivation rec {
name = "ghc-${version}-binary";
src = fetchurl ({
- "i686-linux" = {
+ i686-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
};
- "x86_64-linux" = {
+ x86_64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
};
- "armv7l-linux" = {
+ armv7l-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
};
- "aarch64-linux" = {
+ aarch64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
};
diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix
index 7e845da5b6486f14e0d5fd8ca3a932f8f7054ab9..152bd5e4874c7041d26d4034e39c3ba07cd925bf 100644
--- a/pkgs/development/compilers/ghc/8.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix
@@ -29,15 +29,15 @@ stdenv.mkDerivation rec {
name = "ghc-${version}-binary";
src = fetchurl ({
- "i686-linux" = {
+ i686-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m";
};
- "x86_64-linux" = {
+ x86_64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r";
};
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 1534e6d1d08ebb2c1172702dfb71ae973a6b59d8..18b2407a90bafbaab03e84a87b58e78834df5559 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation (rec {
name = "D5123.diff";
sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})
- (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ (fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index c859a34729d0db28945c415bc7cc05f977f7bfee..d68c6ab5d59106788785f8e42359a2c85369b3bb 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation (rec {
name = "D5123.diff";
sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})
- (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ (fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 804edabba0c26768b95d087b471abea9d8900516..b78f5bc2204cd0f17946a12fa1b760072b45d81d 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
patches = [
- (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ (fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index e9c303b88b6e6af0af120c7fac1cee550203b51d..ba0bbb1962b812cbd30a5b28a25331b6215a846a 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -61,7 +61,7 @@
let
inherit (bootPkgs) ghc;
-in mkDerivation (rec {
+in mkDerivation ({
pname = "ghcjs";
inherit version;
src = ghcjsSrc;
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index a87876390537a3a109bbf615437ab7f140f1a673..32847a2671c537c346bdfc908322a098f58039cb 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -17,13 +17,13 @@ let
'';
goarch = platform: {
- "i686" = "386";
- "x86_64" = "amd64";
- "aarch64" = "arm64";
- "arm" = "arm";
- "armv5tel" = "arm";
- "armv6l" = "arm";
- "armv7l" = "arm";
+ i686 = "386";
+ x86_64 = "amd64";
+ aarch64 = "arm64";
+ arm = "arm";
+ armv5tel = "arm";
+ armv6l = "arm";
+ armv7l = "arm";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
in
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index dae4c173223c02beba6bdc28332596fe57b336cc..817f3ab324d60fbb22fa2c4bed981c9b4880c4f1 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -17,13 +17,13 @@ let
'';
goarch = platform: {
- "i686" = "386";
- "x86_64" = "amd64";
- "aarch64" = "arm64";
- "arm" = "arm";
- "armv5tel" = "arm";
- "armv6l" = "arm";
- "armv7l" = "arm";
+ i686 = "386";
+ x86_64 = "amd64";
+ aarch64 = "arm64";
+ arm = "arm";
+ armv5tel = "arm";
+ armv6l = "arm";
+ armv7l = "arm";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
in
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 97c243439e89cd1c0a987f628853b037aa18390a..1052f1f1ae1efe2f9777890f49702a8d5ce1ff0c 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -4,7 +4,7 @@
, Security }:
let
- libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc;
+ libc = if stdenv ? cross then libcCross else stdenv.cc.libc;
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 7e11c75e07dccd90484c4b588cd34d4fcd6853ed..0ae038d4713888cac99df86d663ca0436de583e6 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -2,7 +2,7 @@
let
generic = { version, sha256, prePatch }:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "haxe";
inherit version;
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index c0414c6259fdd780daa5a6e2ee8805d3b4c788b3..c706f2facec7909f2bd51b6593a5f05ca59774b3 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -129,10 +129,10 @@ stdenv.mkDerivation rec {
makeFlags =
let
arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}"
+ march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
+ cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
or (throw "unsupported architecture: ${arch}");
in [
"ARCH=${arch}"
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
index b2db09e1c182fed445caf52d66d2d1af42f8b7ec..a9613de91eb96f3a7b9728c48aa4cc7a9f2d7f63 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -2,7 +2,7 @@
, cmake }:
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "jwasm";
version = "git-2017-11-22";
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 754ab020d51e6f77694550a7f64081c2f771609b..90dc20fcd3ea917b99731b8ac38f4d2c5120d35b 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -2,7 +2,7 @@
let
version = "1.3.41";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
pname = "kotlin";
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 4f766e5f9a5c5e887e1ec7301b2af8027efaf26f..44610a1b11d3d1cb5851173ba152b97b9e6512d0 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -2,7 +2,7 @@
let version = "3.5.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 95632a45999dbc50f6ca688289c978e1035cf83f..fc53ad266a65dd6073a8452285a29ba46acb77d1 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -17,7 +17,7 @@
, enableSharedLibraries ? !stdenv.isDarwin
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "llvm";
inherit version;
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index b66284152d4967902b7cef4eb6189ab969829a2b..7c965926f2ee64d27e6266339faf3117b0eb89a0 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index 5fe681185b2d71aff45ec80385e16bb36c930711..bca8e7877aca815b0997d06367ff9ee564688000 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -16,7 +16,7 @@
, enableSharedLibraries ? true
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "llvm";
inherit version;
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index af65fd6388eae50bbf6bc846b543f7615b44d65c..9d82aa230357a18e2ba67fdb46065947825a0719 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 74e9b8719d1d307e514068bd02be36c86a8c0728..0213741e3e064a5029e4c27c5df493e6ebdcb91d 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index ea70382d2ac713c5c1c3d192ae11edbeeed139aa..392ef4279096474016a24bc7519cc6f9031a1cf1 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -23,7 +23,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 9660be4df11f95f2412150e8676954980c2e8cbb..c87b0f235961dae0f503261298614b3fb0429d58 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -1,6 +1,6 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index e3015ae8448da830f7839755515b15a0c78e5547..03d8a2085d0b7b13212da04693305da89017e3f6 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 23b7bf4e2461a2896d34b672b3e6b045da512684..efe2022bedba129f897fde5246c5b22fc08632f3 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -21,7 +21,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index da2a5cfb58aece2758b7e120189daabdbc21c164..4cf79e79569ca91b57bd4480a85660f6b2a88905 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,6 +1,6 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 906baa4ae6460f4cd3eb0c24b7550c72335881e2..658068cbfaff19a8f90bb4c05f70be9e39c9a5b7 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index e104d051fed796b4429895946d563736f03c91b9..2586602d7378492fe2904adafcda537cfc16de71 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -25,7 +25,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index e9cc6dfc1dbe15eb2e879178029df86c5e6bf064..0912435327cef00cbed8a4d48ea22b2fe64538a6 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -1,5 +1,5 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 7f99cc9ae2cdb3f085e7224b1b15b7395de69253..621a246225d7238a322a4c3fe46b5785ddfaeb2c 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -111,7 +111,7 @@ let
'' + mkExtraBuildCommands cc;
};
- lldClangNoCompilerRt = wrapCCWith rec {
+ lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
bintools = wrapBintoolsWith {
inherit (tools) bintools;
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index fc9e3714db0cf6d34320a6e57db7f75da5aa8166..7a0716a6eb3860d98be4ee47ac30bc78c4d7aa51 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index a9caa88141a6bca5f84deadb9f8b0f30d51e5401..cfcda02b41319398f57e75a30cfb14a3d614c22a 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -29,7 +29,7 @@ let
let parts = splitString "." release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
-in stdenv.mkDerivation (rec {
+in stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 1f216178b558d769280e85e9216624de6ce18cfe..936c877d58c9b320c80e3c5e866b2d674d86bbfd 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -1,5 +1,5 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index f864e24acfef9d19989dd99ae61b3b92e67c5628..36d7a14142b460a8bfaccb8d2285a08b6d3a46b4 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -145,7 +145,7 @@ let
'' + mkExtraBuildCommands cc;
};
- lldClangNoCompilerRt = wrapCCWith rec {
+ lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
libcxx = null;
bintools = wrapBintoolsWith {
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index e0bc9e816f5089d9bd9b0b10b56dbcfc75657839..8ec1c419748d8d489ac2023d463b60f4ad287bd8 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
, enableShared ? true }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libc++";
inherit version;
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 6799a3f935f5d4afbfc536387328ae8bd480ff25..70e666ba27decce6d7a4fa73046d7d909d6ee2f0 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -27,7 +27,7 @@ let
shortVersion = with stdenv.lib;
concatStringsSep "." (take 1 (splitString "." release_version));
-in stdenv.mkDerivation (rec {
+in stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 1c0bdf479871cfac42ee25674556fa3dff799b34..6e0716659c79ea0cae3885f2e859678c755ec495 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -2,7 +2,7 @@
let
rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "manticore";
version = "2018.09.29";
diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix
index 3c748e2dff7de794d815729c8d34b9d5af6a1170..cb6edb2a546dca56504aae083c05b8bdef2e4fa3 100644
--- a/pkgs/development/compilers/mono/4.nix
+++ b/pkgs/development/compilers/mono/4.nix
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix
index 0db13308a5af36eabdfeefa05a0c5afe8afbd857..0ecb362acb4de28b6d2ecf2950b00c2e6fe97c58 100644
--- a/pkgs/development/compilers/mono/5.nix
+++ b/pkgs/development/compilers/mono/5.nix
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "5.20.1.27";
sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy";
diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix
index ec91d7e979c1ab064c7503653fa5d24f1bb39190..0157fa7b7f688460da06f9b04b273468eca02d5f 100644
--- a/pkgs/development/compilers/mono/6.nix
+++ b/pkgs/development/compilers/mono/6.nix
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "6.0.0.313";
srcArchiveSuffix = "tar.xz";
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 193e45bf55ebd1b17bd5da8104c77cf809d7f462..36a457125fad23bbf2047ffe50a40d32e22b7c82 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -13,7 +13,7 @@
, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "llvm";
version = "3.6-mono-2017-02-15";
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index 2067184a5b00d9c62d125811ac886e8654747659..8eb35f1b5f7a65301ac155f2590f365f26eb5934 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -8,7 +8,7 @@ let
version = "2.0.0";
binaries = {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
};
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
preferLocalBuild = true;
- src = binaries."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index c1e01ef77828c4a33e01c5185d0255bc4c88536f..357f26cf314167f717b643070de18efaafa9d3dc 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -1,10 +1,12 @@
{ stdenv, fetchFromGitHub, cmake
, boost, python3, eigen
, icestorm, trellis
+, llvmPackages
, enableGui ? true
, wrapQtAppsHook
, qtbase
+, OpenGL ? null
}:
let
@@ -12,13 +14,13 @@ let
in
with stdenv; mkDerivation rec {
pname = "nextpnr";
- version = "2019.08.21";
+ version = "2019.08.31";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "nextpnr";
- rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4";
- sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf";
+ rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b";
+ sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh";
};
nativeBuildInputs
@@ -26,7 +28,8 @@ with stdenv; mkDerivation rec {
++ (lib.optional enableGui wrapQtAppsHook);
buildInputs
= [ boostPython python3 eigen ]
- ++ (lib.optional enableGui qtbase);
+ ++ (lib.optional enableGui qtbase)
+ ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
enableParallelBuilding = true;
cmakeFlags =
@@ -39,7 +42,10 @@ with stdenv; mkDerivation rec {
"-DSERIALIZE_CHIPDB=OFF"
# use PyPy for icestorm if enabled
"-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
- ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF");
+ ]
+ ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF")
+ ++ (lib.optional (enableGui && stdenv.isDarwin)
+ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
# Fix the version number. This is a bit stupid (and fragile) in practice
# but works ok. We should probably make this overrideable upstream.
diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index aa6cf68d2c96916b6c051cc702123c846e58f22f..6362f360f7dabf24363a5039a731a2598ea9ec12 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -1,4 +1,4 @@
-import ./generic.nix rec {
+import ./generic.nix {
major_version = "4";
minor_version = "01";
patch_version = "0";
diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix
index 9ac53f567909ee1c73600296f6cb45805b0f7c5d..4773f9f74a5a1d9ff7ca953af82bf709c7487911 100644
--- a/pkgs/development/compilers/ocaml/4.02.nix
+++ b/pkgs/development/compilers/ocaml/4.02.nix
@@ -1,4 +1,4 @@
-import ./generic.nix rec {
+import ./generic.nix {
major_version = "4";
minor_version = "02";
patch_version = "3";
diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix
index c9536c487d054f691eb23898591b06fc52a9bd61..0bbe8233041997cd5b0cdd473c014344721b6d09 100644
--- a/pkgs/development/compilers/ocaml/4.03.nix
+++ b/pkgs/development/compilers/ocaml/4.03.nix
@@ -1,4 +1,4 @@
-import ./generic.nix rec {
+import ./generic.nix {
major_version = "4";
minor_version = "03";
patch_version = "0";
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 0085739147bfa0b030f4236d5e53eb03893c0793..9557d0a79aebb2382b12b6a44a49ce67188bfb03 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -30,7 +30,7 @@ let
x11inc = x11env + "/include";
in
-stdenv.mkDerivation (args // rec {
+stdenv.mkDerivation (args // {
inherit name;
inherit version;
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index 881748c36ea78ae0778d3747f1a059bbc8b7e1ee..aa50cf225caccc971990ab1ec135f1e50db76cbf 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
pname = "metaocaml";
version = "3.09-alpha-30";
diff --git a/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
index f8de96989967cb2159f482af1fa2d57f4cf1652a..cc34e548758e9649f10f31cd447d86b9ca9d1fbe 100644
--- a/pkgs/development/compilers/openjdk/005_enable-infinality.patch
+++ b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
@@ -6,7 +6,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
@@ -23,6 +23,9 @@
* questions.
*/
-
+
+/* Use Infinality patches as default */
+#define INFINALITY
+
@@ -21,13 +21,13 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
+#include FT_LCD_FILTER_H
+#include
+#endif
-
+
#include "fontscaler.h"
-
+
@@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co
}
}
-
+
+#ifdef INFINALITY
+typedef struct {
+ FT_Render_Mode ftRenderMode;
@@ -169,7 +169,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
+ rp->ftLcdFilter = ftLcdFilter;
+}
+#endif
-
+
/*
* Class: sun_font_FreetypeFontScaler
@@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
@@ -180,28 +180,27 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
int renderFlags = FT_LOAD_RENDER, target;
+#endif
FT_GlyphSlot ftglyph;
-
+
FTScalerContext* context =
-@@ -709,6 +859,11 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+@@ -709,5 +859,10 @@ Java_sun_font_FreetypeFontScaler_getGlyp
return ptr_to_jlong(getNullGlyphImage());
}
-
+
+#ifdef INFINALITY
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
+#else
- /* if algorithmic styling is required then we do not request bitmap */
- if (context->doBold || context->doItalize) {
- renderFlags = FT_LOAD_DEFAULT;
+ if (!context->useSbits) {
+ renderFlags |= FT_LOAD_NO_BITMAP;
@@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp
target = FT_LOAD_TARGET_LCD_V;
}
renderFlags |= target;
+#endif
-
+
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
+
+#ifdef INFINALITY
+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
@@ -213,7 +212,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
//do not destroy scaler yet.
//this can be problem of particular context (e.g. with bad transform)
@@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp
-
+
/* generate bitmap if it is not done yet
e.g. if algorithmic styling is performed and style was added to outline */
+#ifdef INFINALITY
@@ -223,7 +222,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
}
+#endif
-
+
width = (UInt16) ftglyph->bitmap.width;
height = (UInt16) ftglyph->bitmap.rows;
@@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
@@ -239,7 +238,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
@@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv*
return NULL;
}
-
+
+#ifdef INFINALITY
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
@@ -247,9 +246,9 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
+#else
renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
+#endif
-
+
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
+
+#ifdef INFINALITY
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
+#else
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 7ccbfb6351d5551ce2f53ccd38c5c905b98cf2e3..57911f2d58e68e9c5abf401632a07358a84d6562 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,42 +1,33 @@
-{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, perl, fontconfig, zlib, lndir
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
-, libjpeg, giflib
+{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
+, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
, setJavaClassPath
-, minimal ? false
-, enableJavaFX ? true, openjfx
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
-
- /**
- * The JDK libraries are in directories that depend on the CPU.
- */
- architecture =
- if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else "amd64";
-
major = "11";
- update = ".0.3";
+ update = ".0.4";
build = "ga";
- repover = "jdk-${major}${update}-${build}";
- openjdk = stdenv.mkDerivation {
- name = "openjdk-${major}${update}-${build}";
+ openjdk = stdenv.mkDerivation rec {
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+ url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [
- autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
- libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr lndir fontconfig
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+ libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
+ ] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
@@ -45,66 +36,60 @@ let
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap.patch
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk10.patch
];
preConfigure = ''
chmod +x configure
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-
- configureFlagsArray=(
- "--with-boot-jdk=${bootjdk.home}"
- "--with-update-version=${major}${update}"
- "--with-build-number=${build}"
- "--with-milestone=fcs"
- "--enable-unlimited-crypto"
- "--disable-debug-symbols"
- "--with-zlib=system"
- "--with-giflib=system"
- "--with-stdc++lib=dynamic"
-
- # glibc 2.24 deprecated readdir_r so we need this
- # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
- "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
- ''
- + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
- + lib.optionalString minimal " \"--enable-headless-only\""
- + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
- + ");"
- # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
- # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
- + stdenv.lib.optionalString stdenv.cc.isGNU ''
- NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
'';
- NIX_LDFLAGS= lib.optionals (!minimal) [
+ configureFlags = [
+ "--with-boot-jdk=${openjdk11-bootstrap.home}"
+ "--enable-unlimited-crypto"
+ "--with-native-debug-symbols=internal"
+ "--with-libjpeg=system"
+ "--with-giflib=system"
+ "--with-libpng=system"
+ "--with-zlib=system"
+ "--with-lcms=system"
+ "--with-stdc++lib=dynamic"
+ ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+ ++ lib.optional headless "--enable-headless-only"
+ ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+ separateDebugInfo = true;
+
+ NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
+ NIX_LDFLAGS = lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
buildFlags = [ "all" ];
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share
+ mkdir -p $out/lib
- cp -av build/*/images/jdk/* $out/lib/openjdk
+ mv build/*/images/jdk $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
- mkdir $out/include $out/share/man
- ln -s $out/lib/openjdk/include/* $out/include/
- ln -s $out/lib/openjdk/man/* $out/share/man/
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
- ${lib.optionalString minimal ''
+ ${lib.optionalString headless ''
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
@@ -129,11 +114,12 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
-
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
@@ -141,26 +127,20 @@ let
patchelf --shrink-rpath "$i" || true
done
done
-
- # Test to make sure that we don't depend on the bootstrap
- for output in $outputs; do
- if grep -q -r '${bootjdk}' $(eval echo \$$output); then
- echo "Extraneous references to ${bootjdk} detected"
- exit 1
- fi
- done
'';
+ disallowedReferences = [ openjdk11-bootstrap ];
+
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/;
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
- platforms = ["i686-linux" "x86_64-linux"];
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = {
- inherit architecture;
+ architecture = "";
home = "${openjdk}/lib/openjdk";
};
};
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 952c5d1bf6ae93336d5284c9b49ce190605a3054..e764e9c62cb8aa1f1cf0258d85a87d06d28b1942 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,9 +1,10 @@
{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
+, openjdk8-bootstrap
, setJavaClassPath
-, minimal ? false
+, headless ? false
, enableInfinality ? true # font rendering patch
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
}:
@@ -13,52 +14,71 @@ let
/**
* The JRE libraries are in directories that depend on the CPU.
*/
- architecture =
- if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else if stdenv.hostPlatform.system == "x86_64-linux" then
- "amd64"
- else
- throw "openjdk requires i686-linux or x86_64 linux";
-
- update = "212";
- build = "ga";
- baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
- repover = "jdk8u${update}-${build}";
+ architecture = {
+ i686-linux = "i386";
+ x86_64-linux = "amd64";
+ aarch64-linux = "aarch64";
+ }.${stdenv.system} or (throw "Unsupported platform");
+
+ update = "222";
+ build = if stdenv.isAarch64 then "b10"
+ else "ga";
+ baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah"
+ else "https://hg.openjdk.java.net/jdk8u/jdk8u";
+ repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-"
+ + "jdk8u${update}-${build}";
+
jdk8 = fetchurl {
+ name = "jdk8-${repover}.tar.gz";
url = "${baseurl}/archive/${repover}.tar.gz";
- sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg";
+ sha256 = if stdenv.isAarch64 then "1h19zpmc76f8v4s0mfvqxmxvv8imdwq92z5dmgi19y4xnl978qq8"
+ else "19dyqayn8n2y08p08g34xxnf0dkm6bfjxkp7633m7dx50mjcpxnj";
};
langtools = fetchurl {
+ name = "langtools-${repover}.tar.gz";
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
- sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw";
+ sha256 = if stdenv.isAarch64 then "09phy2izw2yyp3hnw7jmb7lp559dgnp2a0rymx1k3q97anfz3bzj"
+ else "11nibmqnf7nap10sydk57gimgwpxqk5mn12dyg6fzg4s2fxf0y1q";
};
hotspot = fetchurl {
+ name = "hotspot-${repover}.tar.gz";
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
- sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s";
+ sha256 = if stdenv.isAarch64 then "1dqrzg2af94pjam6jg9nq8ydaibn4bsjv7ai6m7m3r2ph2fml80s"
+ else "1g512xrrxvnrk5szg7wqqz00x4gv53dx3yffk5im2zfcalyka2q7";
};
corba = fetchurl {
+ name = "corba-${repover}.tar.gz";
url = "${baseurl}/corba/archive/${repover}.tar.gz";
- sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03";
+ sha256 = if stdenv.isAarch64 then "15l1ccvk2slx8wf5gilzjvhc428hl57gg1knbma1jqgs3ymnqwpr"
+ else "0h8nprfzpy21mfl39fxxzfa420skwmaaji4r31j7lj3g8c1wp62r";
};
jdk = fetchurl {
+ name = "jdk-${repover}.tar.gz";
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
- sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545";
+ sha256 = if stdenv.isAarch64 then "179ij3rs1ahl6dh3n64k4xp2prv413ckqk7sj1g5lw48rj7bjh83"
+ else "1sb38h0rckgkr2y0kfzav6mb74nv5whb9l8m842mv1jpavxrdv6k";
};
jaxws = fetchurl {
+ name = "jaxws-${repover}.tar.gz";
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
- sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg";
+ sha256 = if stdenv.isAarch64 then "16bayw7c4vzm9s0ixhw2dv6pan6wywyiddh9a8dss35660dnhrm0"
+ else "0akn5zapff5m32ibgm3f4lhgq96bsqx74g4xl38xmivvxddsd6kz";
};
jaxp = fetchurl {
+ name = "jaxp-${repover}.tar.gz";
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
- sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8";
+ sha256 = if stdenv.isAarch64 then "176db7pi2irc7q87c273cjm5nrlj5g973fjmh24m6a1jxanrrm9x"
+ else "0bw4q8yhmrl8hqlimy1ijnarav4r91dj73lpr7axba77rqlr41c8";
};
nashorn = fetchurl {
+ name = "nashorn-${repover}.tar.gz";
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
- sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h";
+ sha256 = if stdenv.isAarch64 then "0vi3kbsqfpdjxc08ayxk2c87zycd7z0qbqw9xka1vc59iyv97n62"
+ else "0bfcf3iv2lr0xlp6sclxq7zz7b9ahajl008hz5rasjnrnr993qja";
};
openjdk8 = stdenv.mkDerivation {
- name = "openjdk-8u${update}-${build}";
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "8u${update}-${build}";
srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ];
sourceRoot = ".";
@@ -67,15 +87,15 @@ let
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr lndir fontconfig
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ libXi libXinerama libXcursor libXrandr fontconfig
+ ] ++ lib.optionals (!headless && enableGnome2) [
gtk2 gnome_vfs GConf glib
];
- #move the seven other source dirs under the main jdk8u directory,
- #with version suffixes removed, as the remainder of the build will expect
+ # move the seven other source dirs under the main jdk8u directory,
+ # with version suffixes removed, as the remainder of the build will expect
prePatch = ''
mainDir=$(find . -maxdepth 1 -name jdk8u\*);
find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do
@@ -88,10 +108,10 @@ let
./fix-java-home-jdk8.patch
./read-truststore-from-env-jdk8.patch
./currency-date-range-jdk8.patch
- ] ++ lib.optionals (!minimal && enableInfinality) [
+ ] ++ lib.optionals (!headless && enableInfinality) [
./004_add-fontconfig.patch
./005_enable-infinality.patch
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk8.patch
];
@@ -103,33 +123,39 @@ let
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
- ''
- # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
- # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
- + stdenv.lib.optionalString stdenv.cc.isGNU ''
- NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
'';
configureFlags = [
- "--with-boot-jdk=${bootjdk.home}"
+ "--with-boot-jdk=${openjdk8-bootstrap.home}"
"--with-update-version=${update}"
"--with-build-number=${build}"
"--with-milestone=fcs"
"--enable-unlimited-crypto"
- "--disable-debug-symbols"
+ "--with-native-debug-symbols=internal"
"--disable-freetype-bundling"
"--with-zlib=system"
"--with-giflib=system"
"--with-stdc++lib=dynamic"
+ ] ++ lib.optional headless "--disable-headful";
+
+ separateDebugInfo = true;
+ NIX_CFLAGS_COMPILE = [
# glibc 2.24 deprecated readdir_r so we need this
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
- "--with-extra-cflags=\"-Wno-error=deprecated-declarations\""
- ] ++ lib.optional minimal "--disable-headful";
+ "-Wno-error=deprecated-declarations"
+ ] ++ lib.optionals stdenv.cc.isGNU [
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+ # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+ "-fno-lifetime-dse"
+ "-fno-delete-null-pointer-checks"
+ "-std=gnu++98"
+ "-Wno-error"
+ ];
- NIX_LDFLAGS= lib.optionals (!minimal) [
+ NIX_LDFLAGS= lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
@@ -138,45 +164,39 @@ let
doCheck = false; # fails with "No rule to make target 'y'."
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+ mkdir -p $out/lib
- cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
+ mv build/*/images/j2sdk-image $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
- mkdir $out/include $out/share/man
- ln -s $out/lib/openjdk/include/* $out/include/
- ln -s $out/lib/openjdk/man/* $out/share/man/
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
- ${lib.optionalString minimal ''
+ ${lib.optionalString headless ''
rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
rm $out/lib/openjdk/jre/bin/policytool
rm $out/lib/openjdk/bin/{policytool,appletviewer}
''}
- # Move the JRE to a separate output and setup fallback fonts
- mv $out/lib/openjdk/jre $jre/lib/openjdk/
- mkdir $out/lib/openjdk/jre
- ${lib.optionalString (!minimal) ''
- mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
- lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
- ''}
- lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+ # Move the JRE to a separate output
+ mkdir -p $jre/lib/openjdk
+ mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
+ ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
- rm -rf $out/lib/openjdk/jre/bina
- ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
-
- # Make sure cmm/*.pf are not symlinks:
- # https://youtrack.jetbrains.com/issue/IDEA-147272
- rm -rf $out/lib/openjdk/jre/lib/cmm
- ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+ # Setup fallback fonts
+ ${lib.optionalString (!headless) ''
+ mkdir -p $jre/lib/openjdk/jre/lib/fonts
+ ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+ ''}
# Remove duplicate binaries.
for i in $(cd $out/lib/openjdk/bin && echo *); do
@@ -198,12 +218,7 @@ let
ln -s $jre/lib/openjdk/jre $out/jre
'';
- # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
- prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
- patchELF $jre
- propagatedBuildInputs+=" $jre"
-
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
@@ -221,11 +236,12 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
-
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
@@ -233,22 +249,16 @@ let
patchelf --shrink-rpath "$i" || true
done
done
-
- # Test to make sure that we don't depend on the bootstrap
- for output in $outputs; do
- if grep -q -r '${bootjdk}' $(eval echo \$$output); then
- echo "Extraneous references to ${bootjdk} detected"
- exit 1
- fi
- done
'';
- meta = with stdenv.lib; {
+ disallowedReferences = [ openjdk8-bootstrap ];
+
+ meta = with lib; {
homepage = http://openjdk.java.net/;
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo nequissimus ];
- platforms = platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
};
passthru = {
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
index 61c2d57423e449e2435f815696ad1c9599fbab2f..4c808302b4fa8a9b42163e9871f1236937c11da1 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -52,7 +52,10 @@ let
home = jdk;
};
- meta.platforms = stdenv.lib.platforms.darwin;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.darwin;
+ };
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index 7457ffceab1fe4fd4ffcfab34dca7b80cd15cb42..045901b1bae603e0f143d0ac23787495e767b70d 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -53,7 +53,10 @@ let
home = jdk;
};
- meta.platforms = stdenv.lib.platforms.darwin;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.darwin;
+ };
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index b4e19c32e26d6f51ca5c87047c0a51280a462f7e..58e4ba990149ab67ba00a67004ba28b9308bb18c 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -52,7 +52,10 @@ let
home = jdk;
};
- meta.platforms = stdenv.lib.platforms.darwin;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.darwin;
+ };
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 65c85d055cbb4c0ef1705589435162d22a482725..094bd57e6e985f6cfc8254344d765bcca72e091b 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,42 +1,33 @@
-{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
-, libjpeg, giflib
+{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
+, libXcursor, libXrandr, fontconfig, openjdk11
, setJavaClassPath
-, minimal ? false
-, enableJavaFX ? true, openjfx
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
-
- /**
- * The JDK libraries are in directories that depend on the CPU.
- */
- architecture =
- if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else "amd64";
-
major = "12";
update = ".0.2";
build = "ga";
- repover = "jdk-${major}${update}-${build}";
- openjdk = stdenv.mkDerivation {
- name = "openjdk-${major}${update}-${build}";
+ openjdk = stdenv.mkDerivation rec {
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+ url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [
- autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
- libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr lndir fontconfig
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+ libXi libXinerama libXcursor libXrandr fontconfig openjdk11
+ ] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
@@ -53,62 +44,60 @@ let
url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch;
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
})
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk10.patch
];
- preConfigure = ''
+ prePatch = ''
chmod +x configure
- substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-
- configureFlagsArray=(
- "--with-boot-jdk=${bootjdk.home}"
- "--enable-unlimited-crypto"
- "--with-zlib=system"
- "--with-giflib=system"
- "--with-stdc++lib=dynamic"
-
- # glibc 2.24 deprecated readdir_r so we need this
- # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
- "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=unused-result"
- ''
- + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
- + lib.optionalString minimal " \"--enable-headless-only\""
- + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
- + ");"
- # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
- # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
- + stdenv.lib.optionalString stdenv.cc.isGNU ''
- NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
+ patchShebangs --build configure
'';
- NIX_LDFLAGS= lib.optionals (!minimal) [
+ configureFlags = [
+ "--with-boot-jdk=${openjdk11.home}"
+ "--enable-unlimited-crypto"
+ "--with-native-debug-symbols=internal"
+ "--with-libjpeg=system"
+ "--with-giflib=system"
+ "--with-libpng=system"
+ "--with-zlib=system"
+ "--with-lcms=system"
+ "--with-stdc++lib=dynamic"
+ ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+ ++ lib.optional headless "--enable-headless-only"
+ ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+ separateDebugInfo = true;
+
+ NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
+ NIX_LDFLAGS = lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
buildFlags = [ "all" ];
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share
+ mkdir -p $out/lib
- cp -av build/*/images/jdk/* $out/lib/openjdk
+ mv build/*/images/jdk $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
- mkdir $out/include $out/share/man
- ln -s $out/lib/openjdk/include/* $out/include/
- ln -s $out/lib/openjdk/man/* $out/share/man/
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
- ${lib.optionalString minimal ''
+ ${lib.optionalString headless ''
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
@@ -133,11 +122,12 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
-
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
@@ -145,26 +135,20 @@ let
patchelf --shrink-rpath "$i" || true
done
done
-
- # Test to make sure that we don't depend on the bootstrap
- for output in $outputs; do
- if grep -q -r '${bootjdk}' $(eval echo \$$output); then
- echo "Extraneous references to ${bootjdk} detected"
- exit 1
- fi
- done
'';
+ disallowedReferences = [ openjdk11 ];
+
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/;
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
- platforms = ["i686-linux" "x86_64-linux"];
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = {
- inherit architecture;
+ architecture = "";
home = "${openjdk}/lib/openjdk";
};
};
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 223feb1e2a146bc193f77cb12399a61a392b1a1c..9e6d30efda81744fea6c92bc0525fd7fc1abc38f 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
-, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
+, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby
+, openjdk11-bootstrap }:
let
major = "11";
@@ -7,14 +8,14 @@ let
build = "1";
repover = "${major}${update}+${build}";
gradle_ = (gradleGen.override {
- java = bootjdk;
+ java = openjdk11-bootstrap;
}).gradle_4_10;
makePackage = args: stdenv.mkDerivation ({
- version = "${major}${update}-${repover}";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
+ url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
};
@@ -25,7 +26,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
- JDK_HOME = ${bootjdk}/lib/openjdk
+ JDK_HOME = ${openjdk11-bootstrap.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -56,11 +57,11 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
- # Downloaded AWT jars differ by platform.
- if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"
- else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"
- else throw "Unsupported platform";
+ # Downloaded AWT jars differ by platform.
+ outputHash = {
+ i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08";
+ x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a";
+ }.${stdenv.system} or (throw "Unsupported platform");
};
in makePackage {
@@ -87,24 +88,20 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
find "$out" -name \*.so | while read lib; do
- new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+ new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
-
- # Test to make sure that we don't depend on the bootstrap
- if grep -q -r '${bootjdk}' "$out"; then
- echo "Extraneous references to ${bootjdk} detected" >&2
- exit 1
- fi
'';
+ disallowedReferences = [ openjdk11-bootstrap ];
+
passthru.deps = deps;
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/projects/openjfx/;
- license = openjdk.meta.license;
+ license = licenses.gpl2;
description = "The next-generation Java client toolkit.";
maintainers = with maintainers; [ abbradar ];
- platforms = openjdk.meta.platforms;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix
index 266dd7f334ef3db03a2d374bc81896c526cb6948..418c58ac683ef9905c13029417e770e5dbbae9ad 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/12.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
-, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen
+, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
+, ffmpeg, python, ruby }:
let
major = "12";
@@ -7,14 +8,14 @@ let
build = "14";
repover = "${major}${update}+${build}";
gradle_ = (gradleGen.override {
- java = bootjdk;
+ java = openjdk11_headless;
}).gradle_4_10;
makePackage = args: stdenv.mkDerivation ({
- version = "${major}${update}-${repover}";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
+ url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz";
};
@@ -25,7 +26,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
- JDK_HOME = ${bootjdk}/lib/openjdk
+ JDK_HOME = ${openjdk11_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -56,11 +57,11 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
- # Downloaded AWT jars differ by platform.
- if stdenv.system == "x86_64-linux" then "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"
- else if stdenv.system == "i686-linux" then "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"
- else throw "Unsupported platform";
+ # Downloaded AWT jars differ by platform.
+ outputHash = {
+ x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci";
+ i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd";
+ }.${stdenv.system} or (throw "Unsupported platform");
};
in makePackage {
@@ -87,24 +88,20 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
find "$out" -name \*.so | while read lib; do
- new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+ new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
-
- # Test to make sure that we don't depend on the bootstrap
- if grep -q -r '${bootjdk}' "$out"; then
- echo "Extraneous references to ${bootjdk} detected" >&2
- exit 1
- fi
'';
+ disallowedReferences = [ openjdk11_headless ];
+
passthru.deps = deps;
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/projects/openjfx/;
- license = openjdk.meta.license;
+ license = licenses.gpl2;
description = "The next-generation Java client toolkit.";
maintainers = with maintainers; [ abbradar ];
- platforms = openjdk.meta.platforms;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
index 4902b8e840114a4dec8a1b1b3c8eceed3fe3cff3..08cf554a18fecb6d4b1445da408af79ecc9a8ca4 100644
--- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
@@ -1,21 +1,30 @@
-diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200
-+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100
-@@ -161,6 +161,7 @@
- /*
- * Try:
- * javax.net.ssl.trustStore (if this variable exists, stop)
-+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
- * jssecacerts
- * cacerts
- *
-@@ -169,6 +169,9 @@
-
- try {
- storeFileName = props.get("trustStore");
-+ if (storeFileName == null) {
-+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
-+ }
- if (!"NONE".equals(storeFileName)) {
- if (storeFileName != null) {
- storeFile = new File(storeFileName);
+--- a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400
++++ b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400
+@@ -71,6 +71,7 @@
+ *
+ * The preference of the default trusted KeyStore is:
+ * javax.net.ssl.trustStore
++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
+ * jssecacerts
+ * cacerts
+ */
+@@ -132,7 +133,8 @@
+ public TrustStoreDescriptor run() {
+ // Get the system properties for trust store.
+ String storePropName = System.getProperty(
+- "javax.net.ssl.trustStore", jsseDefaultStore);
++ "javax.net.ssl.trustStore",
++ System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));
+ String storePropType = System.getProperty(
+ "javax.net.ssl.trustStoreType",
+ KeyStore.getDefaultType());
+@@ -144,6 +146,9 @@
+ String temporaryName = "";
+ File temporaryFile = null;
+ long temporaryTime = 0L;
++ if (storePropName == null) {
++ storePropName = jsseDefaultStore;
++ }
+ if (!"NONE".equals(storePropName)) {
+ String[] fileNames =
+ new String[] {storePropName, defaultStore};
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
index 31e3800a6c9cf71ed3fa943e4b09d91b3fa7d8bf..b1e95bb704cbb1d7ab019709e3edef56ca6e413f 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openspin";
version = "unstable-2018-10-02";
diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix
index 7885582ad1257e8eb621931dd77d693610fe7635..67d444428e928ee7787aaff4610de2f832a84bee 100644
--- a/pkgs/development/compilers/pforth/default.nix
+++ b/pkgs/development/compilers/pforth/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "28";
pname = "pforth";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index acccc749686cefc278026ceee8034cf2d33930de..06202901563e4ab94a55196c22e224922a14548f 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -18,7 +18,7 @@ let
in
rec {
- rustc = stdenv.mkDerivation rec {
+ rustc = stdenv.mkDerivation {
name = "rustc-${versionType}-${version}";
inherit version;
@@ -64,7 +64,7 @@ rec {
setupHooks = ./setup-hook.sh;
};
- cargo = stdenv.mkDerivation rec {
+ cargo = stdenv.mkDerivation {
name = "cargo-${versionType}-${version}";
inherit version;
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 5cf48715dae203a2b8f04fba2c689d9535a9d646..43a72985ddec597b5f5f76bb1e577f5538ec6cfc 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -32,7 +32,7 @@ let
src = fetchurl {
url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
- sha256 = hashes."${platform}";
+ sha256 = hashes.${platform};
};
in callPackage ./binary.nix
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index e000edad49b672b8cdd071a5516722bb785ea2f2..2bf2722818b982ca3fdcdfe2191c044854a6816c 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -3,7 +3,7 @@
, CoreFoundation, Security
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
name = "cargo-${rustc.version}";
inherit (rustc) version src;
diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix
index 2b8fcbe0ba4ba82f4f9e1b3f637aa33c14210b5e..56b70f21d4c72c6bc8c469279aa382c4f931f36c 100644
--- a/pkgs/development/compilers/rust/clippy.nix
+++ b/pkgs/development/compilers/rust/clippy.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
name = "clippy-${rustc.version}";
inherit (rustc) version src;
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix
index 470611242e0734fc271e67af1b30d29282abe308..942e23c6170d9b53beb4397f541e39ff5d51c14d 100644
--- a/pkgs/development/compilers/rust/rls/default.nix
+++ b/pkgs/development/compilers/rust/rls/default.nix
@@ -2,7 +2,7 @@
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "rls";
inherit (rustPlatform.rust.rustc) src version;
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 537bdaf445cd7f6231ee09a7e475219c99e8daa3..9793eee1708b6da8e9855fd8d6dc17c402100ff3 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "rustfmt-${version}";
+ pname = "rustfmt";
inherit (rustPlatform.rust.rustc) version src;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 0d2a10b6a9982de478e81528a51de5188e4bad58..9c777cc75728e2001cda6b2fd74e650366a50f60 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -2,38 +2,38 @@
let
options = rec {
- x86_64-darwin = rec {
+ x86_64-darwin = {
version = "1.2.11";
system = "x86-64-darwin";
sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85";
};
- x86_64-linux = rec {
+ x86_64-linux = {
version = "1.3.16";
system = "x86-64-linux";
sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s";
};
- i686-linux = rec {
+ i686-linux = {
version = "1.2.7";
system = "x86-linux";
sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
};
- aarch64-linux = rec {
+ aarch64-linux = {
version = "1.3.16";
system = "arm64-linux";
sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl";
};
- armv7l-linux = rec {
+ armv7l-linux = {
version = "1.2.14";
system = "armhf-linux";
sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
};
armv6l-linux = armv7l-linux;
- x86_64-freebsd = rec {
+ x86_64-freebsd = {
version = "1.2.7";
system = "x86-64-freebsd";
sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6";
};
- x86_64-solaris = rec {
+ x86_64-solaris = {
version = "1.2.7";
system = "x86-64-solaris";
sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0";
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 1a450af2b941bb3af6ed0a75cedff12599422401..cdac400b1afd8564bc9ec58cac126887016afe1b 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://sdcc.sourceforge.net/;
license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
maintainers = with maintainers; [ bjornfor yorickvp ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix
index efcaf56110d2fef35b7f6a65375ffcd16a1f3196..f6b732f02aeb7205379b95fd49fb03965c4cece3 100644
--- a/pkgs/development/compilers/seexpr/default.nix
+++ b/pkgs/development/compilers/seexpr/default.nix
@@ -2,7 +2,7 @@
bison, flex, libGLU, pythonPackages
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "seexpr";
version = "2.11";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index c9b4f9639d07f665ccacaf6b97f58c0b21112210..6f1156897db9f4b5484542b75246d2d4f56d7ef3 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ... }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "serpent";
# I can't find any version numbers, so we're just using the date
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index f21b2ae3cb80f1e1637955d7c871268cdd7e34bc..c9698fcad9b455b9ad28b0ac47f964807c1cb561 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -131,7 +131,7 @@ let
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "swift-${version_friendly}";
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix
index d5f0dcbec29f5628d9358e29734f3b8acad26efd..f3ff864f81b1352029057826d332899603b27a57 100644
--- a/pkgs/development/compilers/urn/default.nix
+++ b/pkgs/development/compilers/urn/default.nix
@@ -20,7 +20,7 @@ let
inherit (stdenv.lib) optionalString concatMapStringsSep;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
src = fetchFromGitLab {
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix
index 3196592da4850e37ed38f956e87f32b954541b25..5f812e2c4632330197af5e2ad841ecdef1d0fc93 100644
--- a/pkgs/development/compilers/wcc/default.nix
+++ b/pkgs/development/compilers/wcc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "wcc-unstable";
version = "2018-04-05";
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 467d4e3b49ebe663a2de1aabebc99ffba527c374..1535c7a7de64c9ff7fafc4136deeb5b8074c80a5 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
pname = "yosys";
- version = "2019.08.21";
+ version = "2019.09.01";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4";
- sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw";
+ rev = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0";
+ sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs";
name = "yosys";
})
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index f0e0693d12c4febd9eda6c13467a07a89e243261..15ee5f403bc32d90aa3283d32d20f0b0e9f01e2e 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -23,7 +23,7 @@ let
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
pname = "zulu";
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index d4c4c1f0ac31d0b825c20fa47152ee02b8816ce9..90b28d3183167a8fd3e5baee634476519927f32a 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -23,7 +23,7 @@ let
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
pname = "zulu";
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
index d58f65102190de27b8665d1575042c2f9c33c900..4e75b9407dee4a36b166399ff5088d4325f3bef3 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -8,7 +8,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-Cheerios-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
index 4fe86c3fae18575df4142a0ec06fc22759266fbb..5df96519e7ff6b947f8e3854343a24b4c3f81105 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -8,7 +8,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 874b99f2bebf01a02d4bf403ab0ee227e3e22d9c..b996128948027e3d5968393ef2e7487c05791565 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -14,7 +14,7 @@ let params =
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
};
- "8.8" = rec {
+ "8.8" = {
version = "20190311";
rev = "22af9e9a223d0038f05638654422e637e863b355";
sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
@@ -26,12 +26,12 @@ let params =
sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-QuickChick-${param.version}";
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
index e33b9427223ecffa72fa1341d3ee3d0b5da4e640..2e4d12478b795f54c38dd6dcca73eb0558162230 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -8,7 +8,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-StructTact-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
index cd7ddfefb84a4840e33421ab4362bb70d44abfb5..92c9b2569ca4550abd8050f32d407bb23edcc333 100644
--- a/pkgs/development/coq-modules/Velisarios/default.nix
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -20,10 +20,10 @@ let params =
sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-Velisarios-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
index 00d088a4a92c3d39b3a1348bd67b748357ebca3b..d2e9660a630e2beb06ec09d9301c5dd47c6e5145 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -13,7 +13,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-verdi-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index a074b27ff65879201580ca336abe5d5553dc3476..fb45e591ec1a1d16acafb5c602929f3a29452085 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -22,10 +22,10 @@ let params = {
sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-bignums";
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 3dfa95154d33d09979372264e6caf31a2c56bde4..025a67a1e70b1561897b07d5ae74664397eb2577 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -19,10 +19,10 @@ let
"8.8" = v20190414;
"8.9" = v20190414;
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-category-theory-${param.version}";
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index faf7db09ff9bb11c996d022434fa8aa9e580328e..91fdb8651cc6b86f9936123b572732a4245dd82d 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -34,7 +34,7 @@ let mkContrib = repo: revs: param:
rev = "86ac28259030649ef51460e4de2441c8a1017751";
sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9";
};
- }."${coq.coq-version}";
+ }.${coq.coq-version};
abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] {
version = "v8.6.0";
@@ -219,7 +219,7 @@ let mkContrib = repo: revs: param:
rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc";
sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw";
};
- }."${coq.coq-version}";
+ }.${coq.coq-version};
continuations = mkContrib "continuations" [ ] {
version = "v8.5.0-13-g6885310";
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 04fc428b40921a2eff8a8b0fa3cf8746cccd60a6..c689cea1a82703e9c8b815f8ce3357407c224c04 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -7,7 +7,7 @@ let params = {
sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index cade2bd352ebe6f6643e4abbbf8475d30c92b07e..898272d402b6cc94d9486685b85b22cd2b7fd2bb 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -8,7 +8,7 @@ let params =
"8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
"8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; };
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index 57f31e1847c1aab1076608d689662aad1911693b..e9263fb2be1e4cf135173dfa29f4e79b647d0bcd 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -26,10 +26,10 @@ let params =
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-coq-haskell-${param.version}";
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 28c651f9b16afd426fc6cd1d44076cda6f36a05f..83a505017fbc6f24e92c095331f33543832bfbef 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -9,7 +9,7 @@ let
sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index c67342f1a2f74be51225c5b7c9e306ac41a167d4..6228bd4be9d09e19fe381b21d871fcf3b65b888f 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -15,7 +15,7 @@ let params =
"8.9" = v_8_8;
"8.10" = v_8_8;
};
- param = params."${coq.coq-version}"
+ param = params.${coq.coq-version}
; in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index e403f7d4fb5ce64377f76f1990d389f04d939f4e..401cb299497b0a91eadc9794c38d52e39b149868 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -22,7 +22,7 @@ let params = {
sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
};
};
-param = params."${coq.coq-version}";
+param = params.${coq.coq-version};
in
stdenv.mkDerivation {
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 5446b540fac3dfc868901bef96045833970af216..38444fe2b061035bda10fe79dcf5e6fcd0a048bb 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -32,7 +32,7 @@ let
sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix
index 30917fcb78f23471edb9db3d188fc744a2365072..80b167aaa98aabfdb3315e8e2feeb314156aca58 100644
--- a/pkgs/development/coq-modules/ltac2/default.nix
+++ b/pkgs/development/coq-modules/ltac2/default.nix
@@ -17,7 +17,7 @@ let params = {
sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index d573eca809a276c5d8031036560765d4fbbdc110..6798236591c43c3da05951cd10e1275916db2ebb 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -30,7 +30,7 @@ let
# COMPUTED using the configuration above (edit with caution) #
##############################################################
default-mathcomp-version = let v = head (
- filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version)
+ filter (mc: mathcomp-coq-versions.${mc} coq.coq-version)
mathcomp-version-preference ++ ["0.0.0"]);
in if v == "0.0.0" then max-mathcomp-version else v;
@@ -73,7 +73,7 @@ let
custom-version = if is-released then mathcomp-version else "custom";
# the base set of attributes for mathcomp
- attrs = rec {
+ attrs = {
name = "coq${coq.coq-version}-${pkgname}-${custom-version}";
# used in ssreflect
@@ -126,9 +126,9 @@ let
};
};
in
- {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);};
+ {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);};
-getAttrOr = a: n: a."${n}" or (throw a.error);
+getAttrOr = a: n: a.${n} or (throw a.error);
mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
@@ -136,7 +136,7 @@ mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
mathcompCorePkgs = recurseIntoAttrs
(mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
-in rec {
+in {
# mathcompGenSingle: given a version of mathcomp
# generates an attribute set {single = ;} with the single mathcomp derivation
inherit mathcompGenSingle;
diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix
index 0d9557623c36fb3902534d180547bc34e5d5f649..c342c25a41189a3af25fd75b6d7a668c8126200c 100644
--- a/pkgs/development/coq-modules/mathcomp/extra.nix
+++ b/pkgs/development/coq-modules/mathcomp/extra.nix
@@ -139,7 +139,7 @@ packageGen = {
else compatibleCoqVersions;
mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;
in
- { "${package}" = let from = src; in
+ { ${package} = let from = src; in
stdenv.mkDerivation rec {
inherit version;
@@ -149,7 +149,7 @@ packageGen = {
owner = owner;
repo = package;
rev = version;
- sha256 = version-sha256."${version}";
+ sha256 = version-sha256.${version};
} else from;
propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;
@@ -173,7 +173,7 @@ packageGen = {
};
};
-current-versions = versions."${current-ssreflect.version}" or {};
+current-versions = versions.${current-ssreflect.version} or {};
select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);
@@ -181,14 +181,14 @@ for-version = v: suffix: (mapAttrs' (n: pkg:
{name = "mathcomp_${suffix}-${n}";
value = (packageGen ({
ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";
- } // pkg))."${n}";})
- (select versions."${v}"));
+ } // pkg)).${n};})
+ (select versions.${v}));
all = (for-version "1.7.0" "1_7") //
(for-version "1.8.0" "1_8") //
(for-version "1.9.0" "1_9") //
(recurseIntoAttrs (mapDerivationAttrset dontDistribute (
- mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";})
+ mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};})
(select current-versions))));
in
{
diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix
index 472d3aeb2d08d7e9192dc50641ef2dccc7b49d6f..a8dd74dd5fb64ae8d65dd6433267f708ea520475 100644
--- a/pkgs/development/coq-modules/paramcoq/default.nix
+++ b/pkgs/development/coq-modules/paramcoq/default.nix
@@ -15,7 +15,7 @@ let params =
sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index d53337aca1ad01f9a9b6b2a032816e6239e4f384..8d93492209c6263a334117a01a67b8df1e14cdb9 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -17,8 +17,8 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
- rev = revs."${version}";
- sha256 = hashes."${version}";
+ rev = revs.${version};
+ sha256 = hashes.${version};
};
buildInputs = [ sbcl
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 29d63f1d004864d6503ed57706b5bfe9ec5c25e6..cde9146f78c65f1677a40ac25a9312d656a40072 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, mlton }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ceptre-2016-11-27";
src = fetchgit {
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index 918c577356cd8359ed51f30a964d3497b3d88163..c70bfd9406e097ca216d102eaf34db27ca8f11ac 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "6.30";
pname = "clips";
src = fetchurl {
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index ab8e616ac6d5fc1c58766f4d82435f783aa2384d..0e9d81d5e9599a361cc058200ce62559c1662c3f 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -126,7 +126,7 @@ let # packageJSON=./package.json;
getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
pname = "lumo";
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index d32f91275652b93ee67b93b950c2729ac4ce7691..229c42d9f7b24ae25bb3219126183eda6da389c1 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.5.3";
sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5";
minimumOTPVersion = "18";
diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix
index 73afcbd1597e82dee68ea9b9742abbec984770cb..94dffd1f763d08e5b6ce9a0d4209e3b18a90b6bb 100644
--- a/pkgs/development/interpreters/elixir/1.6.nix
+++ b/pkgs/development/interpreters/elixir/1.6.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.6.6";
sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl";
minimumOTPVersion = "19";
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
index adbbbaff890bac43372449f5b3905086519ac6db..10ebd5438a1102ca60e4aa181ca27ff425651754 100644
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.7.4";
sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
minimumOTPVersion = "19";
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix
index e240e1907e06133de3f64688d12289b2e2381415..931fa50b1f725a9277ed3637c4259913c14bcbde 100644
--- a/pkgs/development/interpreters/elixir/1.8.nix
+++ b/pkgs/development/interpreters/elixir/1.8.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.8.2";
sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq";
minimumOTPVersion = "20";
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix
index 41601eeaa1183f37c8f6fe33885a4c2551961fbf..b9b2400b78b97c68f7a31cf8645eb7ad7950a3e9 100644
--- a/pkgs/development/interpreters/elixir/1.9.nix
+++ b/pkgs/development/interpreters/elixir/1.9.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.9.1";
sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx";
minimumOTPVersion = "20";
diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix
index c263551de2dae5ad1bb7da54e164a207a9ddf659..11637868ed0f4f8b9d997604db7bd31fb9088ae4 100644
--- a/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix
@@ -1,6 +1,6 @@
{ pkgs, mkDerivation }:
-mkDerivation rec {
+mkDerivation {
baseName = "erlang";
version = "16B02.basho10";
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 58b7fd71f0be8f4152c157cf1201901b1770bd50..e9d9366851ebf19be7623847a87b08d9a3c7b8b5 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -21,7 +21,7 @@ let
sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c";
};
-in mkDerivation rec {
+in mkDerivation {
version = "18.3.4.8";
sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index 25a3f662565cc46ce9d7ac9ea1f19532eeeafca6..d5f3afe5f3dff60bf66d2d6f9d68fa10be817bb6 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,6 +1,6 @@
{ mkDerivation, fetchpatch }:
-mkDerivation rec {
+mkDerivation {
version = "19.3.6.11";
sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm";
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 016e175d6b56906ff3c84ea14e67e8005365661d..3a33e55767b44c07f17abedf43e70e91736fb2a3 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "20.3.8.9";
sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a";
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index e21bf6dafbff59613b3315981eb88295d3b3a2bf..fdd034fc6075d6b81c7bc3a51c82c37c3817a2f4 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "21.3.8.3";
sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
index a8c05513c5a6fe2a70ebc5c9a73cf9837368e9d3..8b471f6324717dc0911b1d7e95223d43dc2ad972 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "22.0.4";
sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 744a0f76ff09212dcdd13a273ee3d0675c253654..39d4918a70bf96c7bf64687534c45f0292d13085 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "falcon";
version = "2013-09-19";
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 07ce9347cf708c58e1c97be60e15fa9cc191c716..bba54c83f5c5f4a3ba1eaa904f0232cf3377d8c7 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -8,7 +8,7 @@ let
version = "0.10.2";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "rude";
diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index 7adaca7b86566246400a62dc1d643ed20c29ac70..1c64c417cb0ca73a7fd1a3bcd6ddc54d2ad970e5 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -8,7 +8,7 @@ let
version = "11.2";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "rude";
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
index 0ac1fa30e2f8b30c518dc84c3791dcece331a32b..64050ea95f877c09fccfc2f76c9070ec31b5dcce 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, lua5 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.6.2";
pname = "lua-filesystem";
isLibrary = true;
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh
index 3989bedffdb1e38445e44cb7dae1be1d7b9fca43..f7e56b62ac904a4986581f25872ce69502d7297f 100644
--- a/pkgs/development/interpreters/lua-5/setup-hook.sh
+++ b/pkgs/development/interpreters/lua-5/setup-hook.sh
@@ -1,47 +1,47 @@
# set -e
nix_print() {
- if [ ${NIX_DEBUG:-0} -ge $1 ]; then
- echo "$2"
- fi
+ if [ ${NIX_DEBUG:-0} -ge $1 ]; then
+ echo "$2"
+ fi
}
nix_debug() {
- nix_print 3 "$1"
+ nix_print 3 "$1"
}
addToLuaSearchPathWithCustomDelimiter() {
- local varName="$1"
- local absPattern="$2"
- # delete longest match starting from the lua placeholder '?'
- local topDir="${absPattern%%\?*}"
+ local varName="$1"
+ local absPattern="$2"
+ # delete longest match starting from the lua placeholder '?'
+ local topDir="${absPattern%%\?*}"
- # export only if the folder exists else LUA_PATH grows too big
- if [ ! -d "$topDir" ]; then return; fi
+ # export only if the folder exists else LUA_PATH/LUA_CPATH grow too large
+ if [[ ! -d "$topDir" ]]; then return; fi
- export "${varName}=${!varName:+${!varName};}${absPattern}"
+ # export only if we haven't already got this dir in the search path
+ if [[ ${!varName} == *"$absPattern"* ]]; then return; fi
+
+ export "${varName}=${!varName:+${!varName};}${absPattern}"
}
addToLuaPath() {
- local dir="$1"
-
- if [[ ! -d "$dir" ]]; then
- nix_debug "$dir not a directory abort"
- return 0
- fi
- cd "$dir"
- for pattern in @luapathsearchpaths@;
- do
- addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern"
- done
-
- # LUA_CPATH
- for pattern in @luacpathsearchpaths@;
- do
- addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern"
- done
- cd - >/dev/null
+ local dir="$1"
+
+ if [[ ! -d "$dir" ]]; then
+ nix_debug "$dir not a directory abort"
+ return 0
+ fi
+ cd "$dir"
+ for pattern in @luapathsearchpaths@; do
+ addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern"
+ done
+
+ # LUA_CPATH
+ for pattern in @luacpathsearchpaths@; do
+ addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern"
+ done
+ cd - >/dev/null
}
addEnvHooks "$hostOffset" addToLuaPath
-
diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh
index 545a0ae271c4e14d9e3ab9a8ba35c1178093a176..5941ff4a6b98571d1247ac8f57d18510f88b1674 100644
--- a/pkgs/development/interpreters/lua-5/wrap.sh
+++ b/pkgs/development/interpreters/lua-5/wrap.sh
@@ -4,73 +4,72 @@
set -e
wrapLuaPrograms() {
- wrapLuaProgramsIn "$out/bin" "$out $luaPath"
+ wrapLuaProgramsIn "$out/bin" "$out $luaPath"
}
# Builds environment variables like LUA_PATH and PATH walking through closure
# of dependencies.
buildLuaPath() {
- local luaPath="$1"
- local path
-
- # Create an empty table of paths (see doc on loadFromPropagatedInputs
- # for how this is used). Build up the program_PATH and program_LUA_PATH
- # variables.
- declare -A luaPathsSeen=()
- program_PATH=
- luaPathsSeen["@lua@"]=1
- addToSearchPath program_PATH @lua@/bin
- for path in $luaPath; do
- addToLuaPath "$path"
- done
+ local luaPath="$1"
+ local path
+
+ # Create an empty table of paths (see doc on loadFromPropagatedInputs
+ # for how this is used). Build up the program_PATH and program_LUA_PATH
+ # variables.
+ declare -A luaPathsSeen=()
+ program_PATH=
+ luaPathsSeen["@lua@"]=1
+ addToSearchPath program_PATH @lua@/bin
+ for path in $luaPath; do
+ addToLuaPath "$path"
+ done
}
-
# with an executable shell script which will set some environment variables
# and then call into the original binary (which has been given a .wrapped suffix).
# luaPath is a list of directories
wrapLuaProgramsIn() {
- local dir="$1"
- local luaPath="$2"
- local f
-
- buildLuaPath "$luaPath"
-
- if [ ! -d "$dir" ]; then
- nix_debug "$dir not a directory"
- return
+ local dir="$1"
+ local luaPath="$2"
+ local f
+
+ buildLuaPath "$luaPath"
+
+ if [ ! -d "$dir" ]; then
+ nix_debug "$dir not a directory"
+ return
+ fi
+
+ nix_debug "wrapping programs in [$dir]"
+
+ # Find all regular files in the output directory that are executable.
+ find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
+ # Rewrite "#! .../env lua" to "#! /nix/store/.../lua".
+ # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
+ # Lua to use besides one with this hook anyway.
+ if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then
+ sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^"
fi
- nix_debug "wrapping programs in [$dir]"
-
- # Find all regular files in the output directory that are executable.
- find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
- # Rewrite "#! .../env lua" to "#! /nix/store/.../lua".
- # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
- # Lua to use besides one with this hook anyway.
- if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then
- sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^"
- fi
-
- # wrapProgram creates the executable shell script described
- # above. The script will set LUA_(C)PATH and PATH variables!
- # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
- local -a wrap_args=("$f"
- --prefix PATH ':' "$program_PATH"
- --prefix LUA_PATH ';' "$NIX_LUA_PATH"
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
- )
-
- # Add any additional arguments provided by makeWrapperArgs
- # argument to buildLuaPackage.
- # makeWrapperArgs
- local -a user_args="($makeWrapperArgs)"
- local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
-
- # see setup-hooks/make-wrapper.sh
- wrapProgram "${wrapProgramArgs[@]}"
-
- done
+ # wrapProgram creates the executable shell script described
+ # above. The script will set LUA_(C)PATH and PATH variables!
+ # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
+ local -a wrap_args=("$f"
+ --prefix PATH ':' "$program_PATH"
+ --prefix LUA_PATH ';' "$LUA_PATH"
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
+ )
+
+ # Add any additional arguments provided by makeWrapperArgs
+ # argument to buildLuaPackage.
+ # makeWrapperArgs
+ local -a user_args="($makeWrapperArgs)"
+ local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
+
+ # see setup-hooks/make-wrapper.sh
+ wrapProgram "${wrapProgramArgs[@]}"
+
+ done
}
# Adds the lib and bin directories to the LUA_PATH and PATH variables,
@@ -78,22 +77,22 @@ wrapLuaProgramsIn() {
# `propagated-native-build-inputs`, while avoiding duplicating paths by
# flagging the directories it has visited in `luaPathsSeen`.
loadFromPropagatedInputs() {
- local dir="$1"
- # Stop if we've already visited here.
- if [ -n "${luaPathsSeen[$dir]}" ]; then
- return;
- fi
- luaPathsSeen[$dir]=1
-
- addToLuaPath "$dir"
- addToSearchPath program_PATH $dir/bin
-
- # Inspect the propagated inputs (if they exist) and recur on them.
- local prop="$dir/nix-support/propagated-native-build-inputs"
- if [ -e "$prop" ]; then
- local new_path
- for new_path in $(cat $prop); do
- loadFromPropagatedInputs "$new_path"
- done
- fi
+ local dir="$1"
+ # Stop if we've already visited here.
+ if [ -n "${luaPathsSeen[$dir]}" ]; then
+ return
+ fi
+ luaPathsSeen[$dir]=1
+
+ addToLuaPath "$dir"
+ addToSearchPath program_PATH $dir/bin
+
+ # Inspect the propagated inputs (if they exist) and recur on them.
+ local prop="$dir/nix-support/propagated-native-build-inputs"
+ if [ -e "$prop" ]; then
+ local new_path
+ for new_path in $(cat $prop); do
+ loadFromPropagatedInputs "$new_path"
+ done
+ fi
}
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
index 14bd4a416468aa05ae7db21a8fcd7def91d92460..816744e61cff438afef5a4100ebdddf1d84a7207 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -43,7 +43,7 @@ let
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
nix_debug "Making wrapper $prg"
- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index afd2627d20ecb80269b706d3fada593bb7febae6..e44209799a31d6d3feb0644e8aad5cef525dcbed 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -13,7 +13,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "maude";
inherit version;
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index cd325c94948970aa833ff14680d775ccb2c16bb0..686cfee19a6ddf54bfb563aacf77eb3d007e6720 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "metamath";
version = "0.172";
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 009f9b48ea4e49fe930080a66d4b18f8dd5626a5..30a601ef8dfd0ea792c26427749606bb78a71618 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -2,8 +2,9 @@
let version = "0.9.5.1.1"; in
-python2Packages.buildPythonPackage rec {
- name = "pyrex-${version}";
+python2Packages.buildPythonPackage {
+ pname = "pyrex";
+ inherit version;
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index d79cd58c1598d942cb836d68ef96c3bcbd494799..69a930891885dfcea4f4b7c7904921133b69a12e 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -2,8 +2,9 @@
let version = "0.9.6.4"; in
-python2Packages.buildPythonPackage rec {
- name = "pyrex-${version}";
+python2Packages.buildPythonPackage {
+ pname = "pyrex";
+ inherit version;
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 60d067c1bf2c661b85a97a7778d0f4612338a8ca..1de1c401c37c829a2d122fffc661a9a8a63738a0 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -142,6 +142,8 @@ in with passthru; stdenv.mkDerivation {
"--without-ensurepip"
"--with-system-expat"
"--with-system-ffi"
+ ] ++ optionals (sqlite != null && isPy3k) [
+ "--enable-loadable-sqlite-extensions"
] ++ optionals (openssl != null) [
"--with-openssl=${openssl.dev}"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
index 73d1e0ea9fd78c0a35b6c4b444ffc296778ebc24..e27959c05e8d241e1e982c44d5a7d7e1784c180c 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-html-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
index 54c0954ae5d016bbb74b406c77a6c901d00781e2..0226f7cd8809414845f3bd423547d4dfdb53ee5c 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-pdf-a4-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
index 059908029c0b30a34cef382de2107b064ddd0058..88d1a69316684d3fd045988a65723903ca59413c 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-pdf-letter-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
index 53c5aa3b629b38d7879112b7aaaab09ba207129b..ea35e9fb6a35047e02d2268ca2ab49a93026cee9 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-text-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
index 5a6dcc63225e94014449ad3e019c2b4650deb84d..45783eb82632f0fc311c1f9691433f11b0467231 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-html-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
index a122d7519f5d09697686dcf0d66744884c085acb..998af644c718dae8e2e6a09d9f1be71f4133f467 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-pdf-a4-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
index 4473f2e351c495ab94c7819f8d2150beec6cc646..1c6aea5ee3c16c12fafd101bcf6052ea497b1ded 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-pdf-letter-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
index d9d21bfe3a57b7b99542cbf92c00ed7509a228dd..32388780f6ff9beb1d67d4141ec1f73884a72a73 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-text-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix
index 4a0c84fb272ef4f609b68e357a0d64e439a34215..3cc0c2a9ee85584f96bd88b00e98a0ae947e317d 100644
--- a/pkgs/development/interpreters/python/cpython/docs/template.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/template.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pythonMAJORMINOR-docs-TYPE-VERSION";
src = fetchurl {
url = URL;
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 3e86ddef4ed44ec8c23b5fed2971e7b5933ff860..8154a87f667d8f38bce96a9edb6a96ee23a124be 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
let
isPy3k = substring 0 1 pythonVersion == "3";
- passthru = passthruFun rec {
+ passthru = passthruFun {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index af933f0a4bd05942d40587a2502f6b6077c765f7..aa709bdc646d314ce95ef22b6acad47895b39c62 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -27,7 +27,7 @@ with stdenv.lib;
let
isPy3k = majorVersion == "3";
- passthru = passthruFun rec {
+ passthru = passthruFun {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix
index 3b41e14be850bcc9ee72d0ad24628b43c1ba9494..d49886da8f5485d743cade9232d0700333e2ef36 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/pkgs/development/interpreters/qnial/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qnial";
version = "6.3";
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 35bd1729866ec6dc17b8fabaa5f602ed570d543f..f13adc21d9e6ff89491c4cbfba52bd930ef1e25d 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
version = "7.3"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
- fetchurl rec {
+ fetchurl {
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
inherit sha256;
}
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index a7009097a60280e9b054fcd4ae9e220674d7836f..54c1e70d55346d08046c5cfa63f6e5d0eeda3467 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -29,11 +29,13 @@ let
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
+ rubygemsSupport = false;
};
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
, fetchurl, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true
+ , rubygemsSupport ? true
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
@@ -88,10 +90,12 @@ let
(import ./patchsets.nix {
inherit patchSet useRailsExpress ops;
patchLevel = ver.patchLevel;
- })."${ver.majMinTiny}";
+ }).${ver.majMinTiny};
- postUnpack = ''
- cp -r ${rubygems} $sourceRoot/rubygems
+ postUnpack = opString rubygemsSupport ''
+ rm -rf $sourceRoot/{lib,test}/rubygems*
+ cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
+ cp -r ${rubygems}/test/rubygems $sourceRoot/test
'';
postPatch = if atLeast25 then ''
@@ -136,12 +140,6 @@ let
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = ''
- # Update rubygems
- pushd rubygems
- chmod +w bundler/bundler.gemspec
- ${buildRuby} setup.rb --destdir $GEM_HOME
- popd
-
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 47d8397c9668d323e36090832738d7964f0faa06..c9731331b79e55d78905a3df8cc2ee41de56fa0b 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,6 +1,6 @@
{ patchSet, useRailsExpress, ops, patchLevel }:
-rec {
+{
"2.3.8" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index b9548284355d11391692427a14bd77af68fda8fc..1042caa41ac5c6d9ad21451c4499baa25b3185ed 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "rubygems";
- version = "3.0.3";
+ version = "3.0.6";
src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
- sha256 = "0b6b9ads8522804xv8b8498gqwsv4qawv13f81kyc7g966y7lfmy";
+ sha256 = "1ca1i4xmggizr59m6p28gprlvshczsbx30q8iyzxb2vj4jn8arzx";
};
patches = [
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index c6c8caa7cf3ef466c39f564ee0a1f612e111e54a..43f5758e4c495a939c6a9e92d93160475670b330 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -1,6 +1,6 @@
{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
# The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
# so that it can be written to when using the Self transposer. Running 'Self'
# after installation runs without an image. You can then build a Self image with:
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index e00af6213479a3f40d42bfb5f11f82edbe0becb4..8f9477c4c4ac424525c1dadaccfaf725b97de0d0 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "spidermonkey";
version = "1.8.5";
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 1e1ea10ef6dd4df0d5e3d23c48885a1d5f272d89..238afd4bd040d1f6768e14eb99732fe8ba9b02c0 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -2,7 +2,7 @@
let
version = "52.9.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "spidermonkey";
inherit version;
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
index 175b2f2e767199859af72c00bcb1fdf990723230..f62638dd83866516a080f0bede53cae1bfea2178 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
let
version = "60.4.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "spidermonkey";
inherit version;
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2cacb339d757e4ce8e53fdbac18b2afd94a997f6..049dd9192d7ead567c0c69e0f379a436d91016ae 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
+{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebengine
, readline, qtwebsockets, useSCEL ? false, emacs
@@ -7,7 +7,7 @@
let optional = stdenv.lib.optional;
in
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "supercollider";
version = "3.10.2";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "stackprotector" ];
- cmakeFlags = ''
- -DSC_WII=OFF
- -DSC_EL=${if useSCEL then "ON" else "OFF"}
- '';
+ cmakeFlags = [
+ "-DSC_WII=OFF"
+ "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
+ ];
nativeBuildInputs = [ cmake pkgconfig qttools ];
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index d4ec1677bfbcc2906d974fdff4ebcda2f141a96a..3c585c3f07fae51cc75f36e70541e429f58483ef 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -5,7 +5,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tcl";
inherit version;
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index 30ea124cf4bb7f97ace07227ee580f184f0c0dd7..bb4a2d01499d0d092aa4ed824496021a8333b9f7 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, libX11, libXt }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "unicon-lang";
version = "11.7";
src = fetchurl {
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
index ac291668e2d96f26151731d346e113bf12157a4d..44ac11be540053eafb6147931341694c57ca0597 100644
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "wasm-gc-${version}";
+ pname = "wasm-gc";
version = "0.1.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 90fc38afa0610877bc2479404384cb55894de765..b53b3ed9dbfbae212b68a8c9daec741158beff87 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -1,6 +1,6 @@
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "wasmtime";
version = "20190521";
diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
index e6a2b0cae99d8ab1bc4f5859214acc0626dfd756..e5f4d5f6ee0f0ca66101a72dfc83368dc9dda236 100644
--- a/pkgs/development/java-modules/apache/ant-launcher.nix
+++ b/pkgs/development/java-modules/apache/ant-launcher.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
antLauncher_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant-launcher";
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
index b4a6aa68f4487e2f2bf3557fcbdacfa8a3cdc507..5de82b1703b3129d75a41d652ad4d0a4cbdb129c 100644
--- a/pkgs/development/java-modules/apache/ant.nix
+++ b/pkgs/development/java-modules/apache/ant.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
ant_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant";
diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index 050d511b0a1066372624f9ca487e18fabbb52726..5cb25a0f379eec06f0efa5fa95f5e45943cb6936 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsCli_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "commons-cli";
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
index 70ce940ccf17710c5f63ecd5275505cb50d80cfa..28bb9d381f9eba1c11bb6e5191d7c2c96126b497 100644
--- a/pkgs/development/java-modules/apache/commons-io.nix
+++ b/pkgs/development/java-modules/apache/commons-io.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsIo_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-io";
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index a2d71e9db0c8cf88896eb78d3723d6278363d38f..501da6d204d0e64aa8111333159dab9f2028108d 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLang_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-lang";
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix
index 63f68b925430a6fcbeb092b7b958998a86764829..3bbbe9d2e39af3bf9032b56e32754c24ea82076a 100644
--- a/pkgs/development/java-modules/apache/commons-lang3.nix
+++ b/pkgs/development/java-modules/apache/commons-lang3.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLang3_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "commons-lang3";
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix
index 47750abe46232502e15bbbb6dd3c5b7e0c6de769..befb2003d01c2d5d8e6c77705164f08abe3142f8 100644
--- a/pkgs/development/java-modules/apache/commons-logging-api.nix
+++ b/pkgs/development/java-modules/apache/commons-logging-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLoggingApi_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "commons-logging-api";
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix
index f0614ec99e365170bebcb992b7d84eb4b99b351f..8f7c35b716f9acf91fcac02c350f4b27345cd1be 100644
--- a/pkgs/development/java-modules/apache/xbean-reflect.nix
+++ b/pkgs/development/java-modules/apache/xbean-reflect.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xbeanReflect_3_4 = map (obj: fetchMaven {
version = "3.4";
artifactId = "xbean-reflect";
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix
index 41756bb80d507d53935652a2c161b99eeed2f0ed..783fdc8679cc78a4582c34927773c9c09bc8c6d0 100644
--- a/pkgs/development/java-modules/beanshell/bsh.nix
+++ b/pkgs/development/java-modules/beanshell/bsh.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
bsh_2_0_b4 = map (obj: fetchMaven {
version = "2.0b4";
artifactId = "bsh";
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
index f8bbc07f1025677a2e2a980022ac005fc5cfb6f5..3561c0b6e5e1a1b2ae932707c83be467a5fcb946 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
classworlds_1_1_alpha2 = map (obj: fetchMaven {
version = "1.1-alpha-2";
artifactId = "classworlds";
diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix
index 39b274b5030aea454fab6b23fe695b786e5dc17e..83f7a95af81d14e3a8287428f24e27ee2cec3045 100644
--- a/pkgs/development/java-modules/collections.nix
+++ b/pkgs/development/java-modules/collections.nix
@@ -2,7 +2,7 @@
with pkgs.javaPackages;
-rec {
+{
mavenLibs_2_0_1 = [
mavenArtifact_2_0_1
mavenArtifactManager_2_0_1
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix
index 60aac560b9b2b99b0f642a4f3b7b1b096c5fe67c..6ebca58c44e52fd10cc0b746111a005d321b7ad4 100644
--- a/pkgs/development/java-modules/eclipse/aether-util.nix
+++ b/pkgs/development/java-modules/eclipse/aether-util.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
version = "0.9.0.M2";
artifactId = "aether-util";
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix
index 2e842410aafbf608f0b07b7b6bbad51722019202..7816ab49d61210983355acceb5c7fa3d8d6e4633 100644
--- a/pkgs/development/java-modules/findbugs/jsr305.nix
+++ b/pkgs/development/java-modules/findbugs/jsr305.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
findbugsJsr305_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "jsr305";
diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix
index ec874c73e365e3075476d4cd7c1f78a978372f6b..b5b4551dd97b95cad07b8d918b95331b0b2ac6e9 100644
--- a/pkgs/development/java-modules/google/collections.nix
+++ b/pkgs/development/java-modules/google/collections.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
googleCollections_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "google-collections";
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
index bab9e1b115d0f84e7cf3f1742060011c0ac319fa..73c27c4af8b1758ff2e79567b829bb286b254013 100644
--- a/pkgs/development/java-modules/hamcrest/all.nix
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
hamcrestAll_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-all";
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
index 3842b8c5afa0629017b6c06158c40e2176892093..4145191fdd91a56c48c41cafd03ffd46ec837e9c 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
hamcrestCore_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-core";
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index abb549110a87c3abe1fec33c9789f4a529259716..d179fb531789fdf6a85f5c0a36359de7755452e1 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -15,7 +15,7 @@ in
sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
fetchSubmodules = true;
};
- in stdenv.mkDerivation rec {
+ in stdenv.mkDerivation {
pname = "jogl";
inherit version;
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index a7bfa545908ab3d41e02d7f64ecf115c9f87634d..6f86cede51200cb5229d8a7035d9422dffeafeb4 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -6,7 +6,7 @@ let
poms = import (../poms.nix) { inherit fetchMaven; };
collections = import (../collections.nix) { inherit pkgs; };
in rec {
- junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
+ junitGen = { mavenDeps, sha512, version }: mavenbuild {
inherit mavenDeps sha512 version;
name = "junit-${version}";
diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix
index a8b1ea9f02175354cbeea9efaf0e2b3d0f1479f2..e95c0847aacc678a87ea2f92060e5eaadc9ef005 100644
--- a/pkgs/development/java-modules/log4j/default.nix
+++ b/pkgs/development/java-modules/log4j/default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
log4j_1_2_12 = map (obj: fetchMaven {
version = "1.2.12";
artifactId = "log4j";
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 7ebe655580e500b032dd5508c924086efd2e28e7..3a289c9c9c4ae2a785fd09d641a352c48d0a4530 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -5,11 +5,11 @@ let
name = "${artifactId}-${version}";
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
m2File = "${name}${suffix}.${type}";
- src = fetchurl rec {
+ src = fetchurl {
inherit sha512;
url = "mirror://maven/${m2Path}/${m2File}";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name m2Path m2File src;
installPhase = ''
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index f3d5fb3e9342e017bef139723d5297090f1703b2..b8e128ac728cdfd2588b82c19afd354f1a48614c 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -5,7 +5,7 @@ with pkgs.javaPackages;
let
poms = import ../poms.nix { inherit fetchMaven; };
in rec {
- mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec {
+ mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
inherit mavenDeps sha512 version skipTests quiet;
name = "maven-hello-${version}";
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index f63c91cd360a8d6d610b0489a40c25cd81b59a03..c1fab1e9bc970f2530cacca674cae2053b9ed35c 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -8,7 +8,7 @@ let
fetchMaven = pkgs.callPackage ./m2install.nix { };
plugins = import ./mavenPlugins.nix { inherit pkgs; };
poms = import ./poms.nix { inherit fetchMaven; };
-in rec {
+in {
# Maven needs all of these to function
mavenMinimal = flatten
collections.mavenLibs_2_0_6
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix
index 14c5a99d42ff0b43aa47087baf70ebb89a33658a..9965f86f72bd2efe2fac02ada60c41cf4bbe72d3 100644
--- a/pkgs/development/java-modules/maven/archiver.nix
+++ b/pkgs/development/java-modules/maven/archiver.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenArchiver_2_5 = map (obj: fetchMaven {
version = "2.5";
artifactId = "maven-archiver";
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 0796d0665103be18c2cd572200e6b291a0c9683b..5bf3ef01bc65d3e73a5810ddf0c3f1a4e54263ba 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-artifact-manager";
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index bb0e578d5d6384d9b184b124e617ef8c3c5a4a49..80e3392abd2f65bad5917ec690d71ce51096b9ea 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenArtifact_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-artifact";
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 948dbc3baf6c759394da1d3d5dd651798acdd3c8..8c3886679919a52f7e32ecf3f15af43e9263e665 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven {
version = "1.2";
artifactId = "maven-common-artifact-filters";
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index 5b45f89e9d54ae910aace754cf4e0a30e5a8fa24..a1ea9292a513cf954add8c14a9387ac1142a9459 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenCore_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-core";
diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix
index 00d089ea249bbc50a9c48fe374ea70a789ad35ca..aa3a93849c257b85e8b0ba13f67637d6a681059b 100644
--- a/pkgs/development/java-modules/maven/dependency-tree.nix
+++ b/pkgs/development/java-modules/maven/dependency-tree.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenDependencyTree_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "maven-dependency-tree";
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 9fa1051cd80ba1710a298cada4c6c6bd0d635962..8314abe4924fc6030749374e15a171f8744aac03 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven {
version = "1.0-alpha-6";
artifactId = "doxia-sink-api";
diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix
index 014f678bc149198ee8b440bee6c3ecb86e3a70dc..c7a1d212e0e5f13078838683be7b0cf0b9c16fca 100644
--- a/pkgs/development/java-modules/maven/enforcer.nix
+++ b/pkgs/development/java-modules/maven/enforcer.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenEnforcerApi_1_3_1 = map (obj: fetchMaven {
version = "1.3.1";
artifactId = "enforcer-api";
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 80cbf993a60de9bb8950c2965218cc52f4c50642..f16f10462ff256dd21ca094147bde1bf22b9d8d9 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-error-diagnostics";
diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix
index 963d6c6b646dcdbfa3a6a2b7c698ee96ef585b73..f1e2e551cee2e08c10b6a1758ee562e791e3ab50 100644
--- a/pkgs/development/java-modules/maven/filtering.nix
+++ b/pkgs/development/java-modules/maven/filtering.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenFiltering_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "maven-filtering";
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 2ae3bfe6034c76a6301bd0f099752a4eff673f83..147b15b6e400e7ded35a4a6b78ba43e17ecb1fde 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenModel_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-model";
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index ce6c7c1769411279c0a749d1f67cefd2b82ebf90..609745e94229f0503acd8f4e2e78663fcff6c5b8 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenMonitor_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-monitor";
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index f852cc957a56b0bd6f72357c05c23577eaa40034..bf8d608488e87a1f68e7c2f5c298a1190dc290ff 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginAnnotations_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "maven-plugin-annotations";
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index be9642b0e2069b30631b305dbb6fbbbceb8a44c0..55fb0d2c5ddf4616b1acc6277017adf0670e1e25 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginApi_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-api";
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index dbdc09a46734f428c5088ca8524d598765d23253..7f5c22fe3b3a6293d8b4088c7f8ae5340d9e3d67 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-descriptor";
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 9e11c0f408294b9da3a132b04dd0d8ba14d4d67e..4ff07574dc92573e47a0143019f32d78a4cdaf67 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-parameter-documenter";
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index f0074ef816ed785dfddad8c283da92670179bba9..a7bb92e645d353593f8e4157f526b532ef7e6efc 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginRegistry_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-registry";
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
index a65f19620485e17c17f225885ccea879dec7269b..4cd32d508f331bdf60f6f2ec956f8b8113ab260d 100644
--- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix
+++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginTestingHarness_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "maven-plugin-testing-harness";
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index 6940fafae821991412eaf3e64d3d167dc134e065..c40f87f1c45d84427e14946d61aab74a145a0351 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenProfile_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-profile";
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 0b07d8b8679bbb49bd5595ea9f3506752e38374e..fad53a0250b36626212846931ba9027bf09149fe 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenProject_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-project";
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index 8a508cf150532e03b273892ea2634c208cf5b44c..87999d452fc4fb93dfc2bae82b02dfb57c2c81d1 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenReportingApi_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-reporting-api";
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 443a1acd4513db784dd57eaa017d353abb765a35..0d8f55737b77141fe4ea3541b857cd8852d0d46c 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-repository-metadata";
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index 6b42082cfd8a9d44d68d3b02b72c1b4100aad925..09e0170945d5e5724cbef8553562a0890b12ce3b 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSettings_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-settings";
diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix
index 67c44986d0a023b0b7de33337691ebd705db368b..9fa74f8bfe773b3517991ee179edfc8e82ff6004 100644
--- a/pkgs/development/java-modules/maven/shared-incremental.nix
+++ b/pkgs/development/java-modules/maven/shared-incremental.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSharedIncremental_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "maven-shared-incremental";
diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix
index b3cfc9280914512c724175f794bafb889bfd0924..38addcfe8aa9d6d3af262848a0a0c45442d5b78b 100644
--- a/pkgs/development/java-modules/maven/shared-utils.nix
+++ b/pkgs/development/java-modules/maven/shared-utils.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSharedUtils_0_1 = map (obj: fetchMaven {
version = "0.1";
artifactId = "maven-shared-utils";
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index c1f7fcc3f76c1aac9d719669502d929492b5f6e9..9ad284365d95d1cc369381299480461ffa02a654 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "surefire-api";
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index b62aa86bf45c32bd69946cec3c5dfae303498a99..41f9848d5cd9bca4ba03cc0612001edb9b1af036 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "surefire-booter";
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index bc0573f6b70667c8438275bddf83ad25b8e03752..2f4617eff8c09f01770acc4979bd0d7ac9b02ed6 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireCommon_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "maven-surefire-common";
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix
index 1374080d0874ec6333b4938b3681740b133d11d1..d67177d80d23cf9357e0c4aca0c120748f516f0f 100644
--- a/pkgs/development/java-modules/maven/surefire-junit4.nix
+++ b/pkgs/development/java-modules/maven/surefire-junit4.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "surefire-junit4";
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 864d3b98f7ba12cba70e690c9fc17ea1c9883e8f..91f8fdb77a41998e02455d3064823628a65b2bd0 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenToolchain_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "maven-toolchain";
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 8cc79dc1d228aa6f3b869e9f439135d3e6013047..e481f5d250a34dd5ffd7c9e6a840c3b4f1e4134b 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -5,7 +5,7 @@ with pkgs.javaPackages;
let
fetchMaven = pkgs.callPackage ./m2install.nix { };
-in rec {
+in {
inherit fetchMaven;
animalSniffer_1_11 = map (obj: fetchMaven {
@@ -19,7 +19,7 @@ in rec {
{ type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; }
];
- mavenClean_2_5 = map (obj: fetchMaven rec {
+ mavenClean_2_5 = map (obj: fetchMaven {
version = "2.5";
artifactId = "maven-clean-plugin";
groupId = "org.apache.maven.plugins";
@@ -30,7 +30,7 @@ in rec {
{ type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; }
];
- mavenCompiler_3_1 = map (obj: fetchMaven rec {
+ mavenCompiler_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "maven-compiler-plugin";
groupId = "org.apache.maven.plugins";
@@ -41,7 +41,7 @@ in rec {
{ type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; }
];
- mavenEnforcer_1_3_1 = map (obj: fetchMaven rec {
+ mavenEnforcer_1_3_1 = map (obj: fetchMaven {
version = "1.3.1";
artifactId = "maven-enforcer-plugin";
groupId = "org.apache.maven.plugins";
@@ -52,7 +52,7 @@ in rec {
{ type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; }
];
- mavenInstall_2_4 = map (obj: fetchMaven rec {
+ mavenInstall_2_4 = map (obj: fetchMaven {
version = "2.4";
artifactId = "maven-install-plugin";
groupId = "org.apache.maven.plugins";
@@ -63,7 +63,7 @@ in rec {
{ type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; }
];
- mavenJar_2_4 = map (obj: fetchMaven rec {
+ mavenJar_2_4 = map (obj: fetchMaven {
version = "2.4";
artifactId = "maven-jar-plugin";
groupId = "org.apache.maven.plugins";
@@ -74,7 +74,7 @@ in rec {
{ type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; }
];
- mavenReplacer_1_5_3 = map (obj: fetchMaven rec {
+ mavenReplacer_1_5_3 = map (obj: fetchMaven {
version = "1.5.3";
artifactId = "replacer";
groupId = "com.google.code.maven-replacer-plugin";
@@ -85,7 +85,7 @@ in rec {
{ type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; }
];
- mavenResources_2_6 = map (obj: fetchMaven rec {
+ mavenResources_2_6 = map (obj: fetchMaven {
version = "2.6";
artifactId = "maven-resources-plugin";
groupId = "org.apache.maven.plugins";
@@ -96,7 +96,7 @@ in rec {
{ type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; }
];
- mavenSurefire_2_12_4 = map (obj: fetchMaven rec {
+ mavenSurefire_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "maven-surefire-plugin";
groupId = "org.apache.maven.plugins";
@@ -107,7 +107,7 @@ in rec {
{ type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; }
];
- mavenSurefire_2_17 = map (obj: fetchMaven rec {
+ mavenSurefire_2_17 = map (obj: fetchMaven {
version = "2.17";
artifactId = "maven-surefire-plugin";
groupId = "org.apache.maven.plugins";
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix
index dd9b1d1b0aa522b6fb0a2406634bbafc2e1758e2..221e59f766b9ed1d73bdb01b167744aaf9af5026 100644
--- a/pkgs/development/java-modules/mojo/animal-sniffer.nix
+++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mojoAnimalSniffer_1_11 = map (obj: fetchMaven {
version = "1.11";
artifactId = "animal-sniffer";
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
index 245daa5fdb9005045c8880829792dbbc103eaf1c..f6f7e490c7cf3dda46d69b3bb8604729e3104ee3 100644
--- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
+++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven {
version = "1.11";
artifactId = "java-boot-classpath-detector";
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix
index 08d18745ed7fb1eb11d17b43a6b7fe32b7069831..92418d8c619419692ff55ffe1a4c6b9ad553c63b 100644
--- a/pkgs/development/java-modules/ow2/asm-all.nix
+++ b/pkgs/development/java-modules/ow2/asm-all.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
ow2AsmAll_4_0 = map (obj: fetchMaven {
version = "4.0";
artifactId = "asm-all";
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
index 384b92859762ed71e7740962b3c95ab9c974a49e..41a334007e8f44b5c37b3fdd1767551a33094a2d 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusArchiver_1_0_alpha7 = map (obj: fetchMaven {
version = "1.0-alpha-7";
artifactId = "plexus-archiver";
diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix
index c417c955b69bafb0018c83120b3b8ab5447a5f2a..b362f905091e2d6fa84e15aa0aad0aa5939d87ce 100644
--- a/pkgs/development/java-modules/plexus/build-api.nix
+++ b/pkgs/development/java-modules/plexus/build-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusBuildApi_0_0_4 = map (obj: fetchMaven {
version = "0.0.4";
artifactId = "plexus-build-api";
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
index 6ff1755e8f536d8f395ea313d7c183937129d5ad..7cb6c3dbf558e53864c4d817ed507420804693c2 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusClassworlds_2_2_2 = map (obj: fetchMaven {
version = "2.2.2";
artifactId = "plexus-classworlds";
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix
index 11baab0950d05f5326baa0c35677fb47e63c1aea..a1c6556a769984b7eb318f86241733a59711edff 100644
--- a/pkgs/development/java-modules/plexus/compiler-api.nix
+++ b/pkgs/development/java-modules/plexus/compiler-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusCompilerApi_2_2 = map (obj: fetchMaven {
version = "2.2";
artifactId = "plexus-compiler-api";
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix
index a42064a0e9e805603de369772b5cab30cf427db2..d86240b6d45b8d685a93cb86d23acbbbd1457430 100644
--- a/pkgs/development/java-modules/plexus/compiler-javac.nix
+++ b/pkgs/development/java-modules/plexus/compiler-javac.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusCompilerJavac_2_2 = map (obj: fetchMaven {
version = "2.2";
artifactId = "plexus-compiler-javac";
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix
index f7221a96627fb20fb541970ef69c61aaae00ba20..3f27981b15405f7149ee7a0091127b58163dd649 100644
--- a/pkgs/development/java-modules/plexus/compiler-manager.nix
+++ b/pkgs/development/java-modules/plexus/compiler-manager.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusCompilerManager_2_2 = map (obj: fetchMaven {
version = "2.2";
artifactId = "plexus-compiler-manager";
diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix
index fd3fc80e7e05a4beebf9efb9858dc1291c465aeb..89ae778e762fae708d28b476244e4643a3f05768 100644
--- a/pkgs/development/java-modules/plexus/component-annotations.nix
+++ b/pkgs/development/java-modules/plexus/component-annotations.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven {
version = "1.5.5";
artifactId = "plexus-component-annotations";
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix
index 375a1913afcda3de128faeda8704871fc5f651d8..79d8ac1087b45bf335aec344dade11626f8cbfd1 100644
--- a/pkgs/development/java-modules/plexus/container-default.nix
+++ b/pkgs/development/java-modules/plexus/container-default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven {
version = "1.0-alpha-9";
artifactId = "plexus-container-default";
diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix
index be2013a2676083f08d36193e6000310c0fd742f2..a9c80c146c9b56f68f536b69e59350d9d2d0d7bb 100644
--- a/pkgs/development/java-modules/plexus/digest.nix
+++ b/pkgs/development/java-modules/plexus/digest.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusDigest_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "plexus-digest";
diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix
index 5b34cde0503c2acd05934527e762f5965e6a4373..0b016a7bd493fbbe5933876c508a28a14aa120af 100644
--- a/pkgs/development/java-modules/plexus/i18n.nix
+++ b/pkgs/development/java-modules/plexus/i18n.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusI18n_1_0_beta6 = map (obj: fetchMaven {
version = "1.0-beta-6";
artifactId = "plexus-i18n";
diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix
index 8ada106f48fdd73783c497a9608951f080497f19..378fa76d8c62ae0e4c7a56a1beaa315721678c89 100644
--- a/pkgs/development/java-modules/plexus/interactivity-api.nix
+++ b/pkgs/development/java-modules/plexus/interactivity-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven {
version = "1.0-alpha-4";
artifactId = "plexus-interactivity-api";
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix
index 90ff3de6a3fec19cd64a4c074333d97c40cff3ce..f2813e103f5c62cad068f47519174f488ac475c5 100644
--- a/pkgs/development/java-modules/plexus/interpolation.nix
+++ b/pkgs/development/java-modules/plexus/interpolation.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusInterpolation_1_11 = map (obj: fetchMaven {
version = "1.11";
artifactId = "plexus-interpolation";
diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix
index eee41f5ed2fda57243120141c06a4ae857285cb3..e2cfd4b5882d0f2aa4494489e95db0947e2773e0 100644
--- a/pkgs/development/java-modules/plexus/io.nix
+++ b/pkgs/development/java-modules/plexus/io.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusIo_2_0_2 = map (obj: fetchMaven {
version = "2.0.2";
artifactId = "plexus-io";
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index ce0537cea7d822324ddc8511944a7e90e6550dce..c52425342b0e705e4c38ce53f4a1b8954f5f90c6 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusUtils_1_0_4 = map (obj: fetchMaven {
version = "1.0.4";
artifactId = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 610f98a7e466abd3ba0d80f8f5d89a14fda24c54..d93edb7aa4fd3b71d5a583932062439a9b488ffe 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
aether_0_9_0_M2 = fetchMaven {
version = "0.9.0.M2";
artifactId = "aether";
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix
index 51a004ed5451d72bddfa4c8897248b8889808ea7..e4d0e1f98d4a1c57ee96a2113c90df012647fcc0 100644
--- a/pkgs/development/java-modules/sisu/guice.nix
+++ b/pkgs/development/java-modules/sisu/guice.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
sisuGuice_2_9_4 = map (obj: fetchMaven {
version = "2.9.4";
artifactId = "sisu-guice";
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix
index bca16ccd114ca64064cf545c7091431b121549bb..22d3582608a32b08467c224d39af9a9d9130d965 100644
--- a/pkgs/development/java-modules/sisu/inject-bean.nix
+++ b/pkgs/development/java-modules/sisu/inject-bean.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
sisuInjectBean_2_1_1 = map (obj: fetchMaven {
version = "2.1.1";
artifactId = "sisu-inject-bean";
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix
index 0a181dc1a1ecfc0d790d234b4d851f8e29bad4de..aee624c551c99a7fd49b06370071085a4a0dcff2 100644
--- a/pkgs/development/java-modules/sisu/inject-plexus.nix
+++ b/pkgs/development/java-modules/sisu/inject-plexus.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
sisuInjectPlexus_2_1_1 = map (obj: fetchMaven {
version = "2.1.1";
artifactId = "sisu-inject-plexus";
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix
index 11295b3128fdd40f3b2128acf345df86e39ad99f..2ea05581d0d3f273f2d10cbcb2d63f67d0c62aeb 100644
--- a/pkgs/development/java-modules/xerces/impl.nix
+++ b/pkgs/development/java-modules/xerces/impl.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xercesImpl_2_8_0 = map (obj: fetchMaven {
version = "2.8.0";
artifactId = "xercesImpl";
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix
index a96e3670b4012a05c03ad677073a4c7ac26fbffa..871629dbf3c2feeaedde5b300adc35b9b3c432e3 100644
--- a/pkgs/development/java-modules/xml-apis/default.nix
+++ b/pkgs/development/java-modules/xml-apis/default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xmlApis_1_3_03 = map (obj: fetchMaven {
version = "1.3.03";
artifactId = "xml-apis";
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index fcb708c829befd707b941b8db1651622c9bfa677..94b36b855f25fa1289cbcf8a87b74ce705c3f8b6 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, xorg, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "AntTweakBar-1.16";
buildInputs = [ unzip xorg.libX11 libGLU_combined ];
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index d538a0969b043cd8260e398dab0798deba9e7821..37e38e03b8cf12f887146746eb73e79a386c323a 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -24,11 +24,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "SDL2";
- version = "2.0.9";
+ version = "2.0.10";
src = fetchurl {
url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
- sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
+ sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch
index a6114901055a60c936cb00578244523a42d50fde..a6b10ddb7edf2a933b78c2e83cd64f08b763e63f 100644
--- a/pkgs/development/libraries/SDL2/find-headers.patch
+++ b/pkgs/development/libraries/SDL2/find-headers.patch
@@ -1,12 +1,13 @@
diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in
--- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300
+++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300
-@@ -6,5 +6,5 @@
+@@ -6,5 +6,6 @@
set(SDL2_PREFIX "@prefix@")
set(SDL2_EXEC_PREFIX "@prefix@")
set(SDL2_LIBDIR "@libdir@")
-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH})
++separate_arguments(SDL2_INCLUDE_DIRS)
set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in
--- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300
diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix
index dc88b7b12ef3995523a2f55b82fbe7ed6d4dcd56..f15009c2f5d9e68c84a0178480bb59e253f2e414 100644
--- a/pkgs/development/libraries/SDL_gpu/default.nix
+++ b/pkgs/development/libraries/SDL_gpu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "SDL_gpu-unstable";
version = "2019-01-24";
diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix
index 7b8fb67a30f1f935921d8c09f1c3af15edf0bb86..66fa8888fd1953fcbd33a8ffe99ccdc7ffa3841d 100644
--- a/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/pkgs/development/libraries/SDL_sixel/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsixel }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "SDL_sixel";
version = "1.2-nightly";
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index 307f57d20cf5ba11f5528a8057ecf06ebb4d1346..22f1566ad0ace670082d3762f4c771b7437e78ca 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -2,7 +2,7 @@
# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "appstream-qt";
inherit (appstream) version src prePatch;
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
index 4b8093f74031c4e5f7a72d89cdc27015f6ba824b..17093deae00fc56499591d12b29e2921e96aa844 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -19,7 +19,7 @@ let
sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "argp-standalone-1.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 992119faf65ec034e4ed8c3a7eda992904b56687..fa9a45f1ed3cb3a0ff0c74ef5f266503ff8c5bff 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -160,7 +160,7 @@ in rec {
### Languages
- af = buildOfficialDict rec {
+ af = buildOfficialDict {
language = "af";
version = "0.50-0";
fullName = "Afrikaans";
@@ -168,7 +168,7 @@ in rec {
sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x";
};
- am = buildOfficialDict rec {
+ am = buildOfficialDict {
language = "am";
version = "0.03-1";
fullName = "Amharic";
@@ -176,7 +176,7 @@ in rec {
sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz";
};
- ar = buildOfficialDict rec {
+ ar = buildOfficialDict {
language = "ar";
version = "1.2-0";
fullName = "Arabic";
@@ -184,7 +184,7 @@ in rec {
sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4";
};
- ast = buildOfficialDict rec {
+ ast = buildOfficialDict {
language = "ast";
version = "0.01";
fullName = "Asturian";
@@ -192,7 +192,7 @@ in rec {
sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3";
};
- az = buildOfficialDict rec {
+ az = buildOfficialDict {
language = "az";
version = "0.02-0";
fullName = "Azerbaijani";
@@ -200,7 +200,7 @@ in rec {
sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86";
};
- be = buildOfficialDict rec {
+ be = buildOfficialDict {
language = "be";
version = "0.01";
fullName = "Belarusian";
@@ -208,7 +208,7 @@ in rec {
sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm";
};
- bg = buildOfficialDict rec {
+ bg = buildOfficialDict {
language = "bg";
version = "4.1-0";
fullName = "Bulgarian";
@@ -216,7 +216,7 @@ in rec {
sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl";
};
- bn = buildOfficialDict rec {
+ bn = buildOfficialDict {
language = "bn";
version = "0.01.1-1";
fullName = "Bengali";
@@ -224,7 +224,7 @@ in rec {
sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh";
};
- br = buildOfficialDict rec {
+ br = buildOfficialDict {
language = "br";
version = "0.50-2";
fullName = "Breton";
@@ -232,7 +232,7 @@ in rec {
sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2";
};
- ca = buildOfficialDict rec {
+ ca = buildOfficialDict {
language = "ca";
version = "2.1.5-1";
fullName = "Catalan";
@@ -240,7 +240,7 @@ in rec {
sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb";
};
- cs = buildOfficialDict rec {
+ cs = buildOfficialDict {
language = "cs";
version = "20040614-1";
fullName = "Czech";
@@ -248,7 +248,7 @@ in rec {
sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01";
};
- csb = buildOfficialDict rec {
+ csb = buildOfficialDict {
language = "csb";
version = "0.02-0";
fullName = "Kashubian";
@@ -256,7 +256,7 @@ in rec {
sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1";
};
- cy = buildOfficialDict rec {
+ cy = buildOfficialDict {
language = "cy";
version = "0.50-3";
fullName = "Welsh";
@@ -264,7 +264,7 @@ in rec {
sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm";
};
- da = buildOfficialDict rec {
+ da = buildOfficialDict {
language = "da";
version = "1.4.42-1";
fullName = "Danish";
@@ -272,7 +272,7 @@ in rec {
sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp";
};
- de = buildOfficialDict rec {
+ de = buildOfficialDict {
language = "de";
version = "20030222-1";
fullName = "German";
@@ -280,7 +280,7 @@ in rec {
sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
};
- de-alt = buildOfficialDict rec {
+ de-alt = buildOfficialDict {
language = "de-alt";
version = "2.1-1";
fullName = "German - Old Spelling";
@@ -288,7 +288,7 @@ in rec {
sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n";
};
- el = buildOfficialDict rec {
+ el = buildOfficialDict {
language = "el";
version = "0.08-0";
fullName = "Greek";
@@ -296,7 +296,7 @@ in rec {
sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja";
};
- en = buildOfficialDict rec {
+ en = buildOfficialDict {
language = "en";
version = "2018.04.16-0";
fullName = "English";
@@ -304,7 +304,7 @@ in rec {
sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i";
};
- eo = buildOfficialDict rec {
+ eo = buildOfficialDict {
language = "eo";
version = "2.1.20000225a-2";
fullName = "Esperanto";
@@ -312,7 +312,7 @@ in rec {
sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1";
};
- es = buildOfficialDict rec {
+ es = buildOfficialDict {
language = "es";
version = "1.11-2";
fullName = "Spanish";
@@ -320,7 +320,7 @@ in rec {
sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd";
};
- et = buildOfficialDict rec {
+ et = buildOfficialDict {
language = "et";
version = "0.1.21-1";
fullName = "Estonian";
@@ -328,7 +328,7 @@ in rec {
sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i";
};
- fa = buildOfficialDict rec {
+ fa = buildOfficialDict {
language = "fa";
version = "0.11-0";
fullName = "Persian";
@@ -336,7 +336,7 @@ in rec {
sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8";
};
- fi = buildOfficialDict rec {
+ fi = buildOfficialDict {
language = "fi";
version = "0.7-0";
fullName = "Finnish";
@@ -344,7 +344,7 @@ in rec {
sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq";
};
- fo = buildOfficialDict rec {
+ fo = buildOfficialDict {
language = "fo";
version = "0.2.16-1";
fullName = "Faroese";
@@ -352,7 +352,7 @@ in rec {
sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p";
};
- fr = buildOfficialDict rec {
+ fr = buildOfficialDict {
language = "fr";
version = "0.50-3";
fullName = "French";
@@ -360,7 +360,7 @@ in rec {
sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr";
};
- fy = buildOfficialDict rec {
+ fy = buildOfficialDict {
language = "fy";
version = "0.12-0";
fullName = "Frisian";
@@ -368,7 +368,7 @@ in rec {
sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl";
};
- ga = buildOfficialDict rec {
+ ga = buildOfficialDict {
language = "ga";
version = "4.5-0";
fullName = "Irish";
@@ -376,7 +376,7 @@ in rec {
sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5";
};
- gd = buildOfficialDict rec {
+ gd = buildOfficialDict {
language = "gd";
version = "0.1.1-1";
fullName = "Scottish Gaelic";
@@ -384,7 +384,7 @@ in rec {
sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3";
};
- gl = buildOfficialDict rec {
+ gl = buildOfficialDict {
language = "gl";
version = "0.5a-2";
fullName = "Galician";
@@ -392,7 +392,7 @@ in rec {
sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk";
};
- grc = buildOfficialDict rec {
+ grc = buildOfficialDict {
language = "grc";
version = "0.02-0";
fullName = "Ancient Greek";
@@ -400,7 +400,7 @@ in rec {
sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512";
};
- gu = buildOfficialDict rec {
+ gu = buildOfficialDict {
language = "gu";
version = "0.03-0";
fullName = "Gujarati";
@@ -408,7 +408,7 @@ in rec {
sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23";
};
- gv = buildOfficialDict rec {
+ gv = buildOfficialDict {
language = "gv";
version = "0.50-0";
fullName = "Manx Gaelic";
@@ -416,7 +416,7 @@ in rec {
sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv";
};
- he = buildOfficialDict rec {
+ he = buildOfficialDict {
language = "he";
version = "1.0-0";
fullName = "Hebrew";
@@ -424,7 +424,7 @@ in rec {
sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn";
};
- hi = buildOfficialDict rec {
+ hi = buildOfficialDict {
language = "hi";
version = "0.02-0";
fullName = "Hindi";
@@ -432,7 +432,7 @@ in rec {
sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys";
};
- hil = buildOfficialDict rec {
+ hil = buildOfficialDict {
language = "hil";
version = "0.11-0";
fullName = "Hiligaynon";
@@ -440,7 +440,7 @@ in rec {
sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp";
};
- hr = buildOfficialDict rec {
+ hr = buildOfficialDict {
language = "hr";
version = "0.51-0";
fullName = "Croatian";
@@ -448,7 +448,7 @@ in rec {
sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a";
};
- hsb = buildOfficialDict rec {
+ hsb = buildOfficialDict {
language = "hsb";
version = "0.02-0";
fullName = "Upper Sorbian";
@@ -456,7 +456,7 @@ in rec {
sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd";
};
- hu = buildOfficialDict rec {
+ hu = buildOfficialDict {
language = "hu";
version = "0.99.4.2-0";
fullName = "Hungarian";
@@ -464,7 +464,7 @@ in rec {
sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k";
};
- hus = buildOfficialDict rec {
+ hus = buildOfficialDict {
language = "hus";
version = "0.03-1";
fullName = "Huastec";
@@ -472,7 +472,7 @@ in rec {
sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d";
};
- hy = buildOfficialDict rec {
+ hy = buildOfficialDict {
language = "hy";
version = "0.10.0-0";
fullName = "Armenian";
@@ -480,7 +480,7 @@ in rec {
sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid";
};
- ia = buildOfficialDict rec {
+ ia = buildOfficialDict {
language = "ia";
version = "0.50-1";
fullName = "Interlingua";
@@ -488,7 +488,7 @@ in rec {
sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp";
};
- id = buildOfficialDict rec {
+ id = buildOfficialDict {
language = "id";
version = "1.2-0";
fullName = "Indonesian";
@@ -496,7 +496,7 @@ in rec {
sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj";
};
- is = buildOfficialDict rec {
+ is = buildOfficialDict {
language = "is";
version = "0.51.1-0";
fullName = "Icelandic";
@@ -504,7 +504,7 @@ in rec {
sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h";
};
- it = buildOfficialDict rec {
+ it = buildOfficialDict {
language = "it";
version = "2.2_20050523-0";
fullName = "Italian";
@@ -512,7 +512,7 @@ in rec {
sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v";
};
- kn = buildOfficialDict rec {
+ kn = buildOfficialDict {
language = "kn";
version = "0.01-1";
fullName = "Kannada";
@@ -520,7 +520,7 @@ in rec {
sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb";
};
- ku = buildOfficialDict rec {
+ ku = buildOfficialDict {
language = "ku";
version = "0.20-1";
fullName = "Kurdi";
@@ -528,7 +528,7 @@ in rec {
sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn";
};
- ky = buildOfficialDict rec {
+ ky = buildOfficialDict {
language = "ky";
version = "0.01-0";
fullName = "Kirghiz";
@@ -536,7 +536,7 @@ in rec {
sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1";
};
- la = buildOfficialDict rec {
+ la = buildOfficialDict {
language = "la";
version = "20020503-0";
fullName = "Latin";
@@ -544,7 +544,7 @@ in rec {
sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl";
};
- lt = buildOfficialDict rec {
+ lt = buildOfficialDict {
language = "lt";
version = "1.2.1-0";
fullName = "Lithuanian";
@@ -552,7 +552,7 @@ in rec {
sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn";
};
- lv = buildOfficialDict rec {
+ lv = buildOfficialDict {
language = "lv";
version = "0.5.5-1";
fullName = "Latvian";
@@ -560,7 +560,7 @@ in rec {
sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w";
};
- mg = buildOfficialDict rec {
+ mg = buildOfficialDict {
language = "mg";
version = "0.03-0";
fullName = "Malagasy";
@@ -568,7 +568,7 @@ in rec {
sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji";
};
- mi = buildOfficialDict rec {
+ mi = buildOfficialDict {
language = "mi";
version = "0.50-0";
fullName = "Maori";
@@ -576,7 +576,7 @@ in rec {
sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy";
};
- mk = buildOfficialDict rec {
+ mk = buildOfficialDict {
language = "mk";
version = "0.50-0";
fullName = "Macedonian";
@@ -584,7 +584,7 @@ in rec {
sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m";
};
- ml = buildOfficialDict rec {
+ ml = buildOfficialDict {
language = "ml";
version = "0.03-1";
fullName = "Malayalam";
@@ -592,7 +592,7 @@ in rec {
sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4";
};
- mn = buildOfficialDict rec {
+ mn = buildOfficialDict {
language = "mn";
version = "0.06-2";
fullName = "Mongolian";
@@ -600,7 +600,7 @@ in rec {
sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg";
};
- mr = buildOfficialDict rec {
+ mr = buildOfficialDict {
language = "mr";
version = "0.10-0";
fullName = "Marathi";
@@ -608,7 +608,7 @@ in rec {
sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk";
};
- ms = buildOfficialDict rec {
+ ms = buildOfficialDict {
language = "ms";
version = "0.50-0";
fullName = "Malay";
@@ -616,7 +616,7 @@ in rec {
sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w";
};
- mt = buildOfficialDict rec {
+ mt = buildOfficialDict {
language = "mt";
version = "0.50-0";
fullName = "Maltese";
@@ -624,7 +624,7 @@ in rec {
sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0";
};
- nb = buildOfficialDict rec {
+ nb = buildOfficialDict {
language = "nb";
version = "0.50.1-0";
fullName = "Norwegian Bokmal";
@@ -632,7 +632,7 @@ in rec {
sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77";
};
- nds = buildOfficialDict rec {
+ nds = buildOfficialDict {
language = "nds";
version = "0.01-0";
fullName = "Low Saxon";
@@ -640,7 +640,7 @@ in rec {
sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f";
};
- nl = buildOfficialDict rec {
+ nl = buildOfficialDict {
language = "nl";
version = "0.50-2";
fullName = "Dutch";
@@ -652,7 +652,7 @@ in rec {
'';
};
- nn = buildOfficialDict rec {
+ nn = buildOfficialDict {
language = "nn";
version = "0.50.1-1";
fullName = "Norwegian Nynorsk";
@@ -660,7 +660,7 @@ in rec {
sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc";
};
- ny = buildOfficialDict rec {
+ ny = buildOfficialDict {
language = "ny";
version = "0.01-0";
fullName = "Chichewa";
@@ -668,7 +668,7 @@ in rec {
sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp";
};
- or = buildOfficialDict rec {
+ or = buildOfficialDict {
language = "or";
version = "0.03-1";
fullName = "Oriya";
@@ -676,7 +676,7 @@ in rec {
sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn";
};
- pa = buildOfficialDict rec {
+ pa = buildOfficialDict {
language = "pa";
version = "0.01-1";
fullName = "Punjabi";
@@ -684,7 +684,7 @@ in rec {
sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7";
};
- pl = buildOfficialDict rec {
+ pl = buildOfficialDict {
language = "pl";
version = "6.0_20061121-0";
fullName = "Polish";
@@ -692,7 +692,7 @@ in rec {
sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1";
};
- pt_BR = buildOfficialDict rec {
+ pt_BR = buildOfficialDict {
language = "pt_BR";
version = "20090702-0";
fullName = "Brazilian Portuguese";
@@ -700,7 +700,7 @@ in rec {
sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p";
};
- pt_PT = buildOfficialDict rec {
+ pt_PT = buildOfficialDict {
language = "pt_PT";
version = "20070510-0";
fullName = "Portuguese";
@@ -708,7 +708,7 @@ in rec {
sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq";
};
- qu = buildOfficialDict rec {
+ qu = buildOfficialDict {
language = "qu";
version = "0.02-0";
fullName = "Quechua";
@@ -716,7 +716,7 @@ in rec {
sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0";
};
- ro = buildOfficialDict rec {
+ ro = buildOfficialDict {
language = "ro";
version = "3.3-2";
fullName = "Romanian";
@@ -724,7 +724,7 @@ in rec {
sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk";
};
- ru = buildOfficialDict rec {
+ ru = buildOfficialDict {
language = "ru";
version = "0.99f7-1";
fullName = "Russian";
@@ -732,7 +732,7 @@ in rec {
sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw";
};
- rw = buildOfficialDict rec {
+ rw = buildOfficialDict {
language = "rw";
version = "0.50-0";
fullName = "Kinyarwanda";
@@ -740,7 +740,7 @@ in rec {
sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il";
};
- sc = buildOfficialDict rec {
+ sc = buildOfficialDict {
language = "sc";
version = "1.0";
fullName = "Sardinian";
@@ -748,7 +748,7 @@ in rec {
sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr";
};
- sk = buildOfficialDict rec {
+ sk = buildOfficialDict {
language = "sk";
version = "2.01-2";
fullName = "Slovak";
@@ -756,7 +756,7 @@ in rec {
sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66";
};
- sl = buildOfficialDict rec {
+ sl = buildOfficialDict {
language = "sl";
version = "0.50-0";
fullName = "Slovenian";
@@ -764,7 +764,7 @@ in rec {
sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5";
};
- sr = buildOfficialDict rec {
+ sr = buildOfficialDict {
language = "sr";
version = "0.02";
fullName = "Serbian";
@@ -772,7 +772,7 @@ in rec {
sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh";
};
- sv = buildOfficialDict rec {
+ sv = buildOfficialDict {
language = "sv";
version = "0.51-0";
fullName = "Swedish";
@@ -780,7 +780,7 @@ in rec {
sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v";
};
- sw = buildOfficialDict rec {
+ sw = buildOfficialDict {
language = "sw";
version = "0.50-0";
fullName = "Swahili";
@@ -788,7 +788,7 @@ in rec {
sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby";
};
- ta = buildOfficialDict rec {
+ ta = buildOfficialDict {
language = "ta";
version = "20040424-1";
fullName = "Tamil";
@@ -796,7 +796,7 @@ in rec {
sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj";
};
- te = buildOfficialDict rec {
+ te = buildOfficialDict {
language = "te";
version = "0.01-2";
fullName = "Telugu";
@@ -804,7 +804,7 @@ in rec {
sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in";
};
- tet = buildOfficialDict rec {
+ tet = buildOfficialDict {
language = "tet";
version = "0.1.1";
fullName = "Tetum";
@@ -812,7 +812,7 @@ in rec {
sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx";
};
- tk = buildOfficialDict rec {
+ tk = buildOfficialDict {
language = "tk";
version = "0.01-0";
fullName = "Turkmen";
@@ -820,7 +820,7 @@ in rec {
sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6";
};
- tl = buildOfficialDict rec {
+ tl = buildOfficialDict {
language = "tl";
version = "0.02-1";
fullName = "Tagalog";
@@ -828,7 +828,7 @@ in rec {
sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8";
};
- tn = buildOfficialDict rec {
+ tn = buildOfficialDict {
language = "tn";
version = "1.0.1-0";
fullName = "Setswana";
@@ -836,7 +836,7 @@ in rec {
sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821";
};
- tr = buildOfficialDict rec {
+ tr = buildOfficialDict {
language = "tr";
version = "0.50-0";
fullName = "Turkish";
@@ -844,7 +844,7 @@ in rec {
sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb";
};
- uk = buildOfficialDict rec {
+ uk = buildOfficialDict {
language = "uk";
version = "1.4.0-0";
fullName = "Ukrainian";
@@ -852,7 +852,7 @@ in rec {
sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m";
};
- uz = buildOfficialDict rec {
+ uz = buildOfficialDict {
language = "uz";
version = "0.6-0";
fullName = "Uzbek";
@@ -860,7 +860,7 @@ in rec {
sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092";
};
- vi = buildOfficialDict rec {
+ vi = buildOfficialDict {
language = "vi";
version = "0.01.1-1";
fullName = "Vietnamese";
@@ -868,7 +868,7 @@ in rec {
sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w";
};
- wa = buildOfficialDict rec {
+ wa = buildOfficialDict {
language = "wa";
version = "0.50-0";
fullName = "Walloon";
@@ -876,7 +876,7 @@ in rec {
sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss";
};
- yi = buildOfficialDict rec {
+ yi = buildOfficialDict {
language = "yi";
version = "0.01.1-1";
fullName = "Yiddish";
@@ -884,7 +884,7 @@ in rec {
sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq";
};
- zu = buildOfficialDict rec {
+ zu = buildOfficialDict {
language = "zu";
version = "0.50-0";
fullName = "Zulu";
@@ -894,7 +894,7 @@ in rec {
### Jargons
- en-computers = buildTxtDict rec {
+ en-computers = buildTxtDict {
shortName = "en-computers";
fullName = "English Computer Jargon";
@@ -913,7 +913,7 @@ in rec {
};
};
- en-science = buildTxtDict rec {
+ en-science = buildTxtDict {
shortName = "en-science";
fullName = "English Scientific Jargon";
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 7adc84f4786131366c5aa828a37be76230ebeca4..e7cea235ceb4ed9cc4148e8f84edf56cbf61f39e 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -5,6 +5,8 @@
, ninja
, pkgconfig
, gobject-introspection
+, gsettings-desktop-schemas
+, makeWrapper
, dbus
, glib
@@ -27,19 +29,32 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]
+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]
# Fixup rpaths because of meson, remove with meson-0.47
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ dbus glib libX11 libXtst libXi ];
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
+ # Provide dbus-daemon fallback when it is not already running when
+ # at-spi2-bus-launcher is executed. This allows us to avoid
+ # including the entire dbus closure in libraries linked with
+ # the at-spi2-core libraries.
+ mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ];
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
+ postFixup = ''
+ # Cannot use wrapGAppsHook'due to a dependency cycle
+ wrapProgram $out/libexec/at-spi-bus-launcher \
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
+ '';
+
meta = with stdenv.lib; {
description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
index 978376eb4fa78ab549712c61be83a888679c6f91..6f10283b07bfbb605b1a49c4418d6b2ce4329d76 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/pkgs/development/libraries/audio/lv2/unstable.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lv2-unstable";
version = "2017-07-08";
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index f8b1006d2eb789a491ef4bd8b86f52678da636a7..2ac3115af2aa7e989eb150c64327a6a0ad71de52 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -3,7 +3,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
-rec {
+{
vampSDK = stdenv.mkDerivation {
name = "vamp-sdk-2.7.1";
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index 9582e54ffacaad1427584a826a8294c8ce8afca8..f66d9369c20a49e276024527e71c8c9365c18128 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -2,7 +2,7 @@
let
version = "1.9.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "avro-c";
inherit version;
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index d95797d5a5f6c6d87926dc817aa4c41f5d01314f..c4b1d36ce7011399fa88b78c81802abd38db29e5 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
lcms2
];
- doCheck = !stdenv.isDarwin;
-
meta = with stdenv.lib; {
description = "Image pixel format conversion library";
homepage = http://gegl.org/babl/;
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 05203d6c233aedaf71f52e6f6e78a31789040476..af0053519e3d16108d461d6baf67ca2609fbb1e1 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
python3
];
- passthru.utests = stdenv.mkDerivation rec {
+ passthru.utests = stdenv.mkDerivation {
pname = "beignet-utests";
inherit version src;
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 503e4b0fa43b2d242201c2fae1a4767a32024269..fd0da496fa40ccfbfe8c8250de396455d1e7b76f 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -22,7 +22,7 @@ let
inherit (stdenv.lib) optional optionals;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "blitz++-0.10";
src = fetchurl {
url = mirror://sourceforge/blitz/blitz-0.10.tar.gz;
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--enable-shared"
- "--disable-static"
"--enable-fortran"
"--enable-optimize"
"--with-pic=yes"
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index 0a38f35af753ea7fa5fad999c8ad82bc5fb0e7c1..bcb452ea4f86615253b58cd493c4072cfe24ea63 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.55.0";
patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
index f4931dfe547401013c97e7886af3c476a0ea14d2..fb65e49c500c1004ac562185b7b518184be466a4 100644
--- a/pkgs/development/libraries/boost/1.59.nix
+++ b/pkgs/development/libraries/boost/1.59.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.59.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix
index b6d74234f799b07c9c244d9ee228403d602d405e..646f4652f77daf9a6214bffa881799a0c03a7473 100644
--- a/pkgs/development/libraries/boost/1.60.nix
+++ b/pkgs/development/libraries/boost/1.60.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.60.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix
index 871ef392c1ae966ddf8c607f4760cd2a5d6ed4c0..a1b3c51d0e6925f46a4a03d53ab52647fbb92f10 100644
--- a/pkgs/development/libraries/boost/1.62.nix
+++ b/pkgs/development/libraries/boost/1.62.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.62.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix
index c4749bc3ee411dcd17dbb867882f92753dd9a9c6..a8b459f4b12ff6c77cecc928eac95ba15fe0cb37 100644
--- a/pkgs/development/libraries/boost/1.63.nix
+++ b/pkgs/development/libraries/boost/1.63.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.63.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix
index 1cf9bfa51f4b2ce6e3be1584d01ce0f1c3492744..32632f79d2250c38df43cd7e05e5991637129037 100644
--- a/pkgs/development/libraries/boost/1.64.nix
+++ b/pkgs/development/libraries/boost/1.64.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.64.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix
index 9837e1c691930e7d7f83ad9cddd6183243cb2c59..922c09ba7fe9cf749763fc5dc2377e9551725be0 100644
--- a/pkgs/development/libraries/boost/1.65.nix
+++ b/pkgs/development/libraries/boost/1.65.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.65.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix
index b44c1a3823a907afb3dc54bced52f2de8e5ce996..0a99717a799700daa9a248a7edc6cecd88e8128d 100644
--- a/pkgs/development/libraries/boost/1.66.nix
+++ b/pkgs/development/libraries/boost/1.66.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.66.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
index 406e63b9622b52b7916825baad1fa8f22531e629..a2fe9447c12541e0d9c15d9f94f1af7c390c8a79 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.67.0";
patches = [
diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix
index cd980439b7101fa3fc912825618a91c3f0bcd4be..4d98172c6d05f4923de867060ec98c6c05fef9fd 100644
--- a/pkgs/development/libraries/boost/1.68.nix
+++ b/pkgs/development/libraries/boost/1.68.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.68.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix
index 959fa851fe22ad38e8462f377f94fee7658bfbc0..95c4aa854a4635bd906a451fd6f5f6d22347b359 100644
--- a/pkgs/development/libraries/boost/1.69.nix
+++ b/pkgs/development/libraries/boost/1.69.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.69.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix
index 5f7b39c1189eb67dd277f447b3ff85945e664a3d..45a8bdb931859a6ed14a5291f37d5f61b19637b3 100644
--- a/pkgs/development/libraries/boost/1.70.nix
+++ b/pkgs/development/libraries/boost/1.70.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.70.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index 3c27281571afe9bfeebf24050ab8bb4fd4ae256c..9283f37a8c470d0fe423388904a5fc87a214145c 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, premake4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bootil-unstable-2015-12-17";
meta = {
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index 7db73f5ad47c30c977eb15057f28ea5b979b5e1b..67e2794c8a2930dda9bce23a0292347a35da73bf 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, perl, go }:
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "boringssl";
version = "2017-02-23";
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
index ba7b51bb0e4e96cb7573eb97ecdd2914380a89e8..7710747d8004f9f73e5e31eb4075fbd65479248e 100644
--- a/pkgs/development/libraries/brigand/default.nix
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "brigand";
version = "1.3.0";
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 97fe7e512993115573352602537657b011fc1eaa..8b0901832d11e07a03f7293f817da0992e1d365f 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -2,7 +2,7 @@
, Cocoa, OpenGL
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bullet";
version = "2019-03-27";
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index d9e69b8e75129d2f15d3e78084d74ddcdcb07439..3b7e870b4fe98554c8487ef51e338c50ff631f83 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -6,7 +6,7 @@
# The celt codec has been deprecated and is now a part of the opus codec
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "celt";
inherit version;
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index 80b6480323be54655463a7922108776f9ac0061e..74fd12ffea26861174bfe0222e4a9f0a8aea9281 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -1,6 +1,6 @@
{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "coin";
version = "unstable-2019-06-12";
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
index 2585a7abaed1dcd1f9770d39d907ba58393cfd3e..dfebccc88e3562f193dddf0b351ca9f4cf83c2a2 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cpp-ipfs-api";
version = "2017-01-04";
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index aa0708daaa7fd6ba1b6067beb67e7ee64d572d96..9b6407715df5d2eeabf9bc5486af0a1929b4aaa0 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -3,7 +3,7 @@
let
pname = "cxxtest";
version = "4.4";
-in python2Packages.buildPythonApplication rec {
+in python2Packages.buildPythonApplication {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 76e30e921ba198f79788438eb70ceb23d891d362..dc668a233b06b9a78b1f97941e436d2184ec8517 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "4.8.30";
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ];
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index 7894e4c7326288e6c6ff7d9f2a6f3f91ff9313d5..1223cb897e861db1b0b981e9f9928be4e9e9df4a 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ];
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index bafca3bd52d23d460ce0b1170202554213db2ff0..642054b5a0184968b095d8f4e90ac9c44d70417e 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "6.0.20";
sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
license = stdenv.lib.licenses.agpl3;
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix
index 96f7668aa903b7101d4e1399bcd6faff01f47e30..dee07a9637e6f841c04cfa2a631e657d6ed791a3 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/pkgs/development/libraries/db/db-6.2.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "6.2.23";
sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7";
license = stdenv.lib.licenses.agpl3;
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index abc32b90c6b83f61fa9b1203da3f1a1f6301c65d..616ad869d57c19126e83144d6f675fc3ccc2e355 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,92 +1,105 @@
-{ stdenv, lib, fetchurl, pkgconfig, expat, systemd
-, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
+{ stdenv
+, lib
+, fetchurl
+, pkgconfig
+, expat
+, systemd
+, libX11 ? null
+, libICE ? null
+, libSM ? null
+, x11Support ? (stdenv.isLinux || stdenv.isDarwin)
+, dbus
+}:
+
+assert
+ x11Support ->
+ libX11 != null && libICE != null && libSM != null;
+
+stdenv.mkDerivation rec {
+ pname = "dbus";
+ version = "1.12.16";
-assert x11Support -> libX11 != null
- && libICE != null
- && libSM != null;
+ src = fetchurl {
+ url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
+ sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl";
+ };
-let
- version = "1.12.16";
- sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl";
-
-self = stdenv.mkDerivation {
- name = "dbus-${version}";
- inherit version;
-
- src = fetchurl {
- url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
- inherit sha256;
- };
-
- patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
- postPatch = ''
- substituteInPlace tools/Makefile.in \
- --replace 'install-localstatelibDATA:' 'disabled:' \
- --replace 'install-data-local:' 'disabled:' \
- --replace 'installcheck-local:' 'disabled:'
- substituteInPlace bus/Makefile.in \
- --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
- '' + /* cleanup of runtime references */ ''
- substituteInPlace ./dbus/dbus-sysdeps-unix.c \
- --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
- substituteInPlace ./tools/dbus-launch.c \
- --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
- '';
-
- outputs = [ "out" "dev" "lib" "doc" ];
-
- nativeBuildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ expat ];
- buildInputs = lib.optional stdenv.isLinux systemd
- ++ lib.optionals x11Support [ libX11 libICE libSM ];
- # ToDo: optional selinux?
-
- configureFlags = [
- "--localstatedir=/var"
- "--sysconfdir=/etc"
- "--with-session-socket-dir=/tmp"
- "--with-system-pid-file=/run/dbus/pid"
- "--with-system-socket=/run/dbus/system_bus_socket"
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
- "--with-systemduserunitdir=$(out)/etc/systemd/user"
- "--enable-user-session"
- "--datadir=/etc"
- "--libexecdir=$(out)/libexec"
- ] ++ lib.optional (!x11Support) "--without-x";
-
- # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
- # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
- # problems building without x11Support so disabled in that case for now
- NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
- NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
-
- enableParallelBuilding = true;
-
- doCheck = true;
-
- installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
-
- postInstall = ''
- mkdir -p "$out/share/xml/dbus"
- cp doc/*.dtd "$out/share/xml/dbus"
- '';
-
- # it's executed from $lib by absolute path
- postFixup = ''
- moveToOutput bin/dbus-launch "$lib"
- ln -s "$lib/bin/dbus-launch" "$out/bin/"
- '';
-
- passthru = {
- dbus-launch = "${self.lib}/bin/dbus-launch";
- daemon = self.out;
- };
-
- meta = with stdenv.lib; {
- description = "Simple interprocess messaging system";
- homepage = http://www.freedesktop.org/wiki/Software/dbus/;
- license = licenses.gpl2Plus; # most is also under AFL-2.1
- platforms = platforms.unix;
- };
+ patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+
+ postPatch = ''
+ substituteInPlace tools/Makefile.in \
+ --replace 'install-localstatelibDATA:' 'disabled:' \
+ --replace 'install-data-local:' 'disabled:' \
+ --replace 'installcheck-local:' 'disabled:'
+ substituteInPlace bus/Makefile.in \
+ --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
+ '' + /* cleanup of runtime references */ ''
+ substituteInPlace ./dbus/dbus-sysdeps-unix.c \
+ --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
+ substituteInPlace ./tools/dbus-launch.c \
+ --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
+ '';
+
+ outputs = [ "out" "dev" "lib" "doc" ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ propagatedBuildInputs = [
+ expat
+ ];
+
+ buildInputs = lib.optionals x11Support [
+ libX11
+ libICE
+ libSM
+ ] ++ lib.optional stdenv.isLinux systemd;
+ # ToDo: optional selinux?
+
+ configureFlags = [
+ "--enable-user-session"
+ "--libexecdir=${placeholder ''out''}/libexec"
+ "--localstatedir=/var"
+ "--runstatedir=/run"
+ "--sysconfdir=/etc"
+ "--with-session-socket-dir=/tmp"
+ "--with-system-pid-file=/run/dbus/pid"
+ "--with-system-socket=/run/dbus/system_bus_socket"
+ "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+ "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
+ ] ++ lib.optional (!x11Support) "--without-x";
+
+ # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
+ # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
+ # problems building without x11Support so disabled in that case for now
+ NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
+ NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ installFlags = [
+ "sysconfdir=${placeholder ''out''}/etc"
+ "datadir=${placeholder ''out''}/share"
+ ];
+
+ # it's executed from $lib by absolute path
+ postFixup = ''
+ moveToOutput bin/dbus-launch "$lib"
+ ln -s "$lib/bin/dbus-launch" "$out/bin/"
+ '';
+
+ passthru = {
+ dbus-launch = "${dbus.lib}/bin/dbus-launch";
+ daemon = dbus.out;
+ };
+
+ meta = with stdenv.lib; {
+ description = "Simple interprocess messaging system";
+ homepage = http://www.freedesktop.org/wiki/Software/dbus/;
+ license = licenses.gpl2Plus; # most is also under AFL-2.1
+ platforms = platforms.unix;
};
-in self
+}
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index 5d441c5d133151a6030e088eaaa1fc4332198eef..e714b96b7e9f0fc3c5a6948f4c8d27ae34cf116d 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -22,7 +22,7 @@ runCommand "dbus-1"
+ rewritePrefix="file://${dbus}/share/xml/dbus-1/"/>
'';
nativeBuildInputs = [ libxslt.bin ];
diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl
index 9544aa13db56d34e93fa91ffcdaedc8edd221604..6a19ee14a22c0451f95658d935bd68f9f58c03dc 100644
--- a/pkgs/development/libraries/dbus/make-session-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-session-conf.xsl
@@ -24,6 +24,7 @@
/share/dbus-1/services
/etc/dbus-1/session.d
+ /share/dbus-1/session.d
diff --git a/pkgs/development/libraries/dbus/systemd.patch b/pkgs/development/libraries/dbus/systemd.patch
deleted file mode 100644
index 7e6cb1f87d07afa8008accfe3d57045230d035b9..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/dbus/systemd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 24fcc9e..98e0459 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1167,7 +1167,8 @@ else
- PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login >= 32, libsystemd-daemon >= 32],
- have_systemd=yes,
-- have_systemd=no)
-+ have_systemd=yes)
-+ AC_MSG_NOTICE([NixOS: do not care whether we found systemd or not])
- fi
-
- if test x$have_systemd = xyes; then
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index a6ff37bee97adbdc70920a0e05e4b42c7c4cdc60..cfc95de1555226ee353d30a96ec588cae564f67f 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dyncall";
version = "1.0";
diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 566f8bfd8d15cf4aa60931e4ea3f08c61882d0f8..13617d67bf574e2c17863cd65e5f6875f92eeeda 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "elementary-cmake-modules";
version = "0.1.0";
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
index 4fc85aee69f6cdd6d07e56d2e843eb96131ac807..e968e09459a07eebf481c058741a4033201316ba 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -2,7 +2,7 @@
openimageio, libjpeg, libpng, libpthreadstubs, libX11
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "embree";
version = "2.17.4";
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index ec6f07f0953ab53701b54933644484aa278687e2..21f63e07335df63bcdedd6967113bc6227190061 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
pname = "exiv2";
version = "0.27.2";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "exiv2";
repo = "exiv2";
rev = "v${version}";
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 858bc209391657ca1391b7b31898c82d3c741d88..649a90200e0d239b2dc1324a908cf075c12804ab 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -30,14 +30,14 @@ stdenv.mkDerivation rec {
"--with-lapack-libs=-l${blas.linkName}"
] ++ stdenv.lib.optionals stdenv.isx86_64 {
# disable SIMD instructions (which are enabled *when available* by default)
- "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "haswell" = [ "--disable-fma4" ];
- "broadwell" = [ "--disable-fma4" ];
- "skylake" = [ "--disable-fma4" ];
- "skylake-avx512" = [ "--disable-fma4" ];
+ default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ haswell = [ "--disable-fma4" ];
+ broadwell = [ "--disable-fma4" ];
+ skylake = [ "--disable-fma4" ];
+ skylake-avx512 = [ "--disable-fma4" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"};
doCheck = true;
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 3b1aeeebaabd92655f5f1c235294573213c80811..45a4f48fd337519b803a7edb8ad34de4590fb080 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -272,7 +272,7 @@ stdenv.mkDerivation rec {
* Build flags
*/
# On some ARM platforms --enable-thumb
- "--enable-shared --disable-static"
+ "--enable-shared"
(enableFeature true "pic")
(if stdenv.cc.isClang then "--cc=clang" else null)
(enableFeature smallBuild "small")
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index 439342a50b85067e59bafe483f1ed3c1c91c36b3..f5ef8e850ddc74d3b262e494a3187e892dc49e1c 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ffmpeg-sixel";
version = "nightly-2.3.x";
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 84260f3f57c73dd6e60f870ec87a1b3e6eefcbdd..4c0ca0210cc85fd640ec210902e93c387168da44 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers
+, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
, openglSupport ? false, libGLU_combined ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
"--enable-version3"
# Build flags
"--enable-shared"
- "--disable-static"
(ifMinVer "0.6" "--enable-pic")
(enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
"--enable-hardcoded-tables"
@@ -145,6 +144,7 @@ stdenv.mkDerivation rec {
(ifMinVer "2.8" "--enable-libopus")
"--enable-libspeex"
(ifMinVer "2.8" "--enable-libx265")
+ (ifMinVer "4.2" (enableFeature (dav1d != null) "libdav1d"))
# Developer flags
(enableFeature debugDeveloper "debug")
(enableFeature optimizationsDeveloper "optimizations")
@@ -170,7 +170,8 @@ stdenv.mkDerivation rec {
++ optional isLinux alsaLib
++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau
- ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL);
+ ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL)
+ ++ optional (reqMin "4.2") dav1d;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index bc5de5f9730fa367ddc700bc725cd3c20c1796ac..c9577436c30008dd8868f6b2f94aad42f440e26f 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -9,7 +9,7 @@ let
withDoc = stdenv.cc.isGNU;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fftw-${precision}-${version}";
src = fetchurl {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
outputBin = "dev"; # fftw-wisdom
configureFlags =
- [ "--enable-shared" "--disable-static"
+ [ "--enable-shared"
"--enable-threads"
]
++ optional (precision != "double") "--enable-${precision}"
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 0b4172cdc764a0ed8409c089dadefc5b2336c040..4ac8150274cfcda998ff217d3aa6ce90dbe13e7f 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, alsaLib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "flite-2.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 186560ae101fec9b0cdce20db34f993dde25824d..5c9a0ecc71b70223059126f478a5107930b453ca 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
src = ./config-compat.patch;
inherit configVersion;
})
+
+ # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
+ ./fix-joypixels.patch
];
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
diff --git a/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d5654063fe896dd7c0a471df8a19500657787670
--- /dev/null
+++ b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
@@ -0,0 +1,23 @@
+--- a/conf.d/45-generic.conf
++++ b/conf.d/45-generic.conf
+@@ -5,6 +5,10 @@
+
+
+
++
++ JoyPixels
++ emoji
++
+
+ Emoji Two
+ emoji
+--- a/conf.d/60-generic.conf
++++ b/conf.d/60-generic.conf
+@@ -29,6 +29,7 @@
+
+ emoji
+
++ JoyPixels
+ Emoji Two
+ Emoji One
+
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 2ee0af8cfc131aa1ff9f8fb02fe2f9f5700f6cbb..5b98d6523b9a2ffc2878b82ae35173af9cdd835a 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,7 +1,7 @@
{ runCommand, lib, fontconfig, fontDirectories }:
runCommand "fc-cache"
- rec {
+ {
buildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
allowSubstitutes = false;
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index eb26a241d1cdaed76c5cbbc20c2dfa875ae21b4f..6eaf1bbcc2f4aad2c2c9a4bbbdfb86788317c28c 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ];
+ configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ];
# native compiler to generate building tool
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 100c00eea497b3bc7bfd57fd64af97e23d43ed4d..04903cc5e9eee1bfd9fd95eb835b4e3b547768b8 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "funambol-client-cpp-9.0.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix
index 909c504870f0e1084ca7210313df79edcbf862ca..21975766e74e6c62213b28eab755448c8ee350b6 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/development/libraries/g2o/default.nix
@@ -25,14 +25,14 @@ stdenv.mkDerivation rec {
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF"
] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ {
- "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
- "westmere" = [ "-DDISABLE_SSE4_A=ON" ];
- "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ];
- "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ];
- "haswell" = [ "-DDISABLE_SSE4_A=ON" ];
- "broadwell" = [ "-DDISABLE_SSE4_A=ON" ];
- "skylake" = [ "-DDISABLE_SSE4_A=ON" ];
- "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ];
+ default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
+ westmere = [ "-DDISABLE_SSE4_A=ON" ];
+ sandybridge = [ "-DDISABLE_SSE4_A=ON" ];
+ ivybridge = [ "-DDISABLE_SSE4_A=ON" ];
+ haswell = [ "-DDISABLE_SSE4_A=ON" ];
+ broadwell = [ "-DDISABLE_SSE4_A=ON" ];
+ skylake = [ "-DDISABLE_SSE4_A=ON" ];
+ skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"});
postInstall = ''
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix
index b7043b61c8a62f6dcaffbd9200d2ef273064b87d..1a3447f6674f1df69350af7752c5832cb8f2a214 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@@ -2,7 +2,7 @@
let
newtonsoft-json = dotnetPackages.NewtonsoftJson;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "gdata-sharp";
version = "2.2.0.0";
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 79fb7a8d738f48a8d8e6a2099138b4811501bd4d..4c1e538dcd66c15d2b4502fbc3e99c41bfbd5099 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
"--disable-optimization"
] ++ stdenv.lib.optionals stdenv.isx86_64 {
# disable SIMD instructions (which are enabled *when available* by default)
- "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "haswell" = [ "--disable-fma4" ];
- "broadwell" = [ "--disable-fma4" ];
- "skylake" = [ "--disable-fma4" ];
- "skylake-avx512" = [ "--disable-fma4" ];
+ default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ haswell = [ "--disable-fma4" ];
+ broadwell = [ "--disable-fma4" ];
+ skylake = [ "--disable-fma4" ];
+ skylake-avx512 = [ "--disable-fma4" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"};
# On darwin, tests are linked to dylib in the nix store, so we need to make
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 48e65cc063b0f70dd57254e0be10a8ed16f55386..29360585b7e57a25829b61951aa0df5f1b74de6f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -174,8 +174,10 @@ stdenv.mkDerivation rec {
inherit doCheck;
- passthru = {
+ passthru = rec {
gioModuleDir = "lib/gio/modules";
+ makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas";
+ getSchemaPath = pkg: makeSchemaPath pkg pkg.name;
inherit flattenInclude;
updateScript = gnome3.updateScript { packageName = "glib"; };
};
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index d44bcdda9aeddd5bf89d79a47e9d2a64d85749b9..51e981a2a338e539302edce33314dcaf58e3addf 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
let
version = "1.0.22";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gloox";
inherit version;
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index e914f9d78eef765396e8f47effb3a7cdbcf4ab6b..638d483b60e973339d1ad93c8823f32ee072d1d2 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -13,7 +13,7 @@ let
sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gnu-config";
version = "2019-04-15";
diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix
index e245496c63acd0df8670c6779fa7c56c31f82230..015163b32931a4ea846f86b8e323c2c6933fc486 100644
--- a/pkgs/development/libraries/gnutls-kdh/3.5.nix
+++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 812128fb12fb6a0ce797875d56e061a3880e3e93..8b118fe94834aab4c317d4430386733fe49945d2 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -3,7 +3,7 @@
, glib, gobject-introspection
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gsettings-qt";
version = "0.1.20170824";
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 0ba3bf354235ac57cc4fab9d73385785064bfd6e..ebaf694f04e9521bf6131706a3bb1d25ace9839b 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gsignond-plugin-lastfm";
version = "2018-05-07";
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index d9afecc6d0c154339007db742197fe98456a9ac9..a140859b69315e860c9bcf5d0531155068b8a338 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -2,7 +2,7 @@
, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
, docbook_xsl, glibcLocales, gobject-introspection }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gsignond-plugin-oauth";
version = "2018-10-15";
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index b9eecaf0946f50225884289ef330f6153c308a9c..af57950ac653f8797cdcdcfa11ed9718dd70344e 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gsignond-plugin-sasl";
version = "2018-10-15";
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index c8846509d004cb29ad11a62d661f5becf93f39be..1fd086ca23c721675f166518e61580abbc633e37 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "gsl-2.5";
+ name = "gsl-2.6";
src = fetchurl {
url = "mirror://gnu/gsl/${name}.tar.gz";
- sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04";
+ sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp";
};
# do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index fb1d627d7b123c8bc02e7e6ab0fff75bc42045f7..81d914581321ff874dbfc29818d43a2813031518 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -6,6 +6,7 @@
, libjpeg
, libvisual
, tremor # provides 'virbisidec'
+, libGL
, gtk-doc, docbook_xsl, docbook_xml_dtd_412
, enableX11 ? stdenv.isLinux, libXv
, enableWayland ? stdenv.isLinux, wayland
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
;
- buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor ]
+ buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ]
++ lib.optional (!stdenv.isDarwin) libvisual
++ lib.optional enableAlsa alsaLib
++ lib.optionals enableX11 [ libXv pango ]
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index 8acaefcedf463ca41f8c788b7408037cc7df24ba..27036ad86edf9e7af9eb51cbf39b593d926eb9e6 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -4,7 +4,7 @@ let
ver_maj = "0.10";
ver_min = "11";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gstreamermm-${ver_maj}.${ver_min}";
src = fetchurl {
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix
index 6588b8ab44073c452d8fe7dab0a79117f3e3cec2..1af62e14d8d2b571b4e0a9b62088b67c4584bc2c 100644
--- a/pkgs/development/libraries/gthree/default.nix
+++ b/pkgs/development/libraries/gthree/default.nix
@@ -15,7 +15,7 @@
, json-glib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gthree";
version = "unstable-2019-08-21";
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index 26d0b5c359583d0af555a7e0f3a78b4e1d106415..8cf9baa0c99260f666dd9ffc0236962cafb33331 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gtk-mac-integration-2.0.8";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 26a3428f6793a8012865bbe17b13c6da2e156bf9..87453a09e7f9489f8fb1d9d5dbcbf28b48b961de 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
}:
let
- version = "2.5.3";
+ version = "2.6.0";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
- sha256 = "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y";
+ sha256 = "0rn9fvnrxds7f4812yx68myy3x7szb4z9ql4m1fgjrc2ahbx3xww";
};
postPatch = ''
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 4fa369e299d247282423355b0d3fa328a6bab698..7fbc1bfe1eaacf700f2680545ccb78c1c6e79a4f 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -6,7 +6,7 @@
let
mkDict =
{ name, readmeFile, dictFileName, ... }@args:
- stdenv.mkDerivation (rec {
+ stdenv.mkDerivation ({
inherit name;
installPhase = ''
# hunspell dicts
@@ -542,7 +542,7 @@ in rec {
/* ITALIAN */
it_IT = it-it;
- it-it = mkDictFromLinguistico rec {
+ it-it = mkDictFromLinguistico {
shortName = "it-it";
dictFileName = "it_IT";
shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico";
@@ -598,7 +598,7 @@ in rec {
/* SWEDISH */
sv_SE = sv-se;
- sv-se = mkDictFromDSSO rec {
+ sv-se = mkDictFromDSSO {
shortName = "sv-se";
dictFileName = "sv_SE";
shortDescription = "Swedish (Sweden)";
@@ -606,7 +606,7 @@ in rec {
# Finlandian Swedish (hello Linus Torvalds)
sv_FI = sv-fi;
- sv-fi = mkDictFromDSSO rec {
+ sv-fi = mkDictFromDSSO {
shortName = "sv-fi";
dictFileName = "sv_FI";
shortDescription = "Swedish (Finland)";
diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix
index 297365be87497f216c39b186db25a7c8654d7d17..3a642c8837a3e94558b2b3691e641d3f355a6712 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/pkgs/development/libraries/ignition-math/default.nix
@@ -3,7 +3,7 @@
let
version = "2.6.0";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ign-math2";
inherit version;
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 31b9a4b0e9f7ac1f6867ebbba8fb0848047e9cd5..0e7603db58564ba3a9d3d1b38efbd779fd5c859d 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -5,7 +5,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ign-transport";
inherit version;
inherit src;
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index a5b226ee9c744da9e8819ff5934db708cc7714a2..98a34477e4f1341f48b926197974f0be16c6a8c2 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook ];
- configureFlags = [ "--disable-static" "--enable-shared" ];
+ configureFlags = [ "--enable-shared" ];
meta = with stdenv.lib; {
homepage = https://www.openprinting.org/download/ijs/;
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index 2beff09d0b4e5afed67b177836201c23745b55c0..f74477eab3847e413682d7d70a9fedb468db4ce5 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, tcl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "incrtcl";
version = "4.0.4";
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index 20a60f1a102dbbf83e91e7e609d44a97a9b18a9a..13c71dc8f7047c711663f68fd2dbbb95c22c1ee3 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
src = fetchurl {
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 599e8dcc5975bb107fd22d0646359a7ecab07844..37d6c0643c735c2f40d6ee13ade3016467bc2236 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iso-codes";
- version = "3.79";
+ version = "4.3";
src = fetchurl {
- url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz";
- sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb";
+ url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2";
+ sha256 = "11n3sccwapfr7npxad8m3xmc7w8i11kk70ffbz25gj82bn8rylvb";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 68e2a7377919d5f5c6ede43a5f213fbd0ef5dd94..1f2aeda80cfec3a9311ebc69d424ae396007fc62 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,6 +1,6 @@
{ fetchgit, stdenv, ant, jdk }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hydra-ant-logger";
version = "2010.2";
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index 591de48d3195466e5095c18d649e933d0fb8b3f8..a93d77742915fe0060e0e7c8b5072eed1107ae4f 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -5,13 +5,13 @@
let
platformMap = {
- "x86_64-linux" =
+ x86_64-linux =
{ platform = "gtk-linux-x86_64";
sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; };
- "i686-linux" =
+ i686-linux =
{ platform = "gtk-linux-x86";
sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; };
- "x86_64-darwin" =
+ x86_64-darwin =
{ platform = "cocoa-macosx-x86_64";
sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; };
};
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index e8a7aa7322f3ef3e69622454c0c9ecab3289be73..ef1171b17601c784fa69566b88387d12ec037d82 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -64,7 +64,7 @@ let
let
inherit (args) name;
- inherit (srcs."${name}") src version;
+ inherit (srcs.${name}) src version;
outputs = args.outputs or [ "bin" "dev" "out" ];
hasSeparateDev = lib.elem "dev" outputs;
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix
index 1ebf2c2e21e54b979b73178bf03365ead874daad..21e3c4d3424eb28e6e5275f049ddb1e1b6768435 100644
--- a/pkgs/development/libraries/kinetic-cpp-client/default.nix
+++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix
@@ -8,7 +8,7 @@ let
sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kinetic-cpp-client-2015-04-14";
src = fetchgit {
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 3f84706bffb3b8890a55aa0418fb9992fb5301e3..71e88559dee6404bb1f8b457416807064033e521 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "kmsxx";
version = "2018-10-23";
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index a8ddab2978d134eedc4c1b4a09b6823a3dc5d7fa..48fb0f1153e78d5e13c425ba81ebda8f7870d96f 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -4,7 +4,7 @@
}:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libagar";
inherit (srcs) version src;
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix
index 43d66b8251cfd92b308c13a855c550036ceb8c06..4295971d5a0b14fd1ba6c367a977edac805f0074 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/pkgs/development/libraries/libagar/libagar_test.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libagar-test";
inherit (srcs) version src;
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index b20850e88ff071c9955f0b4ed2163b0e5f869b79..9aedde923f0be24a68c654250b19fb4c7b6b19c6 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
which }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libbap";
version = "master-2019-04-05";
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 5af8acb5ed7695710b3b8b081534e6e812dcc9f5..89ca984767b3e71694bcc9f0331a56480f22f49b 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -3,7 +3,7 @@
, libiberty, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libbfd";
inherit (binutils-unwrapped) version src;
diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix
index 10a4c276ebd5e05f768f539b0aea68e967ef5d94..bfc7fe1d9498a9e9031bbdfa640f3d22b993edea 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libcredis-0.2.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 29d59659f90dec40d47e0d62730f16a5bbec91be..11fb21fe52e26c2f5bb1a78a914371264c9b0c5d 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }:
+{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
+, withValgrind ? valgrind-light.meta.available, valgrind-light
+}:
stdenv.mkDerivation rec {
pname = "libdrm";
@@ -12,7 +14,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "bin" ];
nativeBuildInputs = [ pkgconfig meson ninja ];
- buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
+ buildInputs = [ libpthreadstubs libpciaccess ]
+ ++ lib.optional withValgrind valgrind-light;
patches = [ ./cross-build-nm-path.patch ];
@@ -22,14 +25,14 @@ stdenv.mkDerivation rec {
done
'';
- mesonFlags =
- [
- "-Dnm-path=${stdenv.cc.targetPrefix}nm"
- "-Dinstall-test-programs=true" ]
- ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
- [ "-Dtegra=true" "-Detnaviv=true" ]
- ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"
- ;
+ mesonFlags = [
+ "-Dnm-path=${stdenv.cc.targetPrefix}nm"
+ "-Dinstall-test-programs=true"
+ "-Domap=true"
+ ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
+ "-Dtegra=true"
+ "-Detnaviv=true"
+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false";
enableParallelBuilding = true;
@@ -37,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = https://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
- platforms = stdenv.lib.platforms.unix;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 3fd2a328558eb0577b5390beafe1519971af4754..352d2b17406b8239e564df854ab03efc7784d21f 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -16,7 +16,7 @@ let
};
in rec {
- libdwarf = stdenv.mkDerivation rec {
+ libdwarf = stdenv.mkDerivation {
pname = "libdwarf";
inherit version;
@@ -37,7 +37,7 @@ in rec {
inherit meta src;
};
- dwarfdump = stdenv.mkDerivation rec {
+ dwarfdump = stdenv.mkDerivation {
pname = "dwarfdump";
inherit version;
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index 8555449f28bdf7d89feeb9173b3ab3fcfb810462..9650f540fcfba44a49ec5ec2646bdf1fd76a7e38 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libESMTP";
version = "1.0.6";
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 5fb46bff075620c7d0c47815b6cf3094cf29ca28..a94b6d1dc2a69b7d05a8810700a2bd3f9358fa83 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -6,11 +6,11 @@ assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
pname = "libevent";
- version = "2.1.10";
+ version = "2.1.11";
src = fetchurl {
url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
- sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78";
+ sha256 = "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6";
};
# libevent_openssl is moved into its own output, so that openssl isn't present
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 0c8a7084e095bc0ccd6e49c7745f774ac7c90c85..e007ab2f95af295ef2cfae345ae2790bf316d78c 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -2,7 +2,7 @@
zlib, libpng, boost, qt5, guile
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libfive";
version = "2018-07-01";
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index c0595ac93d1ceb281a8271107b8a4e51873d0dcd..8ddce0aa98c60207ae2378d0565ee361af9d43dc 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libnfc, openssl
, libobjc ? null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libfreefare";
version = "0.4.0";
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 36a1b7d37208632c74a291bf13958b327284ca31..75d8e6710e0935b999eaa3d223f0509c4b9bec55 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "libgcrypt";
- version = "1.8.4";
+ version = "1.8.5";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
- sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
+ sha256 = "1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv";
};
outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index ba9eab432029beda249d854f14f3910c4783306f..9ba3cdbd09aacd6da6752e72cda140334a1022dc 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -2,7 +2,7 @@
, libtiff, giflib, libjpeg, libpng
, libXrender, libexif, autoreconfHook, fetchpatch }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libgdiplus-5.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix
index 260c3a3d97bf1bb9ebce7b346b649aa544874745..b9e1d668cd3e2eec9de584a31663224d1bcad965 100644
--- a/pkgs/development/libraries/libgee/default.nix
+++ b/pkgs/development/libraries/libgee/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libgee";
- version = "0.20.1";
+ version = "0.20.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
+ sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy";
};
doCheck = true;
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index ed6139d48f6fba8ac2680fe34149f2b4a12fa974..2b64d5b7220ad1bc4ca01ff991afbc149ef02d98 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -43,10 +43,11 @@ stdenv.mkDerivation rec {
});
outputs = [ "out" "dev" ];
- # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
- # See the explanation in addOpenGLRunpath.
+ # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib.
+ # Note that libEGL does not need it because it uses driver config files which should
+ # contain absolute paths to libraries.
postFixup = ''
- addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so
+ addOpenGLRunpath $out/lib/libGLX.so
'';
passthru = { inherit (addOpenGLRunpath) driverLink; };
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index f3e1b8b0f99788a961cd7db0f1e475df42192779..d7fb35897dc4f2610f93edecb964db01ff080626 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, fetchurl, gettext
+{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch
, genPosixLockObjOnly ? false
}: let
genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
@@ -24,7 +24,18 @@ in stdenv.mkDerivation (rec {
sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds";
};
+ # Remove gawk buildfix on > 1.36
+ patches = [
+ (fetchpatch {
+ url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1";
+ sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq";
+ })
+ ];
+
postPatch = ''
+ # Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration
+ sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in
+
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix
index b82c547fb331c2c8db15ba176ee8de796304a05a..f1483c38c154e370bd3d7f2d20beec6e794ce217 100644
--- a/pkgs/development/libraries/libgumath/default.nix
+++ b/pkgs/development/libraries/libgumath/default.nix
@@ -4,7 +4,7 @@
, libxnd
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libgumath";
version = "unstable-2018-11-27";
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 4883b39b7cf781f3cd8c681dc2381ee55a179714..3f80b16d8c03316b50afa4e9c16e475101277593 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -5,11 +5,9 @@
, hicolor-icon-theme
}:
-let
+stdenv.mkDerivation rec {
pname = "libhandy";
version = "0.0.11";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";
diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
deleted file mode 100644
index 2ea1b124ce7b80fcf98c4b5c7be3e414d2323bd5..0000000000000000000000000000000000000000
--- a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014
---- a/libheif/heif_context.cc
-+++ b/libheif/heif_context.cc
-@@ -571,6 +571,11 @@
- image->set_is_alpha_channel_of(refs[0]);
-
- auto master_iter = m_all_images.find(refs[0]);
-+ if (master_iter == m_all_images.end()) {
-+ return Error(heif_error_Invalid_input,
-+ heif_suberror_Nonexisting_item_referenced,
-+ "Non-existing alpha image referenced");
-+ }
- master_iter->second->set_alpha_channel(image);
- }
-
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index 7e1bb2daa9e143f9e0467be9f2e0471169e80123..02c4dd3348137f9ea9285e595b3e677ab8ec5bd7 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -1,18 +1,16 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
stdenv.mkDerivation rec {
- version = "1.4.0";
pname = "libheif";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
- sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2";
+ sha256 = "1nvfjmnha06689imm8v24nlc011814gc9xq3x54cnmqvh5gn98ah";
};
- patches = [ ./1.4.0-CVE-2019-11471.patch ];
-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libde265 x265 libpng libjpeg ];
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index ab1858c51a6121306d13e7691b3f04eabf7d369c..08a88bfee459a8bbe10e7dbf92a7e7594c15ff5c 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -2,7 +2,7 @@
let inherit (buildPackages.buildPackages) gcc; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libiberty-${gcc.cc.version}";
inherit (gcc.cc) src;
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index d8881b929a05deae181cd93500c6b4323108a700..050cba5460d98c149a01c738531c9f644a7f7e86 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -1,34 +1,64 @@
-{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection
-, python3, tzdata, glib, libxml2, icu }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, glib
+, gobject-introspection
+, icu
+, libxml2
+, ninja
+, perl
+, pkgconfig
+, python3
+, tzdata
+, vala
+}:
stdenv.mkDerivation rec {
pname = "libical";
- version = "3.0.4";
+ version = "3.0.5";
- outputs = [ "out" "dev" ]; #"devdoc" ];
+ outputs = [ "out" "dev" ]; # "devdoc" ];
src = fetchFromGitHub {
owner = "libical";
repo = "libical";
rev = "v${version}";
- sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm";
+ sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra";
};
nativeBuildInputs = [
- perl pkgconfig cmake ninja vala gobject-introspection
- (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
-# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
-# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
+ cmake
+ gobject-introspection
+ ninja
+ perl
+ pkgconfig
+ vala
+ # Docs building fails:
+ # https://github.com/NixOS/nixpkgs/pull/67204
+ # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
+ # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs
+ ];
+ installCheckInputs = [
+ # running libical-glib tests
+ (python3.withPackages (pkgs: with pkgs; [
+ pygobject3
+ ]))
+ ];
+
+ buildInputs = [
+ glib
+ libxml2
+ icu
];
- buildInputs = [ glib libxml2 icu ];
cmakeFlags = [
"-DGOBJECT_INTROSPECTION=True"
+ "-DENABLE_GTK_DOC=False"
"-DICAL_GLIB_VAPI=True"
];
patches = [
- # TODO: upstream this patch
+ # Will appear in 3.1.0
# https://github.com/libical/libical/issues/350
./respect-env-tzdir.patch
];
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index c1ee68a2470bd285db10ffe507ec9448a92708a4..044ef2dd6a7998f8a7ae68f399c8295d7803ee6d 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -27,11 +27,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libinput";
- version = "1.13.4";
+ version = "1.14.1";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
- sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk";
+ sha256 = "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix
index c4dca659d36607993d88244873a89c3cdb02d075..fccf4b3d50f2370dae57b1ff832c9845e64bf0ab 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/pkgs/development/libraries/libipfix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libipfix";
version = "110209";
src = fetchurl {
diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix
index 0f2c9dce28a222897e039a5d2d5a11f4bde77208..4e9c165e71fb5d4691b693dd87e84e4420817194 100644
--- a/pkgs/development/libraries/libjpeg-drop/default.nix
+++ b/pkgs/development/libraries/libjpeg-drop/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libjpeg-drop-9b";
srcs = [
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index ba92bdd516557c0119bb60ab9d8b54121e5353f5..b62f0f116a099c22e480cd3513b5f08ece92ced8 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
let
version = "7.6.1";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "libjson";
inherit version;
src = fetchurl {
diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
index 92e7d26f5afa0d047895933332e90c306fde3343..b4e9f2bdf88501edd30db02d1f05dc987ac38cfb 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libksi-2015-07-03";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
index d9f460d44e8ceb7b777e51e185d03ec3d6f03e7b..c51cb9baead6c78b5fea344a82abde53dda12f41 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, curl, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "liblastfm-SF-0.5";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index a61c21ffec5fc6e970183c787d650d1549d95fd9..6dfb95d1fb837c485a17599976411dbe221ed982 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -4,7 +4,7 @@
let
version = "3.10.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "liblouis";
inherit version;
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index 2ce11b998a1a34d4f37df7a0242a283c6785c257..4a4074e2f2296193ea65aaa7e07804e0a1f237f0 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libmcrypt-2.5.8";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index d2fba5cddd82ae99d4bd30b1baf916842e15d919..57053103417a5e2cecd0e7451bcc1708152c50a3 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libmemcached-1.0.18";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 719053e7ecf15117948ab09c04a6ca138423e52d..f8f4439a3dfeb6d55362baea5416328f431cc34d 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmicrohttpd";
- version = "0.9.64";
+ version = "0.9.66";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
- sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7";
+ sha256 = "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf";
};
outputs = [ "out" "dev" "devdoc" "info" ];
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index e4010280f4bdd8da96df1dd9cd3baf72dbcb1ae0..9ffbc95b1fd14eba02e410c4f61c53416f5b4fb8 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -5,7 +5,7 @@
let
version = "1.1.0";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libmpc";
inherit version; # to avoid clash with the MPD client
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index cde4251e2c697a246f598251eca4e9f317085ac1..518991120f7a79bf6202c0d16b2d8970861b22a1 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -2,7 +2,7 @@
let
version = "1.3.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "libmypaint";
inherit version;
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 6c4fc798f335ecba6729eb384b70fc39cfeeccd3..a522c72fc766726f0d009b5029b351dc9af2a3c4 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libndtypes";
version = "unstable-2018-11-27";
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index 695ddadb5f398744daaf8bfa7752631f4c8ff453..3d069d7a168d5b21fe5a6a6dff7b963bd4b0df04 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libusb, readline }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libnfc";
version = "1.7.1";
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index ad51ac8d6dbb892f655b1973cf3b6625c2f5b568..815ed3a6bd4016d879f862ee1e47e5dad1e1e333 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
- version = "1.1.3";
+ version = "1.1.4";
pname = "libnftnl";
src = fetchurl {
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
- sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92";
+ sha256 = "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index c0c66bc1a4a01466d0d4d42ecf15829fd2131c37..4049a18145c723cb583a24dae8233d56cb980e1d 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -2,7 +2,7 @@
let version = "1.0.3"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libnih";
inherit version;
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index c42cd3206b41815e1e351ffea10451fe06fd8934..aa307f68ca00ec5f5c6e34edbb57958bc21df59f 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -3,7 +3,7 @@
, libiberty, libbfd
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libopcodes";
inherit (binutils-unwrapped) version src;
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 752be52963cb8de967ec6f7d61a80575f11e7db7..01da76749baba790d1d1eca363acc9aa88ce2e42 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -4,7 +4,7 @@
let
version = "1.3.1";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libopus";
inherit version;
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
index e1d70bee6c4c840e7c2766d112771828e01674db..9b91e32f2285254454dedd2eb483338819f3aa33 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -3,7 +3,7 @@
let
version = "0.2.1";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libopusenc";
inherit version;
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix
index 54ee86f0a39ac5611b1b3faf242ea8bd15217635..4be744e7ba936f04da0ada18ae1f4f941d6275ad 100644
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ b/pkgs/development/libraries/libosmpbf/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, protobuf}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libosmpbf-1.3.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 7e2443d31e9283e89d667c3069992295bd0ac5f5..15aa7c9e22d1f9416817f7f79637bac429327ca9 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
# "--enable-gtk-doc"
"--enable-man"
"--enable-valgrind-tests"
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index f1c7874e313e33676c6211d301dad372e111d99d..41a2a1b669d8d3432160112f3bf4dd38ecc756b2 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -2,7 +2,7 @@
, qtbase, qtmultimedia }:
let
- generic = version: sha256: prefix: stdenv.mkDerivation rec {
+ generic = version: sha256: prefix: stdenv.mkDerivation {
pname = "libqmatrixclient";
inherit version;
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index f11a7eb1fe542b50035688e01c43d649dcd29591..43f80076328ee7efc83128cc6ab70f3a69033f68 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [ readline texinfo ];
propagatedBuildInputs = [ gdbm gmp libffi ];
- configureFlags = [
- "--disable-static"
- ];
-
setupHook = ./setup-hook.sh;
meta = {
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
index bdca44dc7d0307f7df52d0c6ce9cc7ab366a8276..d85c9e94ebdffe2f46d4286fe27c9ebf4b15f358 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -2,7 +2,7 @@
let version = "1.8.5"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libspatialindex";
inherit version;
diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix
index 67d6d8d42ead4c771812d03d5ffe57c34122a7b7..2f6b2835c4e327ec6ac3c3062499c3b3ad178004 100644
--- a/pkgs/development/libraries/libstemmer/default.nix
+++ b/pkgs/development/libraries/libstemmer/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libstemmer-2017-03-02";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 302400388437fbbe59034a5f7a5e5acdaea5d5da..004d2ef0dd5b38499770da89f3f01fe557d3076d 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, texinfo }:
stdenv.mkDerivation rec {
- name = "libtasn1-4.13";
+ name = "libtasn1-4.14";
src = fetchurl {
url = "mirror://gnu/libtasn1/${name}.tar.gz";
- sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky";
+ sha256 = "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
index 7a25980a38b99ef555d6462c53423dde1bf83edb..6d95d81e5d9c975dc44ca43ddf2362ad7631d313 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libtcod";
version = "1.5.1";
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix
index 139de830972fd6f83aabe2f79ccbda4d5c999810..043acee0cfeb8e64c542aa5d4e3c81c8778b4073 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/pkgs/development/libraries/libtelnet/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libtelnet";
version = "0.21+45f2d5c";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 9bccff49b5404c6c03347c487f867ea663bfd058..e9267df5047b28851de248a621f0092aa7550186 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -3,7 +3,7 @@
let
generic = { version, sha256 }:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "libtoxcore";
inherit version;
@@ -42,7 +42,7 @@ let
};
};
-in rec {
+in {
libtoxcore_0_1 = generic {
version = "0.1.11";
sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij";
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
index c3981f5c58eae150b5c107f67eb190361c0506db..6cd5f9122a4f7bc26cf1c55617541a11ae8f7919 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
, libvpx, check, libconfig, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tox-core-new-20160727";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index 9a3671c32589754b51b895779d5040d57abc1ccd..4959674f0ad28a29c60bfe6aab0947bf07a14ede 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -2,7 +2,7 @@
let version = "1.0"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libtxc_dxtn_s2tc";
inherit version;
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 446d30c609ee0387815861c9060caaeedc17389f..e333e73de3ffee46636f2cc5e94bb4b4a4b9b609 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -6,7 +6,7 @@ let
backend = if stdenv.isDarwin then "darwin" else "unix";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${shortName}-${version}";
src = fetchgit {
url = "https://github.com/andlabs/libui.git";
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index a0ec3b74cc17f73c9e36e0a6e81980e8912c9891..2c042281f37a78f33d2a5ed5c66b97dc8d587bd5 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -12,7 +12,7 @@
, autoreconfHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libunity";
version = "unstable-2019-03-19";
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
"--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
];
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index ee36365c03ff4efe3d848ff3a59c9f5eb2a10ec6..d80fe6a998c9985fe435b4ff18365adf0e9fe8d2 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
(if isDarwin || isCygwin then
"--enable-static --disable-shared"
else
- "--disable-static --enable-shared")
+ "--enable-shared")
(enableFeature smallSupport "small")
(enableFeature postprocVisualizerSupport "postproc-visualizer")
(enableFeature unitTestsSupport "unit-tests")
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index 75e935d18d90cd15ab08ff214123f46a95ac4f02..48dbc5f395c8d3c4457b1726ac31929f53eba5b6 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -4,7 +4,7 @@
, libtool
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libvterm-neovim";
version = "2018-11-26";
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index 9eb891544b5f1a5fe24439e1cdd5905cbe18dc32..eb031eb2a9d79e2379b5f68116b0b69cddf42b6b 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -4,7 +4,7 @@
, libndtypes
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libxnd";
version = "unstable-2018-11-27";
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix
index 9aa189586f05445d8a7080b790eddc39457b5429..e1bf4fca7b553c05c4fc2fbbd3e7d58638cd1410 100644
--- a/pkgs/development/libraries/libykclient/default.nix
+++ b/pkgs/development/libraries/libykclient/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libykclient";
version = "unstable-2019-03-18";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index f5cb197dfe5e84e72e47ca292d4f09cfa8fef99e..8635b8c412f3a0b1167c7471e15a4b95c4b19112 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -37,14 +37,14 @@ stdenv.mkDerivation rec {
"--disable-optimization"
] ++ stdenv.lib.optionals stdenv.isx86_64 {
# disable SIMD instructions (which are enabled *when available* by default)
- "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "haswell" = [ "--disable-fma4" ];
- "broadwell" = [ "--disable-fma4" ];
- "skylake" = [ "--disable-fma4" ];
- "skylake-avx512" = [ "--disable-fma4" ];
+ default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ haswell = [ "--disable-fma4" ];
+ broadwell = [ "--disable-fma4" ];
+ skylake = [ "--disable-fma4" ];
+ skylake-avx512 = [ "--disable-fma4" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"}
++ stdenv.lib.optionals withSage [
"--enable-sage"
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
index 857f5247cd51fd6bd8a178962edcd67ed4bd5e10..0098116563aed00b105ee9d22cc1624b1690a6f6 100644
--- a/pkgs/development/libraries/linenoise/default.nix
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "linenoise";
version = "1.0.10"; # Its version 1.0 plus 10 commits
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 8b0aecdab168600add94e5063a936d1111c9cbed..8c691f77591661c523905ba8ea64e866bc454c56 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "liquid-dsp";
version = "20170307";
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 9c1815f840b4ef25b6ff500d76c34e0f5e4badba..2df7ef94cf36d36055ce31c498557679f53b3479 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -8,7 +8,7 @@ let
hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = requireFile {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index ab8c2c9385f8961873aa4f97ab8f3378eb0eb6db..ccf246c044e99447e440eeb8e6ebfe63b0cd783b 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "log4shib";
version = "1.0.9";
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index 50baad6a7a0b8eeefb03bea10589bf7f9fe939f4..7ca7456f789790ac1c5e7987c07aed795ea65f4f 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, boost-build, lua, boost}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "luabind-0.9.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index ebd68134ba55462944ae294eafa1255032242683..38261bd1e53a05bb2da43cd3ed84dca1aaaa600a 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -2,7 +2,7 @@
, fetchgit, cmake
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mediastreamer-openh264";
version = "0.0pre20160801";
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7610b15296ee0e1db64e2c6e102361b397197554..cf1bdaf643233a5803113dcbf9a56219bdfae6c0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -27,11 +27,11 @@
with stdenv.lib;
let
- version = "19.1.3";
+ version = "19.1.5";
branch = head (splitString "." version);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mesa";
inherit version;
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
- sha256 = "1q5p4mw7zrklwx1is09knnb762zzk33xwhwp99fw25ax4ar60m44";
+ sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v";
};
prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
index 3493bc5d967977bceab81890b017df6e7d113207..287241a75c927e2ae525f8c21318daa19bdab58b 100644
--- a/pkgs/development/libraries/miniball/default.nix
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "miniball";
version = "3.0";
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 04f84d49f84402dbf23da299b7817f4d21f3a65e..c8ea3315f8b7a1e80833c56b44979f35eede1594 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -3,7 +3,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "msgpack";
inherit version;
diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix
index 7117599d15ec3bef33a12131dafa4592a577682b..f936fc8b3df6e4385ef331693cd3d0358aa527a6 100644
--- a/pkgs/development/libraries/mumlib/default.nix
+++ b/pkgs/development/libraries/mumlib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, boost, openssl, log4cpp, libopus, protobuf }:
-with lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation {
pname = "mumlib";
version = "unstable-2018-12-12";
diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix
index 423a93b69a804f9bb61936015ad274f5341c608f..37bfb05c4eef62e6c3185e75d6f96c7c7da6bb56 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/pkgs/development/libraries/mutest/default.nix
@@ -4,7 +4,7 @@
, ninja
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mutest";
version = "unstable-2019-08-26";
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index 140dbcc937b5ff3f2f2fc02f941a521f2f67dbda..3dac7c93e84ba04fc4af7ec9ad9ede07d114b143 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -3,7 +3,7 @@
let
pname = "mypaint-brushes";
version = "1.3.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
index 6ec288f985b071881f525e6f25ab8fa601d1531d..8164f4ec9729afe771ad890028538fc4b6b23ba7 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mysocketw-031026";
src = fetchurl {
url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz;
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index 83d01f85d0a45b6282d5a0d2f6a91ae8ded68c02..2e29ab395d6b18f3d7e67dbd1448484ad66ec0c5 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -2,7 +2,7 @@
let version = "2.8"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ndpi";
inherit version;
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index 65679c7e282517715148de330264e926ebc0bd6f..a79c42a1c8f44fde6004c99fb9a5d9c5122d1f80 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "neardal-0.7-post-git-20150930";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index d78a31d65cd36808b5738fdfbdd2f3f389456595..064ef344398007efa88868ddb4480fb04a16ee06 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -4,7 +4,7 @@
, version, src
, ...}:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "nettle-${version}";
inherit src;
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index d6fcfb411491ef4fbe74b70e620a11c1e5c7a151..d02247196b1a194da0a2dce0ad6c802029f2601d 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
pname = "nghttp2";
- version = "1.39.1";
+ version = "1.39.2";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
- sha256 = "1vzmkh3pky3l3w6iaffhikh7hslp8zp0jsdqpd6knbflsmzp511a";
+ sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj";
};
outputs = [ "bin" "out" "dev" "lib" ];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index b7b4ea45d8b01d52bc7a8bd2f9c2ce19607739ab..b6b1d406eacd7fd623a4f0452f47f2871308168f 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.44.1";
+ version = "3.46";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w";
+ sha256 = "1vqcl6wxn2nsm2fmlwzmxyagrsj1p1y9bc54b2i2nq45s94rcsbb";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix
index 798f9d3a3965897cb531678860947cac5d13e6f2..b7d46cd5537d5f2f1233f11c5a29ba7dd0598057 100644
--- a/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nvidia-video-sdk-6.0.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index 6cab843a22b101b10cbbba9f230e64408f7cd9c1..84205253554cca20a4a94ac7709c64ec0eaa5669 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2";
};
- nativeBuildInputs = [ ruby addOpenGLRunpath ];
+ nativeBuildInputs = [ ruby ];
buildInputs = [ opencl-headers ];
@@ -17,12 +17,6 @@ stdenv.mkDerivation rec {
sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
'';
- # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
- # See the explanation in addOpenGLRunpath.
- postFixup = ''
- addOpenGLRunpath $out/lib/libOpenCL.so
- '';
-
meta = with stdenv.lib; {
description = "OpenCL ICD Loader for ${opencl-headers.name}";
homepage = https://forge.imag.fr/projects/ocl-icd/;
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 5aeb07de9235925d15246ac4e6cd0dde11b7665d..4d4505c3e703e6fdcb35328784c7769a812ffbef 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.5";
pname = "openbr";
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index 9ce8bb618bf99d4d48743cf5cc666b8b2f0b8e9b..d0cc6396b8d8c7ad6f38da83a1fb690a45a94516 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -2,7 +2,7 @@
, version # "12" for "1.2", "22" for "2.2" and so on
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "opencl-headers-${version}-2017-07-18";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d3efb022a0e01d99b7e9bb63dabe9e8698a0ef68..d8946dae095bd9e27b1148599d97fec5d547b607 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -140,7 +140,7 @@ let
printEnabled = enabled : if enabled then "ON" else "OFF";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "opencv";
inherit version src;
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 205a87d78e8fb6d4046a07b109da0c572d6ad201..aa4c7afa4dbe1d3b23af26a9a7c0c23f9ffe11f0 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -153,7 +153,7 @@ let
printEnabled = enabled : if enabled then "ON" else "OFF";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "opencv";
inherit version src;
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index 5d26063adb61d1a9b59b420bfbc35e58fdd241fe..b8a3c4a81e00df4bc42881a3406be1588a22bfc9 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }:
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation {
pname = "openexrid-unstable";
version = "2017-09-17";
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix
index abc60f026e578b469684697826eafc748a74eeb7..4a7927bfcb2e6adf687ef9a8d15b92d572b4eb0e 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/pkgs/development/libraries/openfx/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, unzip }:
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation {
pname = "openfx";
version = "1.4";
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
index 2a625f32e7ff682f4c6e7ec42ba94c26ab746878..beb151f0d2de9bfb554951d8320e1b41430e48d0 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.5.2";
branch = "1.5";
revision = "version.1.5.2";
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 55d003d2d92b4c2f2db8dccb23645d9e1c22240a..64ed6cb58f0b9930ace211d1e8ef4617880cb8f0 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -23,7 +23,7 @@ let
mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openjpeg";
inherit version;
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 04988debb72308d734d5460f888cc407d80f9fc9..fbc9de11e8f7312527c58ec05eeba954b66ec89f 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
stdenv.mkDerivation rec {
- name = "openldap-2.4.47";
+ name = "openldap-2.4.48";
src = fetchurl {
url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
- sha256 = "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m";
+ sha256 = "0k87qra4kirb6xgja4q1jyw6piwb9v8b8g6gkxq4plawmgy3ylnr";
};
# TODO: separate "out" and "bin"
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index 46028d3a7ea48fd0052906eac289285a64863cc7..e2f6411471662097d687cfc80d28159a9b21e997 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -3,7 +3,7 @@
}:
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openssl-chacha";
version = "2016-08-22";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index bd4802b8775b4bb930ef40b1277b2a3a8adf5f6d..03082eab091780a5a52ac6033210dbb844109e19 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -44,10 +44,10 @@ let
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
configureScript = {
- "x86_64-darwin" = "./Configure darwin64-x86_64-cc";
- "x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
- "armv6l-linux" = "./Configure linux-armv4 -march=armv6";
- "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a";
+ x86_64-darwin = "./Configure darwin64-x86_64-cc";
+ x86_64-solaris = "./Configure solaris64-x86_64-gcc";
+ armv6l-linux = "./Configure linux-armv4 -march=armv6";
+ armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"
@@ -73,7 +73,14 @@ let
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng";
- makeFlags = [ "MANDIR=$(man)/share/man" ];
+ makeFlags = [
+ "MANDIR=$(man)/share/man"
+ # This avoids conflicts between man pages of openssl subcommands (for
+ # example 'ts' and 'err') man pages and their equivalent top-level
+ # command in other packages (respectively man-pages and moreutils).
+ # This is done in ubuntu and archlinux, and possiibly many other distros.
+ "MANSUFFIX=ssl"
+ ];
enableParallelBuilding = true;
@@ -114,7 +121,6 @@ let
license = licenses.openssl;
platforms = platforms.all;
maintainers = [ maintainers.peti ];
- priority = 10; # resolves collision with ‘man-pages’
};
};
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index d1a20552ff76952500ef56d5673966442c6aa21a..8013d68658552f917876fb189cf89267b17a2b36 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openxr-loader";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenXR-SDK-Source";
rev = "release-${version}";
- sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q";
+ sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn";
};
nativeBuildInputs = [ cmake python3 ];
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index c3407289f020d1cb7cf24851f4e429cd248f39d1..3d5988f8114ee1227918d2cd00ae9dad30f09396 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -5,7 +5,7 @@
let
version = "2018-11-13";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "openzwave";
inherit version;
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 06b9e360d1a353c216a0661424e1e19e2fd9d566..ea4ee44eb2df2a1ec5769e3a396a1d43ddcd64a5 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -51,9 +51,9 @@ let
# convert platform to oracle architecture names
arch = {
- "x86_64-linux" = "linux.x64";
- "x86_64-darwin" = "macos.x64";
- }."${stdenv.hostPlatform.system}" or throwSystem;
+ x86_64-linux = "linux.x64";
+ x86_64-darwin = "macos.x64";
+ }.${stdenv.hostPlatform.system} or throwSystem;
# calculate the filename of a single zip file
srcFilename = component: arch: version: rel:
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index b67db91ef642bb645599cd9ddaad1ed6ed4fbe30..9d49b63fbacfb8bd6ea1f342a5cbfa53ec9669d1 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz
, libintl, gobject-introspection, darwin, fribidi, gnome3
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
, meson, ninja, glib
@@ -37,10 +37,10 @@ in stdenv.mkDerivation rec {
optional x11Support libXft;
patches = [
- (fetchurl {
+ (fetchpatch {
# Add gobject-2 to .pc file
url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
- sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr";
+ sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
})
];
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 44293d52da48560d11e00148c1ac6bf4c0d2e55f..d788f1eff346c97b01ad94dd79e6ddc8cbce2a04 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -3,7 +3,7 @@
, Carbon ? null, Cocoa ? null
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pangolin";
version = "2017-08-02";
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index d90a27ed545874f51dc4f46b8179395104ebf07e..b08936dd34de65f45fd14cbb8ce9666bbce48185 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }:
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation {
pname = "partio";
version = "2018-03-01";
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 32fc27f9ab4da032e8d54704ad54bc7db4340499..5a02229cb0e20b981190bb3496c0ca8529965c84 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -3,7 +3,7 @@
, portaudio, alsaLib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pcaudiolib";
version = "2016-07-19";
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 6d2896ac3396f48bf4d1023bb550387b9c22c710..2e111240758d645a0d1fb44b932a035a6e6e989f 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -13,7 +13,7 @@ let
else if (variant == "cpp") then "pcre-cpp"
else variant;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 67f343d6038065e095a7796d91f9f5f442090746..ef7633dadaf36c52c417b5338ab36745ba27e476 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -14,7 +14,7 @@ in
assert withQt5 -> qtbase != null;
assert withQt5 -> qtx11extras != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 829ecdb86e064570f04518c349e43499cb5b07d5..98c6be85672c37dce87af0b63f18a1a8436efd67 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null;
assert !withQt4 -> qtbase != null;
assert !withQt4 -> qtx11extras != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 2dd0cc10c947ce23cc4da9e08ba62b69a33a439a..dc32c4ebfb0546654cce718f788f11ad6cd98ff3 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -15,7 +15,7 @@ in
assert withQt5 -> qtbase != null;
assert withQt5 -> qttools != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}";
meta = {
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index fb108dd7c2572b79b9b7da105d1eff40704089f4..4ec11777785780cf2dae951d9c8cb9fc243e0260 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -35,7 +35,7 @@
, libXmu
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "10.4.1";
pname = "geant4";
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index dd39fbbc84b7a2a3f50a982e52d53f845c14e3ec..3d6891c48e2bb1439b026bf87d4b8eed8c32afaf 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -14,7 +14,7 @@ let
boost_python = boost.override { enablePython = true; inherit python; };
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (geant4_nomt) version src;
pname = "g4py";
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 89248597f5d99c9bed5b9230228fe67f9af559e8..92b56467aee9ae06328dddc259744d6f0ee5fd65 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2
, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "portaudio-190600-20161030";
src = fetchurl {
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index ffe7f46b77d8a2d782d2f6f0d407511278b091d5..37958038601cc6efeac2f4affd39db39cd9e0829 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
# XXX: This is to deactivate Java support.
- patches = stdenv.lib.singleton (fetchurl rec {
+ patches = stdenv.lib.singleton (fetchurl {
url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/"
+ "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 8f6adaf03d9be0cd90e22d563d463eda0d06ee6c..7839547ee92834e0b47c54a1bda8696302281d51 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -2,7 +2,7 @@
let version = "1.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ppl";
inherit version;
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 957b59a6f662a2048f71fb012eeed20be79cb558..01f74bc48eb7d2cb41fdfd8c8a438611923f6e47 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -6,7 +6,7 @@
}:
let
-mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
+mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
pname = "protobuf";
inherit version;
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 773e31391758ddbb5453571b133648f6fdf58ff6..3c08537db0b6b4720a05ef3cec788efe21b8258c 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -3,7 +3,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "protobuf";
inherit version;
diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
index c3a815c45ac897939a3ddbad44186459b9051430..304f9d61f397f868c9fd631b2e1b5f5904e47e5f 100644
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ b/pkgs/development/libraries/protobufc/1.3.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchFromGitHub, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.3.1";
src = fetchFromGitHub {
owner = "protobuf-c";
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix
index 91c0ae5624e87422bd607760faaed320d2be489a..838fa7de82610d76e75ae46c16b98ccb9065461f 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -3,7 +3,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "protobuf-c";
inherit version;
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index 596dc543e33527a7971cfe3a3babe7f57f746181..92f927ee398594582f0da9ce83037d8c36bb86ae 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "qhull-2016.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index 083e0a51b813e7bb32b08adad8bfb7036823022c..03247f9d695b7771a022959891d188184f6a4bd8 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -1,5 +1,5 @@
{stdenv, qtdeclarative, fetchFromGitHub, qmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "qml-box2d-2018-04-06";
src = fetchFromGitHub {
owner = "qml-box2d";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index d3f4a8e88e2ef6992761e504eab6ce2ff7868f8c..b156a1cbf992fbd45f00585ea3e71022f19d258e 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-11-24";
pname = "qmltermwidget-unstable";
diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
index e7d7d1326174a18c16fca336fcf3d5bddb6a84a2..eb6e7715385cd50e3b44ab1827029d7832c902da 100644
--- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
@@ -82,7 +82,7 @@ wrapQtAppsHook() {
find "$targetDir" -executable -print0 | while IFS= read -r -d '' file
do
- isELF "$file" || continue
+ isELFExec "$file" || continue
if [ -f "$file" ]
then
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 8250e42a1b6cbcf934502a0e9a6a795a8f2e11cf..e2c71a77062eb7d26cb6772e68eb0bfc197b83cb 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -255,14 +255,14 @@ stdenv.mkDerivation {
if (!stdenv.hostPlatform.isx86_64)
then [ "-no-sse2" ]
else lib.optionals (compareVersion "5.9.0" >= 0) {
- "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ];
- "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ];
- "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
- "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
- "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ];
+ westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ];
+ sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
+ ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
+ haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"}
)
++ [
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 84a9d30918b15e527fa9a265209d7e79c472670d..5003205ef37dc4e8fa5ba6c67bd14bb6a35e4de4 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,14 +8,14 @@ args:
let
inherit (args) name;
- version = args.version or srcs."${name}".version;
- src = args.src or srcs."${name}".src;
+ version = args.version or srcs.${name}.version;
+ src = args.src or srcs.${name}.src;
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
- patches = args.patches or patches."${name}" or [];
+ patches = args.patches or patches.${name} or [];
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index dd50e6ec03983269ffe7afada7ea1e411ec19221..a033f477afb085f19ac1510dd33dbb6910f5a82c 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,6 +1,6 @@
{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }:
-mkDerivation rec {
+mkDerivation {
name = "qtstyleplugins-2017-03-11";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index 96a2347c50fa537fa19e879932736acca5c834b9..afb4e0daeb66e94164f316829618c88f86cf63a6 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rabbitmq-java-client-3.3.4";
src = fetchurl {
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index e36b6f9488a5893407870ca827bac5bfcb14495b..2b60c3cbf546e4aeb5403e8f683f4be78c60dc2a 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "re2";
version = "20190401";
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index f9a20a535cb3d655a93c8ab6a651ee0cc30db3b0..73ed823d2be5854edd4cf1d7d695b9541801e3fa 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "readline-6.3p08";
src = fetchurl {
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
index 75beddcd22ca6ea273a6098003ab898416a04d53..53d30019f28d4e8ae41c2096b4e565d6ea493c05 100644
--- a/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -2,7 +2,7 @@
, fetchurl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "5.6.0";
pname = "papi";
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index d22858d64d0c922daa44a0d648ec1714050b3f41..26ec1237601f087a377893e585e068a9b0f9e3ba 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -38,7 +38,7 @@ let
'';
cub = {
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "NVlabs";
repo = "cub";
rev = "v1.7.4";
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 3c448abeccf6da6fd8f4799d743d511196250641..f0f5829ce4658bfad339a952d616d97daa905eb5 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -10,7 +10,7 @@
, addOpenGLRunpath
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
inherit version;
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 2e5bb5e371f548c69d47f6807050b7ecdeb72ff3..5a62578481c6bf2c7206c9d62a78c45213f5b566 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -11,7 +11,7 @@ let
version = "3.8.0";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "liblapack";
inherit version;
src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
index 892dfa2a609728880023437932b5c9ec13d37589..76f0c5eea7fa8bb4b18f28393ebd603e3de9ac20 100644
--- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
@@ -1,14 +1,14 @@
{
version = "1.14.0";
-"cpu-linux-x86_64" = {
+cpu-linux-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz";
sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k";
};
-"gpu-linux-x86_64" = {
+gpu-linux-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz";
sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6";
};
-"cpu-darwin-x86_64" = {
+cpu-darwin-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz";
sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92";
};
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index c9c26ca0d66c3e22b76d4d3796171f0a479e2c9d..ff29ae82c5ce303dc878219875b614deb4a6ff3c 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -2,7 +2,7 @@
assert stdenv ? cc && stdenv.cc.libc != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "scmccid-5.0.11";
src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
diff --git a/pkgs/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix
index 116f248b3b4e84530e56a95d40da4380d01335ce..b78f1d5624ca11ea58553969fd5d386225476f0e 100644
--- a/pkgs/development/libraries/sdformat/3.nix
+++ b/pkgs/development/libraries/sdformat/3.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, callPackage, ... } @ args:
-callPackage ./default.nix (args // rec {
+callPackage ./default.nix (args // {
version = "3.7.0";
srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q";
})
diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix
index f81eb9b259e890a067908d202756f2aa0f2e5314..66ad311387f8891f9d238f6f67ed917ad99735af 100644
--- a/pkgs/development/libraries/sdformat/default.nix
+++ b/pkgs/development/libraries/sdformat/default.nix
@@ -5,7 +5,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = fetchurl {
url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2";
sha256 = srchash-sha256;
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index cf73e205830b15b5e1d79c5bfeb05df0be03870e..4726221a40d9501ac6d92cf10b8d777e53021848 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -7,7 +7,7 @@ let
version = "2.5.1";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sfml";
inherit version;
diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix
index 2f3ec44a08cec3fd17f329be9b961592a33d1404..d9fcea767d5ea008e1c6e39f52ac8d800a679f92 100644
--- a/pkgs/development/libraries/soil/default.nix
+++ b/pkgs/development/libraries/soil/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, mesa, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "soil";
src = fetchurl {
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix
index edcb3549c310bfda6f327c8b91c628c227b61995..4a744c08ae33eac757a8059a17ebc49a9ef5f6cd 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/pkgs/development/libraries/sonic/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sonic";
version = "2016-03-01";
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index 98226ce20f4a00c9fbb8dd129d8f802352278a75..79084ceda1c32dc9a4f303a08fbb1a4dc7b62a1b 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,6 +1,6 @@
{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "soqt";
version = "1.6.0a";
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
index 50ba9c944ab5f29c7bf245711f306c04f6dfc0cb..11ba48c59716bc5bc42a9df49163ea475d400966 100644
--- a/pkgs/development/libraries/soxt/default.nix
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -1,6 +1,6 @@
{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "soxt";
version = "unstable-2019-06-14";
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
index e4c1f8eb5f681790c4cf2032f8aaf802c5a84c59..739dfc3bc5b47033c865078ba7b600cbf774eb28 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fuse, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sqlar";
version = "2018-01-07";
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix
index 440f0c22ea6f41b999781b3f067b2c2a7d841845..c2353c7b7061204295e40ffaa6c46b630c197c5c 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/pkgs/development/libraries/stb/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stb";
version = "20180211";
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 8992c7e75c0561e7dd8fd28af32b70ee91485326..401c2562167f8deb55fd1777f31d8c0a51ee50a8 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, zlib, cmake}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "taglib-1.9.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index 61d9c710801c2e638825bbb86cd8429ecda7decb..507f2fb275b7cf83b5502f137f2a51e64e1492b9 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, tcl, tk, fetchpatch } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.4.3";
pname = "tix";
src = fetchurl {
diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
index 141f6da14ce4940cf83c0b9d57763a465bc18a44..3058af46ab57ed0e64e24bd0cd7fff10cb3737b3 100644
--- a/pkgs/development/libraries/tk/8.5.nix
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, tcl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index 5013db64bbae92e19cca5b7c6fcbf28f5ca290ac..c30f9a81947852ef20ad0159bf7319c7ce05246c 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, tcl, stdenv, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index d7162067debadd751e57fdb34c4a1343471e2c6e..13e8f783915d0d4cb060f1ac042264ab3d6124a7 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tnt";
version = "3.0.12";
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index 5609f1d67d17ff4f0a74f60a450b403326f4a3ad..2913360768925d0433e19b79bdd05906b6cc694e 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tremor-unstable-2018-03-16";
src = fetchgit {
diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix
index 46b65a08eaab34d0969e822b6b0d5b9533a97df0..e1284c39aa3bea93d9ae52100241432beaf492db 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/pkgs/development/libraries/twolame/default.nix
@@ -2,7 +2,7 @@
, autoreconfHook, pkgconfig
, libsndfile }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "twolame";
version = "2017-09-27";
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index e1f3c0bd39c2abe381dbec6443e2b09572d078ee..e6cd082763966850e5bba26f4630a0b9a2e56bc3 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -3,7 +3,7 @@
let
version = "2.1.0";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "uthash";
inherit version;
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
index 7f9e8508a657ff35c7de73319f15bd0cdd6f2fc9..d62a8524644d789964573c4c1d941594b1195915 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -11,7 +11,7 @@ let
arch = if stdenv.is64bit then "x64" else "ia32";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "v8";
inherit version;
diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix
index cb53765e394b534d74bda875a61c6ab536ae25de..050abe9e81bfc1b4553afa46b416ac3cbdc39eca 100644
--- a/pkgs/development/libraries/v8/5_x.nix
+++ b/pkgs/development/libraries/v8/5_x.nix
@@ -17,7 +17,7 @@ let
sharedFlag = if static then "static_library" else "shared_library";
deps = {
- "build" = fetchgit {
+ build = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "2c67d4d74b6b3673228fab191918500a582ef3b0";
sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q";
@@ -32,7 +32,7 @@ let
rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf";
sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns";
};
- "buildtools" = fetchgit {
+ buildtools = fetchgit {
url = "${git_url}/chromium/buildtools.git";
rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582";
sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0";
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 2d9c5d4b92a37fdb0b77324bcf6c02d9f083602a..e367d8242dec22b6e08c35e5df709cdf2517fdd3 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -14,7 +14,7 @@ let
rev = "936ba8a963284a6b3737cf2f0474a7131073abee";
sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2";
};
- "build" = fetchgit {
+ build = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079";
sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf";
diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
index a72c9473d4ab1a9476d83473017f6cbd8e8a12c6..782d324c8be0e09773f7a7eef62f2a9fb6e84192 100644
--- a/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -26,12 +26,12 @@ let
rev = "0e9a47d74970bee1bbfc063c47215406f8918699";
sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c";
};
- "build" = fetchgit {
+ build = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac";
sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh";
};
- "buildtools" = fetchgit {
+ buildtools = fetchgit {
url = "${git_url}/chromium/buildtools.git";
rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8";
sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw";
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 53d70f4d369d66e3a17e7d9ada776f9fe6119938..0d96829b6baf81ac8d7b094001f7099cd824a0c9 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
++ optional imwriSupport imagemagick7;
configureFlags = [
- "--disable-static"
(optionalString (!ocrSupport) "--disable-ocr")
(optionalString (!imwriSupport) "--disable-imwri")
];
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index 77cd3be0cbdae6db40322da3c125ce9c63c9dde4..2b0a807bfa75f5b80200465329dbe521cc200a6a 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -6,7 +6,7 @@
let
version = "0.3.11";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "volume_key";
inherit version;
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 032181e458ea7b4c2d4ae4da52d8ccb44cd5b4d7..4ea8d69a498b72fc5895d309252950110b51c926 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "vulkan-headers";
- version = "1.1.106";
+ version = "1.1.114.0";
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 5631665a69169e244cdd7d603ea95e67cea3ffae..3cdf8f08651f51332c10490c533eb8ece5f6dc70 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -6,7 +6,7 @@ let
in
assert version == vulkan-headers.version;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vulkan-loader";
inherit version;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww";
};
- nativeBuildInputs = [ pkgconfig addOpenGLRunpath ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
enableParallelBuilding = true;
@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
- # See the explanation in addOpenGLRunpath.
- postFixup = ''
- addOpenGLRunpath $out/lib/libvulkan.so
- '';
-
meta = with stdenv.lib; {
description = "LunarG Vulkan loader";
homepage = https://www.lunarg.com;
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index f3f87b3ba60405b660a5036115dc40b0f89f54ca..cd0b8bdb29dd49fe62bc8bb82948a933e689124d 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -69,6 +69,16 @@ stdenv.mkDerivation rec {
name = "CVE-2019-1010319.patch";
sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb";
})
+ (fetchpatch {
+ url = "https://github.com/dbry/WavPack/commit/36a24c7881427d2e1e4dc1cef58f19eee0d13aec.patch";
+ name = "CVE-2018-7253.patch";
+ sha256 = "130kvmlpaj6x1pm6qzdzrmf4xzhp0pj29qrardb76zcfinx5pk2n";
+ })
+ (fetchpatch {
+ url = "https://github.com/dbry/WavPack/commit/8e3fe45a7bac31d9a3b558ae0079e2d92a04799e.patch";
+ name = "CVE-2018-7254.patch";
+ sha256 = "06fdzw2cbdj8ajf171z1g53cl6bf1cdh2czswqldrqqvv3jkzk77";
+ })
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index d2af8b084e685909846f9132bbfdcd809623768c..0b367f4a930fb33db6a1d630ca7bb3d0481257fe 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "wayland-protocols";
- version = "1.17";
+ version = "1.18";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz";
+ sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 60f911765992eb8508c52d8b5d9962310897ad42..958257ffe76d7eab739bbf0efa50e62372fed1e9 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -6,7 +6,7 @@
let
generic =
{ version, sha256 }:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "wt";
inherit version;
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 362f704a05d8d69ca65717683add1f2dc85aa982..9d317fe00d29135e05c1f856fbba52be8cd5e3c5 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -2,7 +2,7 @@
, libuuid, zlib }:
let
- generic = version: sha256: stdenv.mkDerivation rec {
+ generic = version: sha256: stdenv.mkDerivation {
pname = "xapian";
inherit version;
passthru = { inherit version; };
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 705bd6b87fc6ddece582fbc3703ceff00ca5d2a8..4764c1bdb93cde1a5e52df7dda04e41a1aee49ce 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
, xorg, gnum4, libxcb, gperf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xcb-util-cursor-0.1.1-3-unstable";
version = "2017-04-05";
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index e6ececf8513e9ca84dbb26e2d82b78767bf6e359..74846c8306dd7990fe97cbaf9ceff50feffa91cf 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
"--with-openssl"
"--with-xerces"
"--with-xalan"
- "--disable-static"
];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index 3e54944a3779efbd4a89d751ce51d4511a69cf1c..25c5bf458887711a9a2819b354e3c5772ffccd65 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -4,7 +4,7 @@
let
version = "1.2.28";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xmlsec";
inherit version;
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
index 5a267bbfe76787ea560ebb1c2c200765d355be41..bd87d306b965912ab3e30e3dd166833c35af9cb9 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -3,7 +3,7 @@
let
fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xsd";
version = "4.0.0";
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
index 6305b6c03a46a5d6ab7c24e4bbca070ed0af0d32..d3df30e03e18a22174d4478202bf7b46f985515d 100644
--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "yojimbo";
version = "1.1";
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 592abea4ea04e60579bfcae44fa61c7bacae1ac2..b0f8ae503ea4805f9176c0d87ed3318c4f2d9ec8 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -96,6 +96,9 @@ stdenv.mkDerivation (rec {
"LIBRARY_PATH=$(out)/lib"
];
+ enableParallelBuilding = true;
+ doCheck = true;
+
makeFlags = [
"PREFIX=${stdenv.cc.targetPrefix}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
index 58e1940a3ef4d0a10b166aed3e7c120871b0a2a6..bb5b602b64ac2ad30fcbeaf11708e61ee2b35001 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -1,6 +1,6 @@
{ stdenv, zookeeper, bash }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
src = zookeeper.src;
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 46d417fd2aac52534d9e8943dd7ea6cac882da5b..d9478c60db8874b0a13a7648632e48dc5ef6fb9d 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -36,7 +36,7 @@ let lispPackages = rec {
};
};
- quicklisp-to-nix-system-info = stdenv.mkDerivation rec {
+ quicklisp-to-nix-system-info = stdenv.mkDerivation {
pname = "quicklisp-to-nix-system-info";
version = "1.0.0";
src = ./quicklisp-to-nix;
@@ -57,7 +57,7 @@ let lispPackages = rec {
dontStrip = true;
};
- quicklisp-to-nix = stdenv.mkDerivation rec {
+ quicklisp-to-nix = stdenv.mkDerivation {
pname = "quicklisp-to-nix";
version = "1.0.0";
src = ./quicklisp-to-nix;
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index a5fddd417fa1fc000670fe100f3febaa3a1796c5..729f5937117eb6f4ab9b35a38554b03b5ff66520 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''_3bmd'';
version = ''20171019-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
index a657159a41f1c608ecd3483cadff12a71b87f8a5..cbfcb6f436199f1b122ce9f1576fabe6155a7ce0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''abnf'';
version = ''cl-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 48dd57aac54b3a364c1e9cc76f46da61d7d614e1..586502945ba6359a884d32c5c943fea7fdaed58f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''alexandria'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 61a07c61ca07fb87067d695829b101bf49c14e2d..5921b5f49b1276fcf2a5b9b0f974fe20bf6ed073 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''anaphora'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 40d5aed49917f89a41d92a403ee1cf6884f3840b..1d64784a0a642e5baab666e52817cbb9344a1de1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''array-utils'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
index 68c8a7e087b54733ac0a15d94446e32118dd5db5..482752f2c7f2e94e878f0cc4b885c34ca097709f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''asdf-finalizers'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a50c802fc2ac5430d128bd7607c05a2..1d1ef41f2d16f500c8c69d0eaec070fcb86f55ad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''asdf-system-connections'';
version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 4f438eb734a8fcec6692d7914a11576e64501e85..5251cbc920fadbf1003c3e68a8470269e2ae2886 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''babel-streams'';
version = ''babel-20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 4cba3e86e06853ed2b91b9f7d6c656bc5234c223..d8a12f6edbe3fa01bf01520783a7000399d847ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''babel'';
version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index a660882f36b1dfbf4b76c890ff97ac12506adb44..d7cebabb0adff1f7535be53b67d47c4c06cd37aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''blackbird'';
version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index c5305587a029b62d8f241fc146675b15eaa72dda..530a3b76d301043299893900dc790042c8e094ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''bordeaux-threads'';
version = ''v0.8.6'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 5d7f3f2dd10b074ee11de7f2c9966a0d3a19f0e8..71a7a1894a25e07adaa888f0f529d228c4627485 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''buildnode-xhtml'';
version = ''buildnode-20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index 0a2e56a9c9b882b4b87f79185f64d14b2df1c5f3..26d907c2524cdd1904243c0e1e48688aace127f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''buildnode'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 6cf81070734322a0cd1e85837297a59fb2814525..d159ce49581e97d78aad51223c0fe1f33843b4aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''caveman'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index a7d22ac129b9a40b326f61385f6bc315dc15d571..c4e3b9b5734000b7b9163e7a99715e755128bddd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cffi-grovel'';
version = ''cffi_0.20.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index 3d24638060734d4b62ba41476c94cf096cbc248f..db85c50a5c1e7a58bdc39f73cdadc1525145aae3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cffi-toolchain'';
version = ''cffi_0.20.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index b83b14611978635a7df5555f54bc445e9e8db306..08115ea3a3ab3259f97e25601fd52e9f7a0219dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cffi'';
version = ''cffi_0.20.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c30c68e53c8db79f1d3d5ff1c84d5ad983d8e7d6..c9700a9d009190dd6fe729821d1baafeb5955be7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''chipz'';
version = ''20190202-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 4a533220caf570053350f622b9e8f59ecd846ca0..3209735adb593eec36093ab4feea6ba376bc77d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''chunga'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 2e387d29833f49aef79c6cd9bd73cc4c24f167a5..ea812b38c954f1883edd8927317ce763fc29c701 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''circular-streams'';
version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 531d429df244fdcb667f1f23d46a557dab196f3e..9ffc4c0d39ef1c34998c9a8f67b4d1e96c10be70 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-aa'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 5f93167a1141974f818db9ccab75c73ef5187b9d..5dab19a553198dbbc56d2f62217cc2962151a8ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-annot'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index a413743eb8d54429c657db5b589cd17a18e1421f..8459e32fd045c14103cb364ca6b0629fde7de770 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-anonfun'';
version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 9b053c920e32e579ac7b831163afa6d0ee15b57e..1e61d4e48e75596fe3e7fa9a877a7b5ddf6d9eae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ansi-text'';
version = ''20150804-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d84233c434247801b8613381f83930a3ce483287..e366dc551d60188695b989d84efcf837b0b78a15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-async-repl'';
version = ''cl-async-20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index c13b8b70647d6149b010d53733ea2cf8fdef93d6..d18c95153ff5010ef0f8644d8b6475e191be800d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-async-ssl'';
version = ''cl-async-20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 363227534a8b6db96fedebf59f9d9c313e064749..876a24055c21be7d160e5129259eb5daed1ebcea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-async'';
version = ''20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index a4a9a9261fd6f1b062cd04d453bae709e79add44..8aa43a81f1903a6e914bc7fa90fb3e3251659ee1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-base64'';
version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index 36641b73b750a9c142083823f14acce11203ed2b..aed744e04338fa9398edf64993e4dcde3e9976c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-cli'';
version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 0d0337a65cec91639ac9f6ee515d5fff208061c1..9b69bf886c0e3a1c8de58eeb2e5c1ab1480f1d6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-colors'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
index ebff2928c3ea03ba84ba6ac76c3c84d50f02429c..9b558402ce6a699efbe6ccbdadfa5ee86e8b26c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-containers'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index a3aacd0aa8bd1679ab389674bc022f066ea4b95a..62f895b202790ca07c3d496812a38f1f421e699e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-cookie'';
version = ''20150804-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 56ccab7b5cd50c03756d5f5911f47db41269b9e9..82b63ca088dd8820d75a2fadd528bb90450e3485 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-csv'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index bdc5fe920cf677492a2419ed8fa601e05057e5c1..7a1b7d9f8639cd983678aa5237960c7148e613f6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-dbi'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 1510495a4cbc5160f990e68cdefa8e5ea3e54d94..d6fb845aa3862df0875ea59600b74ead5371954f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-emb'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index d032b4768dd6e155aad18ad3e3ac80db14cebcd7..f92d9c464cf45c6ab17b8157ead4584dca9da6b0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-fad'';
version = ''20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 6a40d0fa8c92fb8c025dca2e60e3c7b49b464dfd..399abebe6e7024941cea1e955e4c4c7b75db417c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-fuse-meta-fs'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index de71e2e299ada1a014ef27a9bfa16a2ace097cc5..b0e6159e62624deb35788d4454732928733b8407 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-fuse'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 61a35f2b58c63ef5c653fd613e63fe9bc8d2d56e..365360ba896b9b85c08b35ad43bf7b8a5c3a2e3f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-html-parse'';
version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index dde2cc31dd05343209c1215869fe91edd9df59ff..7f20a171734abba5fa4867bd5ccec9fa7f43ea42 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-html5-parser'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index b0be8c775a37789804fa4b543db30dcdd636de5c..feefecf75bbbdd8c8a99c29de2c34abc3a1657cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-interpol'';
version = ''20180711-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
index 713aff0ea405ef1d42847469fea585fefaa960cd..66fb98ee0dec4413e6eb27f3021fe122c98a2885 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-jpeg'';
version = ''20170630-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index d8bc535f355959483f655d68df8d71ec5b000e9c..9faf2b1b3888031c0d50755adecc47350ae92166 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-json'';
version = ''20141217-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index dfabda0428f09a875d2b90d98e67a1b2e02c1b63..0c276740f90ae64d9584451059403a91cd4802ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-l10n-cldr'';
version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index f37e653bc5642820269e4d5d25360241c884a759..1a13df6792834969d2f3b491e6e06652b0c60d27 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-l10n'';
version = ''20161204-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 36d15673427c201ba30983b90be7f48c3d733f08..cbbc8ccb0b216cde84c2275b63af993e519ba78b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-libuv'';
version = ''20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
index d506acf876ee935261fadba1b1cc517ba0a8a818..9c623c2278ece6e26d2464321382945ac2e9be18 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''cl-log'';
version = ''cl-log.1.0.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
index f52952af3e1a2e3fbe8ff6be3cbff38df9cc09ad..0f3d0c126ff76f9fadcbae9f275c211d3c8200a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-markdown'';
version = ''20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index b1916c27bfddac96b6396bcb8ef2772d2ba59f7c..7b5b7fb3e1ab04843dc9e3a69da573f2fd05edbc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-markup'';
version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 1590f2536e341fbfbd56323ed98baa9d15661b8f..c8460177a244b2c4882b629a2eb27f0e50095a75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-mysql'';
version = ''20171019-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index cfca59e3b50351cebe04e70d8021ecd2dbe5ce0f..c096c4d2728b77dc09afbbcc790d97e6d3607a8a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-paths-ttf'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index e8034b11c237579be4a8defc21497681e666e233..0f0a22c97e0e2d02ef1451aee892e369a769c71d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-paths'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index babdf04e3ec2f326d97213cc49451a33b132ba7a..d54c37c2de1c8e268fa261f17c9eab611ac12506 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-pdf'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 2fad295c7ee5b68415b63f9bccc817abaf81e646..952a4394ae79a9714d850c601431172675d9ea21 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-postgres'';
version = ''postmodern-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 4c97f03870fabc87c0774433797f47bcfb924b4e..c10a1500563b485f12e02c6bb0e211fee0daab60 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ppcre-template'';
version = ''cl-unification-20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 27887f12497efe0b22bb17f1192a664ead6d522f..20433b51f87749675c3236d902234404441b92d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ppcre-unicode'';
version = ''cl-ppcre-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 8bb8fb2478d870d89d9c66880bb42747cf9cd0b2..cfea494fc4bd81b671036e3011bb42658e5935b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ppcre'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 496a0bd4e567b3d3b13d6009ca535243f4f3d75d..1e13378b38c45a2b047fcfe7c7ab2373d7f5629b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-project'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
index 046f910a866014fdc3cdbcb8c04cedf59f1adf5e..81f1455714d9494d59042ef3655b731661425ad5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-protobufs'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 916af5b29727a6f43495cb5d30b8294feb3b6687..c16486754db37a4c24bea717b445b59d93aedd73 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-reexport'';
version = ''20150709-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0d58e11b4d2622feef76def935136c2e1f30fe7f..16cc2309e645a95bff9fc0a0ae22dfc2508bc96e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-smtp'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 2aff988dfd2480d4dfb9b4a2d20e03ac0d240a54..b639681fd306e674fdaac39a576f7aa597a9e0fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-store'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index add200b09a1d9de42ead4a9b079716252005bf42..4639a66da78f286e6d01053adc52ee2dfffe5258 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax-annot'';
version = ''cl-syntax-20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index c19a47df6c23f5ce687c3633cfd12e1445706fb3..cea65514d4b14258269ea57adecd7e2a4de3158d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax-anonfun'';
version = ''cl-syntax-20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index cded8dc2d06d093053046acccbdcadeae6201eee..fa08d3b114ce8d83e2da4887c750b333c8987a66 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax-markup'';
version = ''cl-syntax-20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 353c8210885e4f9117a3765e60b7652684ed8cb6..2715cfdf8dac93470992963c279072a8496471eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax'';
version = ''20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 968f2972abfcbddd4331468d91114aaddbaec850..b04a6cd83444580dd22b8b8bd23e20af8b1abbc7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-test-more'';
version = ''prove-20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
index 358666877a6d97a046a2225114702343eb195015..38237f6f3b7b6ff8c8f754daf3028021fdd80359 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-typesetting'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 7849acb57c0a01b15684276fa74670c4ffcc04af..77e2ba0036ce50c4aefbdde6975145846a45b792 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-unicode'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index dbdd53a9346942d95b11c096807aa01a1bc952b2..bb8a05b0d6d16eb45548bfe2a0e9df9c00bc5c0e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-unification'';
version = ''20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 750da99d5d6a7f5e743e0e67c60962c4c64b4205..4999da6d0b6932e797d965b3df62c197cf4faa54 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-utilities'';
version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index f44bd0f22e0cd421e2e141980dec9e74aea6d74c..dbdd6d6b617c63511599b181fbf7cd4b4134bca7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-vectors'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 3be45384d418175e52af4d83af494a70d3013100..19af99826fce57f3a6bb32e243bf5d936b76013a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-who'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f344dbfa2fe846a3468793ce74004bf2276542ac..5294613b9789a11dd4373f592ae65fb5503725e6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl_plus_ssl'';
version = ''cl+ssl-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 6cfd7842409c755d0bc846180eb108c71b130940..4b0a4cd176d8acb725c45a9c8b5c313459940ea7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-handler-hunchentoot'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 1ac6ccc329c27bfc7f2dc69cbce65ef6ad4abdde..5f4a96dbcc4a2c7aa2edfdcca0b44b138388488a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-socket'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 1792d79f1d890a5e911b9f5529409de2050ef8d6..d8c8acf83aa636e55b28656fa25ea69115278ed9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-test'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 749fce006e4ea4cf6e90d2605d3311ad6c366801..0234f7644988c8b58c4f2d5e40c6330cd5c017e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-v1-compat'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 1813844e85fd861f2de92d0a1fce5a3c38a7fe7e..ab615e5dc83fc42c364fc951a1a0618b1450cfd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ca03207fabd8ee81dcf72897ae33a2abe62b774a..abbefea70b481370bfbe062154c4482ff8c2c87b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''closer-mop'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index c1b36b6b653c41631f36644baa112ce4356cc35a..3448f70f5adbff257a00bd09a88071dbeae96439 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''closure-common'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index f55ccecadc6143b5162424275fe28211df35ae7c..2746ccff6c9c5abd1b2a213a38ee269c5661a28d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''closure-html'';
version = ''20180711-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
index 9f4abb8e4756ffdc9c25bbc7affebcff70b073db..8f6760b96247e0a1353b3c7eab1738dfe90dbe66 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-postgresql-socket'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
index add3a15d27c7a224182c986e9d9494973d2da225..e90cda0f6d93ac3cf45fe8ce8f0b329e041b2f80 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-postgresql'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
index 653adb3d12b325d4b23b5133969b74cd88952fe5..254a22fbafa5e77adb719b1c8336087bb932aefc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-sqlite3'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
index 8243a33758536075717c9c46e61e1d3da653291c..c664c23dd1c581d07cc5863acc59cdddee842b35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-uffi'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 74b8442c0c908f023540d1bc49c1a22ba79b96a5..e37eecabbca91030e223dbaf5e48202e91da433f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql'';
version = ''20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 2f07706a912940c47297d4d29524a487f91f1db4..458cb51e6adf01adb9dd4a195b0c2b752f5796cc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clss'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index 303d43a964ee94636023591e39be9ed1741270b7..ba45b3530573b84aeceadf5cb15a49d0f4144c69 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clx-truetype'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 6b99f99b7ab8fd5c4e98d1af4caf2e500d0c1946..0fe6e115f3f256643e0d0211db6fc4f637422d77 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clx'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
index 7375b8dd70948223f0cd474ea1f85c862e67638b..0a4a40b06841c0ddb87093442aab2d518e3d70fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''collectors'';
version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1d81acba2dc633144e17d7a6853836e018f7fb27..25eaf1fa6fa9bfece8e734291e5cd1500c5c81b6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''command-line-arguments'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index f4941aa80cd63f0bc3faf23128f4ad892e6243b6..0dd93c46fb2f7620c7119a364ea15e7993c12114 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-lite'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index 98c565648dcb492bfb0eafac76e9a137c2c80fcf..a0a6d2d7c2ec5a694b55b5841e2956d5707d93a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-selectors-simple-tree'';
version = ''css-selectors-20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fcdb69f3c3515a3f4e2a6d2f3562e946b3689aaa..1aff3a5826cbc2149774c24cceaa6799452cac83 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-selectors-stp'';
version = ''css-selectors-20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index aa523d6f838b30c5014429c3340d94795dae27b1..268eea723ddf2044b177e76d9fac40f45868c3bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-selectors'';
version = ''20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index ebae32962f10d387d50a05aaf65bb1e152c7b0b5..9bef7fb990c50b6f417e290e5fdd38dfd8471563 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cxml-stp'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 68a019fa027ddfae91e5918cf67db37d90e7a7d4..667cf93d44f90171e56e4741ecd1955748c2dc62 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cxml'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
index 7c69878900cd46011729a0c1dac9f6f780cc59f3..1f0b4f9f71bc875364a82201cf1bc69be2af9075 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''db3'';
version = ''cl-20150302-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 173a31e9f31d255b947f707d9cb9bc5455127faa..9d0f2549f50b0ca9aa397f47d4580ec2dbea56ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbd-mysql'';
version = ''cl-dbi-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 6668cd4f762bbbc82795c1e0ad738d03e2696a45..9f3046eb51ff816121cd5ca33629c9b27b15676f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbd-postgres'';
version = ''cl-dbi-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 9b6fde0ea94b493e32fb3107bda4ef477e89410d..7bc556eaff207dcdaa9dda189ced05552bc1aeec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbd-sqlite3'';
version = ''cl-dbi-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 26c5306c06a3a004ec00f4d8145a3cbc2c77c248..2e4006dbf3f4d49b6004b2c1969f264a55d7be0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbi'';
version = ''cl-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 4d5bc0a22175d034edbe698cd875715737896d63..5a84a62ee8355ca0a824eb0d8a54f3f57c0f08b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dexador'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 3dbacdf0f81ad775593f7763de64fad963528ce9..2896ec154ecda46ae22c57eed9e81dcdc77954bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''do-urlencode'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7c25ed9a037732d16e8c86cda4aef36e2ffd9e0b..a4196b2d394fe9f4303069e5b0b8942ad894d56a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''documentation-utils'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index aa97f8f7cbe318e7d2c84c6dde81413515d7af6e..a3d063ec9bd90f4bca038bbdfc775e9145cb2669 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''drakma'';
version = ''v2.0.5'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
index a4a58fd0d0b68911332a56d952cf23330b60f7b7..8c318204572022c14a9208ac593563ce34ced87e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dynamic-classes'';
version = ''20130128-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
index 91b8db69a36b100207628b9a218ec2030357bbb4..aa2b01e6bcd543a4da089f8b28e6d9d18c876663 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''eos'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index d68fd839bd1631ae933e0ee28538e60a560e1589..e94ed40f9e1c76307644cec9b07bc5e19104e1d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''esrap-peg'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index a024ad3907a31038b2495a3b844e9e9dc478ae67..3ab6e03ab6591fe44e2f312762dadbff835c5578 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''esrap'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 0e7f5b79160be6eea9c992e8811432cbc1dd4913..b247ea27298d3bbcba8ad2ffe7da9455a9eddf7b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''external-program'';
version = ''20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 82c8603d4a4534a53f01a615a671de39122c72fc..8d43fa3362cc30b34a978747a18aa175c2a56cb0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fast-http'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 89bed83acd54144eb7c14bc656afd2e1d9b5fb89..ea006556876e36234e4c4e0ce4aa57a09cb45c57 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fast-io'';
version = ''20171023-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 39f2af5430fcaae13604b965a215fc19069fc1a5..8b5fe1f7de6cd12f5f20eb0a0957252d6d82b482 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fiasco'';
version = ''20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index be9648a0da4a3e184479911d51acb4d7f2a0a0f3..8ebd9f60381675e7d640b280ceb07947d0a7d398 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fiveam'';
version = ''v1.4.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index d9b25bebddc3fc564da1f73594947a67190202cc..4d5524d9d18dbb6e1af85fa5da85373b68d2c24c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''flexi-streams'';
version = ''20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 90ce8b83dde6f7ebc48cf5d2e854b3cf74df2dd5..a5fe52ec0277aa6311ab095bd9569a87a954d14e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''form-fiddle'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
index d901df215a6850032e8c2ac5334877dae0897a6e..893cec1c72ad28898eecb77ef8aa15639ae1ab23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fset'';
version = ''20171019-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
index 76e2a55620cb86c4c4d7e4f6c99078c9a470aade..e961aecf8540c5aac68d9eb5b1ff7e9c74b7b2a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''garbage-pools'';
version = ''20130720-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 3754829ac37b3564bd8303110e98bfd267b76b06..775e30e711a95be81d279ad1677fd9b530e70f48 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''http-body'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index 1f2700608e377bc3d72209c4fc28343a75a7328f..6fc92c088822ec4ccd937c3ea9735e6e1bc9c59b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''hu_dot_dwim_dot_asdf'';
version = ''20190521-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
index 51f4a2d06980ea8b5f2464cfa7706229334e2ef4..98a77dad63cd85811703b00bf1333331adef41ba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''hu_dot_dwim_dot_stefil'';
version = ''20170403-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index 611ef77256fad68bd83e29b1285172ac35f88dea..11d0831c96fcf8bd31c8323ab63dcb7b8dc033d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''hunchentoot'';
version = ''v1.2.38'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 1b948bcf325eef3358147f8bf67bd79bd7662ae4..9dfeb3f120625871e67bd0d52587dee368a4d05a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''idna'';
version = ''20120107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index 4211dfbc9194d593fa0f814cd168da5ad406c36e..675521dcde94ecc54403c0fdfeda9e4b49c6d2cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ieee-floats'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index c4ae44cd676104f7e763372e4aa918c96c095017..bd0e896e143424e2fa7325bc0c5a9c8440b83888 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib'';
version = ''v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index 195b52c08c45a8e00e44f6191de7b0a9b3dafc40..d5e072e5f6a848390543009f86c1c2109cc6a31a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_asdf'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index aa650edde020464233cc802043164d11eb40134d..445da3b1b17918335d26284f2143c0f9c690f0fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_base'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index c0ec72d48695dac1aafe37a449b05fee417506fb..415e7a598202e13ea8d03cd3694350f68b38b257 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_common-lisp'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index 4ba0cfa1ce2e0a2a690f7e6266c0d72ef72d6703..58fd95012e8210f4f338356467feb816249f4b4f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_conf'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index 7a1a12243fe2c194e62a4fed2625fa1cfe4c0d87..009e0e27866055b895f09c400b10774ee1678d90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_grovel'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 2c56b5964f97e47fc99209942636c9e124e11be9..727be89bf44614688fe124a5c8b1a3a310eef1af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ironclad'';
version = ''v0.46'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f276ec72736dba53882ec3b7beb26e4a8ebb1b36..9a91033bb8be8f0d299df5ac2a03fa0271bc45c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iterate'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
index 9a46818948182774cec9bc90c51100457423bc2f..9d219f4c193cfe6e01b37a1439f2a4f005deac4b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ixf'';
version = ''cl-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 702eb2d05b55c7f9614d419ff9d80d775313d1a5..790638f5954c505d6f89b2a817d804d7f20aa576 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''jonathan'';
version = ''20190202-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e44004a9cf7e7d6de54ddc6ef1945bfc68d039c2..88ededf0e73bd9e23dc69ac59a684e204d6765f8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''kmrcl'';
version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 96a831147bbafd129d13c3945a4eff3792489855..cdac924b4396d1f24685b2bfa625ce7ebd27763b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack-component'';
version = ''lack-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 610633e9af258c2cb82e6395d9ad738760c8536a..68604485c77a252a204f76598cb52f3295811c55 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack-middleware-backtrace'';
version = ''lack-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 3607cbedf44f91dc3adf004f761e39d011c52826..cda7716151ab536475733f036697628eb56d2335 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack-util'';
version = ''lack-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 08095979989bd7d534e3a63d1e2ef3637c0d8b87..7740e73c0e5bccfc4b9b7897274b96352e06747e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 1f6a0709b0f43727b681c1a3292de354059af8a7..91e28f402b23e5b3507cb7f1cd141b18c688ff99 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''let-plus'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9dd6baad1bdc737c9e53a31baa787d333c5352e6..8d52d518e1137f1745128522a5c7743b10b84ba1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lev'';
version = ''20150505-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
index 10977c16f8389aa0e19080dde573510a6f80d965..6ff0fdb4c8294cab33d672531e0c2a48393f8e25 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-client'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
index 4a5fe87982ae51f193798f52c6f95462457013e4..4be971bef065a0f1e85ede79db357d6cc6e4dd9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-common'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
index 354d6c31507622dceba0eda2a78fda973d2f7590..44c8cc01c95f2f46f09f701a95b22a514f85eaa0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-server'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
index 348c71fe96639e8a7caad839bd54b2f4f3a71955..3d917ff2817f363d5d44a0e5e06196a74afac5bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-ssl'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index 1edb65596a6c7505b34ecf1574db793a45016a7c..84f0ca863ec1e24ff25efd8ad31d85a93dae9d28 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lift'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 7f88beb974b05e38f1bc0ecf72337ea1f20c0b3a..802b9eb2b7a919838a7824f08af0b61718a152c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lisp-namespace'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 8d21f88cbf8260dbd2c74784e0eee5b0df8d98a9..c623d368a043e749b4112d295093a5002721c21c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lisp-unit2'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
index 7189a09e20cfd471c4ee4d2eb6abee7d59e12f94..4eb30ef013b0ba0f867f0241fd7da93b77d1516a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''list-of'';
version = ''asdf-finalizers-20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 5ffa27fcca53c44129315fa3672761bcf60b0887..4695c3dfe0e72563e5617023d25e59641689d82a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''local-time'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 1a6f217a2f962ea7bdf8bac457dc75343e1a8640..a4011b78d4f4795c1a95dbcc246b355b7951cc82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lparallel'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index f64e9ee6a330ce28b0beafd1c110b7a650f7c1be..5dbd186e62e76745c45bb0ee7950ca5786401d56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lquery'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 8187c99f94a4c523621cf021235b7ce21e3e6217..c6445010f54466fc6b21d3ed1c2526073a749dda 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''map-set'';
version = ''20190307-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 4f6842606b451723b51e269add7af0dd08bfc824..531cc1adc1afbc9952c04c87ab2136db3817c614 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''marshal'';
version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 953dd0a58a4ac23de8296bf76d3a53db912d0f9e..b34fdd83ca38aa7068a3f7ba85bff0dd214ef478 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''md5'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index d72e0839d1e8baf04e318f25208bd6e91e0c8a97..cf2c3a1c777ba9a3cf8e0ca7393046dbe167cb3b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''metabang-bind'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index 6bbdf5f911e031b27d964a8d01763c081c7271b4..c45a3eff384e0fb5f49969473a6c35b8eea2ffdb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''metatilities-base'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 6334804c4f708edc0c977020b75c5e8d59d19cdf..ef0da68cfe4da974c1b5ce474fd3cd7f95e9c238 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''misc-extensions'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
index 1f2dd20ee4bedad67719cc4ad6e34e19fe45dc6b..adb1ad27c45da9cb352c4b002fca22b8b2255c28 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''moptilities'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
index 470d2fed738c6f82a2d11c9d0354a8576e810695..974a63c1a73073210289dcd8367e7c4073a6ec0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''mssql'';
version = ''cl-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a8cfc070bf9996a8bb83ff146d6159e68ebafc5d..f1fe0e3c2791671a1a53a154343298a1190526c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''mt19937'';
version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 068d0eba69dddd2b198f41a0ce356ca96963ce31..16b1f22ceebb399a0ec24d3fd91bb03f88f04799 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''myway'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 82d06b1c93b2f8fe6727aea2a52776d1f4cf4e93..c5f1379f421fbc13a5e2bbc39aec7a21fc4fc7d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''named-readtables'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 4e7c84566a0ac1c1c3d6b5851ddf9016877191a1..dcc49aa799374f111c625235b6e4f291eeddcd0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''net_dot_didierverna_dot_asdf-flv'';
version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index ea6adac9e9f8d420b6c23b4d4a070a44dbfae9ed..0a3dba6b8243d63eb123e2ef911d5742c6d19e0c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''nibbles'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 07b86f58fe7cae1dc41b980dbafa8f58c310468d..b5b6ace2ae949635bfe9dc3722e89bf5c821dfa8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''optima'';
version = ''20150709-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index bf6216dcaddc5069c988430c11e8cfe3f493d9ba..2bf306507858fc71c55061cb34f7be3649297d8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''parenscript'';
version = ''Parenscript-2.7.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e7d638fa67bdc8a70fe6f381705277..72bef6f60bf2d5ac978f0e185d77626703efc570 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''parse-number'';
version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index fe9ccae2886a82de8a7454715f2020934ce5b164..0c34654b1ae3af62b576ac0183f29d2a9628a646 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''pcall-queue'';
version = ''pcall-0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 025d160f4602ee7dbf2217ee0e50b48915af39bf..60385ab59393e3810e1985e9510bef92add99116 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''pcall'';
version = ''0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
index a913cdbe521c13f270877e03d2de64da99badf0a..f0b5fb23d661936ccf8dc18391f440d19d6d507a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''pgloader'';
version = ''v3.4.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
index 38fb942c331f5ac88bfb33b76b9a011f2a3055c0..e4fd9f0c4df8d44f1ae07a522779101fb64d1005 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''plump-dom'';
version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
index cd0db041c5b2212dfde798045c96eeb4deafda31..16cd9d5f062dcca2e9b39868d65566f749cdb44f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''plump-lexer'';
version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
index a9d07b48a9d4c0f65c289a6a7f9412e3d1e89e9e..cb06b039abd9ff799ab1d63872e2d053c06c3822 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''plump-parser'';
version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 8757c704c8f4c0039c27156cfebba18cbab5171a..53af356f05ac2634cf6f0320ae4f448a3f15c30b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''plump'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index ba7bef260c08c9b361d94b06e964b452dfefaa71..ed09e3805c082b89c80bfcfc5c90b433b87d80c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''postmodern'';
version = ''20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 8ffcbc784ff73852fb13eba50d60bb4c4bd0b01b..3afcbf98d5058b824accb4dd4f23aa44208d7542 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''proc-parse'';
version = ''20160318-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index a1542dc13cf655bb6623f00c216876d89fd44931..9bbc47275f807680044be55228a49c4da7ba5493 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''prove'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index ffa2e595c26a249c6ec5037d473fa8395b31ed28..b4957d68e8839c46a5eacea5c8abd83803afb2bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ptester'';
version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index 4f6946783939bed27696fbd3659db267efaa5c40..84b252f93a5171863142f2dc65da0826425b73a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''puri'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
index 0eb4c0f5b9e6b733af6636ec22a47195d338ba19..741929484d8493823aabb0846be802dd6ed94bcf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''py-configparser'';
version = ''20170830-svn'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
index de24a598496052cf02cf1aaebf9e0104fdb0eb56..03d96005935e4bdb11158a751ca2ad479a9d27a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''qmynd'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 3666dda9bf8795302f1bd00ab87d6602a77dec3b..dbeb5f1d08e0aeef3791924d473448e339a4d443 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''query-fs'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index f6022cb2a1f292fb59a1ef06b328869b4317ef2b..fed624578912ff35e09ae515b752fdfbd7f92eec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''quri'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 25d535176a6ad552e6b46133be0cee164ca5c7af..e6c1477298d4dec29007bf068888540e000e823f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''rfc2388'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index d5be4be7daf433cd9e1a1eeaeb1fa19fde49115f..14b327a97364b72af1647c23073828642413acdf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''rt'';
version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index c283abd479eddad2beba5e9190894465ae83a979..92fa577945222ddf49d1460dea79f38f8c8db29d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''s-sql'';
version = ''postmodern-20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca8fd242bc24cffc80e9b9e43bf5535..26c616ec3922b0dc62049534edce7f2964889c71 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''salza2'';
version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 33847198bdd96f6636983e15ad123832cfa4cde1..f3c1dade82197d3d26cd2134f6a918c7581ed52f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''simple-date'';
version = ''postmodern-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 63adab55741b28a607719f78ae0163ac8c569295..a6fc781c3698d4a8f0cf427f5c2150265dc4fa4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''smart-buffer'';
version = ''20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index a22076facd3999ad7153586ec41fc9ad5ee6ccb0..be9f5998642876fe09dfeab24b6317b9a8badc00 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''split-sequence'';
version = ''v2.0.0'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 57dec7c93cac7ceab9d970d67e3a3ca8d3fc627d..cd018a4b9975b47c749f14754ee66679fee33242 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''sqlite'';
version = ''cl-20130615-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1cd4e4c440273c7e639e78d5891652c6537a8a6a..0386a674916b74b0c2bdef6f87bb3ea154e7af2b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''static-vectors'';
version = ''v1.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index df63a5c9836af9b87bf77c91fcaea2c7e45fb694..7c769e614c142bd8251b4e0ce23286e924bc9d79 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''stefil'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 17a56c09b7e8723a82bafc0eacbed0ab19f85134..2b38115aabdd12aadb94080b0a0ae7a23e23c80f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''string-case'';
version = ''20180711-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index e89eb1971d602b631095bad7caf1370c22c03538..fa0a2ab7944def2564844c3fe3df7bd33b423d84 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''stumpwm'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 50b815425dc612d0ba035a8cc543ec9020377e74..ec14ffffcba14ece2e858eb5d5ad78d2d5e8734a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''swank'';
version = ''slime-v2.24'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index f0df3b84f153a084eef38a5fc102ba66899b0505..89003686df3812a924422d34f4845f780f6fed14 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''swap-bytes'';
version = ''v1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
index 4bae3cc1ceed8d5c77bc5078c300d29d2260f4ad..9ec472fa08a10784ee59027993b17ef8a20246c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''symbol-munger'';
version = ''20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 683f87357f56cc0a426969c63af03f6294643572..d10b68b2d2edf0e090d523412fb30020ad71116d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-backtrace'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 82d0e4513ab1082c5a269ad669c5443cc833d8ba..8db7c603ec88d5eff632838dfd3cc60e4fb162c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-features'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index c629bb3548d4d5a80fd4b89415dcdb4becfee9a7..4d26aa43519396cd222bcd42c7f69195e0d3bfb6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-garbage'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 2aee236ac0cad0a3f112c600d484e2bd7b9a8b63..7826a937992448357817063fffeefc795d24760f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-gray-streams'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 33eedbaa818415940406568622149df829cfd215..002c75e102126421cc38ef0b6bf041e00d77c269 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-indent'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f02d9e0dc2c7f99ea1ff86261483d3b15e5cd2c9..960778dc17c11f9d58fb38708e1454f1b2f9548e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-mimes'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8cc04c2c64ac36a6dc09ffbd54c637bcd1a3b999..6bfaac06f2ddcc8d8db35ef949885ba8b81db91d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-types'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index c925382d81d4457f67ff24e402d28f4200524feb..0ac57089e50d11fc9e1fbce2c5824b201ebee209 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-utf-8'';
version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7ac2c158b8232eb194f890c869a32f..f5e8677f508f080e4f6d33a1c4bc25e599a718b0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''uffi'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 18f1b74edbd3abd0d79587c7bc10c2d135ed621d..ae9c1c6d5ac7ec1915ef1b3be2165e434eba97fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''uiop'';
version = ''3.3.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 6c45649673203de315918d210f6634a5716d0bd3..6a877e5a96464b603e75ebd437fc66818da9f736 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''unit-test'';
version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index c3928cf0e4ccb34ceec8fd665d629bc623f8ee2b..fccce79eb84d44c6c945c7c3807087d029d37c52 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''usocket'';
version = ''0.8.2'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
index 0886b1082a88b2c63924503d47a62759d9f717ea..bfd8451462234f7ef3e6c50817a75fbdc1de0bb1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''uuid'';
version = ''20130813-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 6a4751f799ea0240fa9846501fa3481af5304b6e..2fb1cdacfac2e98785ddd6081373b6abe20d8e6e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''vom'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 59a41a7cf9aeab55a11060ee796f559e7434a941..7825678c77c5ae8b860dd2127a96d59ee5d56cf0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''woo'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index f717441068b6106a76b5b20cbcb474fb043232cb..93bcb2072a7b1d2ca49250a1583d8bbf18ecd27d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''wookie'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 9854567fd5bf66748965b45719f1307003fb6931..db03e57a663b91371b22cf11a97b61bd3a7d7358 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xembed'';
version = ''clx-20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
index 4bfc0678f0f13d135cfdfadfeea46ec4b20faf4f..71cd9cfbde6b9bebdb6723f1f5e97296ad1e1c70 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xkeyboard'';
version = ''clx-20120811-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 0fd076509c2282532b87d0508984a94aa6cfb1c2..ea08214cb6f5186f4d7476b4de029b86a2b2ffc7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xmls'';
version = ''3.0.2'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 3e14a5ba9f06c70d565f77d58eb928a092427233..e2a5494c5b4bd589b1d2be2e8eea08aaf320aafe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xpath'';
version = ''plexippus-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index b9ab71744c3a1f2e42e1e177f91cf1bdee914cdb..92f661f8531015fa3bb864334ec1315c739cdb29 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xsubseq'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index c7031f4aa3fc9787c2735fe73e2709a1fb575154..cf8f3a8ac0fd5a0dd26607dead2311e16c08c740 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''yacc'';
version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index e14a540a1783aa305270c7703442797ffdf4a7fb..ca74dd0e50073ed15ea256b2fbe86b8b6791e8f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''yason'';
version = ''v0.7.6'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 74e5d7e97e95aeb6cbec7505bad05fc52ae46c3f..3aa695caed6f03893d30808ddb4f74bde14d6ebb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''zpb-ttf'';
version = ''1.0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 2e4ceda31c81991081006cbf35f9ab0a47110d67..052bfb1194987ea2223e12175be794c7f4cc2f39 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -39,7 +39,7 @@ in
};
};
hunchentoot = addNativeLibs [pkgs.openssl];
- iolib = x: rec {
+ iolib = x: {
propagatedBuildInputs = (x.propagatedBuildInputs or [])
++ (with pkgs; [libfixposix gcc])
;
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 3dae32b5e15d7fbd8fa2d24db6a71c37d4debfc9..71e1f7c05e6e661b5db3a08e0e0a9012089d8ebf 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -1,6 +1,6 @@
{ lua, writeText, toLuaModule }:
-{ buildInputs ? [], disabled ? false, ... } @ attrs:
+{ disabled ? false, ... } @ attrs:
if disabled then
throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
@@ -18,37 +18,8 @@ else
//
{
name = "lua${lua.luaversion}-" + attrs.name;
- buildInputs = buildInputs ++ [ lua ];
-
- setupHook = writeText "setup-hook.sh" ''
- # check for lua/clua modules and don't add duplicates
-
- addLuaLibPath() {
- local package_path="$1/share/lua/${lua.luaversion}"
- if [[ ! -d $package_path ]]; then return; fi
- if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi
-
- if [[ -z $LUA_PATH ]]; then
- export LUA_PATH="$package_path/?.lua;$package_path/?/init.lua"
- else
- export LUA_PATH="$LUA_PATH;$package_path/?.lua;$package_path/?/init.lua"
- fi
- }
-
- addLuaLibCPath() {
- local package_cpath="$1/lib/lua/${lua.luaversion}"
- if [[ ! -d $package_cpath ]]; then return; fi
- if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi
-
- if [[ -z $LUA_CPATH ]]; then
- export LUA_CPATH="$package_cpath/?.so"
- else
- export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so"
- fi
- }
-
- addEnvHooks "$hostOffset" addLuaLibPath
- addEnvHooks "$hostOffset" addLuaLibCPath
- '';
+ propagatedBuildInputs = [
+ lua # propagate it for its setup-hook
+ ];
}
) )
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index d16f63152b844c2bcba4510344a925e50f757ad5..e93f904b8959ff083904623be6c0f4387bce3d47 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -1,6 +1,6 @@
{ requireFile, stdenv, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "6.0";
pname = "amdadl-sdk";
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index ba6d5559f26b1f39de47d28413f74baa52809ab1..4169b9e4d35d5fae3f6e6e35a05cc01067a26efb 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -35,7 +35,7 @@ let
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "amdapp-sdk";
inherit version;
diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix
index 105104ebd7217c8c29708a10cabcb22c9a0ddfa2..db6ade1c85a65e106f30cad308122dfa5e70274a 100644
--- a/pkgs/development/misc/google-clasp/default.nix
+++ b/pkgs/development/misc/google-clasp/default.nix
@@ -5,7 +5,7 @@ in
(import ./google-clasp.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
-})."@google/clasp-${version}".override rec {
+})."@google/clasp-${version}".override {
preRebuild = ''
patch -p1 <<<"${builtins.readFile ./dotf.patch}"
'';
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index ad1d0e396a91c7731d0024bc493627ab0066456e..557d6f1760974171951cdbfb34fd3e6dea2c56a1 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -4,7 +4,7 @@ with rustPlatform;
buildRustPackage rec {
version = "0.4.1";
- name = "loc-${version}";
+ pname = "loc";
src = fetchFromGitHub {
owner = "cgag";
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index 8578e51e939d244c00fb13f2016227f1f984ed49..ebba63353dabf3d9b89a22f6e3b758dd41bf5b28 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, python3, platform-tools, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "adb-sync";
version = "2016-08-31";
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 6e6a349cccc5380c1544aeaf30a8a6dea91ade93..a74736620066b50d5878cf29c179856225a33631 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -101,14 +101,14 @@ rec {
platforms = map (version:
deployAndroidPackage {
inherit os;
- package = packages.platforms."${version}";
+ package = packages.platforms.${version};
}
) platformVersions;
sources = map (version:
deployAndroidPackage {
inherit os;
- package = packages.sources."${version}";
+ package = packages.sources.${version};
}
) platformVersions;
@@ -151,14 +151,14 @@ rec {
google-apis = map (version:
deployAndroidPackage {
inherit os;
- package = addons.addons."${version}".google_apis;
+ package = addons.addons.${version}.google_apis;
}
) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default
google-tv-addons = map (version:
deployAndroidPackage {
inherit os;
- package = addons.addons."${version}".google_tv_addon;
+ package = addons.addons.${version}.google_tv_addon;
}
) platformVersions;
@@ -225,10 +225,10 @@ rec {
# Link extras
${lib.concatMapStrings (identifier:
let
- path = addons.extras."${identifier}".path;
+ path = addons.extras.${identifier}.path;
addon = deployAndroidPackage {
inherit os;
- package = addons.extras."${identifier}";
+ package = addons.extras.${identifier};
};
in
''
diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix
index 9957168f7af366f5187251f19c86c38cc8820f27..92f53e5a7c20c2d63b351153f9fc7c262bbb6e32 100644
--- a/pkgs/development/mobile/androidenv/tools.nix
+++ b/pkgs/development/mobile/androidenv/tools.nix
@@ -19,8 +19,8 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix {
};
} else if toolsVersion == "26.1.1" then import ./tools/26.nix {
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
- package = packages.tools."${toolsVersion}";
+ package = packages.tools.${toolsVersion};
} else import ./tools/25.nix {
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
- package = packages.tools."${toolsVersion}";
+ package = packages.tools.${toolsVersion};
}
diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix
index 0b9bb7c5b5fc2a756b2327c00763b287df7f186e..c235b9e9a1266434c150e559c69eda9e44689e1d 100644
--- a/pkgs/development/mobile/cocoapods/default.nix
+++ b/pkgs/development/mobile/cocoapods/default.nix
@@ -1,7 +1,7 @@
{ lib, bundlerApp, ruby
, beta ? false }:
-bundlerApp rec {
+bundlerApp {
inherit ruby;
pname = "cocoapods";
gemfile = if beta then ./Gemfile-beta else ./Gemfile;
diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index 9f723a6da4707d0808dbd4c05cbb66eafff61eaa..9e2521717efc19f9c7e4e3c2d1225184a12db767 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 4f05009f3efd428f040fb90a9929ff875bc27b6e..4ed0336ec5c4f8b42290a3de2c238664f3799db9 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index 38673fb9ddc482e023c5b11f3bd46306c135bedc..6a98267d89a55b953d2a56956815fb32f9899d25 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, bisect_ppx, ocamlbuild }:
-buildDunePackage rec {
+buildDunePackage {
minimumOCamlVersion = "4.02";
inherit (bisect_ppx) version src meta;
pname = "bisect_ppx-ocamlbuild";
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index a30b574f19bc0d3c7b4327365b243746f098fb5e..eb9cdb78562e207752685e4cb1213fd5b7e6764f 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "camomile";
version = "0.8.5";
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 64a8f2416ad466649dd41bfcdc2cc32cd567b938..588ba6711cb4b0f96886c65877bc4cd1db4cf55f 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -7,7 +7,7 @@ if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99"
then cohttp-lwt
else
-buildDunePackage rec {
+buildDunePackage {
pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src meta;
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 93ba084703e542cf3b9096d0034f62d3f80c84b4..748b970477eebff1cfaf7c7adc797e71de84bf4d 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp
else
-buildDunePackage rec {
+buildDunePackage {
pname = "cohttp-lwt";
inherit (cohttp) version src meta;
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index b6d2e24ec551522811b5103779ad39380cedeb97..51fb369e66fee08e5564264f9944bf340d7f6b42 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -6,7 +6,7 @@ if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
then conduit-lwt
else
-buildDunePackage rec {
+buildDunePackage {
pname = "conduit-lwt-unix";
inherit (conduit-lwt) version src meta;
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 560600e2fee8ae0ffe7d724343019647de32437b..2eb225d88b6e5a14900d9fc4f1d4d55672dba3a2 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast conduit.version "1.0"
then conduit
else
-buildDunePackage rec {
+buildDunePackage {
pname = "conduit-lwt";
inherit (conduit) version src meta;
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index 17da11708c60cb2684ed62b601ebbf3114ea1089..8d395798979c12f26210d9d7cfb5cc27b8c5dea3 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -4,7 +4,7 @@ if stdenv.lib.versionAtLeast ocaml.version "4.06"
then throw "cryptgps is not available for OCaml ${ocaml.version}"
else
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ocaml-cryptgps";
version = "0.2.1";
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1811e21cf58f37e7a32567635af79dfbc8d02c7e..8180373a3dd9c0a4b82a71acd4ecadf4145f81a4 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -17,7 +17,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cryptokit";
inherit (param) version;
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index 0ddf3cb5995c6df1836234ecbf77f57ee0a50fc2..567defea7d2f3b6a7f1110c8c7e057bbf18436d9 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }:
-buildOcaml rec {
+buildOcaml {
name = "ctypes";
version = "0.13.1";
diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix
index bff993a4d1939d9fe8017df8b76c69b77b13dd2b..5fb9131ef095f78b08e7064351f0eb9cffe8a241 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@@ -10,7 +10,7 @@ in
assert versionAtLeast (getVersion ocaml) "4.01.0";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 0869ae659cc3f1f3f43b0dba3754c7bff2351088..89a1803b520241dd0f171e18232184bde4d75beb 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }:
-buildDunePackage rec {
+buildDunePackage {
pname = "git-http";
inherit (git) version src;
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index 9c8a7c48255f430c04ec7bfa753533df9fb1d753..50e6f1d3bce97e1d0f6b17f7507ab258c9787e51 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }:
-buildDunePackage rec {
+buildDunePackage {
pname = "git-unix";
inherit (git-http) version src;
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
index 19eef7cf1825781b82b671177e3874778d9a35e5..ff923bbd467efd0522900800d018918351a43bcc 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
@@ -2,7 +2,7 @@
bin_prot, core, ppx_custom_printf, fieldslib, herelib,
pipebang, sexplib, async_rpc_kernel}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_extra";
hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh";
propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf
diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
index 938f5ccf4474c32c2fb041ed2167f16e6577086c..49f38136c4f599c2224a7dfc2a4cee740520136b 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
@@ -2,7 +2,7 @@
bin_prot, fieldslib,
sexplib, herelib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_kernel";
hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60";
propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
index 1f5ff6b9646f3411798e38aacd99c956ae5e3581..83a7e13a5d01cfcd27b014b958b8eadae31f9d2d 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
@@ -2,7 +2,7 @@
fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test,
ppx_jane, sexplib, typerep, variantslib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_rpc_kernel";
hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw";
propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib
diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
index 7db7cae27096feb03c848b72ed153f5cfe62987a..0d0f26134f2ff47deff3a3036a3bfd3cc9f9b309 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
@@ -2,7 +2,7 @@
bin_prot, comparelib, core, fieldslib, herelib,
pipebang, sexplib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_unix";
hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7";
propagatedBuildInputs = [ async_kernel core bin_prot comparelib
diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix
index 4cd67e1af86b7822271f2475dbe9127aaa34fcb6..fe01e47426da47d124a3a6b72522f28624bbe12f 100644
--- a/pkgs/development/ocaml-modules/janestreet/async.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane, async_kernel,
async_unix, async_extra}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async";
version = "113.33.03";
hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr";
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
index 631562159762313359e545f6106042d77aec93b9..e8f42ef71d1e4864840f7237adb950dad16a1ae2 100644
--- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -2,7 +2,7 @@
, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis
}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_ssl";
version = "113.33.07";
hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs";
diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
index 11e6189e6c1e1b4c94c60f12556f7ef1103544e3..c47fcd2fea6b2f830a1e7ece496ba846dc453009 100644
--- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
+++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "bin_prot";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.02";
diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
index 5410167e0a2625ef5697c7576b1c85ab75fa46e5..c7c69beedb7bf7716c8dfffcfbdd322f3b0f94f9 100644
--- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
@@ -4,7 +4,7 @@
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
re2, textutils}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core_extended";
hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix
index c2f97badda93d63eeb8983765256bf834dd6e279..f6a7ba5b0db06469c062d5de8fc3219656dec00d 100644
--- a/pkgs/development/ocaml-modules/janestreet/core.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core.nix
@@ -3,7 +3,7 @@
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core";
hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
index 83e6100f05970a18941734de1821d9aa108d0139..b279318dd935e1c937f7e822ce93e097eed0a575 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
@@ -5,7 +5,7 @@
, textutils
}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core_bench";
hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
index e5bbb7800520c6c34a874a16aec406e9da24b8c8..53e92a95c23650a54b0da679b71cdd6be59909ce 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
@@ -2,7 +2,7 @@
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core_kernel";
hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
index 8823a0c8054d4ce88c59c5957cfd60dd71fb286f..8ce1ca6c505a38a2a6db256ded226517d7fc6f88 100644
--- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
@@ -1,6 +1,6 @@
{ stdenv, type_conv, buildOcamlJane }:
-buildOcamlJane rec {
+buildOcamlJane {
name = "fieldslib";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
index b61874d3a7ea88c9fc83a8a75b780d1f7f94f6f2..3ed7106e7b652241d2c9030930d687e78110a175 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_assert";
hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
index 56a124c5b6913576989579521da19bbc01ec0f3e..9e5df431e04c2a48ff8ddf90fa2a5219f77cd8b1 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_inline_test, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_bench";
minimumSupportedOcamlVersion = "4.02";
hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk";
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
index 9dffbed69600fdf207b6eacd0ee6618b8771a27f..d7f333d4cf4c5129b4e903ab9f3cd9f4925950f2 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, bin_prot}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_bin_prot";
hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
index d70fe6ddd5508f287a957b68b939a50921550b0a..0bfdd7bd540ce8944e5754a44cb5af4271beb8d0 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_tools, ppx_type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_compare";
hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
index 4f5bb87b76753e2bb17020728b716a735eff6415..c5789ee9cfb4b66995b466173524f78f13265c32 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_core";
hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
index 3fe78e3e7e2e5366ae628215a94fb4c2cd338e4c..c652afa5fbfc9228fbd37659ca71f5e87d6453ef 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_custom_printf";
hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85";
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
index 7844756c7bfb349dca13e3001b0cbd2be1f77903..b4fb9ec7602fa6f75eb4e83c564cd9c7dc92e24f 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_optcomp}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_driver";
hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
index 8dbf34ed2329a20d454935c479eaabb597ce78e1..2fdfede0f23dfb5ab2bd943d32708298007ce55d 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_enumerate";
hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
index 7e688a1dc1c824b3dd8ce4013fd46033d77669a5..f78f93ee1202ba7a4ad430680b4cd65b3dd82e58 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
@@ -3,7 +3,7 @@
ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools,
ppx_variants_conv, re, sexplib, variantslib, fieldslib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_expect";
hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
index 187d5db199959090349c2e54879f32676d205445..4f55a6c4eacb959417e1f04e3048c8bb0ba0284a 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_here, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_fail";
hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
index a05cf149b268107bb7a45bda8998d070a6e8d7f1..551738573b3692216a868176da2ee3fe231bacf5 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_fields_conv";
hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
index 3aa157a68c5b1b4091ce96f68080a66835f3bb4b..ea3ac5e8e5aef2ca7457ab4dcc59237b9ebdb9c9 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_here";
hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw";
propagatedBuildInputs = [ ppx_core ppx_driver ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
index cd16d7c32864cf33cbe127a752f851e2f92392ca..d0e4c84158c7d876ebc2ccba2d7178aad913b859 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_inline_test";
hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
index 86394f228e9d331a8dceb1b64ff99d566cf1754d..1086059b19f3e9569c20149d9066c784e9729da4 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
@@ -5,7 +5,7 @@
ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message,
ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_jane";
hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
index 3498affeb090095230e0e2c6589e88663fb4d852..8c8b87d7112e8927b20d86b7feb52809b414643e 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_let";
hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467";
propagatedBuildInputs = [ ppx_core ppx_driver ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
index 5dcfc97bfa374766eeb5d7549c942c3c412406d0..61fa66b77cc52291dd9bd051ff12956a7eeafe95 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_optcomp";
hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
index f3f4bcdead59a773c58b41c6da73653521da7d2f..209638f97b74155a56a9b7c5aa9be0cb80ee3d46 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_pipebang";
hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
index bf4a7b214decd51c227bc5199709b5aeb3cc4134..00361ee81ebed88278ce0f39a9ce2d594f97a9f7 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, sexplib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_sexp_conv";
hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
index e83aaa2c272358b3604e0ce7c04e926f244f93cd..2a8bf44bfab201220170fce5743fd4dbef4a841a 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_sexp_message";
hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
index a1a1080d73d74673ab3b8db1b8e530a4fdb1740b..64fbe4bd9bb9c04becd1f7f24e5ed8439fa7abdd 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_sexp_value";
hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
index fc6d9ca0345984ac108dea55a579c55fb3e9c7d6..bf36dfab5cb053a99177ea077bbc7f3c463fd9f7 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_deriving, ppx_driver, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_type_conv";
hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
index e6d23e0dbdd0f1c5f12189e7a173c1fb8ce60af8..472ec19b558849cf6132c7f2d3d71b1dd9587e41 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, typerep}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_typerep_conv";
hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
index 9bc1cbb59e46d8868ca685f96e2adcfb6c7ebb30..1d01b0bc321d1a7e20284586ebb6a78a2bd26613 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_variants_conv";
hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ];
diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix
index 6604a8d012c631b5c22066d5fd722236b71d868e..9153d336b22a3cb0dc32b1d2648af6d9a51ba045 100644
--- a/pkgs/development/ocaml-modules/janestreet/re2.nix
+++ b/pkgs/development/ocaml-modules/janestreet/re2.nix
@@ -3,7 +3,7 @@
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
rsync}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "re2";
hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw";
buildInputs = [ rsync ];
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix
index 4a785d199c8ca8dca9427db729df1b0c12a7cfd6..f4a86f80b04d5f941872bec89bfcb848d8d7d773 100644
--- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
minimumSupportedOcamlVersion = "4.02";
name = "sexplib";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix
index 459743f055ab56a11e0d2a7f88cb1cb75e7a3ed3..6b3dba5aac8e5be5dfc5131b8a92f172acd8b58b 100644
--- a/pkgs/development/ocaml-modules/janestreet/textutils.nix
+++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix
@@ -2,7 +2,7 @@
bin_prot, core, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "textutils";
hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix
index 81e6c4be9cbc46b947ece13a47de4e568186baed..2e8fcde1d0da3abaf2331faa4cac8e02d678e2bd 100644
--- a/pkgs/development/ocaml-modules/janestreet/typerep.nix
+++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "typerep";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
index d9acadbb6158dbb346d9389e69dee64f70950da8..7b3af8a080e98331976e41016e9b5e67917697bf 100644
--- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "variantslib";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index e78dd91f00a3d43cf2b381b0201a288056a47df3..3c799d3d1c02a44089ac592393caf7697e7fe38f 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -3,9 +3,9 @@
let param =
let check = stdenv.lib.versionAtLeast ocaml.version; in
if check "4.06" then {
- version = "2.18.6";
- url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz;
- sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d";
+ version = "2.18.8";
+ url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz";
+ sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci";
} else if check "3.12" then {
version = "2.18.5";
url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz;
@@ -13,7 +13,7 @@ let param =
} else throw "lablgtk is not available for OCaml ${ocaml.version}";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lablgtk";
inherit (param) version;
diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
index 7e898be749015268c3ca412250a2c2c1efc21dec..be57c7e7146f8b4da409a1d2173d77551ab9606a 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, gtkspell3, lablgtk3 }:
-buildDunePackage rec {
+buildDunePackage {
pname = "lablgtk3-gtkspell3";
buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs;
propagatedBuildInputs = [ lablgtk3 ];
diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
index a266e57dd8598a74f152d1b0b9ce4f0609f02d16..0e8ba3ef3ffe83278a4cf19c0ce623c65df99384 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, gtksourceview, lablgtk3 }:
-buildDunePackage rec {
+buildDunePackage {
pname = "lablgtk3-sourceview3";
buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
propagatedBuildInputs = [ lablgtk3 ];
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index b4a4e012560e0b287f51ad5ad8aac6bde608a34b..d92cf543f8030c7bf2c626e9a63d06b814cf4d8c 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -25,7 +25,7 @@ let param = {
key = "1764";
sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj";
};
-}."${builtins.substring 0 4 ocaml.version}";
+}.${builtins.substring 0 4 ocaml.version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix
index cd40a5051be9e00638bfa8955d9f3336b50f051d..e6ef82a900880409faea1f041c8ad86df78f4872 100644
--- a/pkgs/development/ocaml-modules/lwt/legacy.nix
+++ b/pkgs/development/ocaml-modules/lwt/legacy.nix
@@ -14,11 +14,11 @@ let sha256 = {
"3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
"2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
"2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
-}."${version}"; in
+}.${version}; in
let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
-buildOcaml rec {
+buildOcaml {
name = "lwt";
inherit version;
diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix
index 06784b445e3bfc394707a26bb171207eefa78c8a..cbd3a14541f561cca12632bf3f695a30abed3130 100644
--- a/pkgs/development/ocaml-modules/opium/default.nix
+++ b/pkgs/development/ocaml-modules/opium/default.nix
@@ -13,7 +13,7 @@
, alcotest
}:
-buildDunePackage rec {
+buildDunePackage {
pname = "opium";
inherit (opium_kernel) version src meta minimumOCamlVersion;
diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix
index e80b322ffba1b9534cf9d5ab9295a5ca913517aa..c78adce0ac15c2a1013de14e7c9e3267361eb247 100644
--- a/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/pkgs/development/ocaml-modules/otfm/default.nix
@@ -8,7 +8,7 @@ in
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 94120f2f8b9d747125f53c159e2d7c6b89272feb..31408ebe6a4a3e81c092a24867f248e366d1e9e1 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -7,7 +7,7 @@ let
version = "1.5.6";
webpage = "http://sawja.inria.fr/";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml${ocaml.version}-${pname}-${version}";
diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix
index 69b276db90ec1831bae62cc6855ee082fb5dc42c..64f05b26dd810ff3cc7ae0f0cc0fb44755ffb77f 100644
--- a/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }:
-buildDunePackage rec {
+buildDunePackage {
pname = "secp256k1";
version = "0.4.0";
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 9980b3f10830167a73c87816884b4ab39a5ce74a..dec0af5a9c1223e8c378c9708c8b0319610e52c0 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -19,7 +19,7 @@ if !versionAtLeast ocaml.version "4.03"
then throw "vg is not available for OCaml ${ocaml.version}"
else
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml${ocaml.version}-${pname}-${version}";
diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix
index 378bcf3acec047bf74feabc48a9484949ba4466d..f8fc06791b1bcb495a9f1ae3642bed2a65d43fa9 100644
--- a/pkgs/development/ocaml-modules/zmq/lwt.nix
+++ b/pkgs/development/ocaml-modules/zmq/lwt.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, zmq, ocaml_lwt }:
-buildDunePackage rec {
+buildDunePackage {
pname = "zmq-lwt";
inherit (zmq) version src meta;
diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 54df32f3eb20db44436d7832c7ad7b620a4ad73f..6eed57c4e7c6709d70c7d4aec729f2be7e8dec1a 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
-buildPerlPackage rec {
+buildPerlPackage {
pname = "DBD-mysql";
version = "4.050";
diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
index 0e65a9b990edfc10113854e5555780e2095d27bd..91cf01847090de80a8da7161eb2a1ada57d84e1f 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -27,7 +27,7 @@ in
let suffix = if stdenv.is64bit then "64" else "32"; in
-rec {
+{
# Build the latest VM
spur = pharo-vm-build rec {
name = "pharo-spur${suffix}";
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index 48878995bb4e8584ec9387b2e0c6c95816943c45..0862fa63072d5c32f830cc3ef6df8b9d287b4981 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -18,7 +18,7 @@ let
in
-buildPythonPackage rec {
+buildPythonPackage {
pname = "PyLD";
version = "0.7.2";
diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix
index 83dab71e22165eec302bbc55f69d2b3cdced7c80..4e37d18a9f3ae9355550af055d78ad3329e4e6f7 100644
--- a/pkgs/development/python-modules/adb-homeassistant/default.nix
+++ b/pkgs/development/python-modules/adb-homeassistant/default.nix
@@ -7,7 +7,7 @@
, pytest
, mock
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "adb-homeassistant";
version = "1.3.1";
diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index c79f9a5a73e3979122627f600bab469e845f4f52..73ce99eb75255e7779ab553e28c64ab108585670 100644
--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -8,7 +8,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "azure-mgmt-billing";
version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb
diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 86e323be1686d35e3fa44c7a9fd22106bec8e1ae..ed0cb18aff33561881cb93b4ed9cc68a280ca40f 100644
--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -8,7 +8,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "azure-mgmt-commerce";
version = "1.0.1";
diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 6a0c04c58cc942e70e53fc19d97d911c22a3f0ed..51e1c08e63dc2ffa55a942136632d12bf5c76676 100644
--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -5,7 +5,7 @@
, requests
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "0.20.7";
pname = "azure-servicemanagement-legacy";
diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 3cd37617a3935a60b42936c412125667f1a18e3b..1436574797108508dc449798f2c53a8c3f733990 100644
--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -5,7 +5,7 @@
, pythonOlder
}:
-if !(pythonOlder "3.3") then null else buildPythonPackage rec {
+if !(pythonOlder "3.3") then null else buildPythonPackage {
pname = "backports.shutil_get_terminal_size";
version = "unstable-2016-02-21";
diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index a210b5b44aae70e41f7844a6b8bc5632cb11dc16..56a60de59793e73e1dd095caa2359db72ef2d01b 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -15,7 +15,7 @@
, mpi4py
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "baselines";
version = "0.1.6"; # remember to manually adjust the rev
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index bd19b8eb33e2e5f7c41f98abdb3473a10b71ce47..88ef71cabdf178852fdd87a2fec11cd783e15705 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -15,7 +15,7 @@
let visualizationSupport = (pyqtgraph != null);
in
-buildPythonPackage rec {
+buildPythonPackage {
pname = "binwalk";
version = "2.1.1";
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 158a3d31882259260d937f08ea4f2b158028e5ce..d53371221202ec51523841bb23e7e316e93d979c 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -1,74 +1,55 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
, fetchPypi
+, futures
+, isPy3k
, isPyPy
-, mock
-, pytest
-, flask
, jinja2
-, markupsafe
-, werkzeug
-, itsdangerous
-, dateutil
-, requests
-, six
-, pygments
-, pystache
-, markdown
-, pyyaml
-, pyzmq
-, tornado
-, colorama
-, isPy3k
-, futures
-, websocket_client
+, lib
+, mock
, numpy
-, pandas
-, greenlet
-, python
-, bkcharts
+, nodejs
, pillow
+, pytest
+, python
+, python-dateutil
+, pyyaml
, selenium
+, six
+, substituteAll
+, tornado
}:
buildPythonPackage rec {
pname = "bokeh";
- version = "1.0.4";
+ version = "1.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf";
+ sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2";
};
- disabled = isPyPy;
+ patches = [
+ (substituteAll {
+ src = ./hardcode-nodejs-npmjs-paths.patch;
+ node_bin = "${nodejs}/bin/node";
+ npm_bin = "${nodejs}/bin/npm";
+ })
+ ];
- # Some test that uses tornado fails
-# doCheck = false;
+ disabled = isPyPy;
checkInputs = [ mock pytest pillow selenium ];
propagatedBuildInputs = [
pillow
- flask
jinja2
- markupsafe
- werkzeug
- itsdangerous
- dateutil
- requests
+ python-dateutil
six
- pygments
- pystache
- markdown
pyyaml
- pyzmq
tornado
- colorama
- bkcharts
+ numpy
]
- ++ lib.optionals ( !isPy3k ) [ futures ]
- ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ]
- ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ];
+ ++ lib.optionals ( !isPy3k ) [ futures ];
checkPhase = ''
${python.interpreter} -m unittest discover -s bokeh/tests
diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f8f33c0021f27267cce0e0b59688f65d81b0955b
--- /dev/null
+++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
+index a752aad7d..8af05ff63 100644
+--- a/bokeh/util/compiler.py
++++ b/bokeh/util/compiler.py
+@@ -442,8 +442,8 @@ def _detect_nodejs():
+ raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
+ '("conda install nodejs" or follow https://nodejs.org/en/download/)')
+
+-_nodejs = None
+-_npmjs = None
++_nodejs = "@node_bin@"
++_npmjs = "@npm_bin@"
+
+ def _nodejs_path():
+ global _nodejs
diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix
index dfd4d8f0cbf10796edfa37a3975f78b69589809e..f998ebca06d9c07944617672036cbc55a7626375 100644
--- a/pkgs/development/python-modules/bt-proximity/default.nix
+++ b/pkgs/development/python-modules/bt-proximity/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, pybluez }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "bt-proximity";
version = "0.0.20180217";
diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix
index 4af8b247fcf39f3cfa8332b89b24a10b19d95ddf..57ec37285744dae2156755c001fb7dcf9037192f 100644
--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/pkgs/development/python-modules/bugz/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "bugz-0.9.3";
version = "0.13";
diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
index 7f4857a9531973137960cc705f182ad4c290dbe4..a12a12547e968bedb36219b3785a29ed67a659e6 100644
--- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
+++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
@@ -4,7 +4,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "asynkdev";
pname = "caldavclientlibrary-asynk";
diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 1afe23416331b5638233679bd8597be3a9c3d379..a76e05332f1903c7ad6efd49a60dbfe961e521b3 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -5,7 +5,7 @@
, can
, canmatrix }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "canopen";
version = "0.5.1";
diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix
index c6338fce56bccff60922a8af9193b037d720fb19..7fa3a2b471de6d372ad9d5b8318962814663fdf4 100644
--- a/pkgs/development/python-modules/chevron/default.nix
+++ b/pkgs/development/python-modules/chevron/default.nix
@@ -4,7 +4,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "chevron";
version = "0.13.1";
diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix
index 3aece4020e6c304d64c9858add3cc7f341d8c6b5..c3e6a120ae7878f400c0f58d9c3393e94e699459 100644
--- a/pkgs/development/python-modules/cliapp/default.nix
+++ b/pkgs/development/python-modules/cliapp/default.nix
@@ -5,7 +5,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "cliapp";
version = "1.20150305";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix
index f6c94ace1fad0b1d6243f2b1d21e4424998a1d8b..b814455da3ff6b1348ba3ac6732b3764eb5f19fd 100644
--- a/pkgs/development/python-modules/closure-linter/default.nix
+++ b/pkgs/development/python-modules/closure-linter/default.nix
@@ -8,7 +8,7 @@
/* There is a project called "closure-linter" on PyPI that is the
same as this, but it does not appear to be owned by Google.
So we're pulling from Google's GitHub repo instead. */
-buildPythonPackage rec {
+buildPythonPackage {
pname = "closure-linter";
version = "2.3.19";
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix
index 43a7b7646dae5275b03f04a5c68b28441a6de787..ce388bb1d5d297a87d147e324dbfad7652b35a32 100644
--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -14,7 +14,7 @@
let
cntk = pkgs.cntk;
in
-buildPythonPackage rec {
+buildPythonPackage {
inherit (cntk) name version src;
nativeBuildInputs = [ swig openmpi ];
diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix
index 4722b049edf7cd81286e2352187a5ba74f001772..46fcc378be9d1a6a3d467d3c5fc76efa44a714a5 100644
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
pname = "contextlib2";
version = "0.5.5";
- src = fetchPypi rec {
+ src = fetchPypi {
inherit pname version;
sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48";
};
diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix
index 05fa3aa835a3ff5271ade7647eb41bae740fa647..2e205ce6955745e14c431f2daa60aebcdc8d0fd8 100644
--- a/pkgs/development/python-modules/deskcon/default.nix
+++ b/pkgs/development/python-modules/deskcon/default.nix
@@ -6,7 +6,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "deskcon-0.3";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 8a51227da0e4b906a036c1603e49fc1f18031a6d..4ce61680f03bd2cf44ed2eb601286d2f2aa14a93 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -18,7 +18,7 @@ let
version = "1.33";
# first build all binaries and generate setup.py using bazel
- bazel-build = buildBazelPackage rec {
+ bazel-build = buildBazelPackage {
name = "dm-sonnet-bazel-${version}";
src = fetchFromGitHub {
@@ -60,7 +60,7 @@ let
};
# now use pip to install the package prepared by bazel
-in buildPythonPackage rec {
+in buildPythonPackage {
pname = "dm-sonnet";
inherit version;
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index deeb8ce0642091141f6a69b232ed1fbc0c9483ab..a12a63c46f143c6744d96a476134467530f082bb 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -15,7 +15,7 @@
# , fetchPypi
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "dogtail";
version = "0.9.10";
diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix
index beaca07575073b605610f8ce6d37668a7de6f7f9..538a861c9f4cd4c4f635883a91f8934c466cac2c 100644
--- a/pkgs/development/python-modules/dopy/default.nix
+++ b/pkgs/development/python-modules/dopy/default.nix
@@ -4,7 +4,7 @@
, six
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "2016-01-04";
pname = "dopy";
diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix
index 731b83294a8fe7f695186d6101c8b4fc56e94243..cbb5ca56fed5d44e1665123f5f47b32050cef112 100644
--- a/pkgs/development/python-modules/filemagic/default.nix
+++ b/pkgs/development/python-modules/filemagic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, file
, isPy3k, mock, unittest2 }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "filemagic";
version = "1.6";
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index edc873458a11cec4f5973249da3e5e78d51f52bd..653e39b17401e78481849d82774f3df20ab97a0e 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -4,7 +4,7 @@
, flask
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "Flask-Silk";
version = "2018-06-28";
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index df39b2ea7253a4b03901212516e9ff98a7740e3e..bc7962d410815ed85549542cf6bdc40ee94c40a7 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -2,12 +2,12 @@
, itsdangerous, click, werkzeug, jinja2, pytest }:
buildPythonPackage rec {
- version = "1.0.3";
+ version = "1.0.4";
pname = "Flask";
src = fetchPypi {
inherit pname version;
- sha256 = "ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3";
+ sha256 = "ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fa5edc1077c6d63267a35f594dc25b0f4e13f8d9
--- /dev/null
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, python
+, fetchFromGitHub
+, sdcc
+, libusb1
+, crcmod
+}:
+
+buildPythonPackage {
+ pname = "fx2";
+ version = "unstable-2019-08-27";
+
+ src = fetchFromGitHub {
+ owner = "whitequark";
+ repo = "libfx2";
+ rev = "dd1e42c7b46ff410dbb18beab46111bb5491400c";
+ sha256 = "0xvlmx6ym0ylrvnlqzf18d475wa0mfci7wkdbv30gl3hgdhsppjz";
+ };
+
+ nativeBuildInputs = [ sdcc ];
+
+ propagatedBuildInputs = [ libusb1 crcmod ];
+
+ preBuild = ''
+ cd software
+ ${python.pythonForBuild.interpreter} setup.py build_ext
+ '';
+
+ preInstall = ''
+ mkdir -p $out/share/libfx2
+ cp -R ../firmware/library/{.stamp,lib,include,fx2{rules,conf}.mk} \
+ $out/share/libfx2
+ '';
+
+ # installCheckPhase tries to run build_ext again and there are no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers";
+ homepage = https://github.com/whitequark/libfx2;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix
index e0b6b3e49fa4b5ea3893c69c96a8c079b14f4ca7..f9ad118673ac26cb9c9fdbbae6ac67390fd34898 100644
--- a/pkgs/development/python-modules/gateone/default.nix
+++ b/pkgs/development/python-modules/gateone/default.nix
@@ -7,7 +7,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "gateone-1.2-0d57c3";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix
index d352d6def24fa44e19446c17455a17877d279e68..c8ff60b318b73851ef177126395ec8ac9b3bbd4f 100644
--- a/pkgs/development/python-modules/geeknote/default.nix
+++ b/pkgs/development/python-modules/geeknote/default.nix
@@ -10,7 +10,7 @@
, evernote
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "2015-05-11";
pname = "geeknote";
disabled = ! isPy27;
diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..264a13aed5e746ba2397d34a3954e9ec959a8186
--- /dev/null
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sdcc
+, nmigen
+, fx2
+, libusb1
+, aiohttp
+, pyvcd
+, bitarray
+, crcmod
+, yosys
+, icestorm
+, nextpnr
+}:
+
+buildPythonPackage rec {
+ pname = "glasgow";
+ version = "unstable-2019-08-31";
+ realVersion = lib.substring 0 7 src.rev;
+
+ src = fetchFromGitHub {
+ owner = "GlasgowEmbedded";
+ repo = "Glasgow";
+ rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca";
+ sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v";
+ };
+
+ nativeBuildInputs = [ sdcc ];
+
+ propagatedBuildInputs = [
+ nmigen
+ fx2
+ libusb1
+ aiohttp
+ pyvcd
+ bitarray
+ crcmod
+ ];
+
+ postPatch = ''
+ substituteInPlace software/setup.py \
+ --replace 'versioneer.get_version()' '"${realVersion}"'
+ '';
+
+ preBuild = ''
+ make -C firmware LIBFX2=${fx2}/share/libfx2
+ cp firmware/glasgow.ihex software/glasgow
+ cd software
+ '';
+
+ # a couple failing tests and also installCheck tries to build_ext again
+ doInstallCheck = false;
+ doCheck = false;
+
+ checkPhase = ''
+ python -m unittest discover
+ '';
+
+ meta = with lib; {
+ description = "Software for Glasgow, a digital interface multitool";
+ homepage = https://github.com/GlasgowEmbedded/Glasgow;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix
index 9c8d6ca93e050674cb7977b6a721103bb070a20e..311815ef3313f38d8b4394dab802a17b3ae9cbfc 100644
--- a/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix
@@ -5,7 +5,7 @@
, google_auth
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "google-cloud-testutils";
version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix
index b0e418913b7d215c26726b7b9d9c9c00d112003b..c6fddd1554c28f1fc18273fe97475ca6c643094d 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "GreatFET";
version = "2019.5.1.dev0";
diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix
index 46b0dde636af945d318f0624ef97456d236a9151..3cd89a7d0e1e32f373ac76b116c3033d483efd4a 100644
--- a/pkgs/development/python-modules/gyp/default.nix
+++ b/pkgs/development/python-modules/gyp/default.nix
@@ -4,7 +4,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "gyp";
version = "2015-06-11";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index c7f6e5c82194bf16151d527f5e45a5651138518c..f89b7ab1ce62b561fdffec3e2235f4aa5890945b 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -4,28 +4,31 @@
, appdirs
, dask
, holoviews
+, hvplot
, jinja2
, msgpack-numpy
, msgpack-python
, numpy
, pandas
+, panel
, python-snappy
, requests
, ruamel_yaml
, six
, tornado
, pytest
-, isPy27
+, pythonOlder
}:
buildPythonPackage rec {
pname = "intake";
- version = "0.4.4";
- disabled = isPy27;
+ version = "0.5.3";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "3fc1b7c2949c9b4200ecbbfdff17da126981a1d8d95ccb7b7bcca3e3dd849d5e";
+ sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7";
};
checkInputs = [ pytest ];
@@ -33,11 +36,13 @@ buildPythonPackage rec {
appdirs
dask
holoviews
+ hvplot
jinja2
msgpack-numpy
msgpack-python
numpy
pandas
+ panel
python-snappy
requests
ruamel_yaml
@@ -45,10 +50,15 @@ buildPythonPackage rec {
tornado
];
+ postPatch = ''
+ # Is in setup_requires but not used in setup.py...
+ substituteInPlace setup.py --replace "'pytest-runner'" ""
+ '';
+
+ # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball
+ # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball
checkPhase = ''
- # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball
- # test_which assumes python for executable name
- PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_filtered_compressed_cache and not test_which"
+ PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_discover and not test_filtered_compressed_cache"
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix
index 377ed8549cff6d15a2f54d675b1cf6d13c6c8a13..1778e5a81af672d8154cef359bbf7974d6d5a384 100644
--- a/pkgs/development/python-modules/ipfsapi/default.nix
+++ b/pkgs/development/python-modules/ipfsapi/default.nix
@@ -6,7 +6,7 @@
, requests
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "ipfsapi";
version = "0.4.2.post1";
disabled = isPy27;
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index c65c5f21e567353272a450dc61429953c1de336a..54d9aff280f6ae3f4abfecf2b38631e5af70ae32 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "iso3166";
version = "0.8";
diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix
index 177b0d4cfee97a48aca6b8a0853011cae4985e35..1b859e21e90421f8b2f25ecd00d8994d50f32338 100644
--- a/pkgs/development/python-modules/jsonwatch/default.nix
+++ b/pkgs/development/python-modules/jsonwatch/default.nix
@@ -5,7 +5,7 @@
, isPyPy
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "jsonwatch";
version = "0.2.0";
disabled = isPyPy; # doesn't find setuptools
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index c456d67ac4982bb90c2bb910be3161710b93fcef..e89b606879bb98164946e548fa9ff59ed41371fb 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -7,7 +7,7 @@
, enum34
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "libsoundtouch";
version = "0.4.0";
diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix
index dd40ac8518652d17fd58569244644304a5dceb4a..9b262007706f08845029bfd47bd42708f557a9f1 100644
--- a/pkgs/development/python-modules/lpod/default.nix
+++ b/pkgs/development/python-modules/lpod/default.nix
@@ -7,7 +7,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "1.1.7";
pname = "python-lpod";
# lpod library currently does not support Python 3.x
diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix
index a078d33a889576ae33689e739489f7aa88662422..26be7020c6665ee47e37553de854952c0947e5a3 100644
--- a/pkgs/development/python-modules/lxc/default.nix
+++ b/pkgs/development/python-modules/lxc/default.nix
@@ -5,7 +5,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "python-lxc-unstable";
version = "2016-08-25";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix
index 41c932ed1117017807e7de9f9d8ab0e61e208fba..3022eb52f502c98f4e198eb76b310947f9e0a460 100644
--- a/pkgs/development/python-modules/magic/default.nix
+++ b/pkgs/development/python-modules/magic/default.nix
@@ -3,7 +3,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "${pkgs.file.name}";
src = pkgs.file.src;
diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
index 3fbb36a37188e3d6e10acb5f6763036db7d730ea..0d5d8d75a368e25c8dc613e7d9d48a58fb42b159 100644
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -5,7 +5,7 @@
, pyparsing
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "mutag-0.0.2-2ffa0258ca";
disabled = ! isPy3k;
diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix
index 904284e5b332df08916ff142180a98adb6a2cfd1..868700b6223722767f6987f32bfef6c90f7313c5 100644
--- a/pkgs/development/python-modules/muttils/default.nix
+++ b/pkgs/development/python-modules/muttils/default.nix
@@ -4,7 +4,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "muttils";
version = "1.3";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index f2e38a0e9b3b83d5a84660e8cf337e83489a288d..65eb2d44ffccced32f47bc6b2b51a5ee835eedf5 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -8,7 +8,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
inherit (pkgs.mxnet) name version src meta;
buildInputs = [ pkgs.mxnet ];
diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix
index b6e323ff9c69e91608d7aedaa0f2540bcc405de3..31662cd3941aa9dd4222ae7e375ded33f2f39867 100644
--- a/pkgs/development/python-modules/nanomsg-python/default.nix
+++ b/pkgs/development/python-modules/nanomsg-python/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "nanomsg-python";
version = "1.0.20190114";
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 0b0220d32460cb60c318767fce84830c50174ba6..0f84486674e959ffe8f732a067366e7cf8ff1be4 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -4,7 +4,7 @@ let
pname = "nbxmpp";
version = "0.6.10";
name = "${pname}-${version}";
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit pname version;
# Tests aren't included in PyPI tarball.
src = fetchzip {
diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4151d08b60f42a4a8affafb35f7e55efbfbd9f8a
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen-boards/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nmigen
+}:
+
+buildPythonPackage rec {
+ pname = "nmigen-boards";
+ version = "unstable-2019-08-30";
+ realVersion = lib.substring 0 7 src.rev;
+
+ src = fetchFromGitHub {
+ owner = "m-labs";
+ repo = "nmigen-boards";
+ rev = "3b80b3a3749ae8f123ff258a25e81bd21412aed4";
+ sha256 = "01qynxip8bq23jfjc5wjd97vxfvhld2zb8sxphwf0zixrmmyaspi";
+ };
+
+ propagatedBuildInputs = [ nmigen ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'versioneer.get_version()' '"${realVersion}"'
+ '';
+
+ meta = with lib; {
+ description = "Board and connector definitions for nMigen";
+ homepage = https://github.com/m-labs/nmigen-boards;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7375eda43271596400900f2e115b4afbfe35d7a9
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pyvcd
+, bitarray
+, jinja2
+
+# nmigen.{test,build} call out to these
+, yosys
+, symbiyosys
+, nextpnr ? null
+, icestorm ? null
+, trellis ? null
+
+# for tests
+, yices
+}:
+
+buildPythonPackage rec {
+ pname = "nmigen";
+ version = "unstable-2019-08-31";
+ realVersion = lib.substring 0 7 src.rev;
+
+ src = fetchFromGitHub {
+ owner = "m-labs";
+ repo = "nmigen";
+ rev = "2e206220462c67aa6ae97f7515a2191440fd61b3";
+ sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa";
+ };
+
+ disabled = pythonOlder "3.6";
+
+ propagatedBuildInputs = [ pyvcd bitarray jinja2 ];
+
+ checkInputs = [ yosys yices ];
+
+ postPatch = let
+ tool = pkg: name:
+ if pkg == null then {} else { "${name}" = "${pkg}/bin/${name}"; };
+
+ # Only FOSS toolchain supported out of the box, sorry!
+ toolchainOverrides =
+ tool yosys "yosys" //
+ tool symbiyosys "sby" //
+ tool nextpnr "nextpnr-ice40" //
+ tool nextpnr "nextpnr-ecp5" //
+ tool icestorm "icepack" //
+ tool trellis "ecppack";
+ in ''
+ substituteInPlace setup.py \
+ --replace 'versioneer.get_version()' '"${realVersion}"'
+
+ substituteInPlace nmigen/_toolchain.py \
+ --replace 'overrides = {}' \
+ 'overrides = ${builtins.toJSON toolchainOverrides}'
+ '';
+
+ meta = with lib; {
+ description = "A refreshed Python toolbox for building complex digital hardware";
+ homepage = https://github.com/m-labs/nmigen;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 6aadd7f4533d7d7a912526dc7744b83c87801354..f3a1d6514eb59c5d350e22dd7adf2127c58f728e 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -6,7 +6,7 @@
, pkgs
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "python-notify";
version = "0.1.1";
diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix
index ec641420f6524a684043944591fbbe19b7e4e09d..567977a84f547357792ce594220bac7d62381dbf 100644
--- a/pkgs/development/python-modules/notmuch/default.nix
+++ b/pkgs/development/python-modules/notmuch/default.nix
@@ -4,7 +4,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "python-${pkgs.notmuch.name}";
src = pkgs.notmuch.src;
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 10a1df8876cb15cacc4103f2240859e474c9eba5..c6e5c2c648ffa7e25a158d6f0ccfe7ee47e65d04 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -5,7 +5,7 @@ let
cfg = writeTextFile {
name = "site.cfg";
text = (lib.generators.toINI {} {
- "${blasImplementation}" = {
+ ${blasImplementation} = {
include_dirs = "${blas}/include";
library_dirs = "${blas}/lib";
} // lib.optionalAttrs (blasImplementation == "mkl") {
@@ -16,12 +16,12 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.17.0";
+ version = "1.17.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a";
+ sha256 = "f11331530f0eff69a758d62c2461cd98cdc2eae0147279d8fc86e0464eb7e8ca";
};
nativeBuildInputs = [ gfortran pytest ];
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
index c28f22aa5ec9ede4b390934e46c937faed5510ce..8e294f290cbde646a6653623694aa8535bb9d87a 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -8,7 +8,7 @@
, git
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "unstable-20160819";
pname = "nxt-python";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix
index 116ba717add660d9ac83aba4b18a87fc286e8fa3..a9598825dd00eb32d6a7f62b5e796cdf2ead49f6 100644
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -4,7 +4,7 @@
, pyusb
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "openant-unstable";
version = "2017-02-11";
diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index 4c0d4346ee796bd30d20b45ed58c0c36ffe48d54..694b87581cd64f37edd776e2d060fe2bd3c63ef3 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -4,7 +4,7 @@
, pythonPackages
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
# compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
# This is not the "released" 3.0.0 just a commit
version = "3.0.0";
diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index fccd46c605db627954810af28aef61aafded44dd..4c88f0e1e4b707b334394900fa52f2e0b5de9903 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -11,18 +11,13 @@
buildPythonPackage rec {
pname = "panel";
- version = "0.4.0";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98";
+ sha256 = "04w8jjlf7yz3k84xnacahczc9mmddqyp756rj3n8hclks9c1ww40";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "testpath<0.4" "testpath"
- '';
-
propagatedBuildInputs = [
bokeh
param
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 69a2e61e269004647be77c55c50ce8f27fcdaf9b..cb27fdb64e5f5284629ee65d3a16b364f5ec2b65 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "param";
- version = "1.8.2";
+ version = "1.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01";
+ sha256 = "1dbnviszdq3d2k3dfwpimb0adf27yzwm4iyv42rk8xvd8c6p9gdi";
};
checkInputs = [ flake8 nose ];
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index b9c4a62f0de0cc87782bf065ac7427c6a38b7cab..6d2e8169eb76304e6cb1b194252dec70e168ade7 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.10.16";
+ version = "8.10.17";
src = fetchPypi {
inherit pname version;
- sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b";
+ sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9";
};
meta = {
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index c2662915b12d3cb95c6759d29c6f6eaae98e9c1a..025b17d19ae9ca7268cbc044dc0c5321eb3e4dd0 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "1.1.0";
+ version = "1.6.2";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my";
+ sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z";
};
buildInputs = [
@@ -55,8 +55,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ defusedxml lxml ];
postPatch = ''
- substituteInPlace requirements/test.txt \
- --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5"
+ sed -i \
+ -e 's/^pytest .*/pytest/g' \
+ -e 's/^attrs .*/attrs/g' \
+ -e 's/^hypothesis .*/hypothesis/g' \
+ requirements/test.txt
'';
preBuild = ''
@@ -70,4 +73,3 @@ buildPythonPackage rec {
maintainers = [ maintainers.kiwi ];
};
}
-
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 69dce2723ebbd28a1b69a6a71925ada4b3d10164..fcd3d997dcd80ca2a02b126a8e880ea5161b41fe 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
-buildPythonPackage rec {
+buildPythonPackage {
inherit (protobuf) name src version;
inherit disabled doCheck;
diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix
index 02429f589cfc84ffee87f9fcc18b699f1024dddf..f1118325610ce5cb148931e5af1fa868871c7a21 100644
--- a/pkgs/development/python-modules/ptable/default.nix
+++ b/pkgs/development/python-modules/ptable/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, nose }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "ptable";
version = "unstable-2019-06-14";
diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix
index ece89387493924c03ca10c5a202dac4c7a895dee..fbaa1cfad710400ff35b5c266ef795ed29c791dd 100644
--- a/pkgs/development/python-modules/purepng/default.nix
+++ b/pkgs/development/python-modules/purepng/default.nix
@@ -7,7 +7,7 @@
, numpy ? null
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "purepng";
version = "0.2.0";
diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix
index 8f074943dd322a98f33967a184c04df8e96ccfee..f9737b935833c5e0b991a3fb41b0724ccb863001 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pybfd";
version = "-0.1.1.2017-12-31";
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index f49c50185db75091632fc7b5b5a541ce794e949c..1b89cb5ada7ff7feab4ef5c691e835c15e44be3b 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pybind11";
- version = "2.2.4";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4";
+ sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr";
};
patches = [
diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix
index 1cd95c83fa2e269d53c64939d591e672daeb2724..4dcc343402565652b5be48552f2f212d53d0dbb3 100644
--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/pkgs/development/python-modules/pyblock/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "0.53";
md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
- src = pkgs.fetchurl rec {
+ src = pkgs.fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
+ "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 163477a272511c6baa89f4ec870c7eaa21e5d4eb..b3e31a9bc788934caff8f46e58e5019a604d6429 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -4,7 +4,7 @@
let
rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
-in buildPythonPackage rec {
+in buildPythonPackage {
pname = "pycangjie";
version = "1.3_rev_${rev}";
format = "other";
diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix
index c441cea5f45d9b9d1711dfa4ca3b77721f55ff69..cfa685c1ac9cec639e435248a301421205344830 100644
--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
}:
-mkDerivation rec {
+mkDerivation {
pname = "compyte";
version = "git-20150817";
diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
index 9b04f2b6fcb4eb84ebbe0a0b6dce7f6bbf899d7f..01428d41b7d209b5b784c770cfdd00c62a96def7 100644
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -8,7 +8,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pycurl2";
version = "7.20.0";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix
index 31a188ed17207020c53090ba95d0425e5f30ea6e..2e4c639465b45ffe778bcb9ff3c72338bc604569 100644
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyext";
version = "0.8";
diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix
index 1abf04079880e754b602b43a5ec54e062dd90732..b9e15d376b5bc410fc24ab68cb064ed66b576cf0 100644
--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ b/pkgs/development/python-modules/pyfantom/default.nix
@@ -3,7 +3,7 @@
, fetchgit
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyfantom";
version = "unstable-2013-12-18";
diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix
index 507310b4c51e4dfe217a239bab914421b702df88..c7dfdef4be48775fff5fe446ecf447f542d3c7d2 100644
--- a/pkgs/development/python-modules/pygmo/default.nix
+++ b/pkgs/development/python-modules/pygmo/default.nix
@@ -27,7 +27,7 @@ let
'';
});
-in buildPythonPackage rec {
+in buildPythonPackage {
pname = "pygmo";
version = pagmo2WithPython.version;
diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix
index 97401f2eb166ecae16e4735f63536447d739ce2e..103e215f047bed19c85de243d1868ed0ba83d69c 100644
--- a/pkgs/development/python-modules/pygreat/default.nix
+++ b/pkgs/development/python-modules/pygreat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pygreat";
version = "2019.5.1.dev0";
diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix
index 153b5701b267a49213aff9c1fac3c229030f315b..90d13ae07877eafd28a303c4071877862920cc70 100644
--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyinputevent";
version = "2016-10-18";
diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
index 4a5a5c5e1f9758d9c84ab90c212b7787f006b8c8..913453962eb5f1e814f96e1c41d327383008a8f4 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -11,7 +11,7 @@ let
sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
};
});
- pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec {
+ pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
propagatedBuildInputs = [ sip4_19_3 ];
});
in stdenv.mkDerivation rec {
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix
index bc06a10f973251ad2965f7cc809a2703874826b7..27827270fa172159a8b17c47266d3f41d7f71c23 100644
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
version = "1.99.39";
md5_path = "d249f60aa89b1b4facd63f776925116d";
- src = fetchurl rec {
+ src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
+ "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix
index 895171ff7138f2e9f01c600795a172b9da6cf121..f198d214172d25564cec18a55516a70c8f43a2f9 100644
--- a/pkgs/development/python-modules/pylev/default.nix
+++ b/pkgs/development/python-modules/pylev/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pylev";
version = "1.3.0";
diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix
index 234aee8436dc97889a6153fdd74369a12343a0c7..81100a8e214bf229b36cbe0740e2a9a9db7e5da8 100644
--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/pkgs/development/python-modules/pymaging/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pymaging";
version = "unstable-2016-11-16";
diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix
index fb92739776da63988edc58516ba29acd2c83cc04..61239f1cbe36438beb919d2ba246a1a803a3e952 100644
--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/pkgs/development/python-modules/pymaging_png/default.nix
@@ -4,7 +4,7 @@
, pymaging
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pymaging-png";
version = "unstable-2016-11-16";
diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix
index 0839cb1aa4a14d2bbb5884fbad6745acdf216502..755dda341c9dfa266889c23104bc6e720860e30c 100644
--- a/pkgs/development/python-modules/pynac/default.nix
+++ b/pkgs/development/python-modules/pynac/default.nix
@@ -3,7 +3,7 @@
, fetchurl
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pynac";
version = "0.2";
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index 280981ab2c2463ab52517457d9c830a86f84b6b9..d02c85fb4ffdd7f018d0046e456c7921bba5cd04 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -16,7 +16,7 @@
, sc2-headless
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "PySC2";
version = "1.2";
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index 625eae7b74b9d6a9c3cb73e8080854acda3d3ca6..2dfa1f22962e6e10ed20f168b6a40fa7695dc010 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -9,7 +9,7 @@
, pythonOlder
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyScss";
version = "1.3.5";
diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix
index 5069bbe964840a60138931b9be412a3a331ce727..3f55a015991b3f6bda00c187654e76c9f6fd001e 100644
--- a/pkgs/development/python-modules/pysensors/default.nix
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
-buildPythonPackage rec {
+buildPythonPackage {
version = "2017-07-13";
pname = "pysensors";
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 0950726172d50a759c55025b5bdd237c61633b33..feeeda812f9892fe90d7980aa1fa78a14c5c9435 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -5,7 +5,7 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
pname = "pyside-generatorrunner";
version = "0.6.16";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix
index 5314a5cc713539ed887894a8c6a6a9ae1341ca3f..a96ea5d32ff85d2a92e0a57da4d99ea250b5eb2a 100644
--- a/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/pkgs/development/python-modules/pyside2-tools/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5,
shiboken2, pyside2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pyside2-tools";
inherit (pyside2) version src;
diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix
index 45ff5a9b5b49dd961316affa0aa1ae6b90074594..5c3a6bb26f86eedce7d0545ea7c22913587d8abf 100644
--- a/pkgs/development/python-modules/pysparse/default.nix
+++ b/pkgs/development/python-modules/pysparse/default.nix
@@ -8,7 +8,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pysparse";
version = "1.3-dev";
disabled = !isPy27;
diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..088f8702436fbef35041ae68e18067339186950c
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "1.0.4";
+ pname = "pytest-random-order";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52";
+ };
+
+ disabled = pythonOlder "3.5";
+
+ propagatedBuildInputs = [ pytest ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/jbasko/pytest-random-order";
+ description = "Randomise the order of tests with some control over the randomness";
+ license = licenses.mit;
+ maintainers = [ maintainers.prusnak ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix
index e6425c30047816debd94b5196af58a8caa65d7db..a7f0bd93b0af9201c4431fdecf05561990de5b87 100644
--- a/pkgs/development/python-modules/python-unshare/default.nix
+++ b/pkgs/development/python-modules/python-unshare/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "python-unshare";
# pypi version doesn't support Python 3 and the package didn't update for a long time:
# https://github.com/TheTincho/python-unshare/pull/8
diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
index 93fa36fa2fcfce96ea74ecc6914ca97b3f7ef217..8a160da29648df1cd11dff26fb8c82e3b8208784 100644
--- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
@@ -7,7 +7,7 @@
, stdenv
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "python-xmp-toolkit";
version = "2.0.2";
diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 8a49e8418fd0e31d5cad3bd64fdd858d86bbacd5..00f15f801d16c53e9af643626ebd9f1a72b312bc 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -11,7 +11,7 @@
, pythonOlder
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "qasm2image";
version = "0.8.0";
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 987c1ca9049077ba948ee5c07cbab100b28c3985..e8076db60534b127aeab528e11459d3e96a087bd 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -5,7 +5,7 @@
, qtbase
}:
with pythonPackages;
-buildPythonPackage rec {
+buildPythonPackage {
pname = "qscintilla";
version = qscintilla.version;
src = qscintilla.src;
diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix
index 06010b40ed9673c63de49835cb0d0e6f8c8e776b..e44f6205d39fc3f81471f9c855aab00c12cfc4b7 100644
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -9,7 +9,7 @@
}:
disabledIf (isPy3k || isPyPy)
- (buildPythonPackage rec {
+ (buildPythonPackage {
# TODO: Qt5 support
pname = "qscintilla";
version = pkgs.qscintilla.version;
diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix
index 4d80a407564677ab2e8ee9ba302d9fe523420791..08d4a8f36a3479ca9766349882c78e913f747047 100644
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "radicale_infcloud";
version = "2017-07-27";
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 83edfa4f1d277e45ba597fb6406c2ce336448025..a2da451905a10db0568eb591a9db5dbfa0202dd8 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -6,7 +6,7 @@
assert useUnrar -> unrar != null;
assert !useUnrar -> libarchive != null;
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rarfile";
version = "3.0";
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index e394b9646430a5171e640d9d86234134cea4835f..2bd4217291789ac4c8294ff39386368d8cfad884 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -6,7 +6,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rbtools";
version = "0.7.2";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index 9644055b007183e67e474e4e084aead56211cc54..c49f891ec1deab6b678e69b7b5b29cd13a76ab7c 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "python-recursive-pth-loader";
version = "1.0";
diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index ac041d664ae42f079c35a57ff74f0da51e83c0bc..46f562ee5d6dd35fd7509961f0e1439264d4b669 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -5,7 +5,7 @@
, cython
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rencode";
version = "git20150810";
disabled = isPy33;
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index 1a40f61cc50e9516c136c69f0605272a52d81bc5..577c21d6e0b4f124e8337072498af11a0b998409 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,6 +1,6 @@
{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rhpl";
version = "0.218";
format = "other";
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
index b5952e6ee1560317ccf541fe2d54316fc0f24859..8de675d4ea16ce8c23875f2d93a94a6673b28ba0 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -4,7 +4,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "scikits.samplerate";
version = "0.3.3";
diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix
index 2736eb2ee9a3797ad9122085f408ca88a28b63f4..bc71fde5cedba448efe192ec92329aa1927b8e65 100644
--- a/pkgs/development/python-modules/scandir/default.nix
+++ b/pkgs/development/python-modules/scandir/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, python, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "scandir";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
};
- checkPhase = "python test/run_tests.py";
+ checkPhase = "${python.interpreter} test/run_tests.py";
meta = with lib; {
description = "A better directory iterator and faster os.walk()";
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 4072268609d2a8918dd56d9af10e64e5a1d663c5..3201de0ba46cc7b10cc499d138984c0737b36e8b 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "semver";
version = "2.8.1";
diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index 82dfa3c4ea2af9efaa1d122b34cbf5d1f5407ade..0a0a3d8a9b2f2e84e7f8988c78c0717d6585da9a 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage, python, fetchurl, stdenv, pyside2,
cmake, qt5, llvmPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "shiboken2";
inherit (pyside2) version src;
diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix
index ee9444fd38ec7de7728e74d3d31c2978b18df0f9..312f58bf9fa9f74ecec149dbda2489b460ba5b45 100644
--- a/pkgs/development/python-modules/simple-websocket-server/default.nix
+++ b/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "simple-websocket-server";
version = "20180414";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix
index 705b755937252cdebb74dbd029c4f33c6ae09cf4..57f7df73c21d91160fccdad10dea57abcae50ad8 100644
--- a/pkgs/development/python-modules/simplebayes/default.nix
+++ b/pkgs/development/python-modules/simplebayes/default.nix
@@ -6,7 +6,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "simplebayes";
version = "1.5.8";
diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix
index 490113d6952a1eb94404dc73a87c22dea5227bea..8a6971ceb8f865019a14bb09c903b452e0b110de 100644
--- a/pkgs/development/python-modules/slob/default.nix
+++ b/pkgs/development/python-modules/slob/default.nix
@@ -6,7 +6,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "slob";
verison = "unstable-2016-11-03";
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix
index db1a75ab7f27cdd2b57a4a3bbc02c7225267c21f..6b31145d519aba88b15c18ce2a7696737a4b6b48 100644
--- a/pkgs/development/python-modules/snappergui/default.nix
+++ b/pkgs/development/python-modules/snappergui/default.nix
@@ -5,7 +5,7 @@
, dbus-python
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "Snapper-GUI";
version = "0.1";
diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index d9a67454fe6a12acc96928a8642e40e3091da23c..b091c3b7d56cb6397cb6fcfd16f090358fb26816 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/pkgs/development/python-modules/spacy/models.nix
@@ -13,7 +13,7 @@ let
meta = with stdenv.lib; {
description = "Models for the spaCy NLP library";
homepage = "https://github.com/explosion/spacy-models";
- license = licenses."${license}";
+ license = licenses.${license};
maintainers = with maintainers; [ rvl ];
};
};
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index 967e365dde0cf47171663ceffd3d0cd3d745b4c7..71b643e5cb58fed8eb37dbd6d9bca23be0ba9520 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -14,7 +14,7 @@
, codecov
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "stumpy";
version = "1.0";
diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix
index 024fd136c403c755e234dddaa4ba2e4d9adf8e81..eeef94e6c7654bd66f07391ccc69854ad904ee12 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -4,7 +4,7 @@
, testscenarios
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = pkgs.subunit.name;
src = pkgs.subunit.src;
diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix
index 4eff644a1616c7aee039deff56eafa92e96657da..a903aae104efd7585ad12f32fef6822a161d7985 100644
--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, nose }:
-buildPythonPackage rec {
+buildPythonPackage {
version = "0.5.3-2016-09-28";
pname = "tempita";
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 0f03adfccf5c1470330098597c2a445db81ed671..b585ab4f81b535f19282bbfd5e7b709c8771d8fa 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -63,7 +63,7 @@ let
'';
};
};
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit version pname;
format = "wheel";
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index a562ba8f2fad0f3cb1b48c44465b0be5b9b626ab..f7e3906ee1fb24583c912dff460be51e31fc1d40 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -45,7 +45,7 @@ let
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit pname;
inherit (packages) version;
format = "wheel";
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 899e893684368715592dc70657892d9120e6ad9e..7f6952e8fe5470327eab028c7f3bf5cc1eac9eda 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -58,10 +58,25 @@ let
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
- # TODO: remove after there's support for setupPyDistFlags
- setuppy = ../../../development/interpreters/python/run_setup.py;
+ pythonEnv = python.withPackages (_:
+ [ # python deps needed during wheel build time
+ numpy
+ keras-preprocessing
+ protobuf
+ wrapt
+ gast
+ astor
+ absl-py
+ termcolor
+ keras-applications
+ setuptools
+ wheel
+ ] ++ lib.optionals (!isPy3k)
+ [ future
+ mock
+ ]);
- bazel-build = buildBazelPackage rec {
+ bazel-build = buildBazelPackage {
name = "${pname}-${version}";
src = fetchFromGitHub {
@@ -96,27 +111,15 @@ let
# https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
nativeBuildInputs = [
- swig which cython
+ swig which pythonEnv
];
buildInputs = [
- python
jemalloc
openmpi
glibcLocales
git
- # python deps needed during wheel build time
- numpy
- keras-preprocessing
- protobuf
- wrapt
- gast
- astor
- absl-py
- termcolor
- keras-applications
-
# libs taken from system through the TF_SYS_LIBS mechanism
# grpc
sqlite
@@ -133,20 +136,12 @@ let
giflib
re2
pkgs.lmdb
-
- # for building the wheel
- setuptools
- wheel
- ] ++ lib.optionals (!isPy3k) [
- future
- mock
] ++ lib.optionals cudaSupport [
cudatoolkit
cudnn
nvidia_x11
];
-
# arbitrarily set to the current latest bazel version, overly careful
TF_IGNORE_MAX_BAZEL_VERSION = true;
@@ -194,8 +189,8 @@ let
INCLUDEDIR = "${includes_joined}/include";
- PYTHON_BIN_PATH = python.interpreter;
-
+ PYTHON_BIN_PATH = pythonEnv.interpreter;
+
TF_NEED_GCP = true;
TF_NEED_HDFS = true;
TF_ENABLE_XLA = tfFeature xlaSupport;
@@ -237,6 +232,9 @@ let
export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages"
export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}"
mkdir -p "$PYTHON_LIB_PATH"
+
+ # To avoid mixing Python 2 and Python 3
+ unset PYTHONPATH
'';
configurePhase = ''
@@ -300,7 +298,7 @@ let
};
};
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit version pname;
src = bazel-build.python;
@@ -313,13 +311,7 @@ in buildPythonPackage rec {
rm $out/bin/tensorboard
'';
- # TODO: remove after there's support for setupPyDistFlags
- buildPhase = ''
- runHook preBuild
- cp ${setuppy} nix_run_setup
- ${python.interpreter} nix_run_setup --project_name ${pname} bdist_wheel
- runHook postBuild
- '';
+ setupPyGlobalFlags = [ "--project_name ${pname}" ];
# tensorflow/tools/pip_package/setup.py
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix
index 987fbf010197e4980d52b5b5251f4b913175826b..c168492be721a2863917ead2871f5a517a5120de 100644
--- a/pkgs/development/python-modules/tess/default.nix
+++ b/pkgs/development/python-modules/tess/default.nix
@@ -6,7 +6,7 @@
, scipy
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "tess";
version = "unstable-2019-05-07";
diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index bd242c62ab8d3fe7de07a94581426ab6ae6a82eb..ba910f75e199898fe11b99c098e120529ef9042f 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -5,7 +5,7 @@
, isPyPy
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "tkinter-${python.version}";
src = py;
format = "other";
diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix
index 848c114543d24d475ce7a4a47a8fc561d1dad86b..27c4ac2468ffd0484099d0fdc4de226c8dbf47d8 100644
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@@ -4,7 +4,7 @@
, cmake
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "tlsh";
version = "3.4.5";
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 47aa23ca1143abb90a480eb44598bf08c6acbdca..9b7dc424ddc14388a5177557bc2ea968663bbdf0 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -26,9 +26,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic ];
- # build requires UTF-8 locale
- LANG = "en_US.UTF-8";
-
checkInputs = [
pytest
];
@@ -36,7 +33,7 @@ buildPythonPackage rec {
# disable test_tx_api.py as it requires being online
checkPhase = ''
runHook preCheck
- ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
+ ${python.interpreter} -m pytest --pyargs trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix
index 3aeb84113c2d79cd7b1b6eb50f7579f4ebd2e2dc..ef3b1c78c399036ccd6245cb39c0ec2fe23ee738 100644
--- a/pkgs/development/python-modules/typesentry/default.nix
+++ b/pkgs/development/python-modules/typesentry/default.nix
@@ -6,7 +6,7 @@
, pytestcov
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "typesentry";
version = "0.2.7";
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 9c3dae74a79e5a42030bb1266c663fb427335634..2093f4d7053c7a93ad9f28a162a7c98af7590331 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -1,23 +1,33 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pyopenssl
, libuv
, psutil
, isPy27
+, CoreServices
+, ApplicationServices
}:
buildPythonPackage rec {
pname = "uvloop";
- version = "0.12.2";
+ version = "0.13.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f";
+ sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
};
- buildInputs = [ libuv ];
+ buildInputs = [
+ libuv
+ ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+
+ postPatch = ''
+ # Removing code linting tests, which we don't care about
+ rm tests/test_sourcecode.py
+ '';
checkInputs = [ pyopenssl psutil ];
diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix
index c230cd9cfa6ed8f2925ba3defbe42bf8d08b8592..6b3ca778ead14e57ca5240bf829c854ddcec3436 100644
--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/pkgs/development/python-modules/waitress-django/default.nix
@@ -1,6 +1,6 @@
{ buildPythonPackage, django_1_8, waitress }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "waitress-django";
version = "0.0.0";
diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix
index ef6089baa507f21229166472b05d21b2eb8f433d..7cf69fdb614da84b751c2673d699a2dbe6bd273c 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -2,7 +2,7 @@
, mock
, boto3, envs, python-jose, requests }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "warrant";
version = "0.6.1";
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index d672cb8bae908b29faa74b206b3bfc1ff53f9445..97530989a382d6d164a824c46b41f34f81eed1f2 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -11,7 +11,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "wordfreq";
version = "2.2.0";
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index c75362436e4a3a0efc0321d117eaa3697911fbae..81a8d05f5bf0cb94c0b48dce1c38729d13af9fc7 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -12,7 +12,7 @@
, datatable
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "xgboost";
inherit (xgboost) version src meta;
diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix
index d1cab88b45b8bbb08cb36e44446d1d40638fdfc4..ce993d3d41a68102f8ed065799acd1008799c003 100644
--- a/pkgs/development/python-modules/zerobin/default.nix
+++ b/pkgs/development/python-modules/zerobin/default.nix
@@ -7,7 +7,7 @@
, clize
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "zerobin";
version = "20160108";
diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix
index 8c9a0af142cb1132d16beb9d21a46a6a2dae85d5..67f48f34731d1debee8b8f4ea91b66044142783c 100644
--- a/pkgs/development/python-modules/zxcvbn/default.nix
+++ b/pkgs/development/python-modules/zxcvbn/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "zxcvbn";
version = "4.4.28";
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e813e550f6e22b1bb039aa1259b1e5285be2cc1c..995f13853a237813ee49fa9ffd9bcf5301724c21 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -308,7 +308,7 @@ let
RcppGSL = [ pkgs.gsl_1 ];
RcppZiggurat = [ pkgs.gsl_1 ];
reprex = [ pkgs.which ];
- rgdal = [ pkgs.proj pkgs.gdal ];
+ rgdal = [ pkgs.proj.dev pkgs.gdal ];
rgeos = [ pkgs.geos ];
rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ];
@@ -420,7 +420,7 @@ let
odbc = [ pkgs.pkgconfig ];
openssl = [ pkgs.pkgconfig ];
pdftools = [ pkgs.pkgconfig ];
- sf = [ pkgs.pkgconfig ];
+ sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
showtext = [ pkgs.pkgconfig ];
spate = [ pkgs.pkgconfig ];
stringi = [ pkgs.pkgconfig ];
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index c31dfb63b3cd46a191d9db3f0c4d1c8a510c3e83..0812ff590a5036e901f0a757bc51ba8cce6a8953 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -52,7 +52,7 @@ let
name
else
let
- gem = gems."${pname}";
+ gem = gems.${pname};
version = gem.version;
in
"${pname}-${version}";
@@ -70,7 +70,7 @@ let
maybeCopyAll = pkgname: if pkgname == null then "" else
let
- mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found");
+ mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found");
in
copyIfBundledByPath mainGem;
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 6324f27e9faf42cce19c44ff1278a4caefed212b..a093cc4dc95c745f26122272b96ab090993e8710 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -42,21 +42,21 @@ in rec {
converge expandDependencies directlyMatchingGems;
platformMatches = {rubyEngine, version, ...}: attrs: (
- !(attrs ? "platforms") ||
+ !(attrs ? platforms) ||
builtins.length attrs.platforms == 0 ||
builtins.any (platform:
platform.engine == rubyEngine &&
- (!(platform ? "version") || platform.version == version.majMin)
+ (!(platform ? version) || platform.version == version.majMin)
) attrs.platforms
);
groupMatches = groups: attrs:
- groups == null || !(attrs ? "groups") ||
+ groups == null || !(attrs ? groups) ||
(intersectLists (groups ++ [ "default" ]) attrs.groups) != [];
applyGemConfigs = attrs:
- (if gemConfig ? "${attrs.gemName}"
- then attrs // gemConfig."${attrs.gemName}" attrs
+ (if gemConfig ? ${attrs.gemName}
+ then attrs // gemConfig.${attrs.gemName} attrs
else attrs);
genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
@@ -88,6 +88,6 @@ in rec {
inherit (attrs.source) type;
source = removeAttrs attrs.source ["type"];
gemName = name;
- gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
+ gemPath = map (gemName: gems.${gemName}) (attrs.dependencies or []);
});
}
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index b3f91b678c44a30d98b9479828d57819bb547976..9e9ccb128cf9aa55cd53ba66c2460b5c465bca8a 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -49,7 +49,7 @@ in
postBuild = genStubsScript {
inherit lib ruby bundler groups;
confFiles = basicEnv.confFiles;
- binPaths = [ basicEnv.gems."${pname}" ];
+ binPaths = [ basicEnv.gems.${pname} ];
} + lib.optionalString (postBuild != null) postBuild;
meta = { platforms = ruby.meta.platforms; } // meta;
diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
index f5854a6533d1c7c05cf475eef677be933e2727c7..ff9b1bac321c7a088f2e8e4e0417a934ba32357c 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "solargraph";
exes = ["solargraph" "solargraph-runtime"];
gemdir = ./.;
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index 36fa7bb1f1613b28eba926ccaf5dc9bd73abce9a..c250f442a0ebf26995d969e08e3eef3e1d7706da 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "evmdis-unstable";
version = "2018-03-23";
goPackagePath = "github.com/Arachnid/evmdis";
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix
index 7afa71429a75d467a1e5500ebae1ff72f43191bf..20fe74ecb74db1adfcded667fd06357b6be8c526 100644
--- a/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "makefile2graph-2018-01-03";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 300feb9a41b5566322e0f31b42e5a2ba30a4e503..250002a16b76d24564cc2a4cb061bca7ba363ed7 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -4,7 +4,6 @@
rustPlatform.buildRustPackage rec {
pname = "panopticon";
version = "unstable-20171202";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "das-labor";
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index fb0f7414841cfd1443bd0edfd31bd209b8042e5a..d9f39667ceff1e631c1a60b16ce00a0bbc3b3fd5 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -3,7 +3,7 @@
let
name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name;
src = kcachegrind.src;
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 2db6b821b4e1eeb42ec8d2ba93dbe9420c01c99a..a59a47b9e338b0797b954a26aa2c8bde934d228a 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -31,7 +31,7 @@ let
cs_ver,
cs_sha256
}:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "radare2";
inherit version;
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index 86e4d6ef5f69931396c22c8450c3774eb7a2d7cf..922a73a4be094514654a2fb435163c28d54c42e5 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "swarm-2019-03-11";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 908fc35c688b27a54e52285b347793dd5ba3b3b4..2940542454743fedbb4e621e44267e09ede10498 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -46,11 +46,11 @@ let
srcs.io_bazel_rules_sass
srcs.platforms
(if stdenv.hostPlatform.isDarwin
- then srcs.${"java_tools_javac11_darwin-v2.0.zip"}
- else srcs.${"java_tools_javac11_linux-v2.0.zip"})
- srcs.${"coverage_output_generator-v1.0.zip"}
+ then srcs."java_tools_javac11_darwin-v2.0.zip"
+ else srcs."java_tools_javac11_linux-v2.0.zip")
+ srcs."coverage_output_generator-v1.0.zip"
srcs.build_bazel_rules_nodejs
- srcs.${"android_tools_pkg-0.7.tar.gz"}
+ srcs."android_tools_pkg-0.7.tar.gz"
]);
distDir = runCommand "bazel-deps" {} ''
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index ba842289dba4d1323e6f4dada7d7b17421bf23d1..23ffe286824181b7a20825402b80734a3ac5722a 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -49,7 +49,7 @@ let
installPhase = ''cp $src $out'';
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 60a011a49d07b70e40cf30bd123996adeed46612..f14aa4eea6e2904d77c6bb46c2263c89d66b352d 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchgit, perl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "colormake";
version = "2.1.0";
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 24df6fa6ff3bc44f663a5a36332139047823b296..7b29e7d02dc6bd11ea7b1e8630259efec18c9114 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -16,7 +16,7 @@ let
'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gn";
version = "20190403";
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 902c74a08b4a358be06e6d6984ca2129c662a935..5e01438844c6df69e0f536ef58d1664b5e4ed815 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
rec {
- gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec {
+ gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
inherit name src nativeVersion;
dontBuild = true;
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index b5ee5d7581700fb85186c5570499ea0052eb9800..d37951ab94a4e465f5df0112751cd6d63b56fca9 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -3,20 +3,20 @@
let
# See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamilies = {
- "aarch64" = "aarch64";
- "armv6l" = "arm";
- "armv7l" = "arm";
- "i686" = "x86";
- "x86_64" = "x86_64";
+ aarch64 = "aarch64";
+ armv6l = "arm";
+ armv7l = "arm";
+ i686 = "x86";
+ x86_64 = "x86_64";
};
in
python3Packages.buildPythonApplication rec {
pname = "meson";
- version = "0.50.1";
+ version = "0.51.2";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4";
+ sha256 = "0cqhkjbab1mbvxmbjvyfrbjfkm7bh436svqpjapca36c2k9h1vwr";
};
postFixup = ''
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index 28697f4c69cd34678072634ff7bee8349bf0c3b4..7d08bbf6df2c0a58cd0fe1e460322dc3cea50528 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -1,5 +1,5 @@
{stdenv, fetchFromGitHub, python2, which}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "redo-apenwarr";
version = "unstable-2019-06-21";
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index 612dd5c7810da8693eb782408f31c2cc708c23b4..19ce0b44bf72ef72f7bffcfcb9e59203ca380f18 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.0.3";
pname = "redo-sh";
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 317186ea3e0ea06d350b80e8932e954052a884a3..3e6d66048851cbf18f7ecdef98cfd275636c55aa 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,7 +14,7 @@ let
goPackagePath = "github.com/containers/buildah";
-in buildGoPackage rec {
+in buildGoPackage {
pname = "buildah";
inherit version;
inherit src;
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index 001f87b3b279df63ead5b3a2a55a1c7d0a36b294..8a1d81acaaa79dbb3f16bb5a5ba8ae84d53b283d 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -2,7 +2,7 @@
let version = "1.1.1";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "casperjs";
inherit version;
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 921448855a6422617d178b28d6878c105daec52d..d5c7420141899c0fb8f6356af44cac2a26082eac 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }:
-bundlerEnv rec {
+bundlerEnv {
pname = "chef-dk";
ruby = ruby_2_4;
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 0c8e6ff591bfc2594e6cd86f588d4049de0c7336..12289cbb68aa6f7708ecb62edc47e524f03ae973 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "clog-cli-${version}";
+ pname = "clog-cli";
version = "0.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index 0390e7b86bbc9f5a7b73033cc54b88cbbb777e93..a83b5a219440181196e681b3816fa23d38d45cc8 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pythonPackages, fetchFromGitHub }:
let
- pgdbconn = pythonPackages.buildPythonPackage rec {
+ pgdbconn = pythonPackages.buildPythonPackage {
pname = "pgdbconn";
version = "0.8.0";
src = fetchFromGitHub {
@@ -19,7 +19,7 @@ let
};
in
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
pname = "pyrseas";
version = "0.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix
index ca87395b9179c70c0bf0b913f6b75cc8269eb341..070c7c81c403c95411a7c0f539ed25a8cff68a3d 100644
--- a/pkgs/development/tools/database/sqldeveloper/18.2.nix
+++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix
@@ -13,7 +13,7 @@ let
categories = "Application;Development;";
};
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
inherit version;
pname = "sqldeveloper";
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 461acacf4e99336eb7abc468de523155926afea2..9e75088aa5cba617d7f98c19cab9ccb02f20d6d9 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -13,7 +13,7 @@ let
categories = "Application;Development;";
};
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
inherit version;
pname = "sqldeveloper";
diff --git a/pkgs/development/tools/diesel-cli/allow-warnings.patch b/pkgs/development/tools/diesel-cli/allow-warnings.patch
new file mode 100644
index 0000000000000000000000000000000000000000..342ac1baa1026ce2081ef36e903cd24fc533b2da
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/allow-warnings.patch
@@ -0,0 +1,88 @@
+diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
+index 4e743eb4..97c53ed8 100644
+--- a/diesel/src/lib.rs
++++ b/diesel/src/lib.rs
+@@ -131,7 +131,6 @@
+ #![cfg_attr(feature = "unstable", feature(specialization, try_from))]
+ // Built-in Lints
+ #![deny(
+- warnings,
+ missing_debug_implementations,
+ missing_copy_implementations,
+ missing_docs
+diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
+index 741ca003..cf93bb8f 100644
+--- a/diesel_cli/src/main.rs
++++ b/diesel_cli/src/main.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)]
+ #![warn(
+diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs
+index 2edee846..c96917c4 100644
+--- a/diesel_cli/tests/tests.rs
++++ b/diesel_cli/tests/tests.rs
+@@ -1,5 +1,3 @@
+-#![deny(warnings)]
+-
+ extern crate chrono;
+ extern crate diesel;
+ #[macro_use]
+diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
+index 2c43b2a3..44dcf3f9 100644
+--- a/diesel_derives/src/lib.rs
++++ b/diesel_derives/src/lib.rs
+@@ -1,6 +1,6 @@
+ #![recursion_limit = "1024"]
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::needless_pass_by_value,
+diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs
+index 636fea66..f86f3dcc 100644
+--- a/diesel_derives/tests/tests.rs
++++ b/diesel_derives/tests/tests.rs
+@@ -1,5 +1,3 @@
+-#![deny(warnings)]
+-
+ #[macro_use]
+ extern crate cfg_if;
+ #[macro_use]
+diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs
+index 933e21a8..7c4d0222 100644
+--- a/diesel_migrations/migrations_internals/src/lib.rs
++++ b/diesel_migrations/migrations_internals/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
++#![deny(missing_debug_implementations, missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::option_map_unwrap_or_else,
+diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
+index 0a83234e..2f509c04 100644
+--- a/diesel_migrations/migrations_macros/src/lib.rs
++++ b/diesel_migrations/migrations_macros/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
++#![deny(missing_debug_implementations, missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::option_map_unwrap_or_else,
+diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs
+index c85414e5..f025f237 100644
+--- a/diesel_migrations/src/lib.rs
++++ b/diesel_migrations/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::needless_pass_by_value,
diff --git a/pkgs/development/tools/diesel-cli/cargo-lock.patch b/pkgs/development/tools/diesel-cli/cargo-lock.patch
new file mode 100644
index 0000000000000000000000000000000000000000..26d583f9a11d2ea080dcba6dfce5163fd72da3e8
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/cargo-lock.patch
@@ -0,0 +1,1589 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..f20a5bf
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1583 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "advanced-blog-cli"
++version = "0.1.0"
++dependencies = [
++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts_mysql"
++version = "0.1.0"
++dependencies = [
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts_sqlite"
++version = "0.1.0"
++dependencies = [
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_updates"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "assert_matches"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "atty"
++version = "0.2.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "barrel"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "base64"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bcrypt"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bigdecimal"
++version = "0.0.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bumpalo"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "byteorder"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "c2-chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "derive-error-chain"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel"
++version = "1.4.0"
++dependencies = [
++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_cli"
++version = "1.4.0"
++dependencies = [
++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_derives"
++version = "1.4.0"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_derives"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "diesel_derives 1.4.0"
++
++[[package]]
++name = "diesel_infer_schema"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_migrations"
++version = "1.4.0"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_migrations"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "diesel_migrations 1.4.0"
++
++[[package]]
++name = "diesel_tests"
++version = "0.1.0"
++dependencies = [
++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.0",
++ "diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "difference"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "dotenv"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "env_logger"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "error-chain"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "gcc"
++version = "0.3.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "getrandom"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "infer_schema_internals"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "infer_schema_macros"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ipnetwork"
++version = "0.13.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "js-sys"
++version = "0.3.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libc"
++version = "0.2.62"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libsqlite3-sys"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "memchr"
++version = "2.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "migrations_internals"
++version = "1.4.0"
++dependencies = [
++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "migrations_internals"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "migrations_internals 1.4.0"
++
++[[package]]
++name = "migrations_macros"
++version = "1.4.0"
++dependencies = [
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "migrations_macros"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "migrations_macros 1.4.0"
++
++[[package]]
++name = "mysqlclient-sys"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pq-sys"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "0.4.30"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quickcheck"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "quote"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "r2d2"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.3.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_isaac"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_jitter"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_os"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_pcg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex"
++version = "0.1.80"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex-syntax"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rust-crypto"
++version = "0.2.36"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc-serialize"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "safemem"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scheduled-thread-pool"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.99"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.99"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.40"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "smallvec"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "structopt"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "structopt-derive"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "0.11.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "0.15.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synom"
++version = "0.11.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempdir"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread-id"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ucd-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "1.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "utf8-ranges"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "uuid"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "uuid"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vcpkg"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wasi"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
++"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55"
++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
++"checksum barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2016bcea86b2a1a807753dc2b6ba682fa24e14e50c7474f4b1a0330949c86fb"
++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
++"checksum bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6f09cde06fb2cd52a77123c36bfd1e8e60cf13a8bac6ba8f451dabff4644c8"
++"checksum bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "679e21a6734fdfc63378aea80c2bf31e6ac8ced21ed33e1ee37f8f7bf33c2056"
++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
++"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
++"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a"
++"checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7"
++"checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4"
++"checksum diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680"
++"checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
++"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
++"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
++"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
++"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
++"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872"
++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
++"checksum infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64"
++"checksum infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6"
++"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c"
++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
++"checksum js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4"
++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
++"checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1"
++"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
++"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9"
++"checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe"
++"checksum mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85"
++"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718"
++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
++"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7"
++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
++"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c"
++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af"
++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
++"checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
++"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
++"checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406"
++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
++"checksum r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bc42ce75d9f4447fb2a04bbe1ed5d18dd949104572850ec19b164e274919f81b"
++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
++"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
++"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
++"checksum scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd07742e081ff6c077f5f6b283f12f32b9e7cc765b316160d66289b74546fbb3"
++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
++"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f"
++"checksum structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c"
++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
++"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
++"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
++"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7"
++"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc"
++"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0"
++"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9"
++"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e"
++"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d"
++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f6a67b051146ad27c024f2618ba5fa9d3a7a7891
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security
+, sqliteSupport ? true, sqlite
+, postgresqlSupport ? true, postgresql
+, mysqlSupport ? true, mysql, zlib, libiconv
+}:
+
+assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true)
+ "support for at least one database must be enabled";
+
+let
+ inherit (stdenv.lib) optional optionals optionalString;
+ features = ''
+ ${optionalString sqliteSupport "sqlite"} \
+ ${optionalString postgresqlSupport "postgres"} \
+ ${optionalString mysqlSupport "mysql"} \
+ '';
+in
+
+rustPlatform.buildRustPackage rec {
+ pname = "diesel-cli";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "diesel-rs";
+ repo = "diesel";
+ rev = "v${version}";
+ sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb";
+ };
+
+ patches = [
+ # Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated`
+ #
+ # Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c
+ # is in a release.
+ ./allow-warnings.patch
+ ];
+
+ cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ];
+ cargoPatches = [ ./cargo-lock.patch ];
+ cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx";
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl ]
+ ++ optional stdenv.isDarwin Security
+ ++ optional (stdenv.isDarwin && mysqlSupport) libiconv
+ ++ optional sqliteSupport sqlite
+ ++ optional postgresqlSupport postgresql
+ ++ optionals mysqlSupport [ mysql zlib ];
+
+ # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build
+ # because --features fails to apply to the package:
+ # https://github.com/rust-lang/cargo/issues/5015
+ # https://github.com/rust-lang/cargo/issues/4753
+ preBuild = "cd diesel_cli";
+ postBuild = "cd ..";
+
+ checkPhase = optionalString sqliteSupport ''
+ (cd diesel_cli && cargo check --features sqlite)
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/diesel --version
+ '';
+
+ # Fix the build with mariadb, which otherwise shows "error adding symbols:
+ # DSO missing from command line" errors for libz and libssl.
+ NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto";
+
+ meta = with lib; {
+ description = "Database tool for working with Rust projects that use Diesel";
+ homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli;
+ license = with licenses; [ mit asl20 ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ivan ];
+ };
+}
diff --git a/pkgs/development/tools/diesel-cli/update-cargo-lock.sh b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bd2e033e6871be94ae57219925482d01c2661071
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# This updates cargo-lock.patch for the diesel version listed in default.nix.
+
+set -eu -o verbose
+
+here=$PWD
+version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
+checkout=$(mktemp -d)
+git clone -b "v$version" --depth=1 https://github.com/diesel-rs/diesel "$checkout"
+cd "$checkout"
+
+rm -f rust-toolchain
+cargo generate-lockfile
+git add -f Cargo.lock
+git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
+
+cd "$here"
+rm -rf "$checkout"
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index af25f3f75952ca3edd1fef7df57cf2398ae918c9..a88963c6e2cd7b685e429ce4706545f45d572f19 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "mdsh-${version}";
+ pname = "mdsh";
version = "0.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 9dff0cc3ebed10039c2ad2791e2a8fb55269a8b2..4f3d89c07881b46d36acec45dea790194dbb3e44 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "easyjson";
version = "unstable-2019-06-26";
goPackagePath = "github.com/mailru/easyjson";
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix
index eb6f937800aac0bffde5a155c835131bfdc3bc4f..4fb05da306783686c6c9cf3a515d5ce378126802 100644
--- a/pkgs/development/tools/fusee-launcher/default.nix
+++ b/pkgs/development/tools/fusee-launcher/default.nix
@@ -6,7 +6,7 @@
, makeWrapper
} :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fusee-launcher";
version = "unstable-2018-07-14";
diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 17560f55ec4a617be0df6db314563f5d487cb4c0..68d1a74b27771c0ef6d65d0ea57d40dba456c60d 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -9,7 +9,7 @@ with rustPlatform;
buildRustPackage rec {
version = "0.22.0";
- name = "geckodriver-${version}";
+ pname = "geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 70fa18ceddb5b68d462f640c77f108f20181a74c..5faceca571668765b80313ade4e770afdd368e6d 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -4,7 +4,7 @@ with rustPlatform;
buildRustPackage rec {
version = "0.9.1";
- name = "git-series-${version}";
+ pname = "git-series";
src = fetchFromGitHub {
owner = "git-series";
diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix
index 39aab9cfa278172d99f226dcd7557b569ee911d6..9a14cc7f6e2181cc77ae217eee7ab557f221e8c7 100644
--- a/pkgs/development/tools/github-changelog-generator/default.nix
+++ b/pkgs/development/tools/github-changelog-generator/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "github_changelog_generator";
gemdir = ./.;
exes = [ "github_changelog_generator" ];
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index 20d1f7c0f1e3e8885292f9ccf4c58a39fd970d57..fd22295540d0b9bb8f32086628315e8bb53bbcf6 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -4,7 +4,7 @@
, Cocoa
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "glslviewer";
version = "2019-04-22";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 25b80d9cf6977536d041394e327daf7c5d2f3826..6caa32c16f2bf11990b120cfc6fe64c8a004dd6c 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "gox";
version = "20181025";
diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix
index 009f475bb7dd7e7eef096d7be075e4e5284575fa..ee15df1a9f6f5699f78f371a498030c4aabaf7b4 100644
--- a/pkgs/development/tools/gpp/default.nix
+++ b/pkgs/development/tools/gpp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gpp";
version = "2.25";
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index c86c2e275ed1384b1606d63e5480e6bc4edb8209..d17093695114625696188cc01257bad24b18e2eb 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, pythonPackages }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
name = "grabserial-1.9.3";
namePrefix = "";
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 2bac15403038b9b7b8173a17c10b9870a357b5f5..b3ce4f8f6a7196cb6afaa52cc37137d1475d62dd 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, pkgconfig, libftdi
+, pkgconfig, libftdi1
, python3, pypy3
# PyPy yields large improvements in build time and runtime performance,
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "icestorm";
- version = "2019.08.15";
+ version = "2019.08.31";
pythonPkg = if usePyPy then pypy3 else python3;
pythonInterp = pythonPkg.interpreter;
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
- rev = "95949315364f8d9b0c693386aefadf44b28e2cf6";
- sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2";
+ rev = "04f1eb78ed8fd50516aee50102675041a8fd40cd";
+ sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pythonPkg libftdi ];
+ buildInputs = [ pythonPkg libftdi1 ];
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index b394e9e71fbf4963d0ae00d0a32ef8debd7b52d7..549a4d1b8266bc991a7c2144bc24b34a7850818e 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pcre } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "imatix_gsl";
version = "4.1";
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index 035964dafc01bb464b5841aeea9b0abf8cd9bef1..f2c926a6f391c6fae4e5aa69e1f9f2cb3680c97d 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,6 +1,6 @@
{ stdenv, cmake, llvmPackages, irony }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "irony-server";
inherit (irony) version;
diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix
index ad71dfb22a8f4462fde1d65464bd1593a7894e66..a6cb7a92b639856d72ea213142670466a1d04858 100644
--- a/pkgs/development/tools/jazzy/default.nix
+++ b/pkgs/development/tools/jazzy/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "jazzy";
gemdir = ./.;
exes = [ "jazzy" ];
diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix
index a82c21b72e9e22ab260e98c9bbfc5929c38cd31d..e6c562721c2801626cf3a15ee4eb75181a8e07f6 100644
--- a/pkgs/development/tools/kexpand/default.nix
+++ b/pkgs/development/tools/kexpand/default.nix
@@ -1,6 +1,6 @@
{ buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
name = "kexpand-unstable-2017-05-12";
goPackagePath = "github.com/kopeio/kexpand";
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
index 1691f09e6e41fa1cc3199e2af6bc58213f5c725b..1dea14401138bcabe476c3812a023fa7bef9e876 100644
--- a/pkgs/development/tools/lattice-diamond/default.nix
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib,
freetype, fontconfig, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "diamond-3.10";
nativeBuildInputs = [ rpmextract patchelf makeWrapper file ];
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index a5dd0a882728171daef9bf778b8a524c1f505b19..f921e900e56bb6408e171ae55a73befbfada5195 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
name = "manul-unstable-2016-09-30";
goPackagePath = "github.com/kovetskiy/manul";
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 664e7d28d7916ea78b135e17869192b35dc1153d..b3d380b0a0ad7638a574d704cfbf505c9dbdb6cc 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -14,7 +14,7 @@ let
sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "arcanist";
version = "20180916";
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index ea9b340fb0b745fc94877348b87a474f966a7eaf..c246ddb9d9055997f12f810e26462226e8f058e8 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libelf, txt2man }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bin_replace_string";
version = "0.2";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index c33741740adc9e083739ab0f5b097491e543c8ce..210659289d1e23359d8c86c020879ad47bb4a878 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -22,7 +22,7 @@ let
"${stdenv.targetPlatform.config}-";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = targetPrefix + basename;
# HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index 0d78cfbbab8c14a1173b8792515e53de502aef19..6548e9643971a07c19c9de1b2588d077ea93a8bd 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -13,7 +13,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bossa-1.8";
src = fetchgit {
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 0577165bcff4583f014a2f9188090acc9bb6306d..4eeb61a7edd9c18f58c9b9f56c14faa0252ce4c7 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -30,7 +30,7 @@ let ccache = stdenv.mkDerivation rec {
passthru = {
# A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir
- links = {unwrappedCC, extraConfig}: stdenv.mkDerivation rec {
+ links = {unwrappedCC, extraConfig}: stdenv.mkDerivation {
name = "ccache-links";
passthru = {
isClang = unwrappedCC.isClang or false;
diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix
index 4170570e08aa6302b06fd680888ecac4f4549d33..956a8df69cea0e873041c6bc412b5f9f64358a3f 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/pkgs/development/tools/misc/chrpath/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "chrpath-0.16";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index daf39318432ab20b4c640e0fd596e5f0fa3e41b3..e1b89d07cdfd49182d1ccf1cc518dc1a212c8770 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -5,7 +5,7 @@ let
pname = "circleci-cli";
version = "0.1.2569";
in
-buildGoPackage rec {
+buildGoPackage {
name = "${pname}-${version}";
inherit version;
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index 02d480cf2cd503aa6b052f026237222d222de14e..c43509a4f43bcc368e896892d4488c85062c53ef 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -14,7 +14,7 @@ let
stdenv = llvmPackages.stdenv;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cquery";
version = "2018-10-14";
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix
index a1c9e85a83abf263fd6a26e5d08ecf38887f2acd..5bccea9ced882920dd68478de78e4940e4827585 100644
--- a/pkgs/development/tools/misc/dbench/default.nix
+++ b/pkgs/development/tools/misc/dbench/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoconf, popt, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dbench-2013-01-01";
src = fetchgit {
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index afe9b59e012d7a89e7f4668acd650aaebc22d109..ab2ab0de9cf9350190547c7c4ff87a0c4cd6fc55 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnum4-1.4.18";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 264f2aec44d459868607ae7a42dd4894de708845..c4cba5ffc69c9c1a6e0dd7fe7ed47a67ac2487b8 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perlPackages, gettext }:
stdenv.mkDerivation rec {
- name = "help2man-1.47.10";
+ name = "help2man-1.47.11";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
- sha256 = "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk";
+ sha256 = "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar";
};
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
index 7d824fd81fbe39ab205d28f72ebff4360029e773..992d12ae08eeb9707c4a98227b5469b61119a220 100644
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ b/pkgs/development/tools/misc/kibana/5.x.nix
@@ -4,16 +4,16 @@ with stdenv.lib;
let
inherit (builtins) elemAt;
archOverrides = {
- "i686" = "x86";
+ i686 = "x86";
};
info = splitString "-" stdenv.hostPlatform.system;
arch = (elemAt info 0);
- elasticArch = archOverrides."${arch}" or arch;
+ elasticArch = archOverrides.${arch} or arch;
plat = elemAt info 1;
shas = {
- "x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa";
- "i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn";
- "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
+ x86_64-linux = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa";
+ i686-linux = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn";
+ x86_64-darwin = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
};
in stdenv.mkDerivation rec {
pname = "kibana";
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix
index 46a72a32722ebb9f148311f8aaeba394415feada..635be9e087680bb9a8b4b0e303f83943c9f1c108 100644
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/pkgs/development/tools/misc/kibana/6.x.nix
@@ -18,12 +18,12 @@ let
shas =
if enableUnfree
then {
- "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn";
- "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c";
+ x86_64-linux = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn";
+ x86_64-darwin = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c";
}
else {
- "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk";
- "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk";
+ x86_64-linux = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk";
+ x86_64-darwin = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk";
};
in stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
patches = [
diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix
index 9fba3b43e11c1d59ee5018e87fb81bd4c280962c..2fc0242c014b6888c0e0dad288be0f0af2be7c9e 100644
--- a/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/pkgs/development/tools/misc/kibana/7.x.nix
@@ -18,12 +18,12 @@ let
shas =
if enableUnfree
then {
- "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8";
- "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7";
+ x86_64-linux = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8";
+ x86_64-darwin = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7";
}
else {
- "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38";
- "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2";
+ x86_64-linux = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38";
+ x86_64-darwin = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2";
};
in stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
patches = [
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index 77d4c5771f90eb3d3185ffcde95fdaf9ddd33031..b8fa02306c4d3eed6fe0e8f349d514bcc4bfbe63 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, elfutils, libunwind }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ltrace-0.7.3";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix
index ce62634e7d7a8d8245e028ec81ad91379a7b5448..518d128890a93313f88a456a11a3f3c089a7c8f3 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "macdylibbundler";
version = "20180825";
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index af3b45a8e62cd5cc70e327b28b9e3a671cee723b..8af1217079866a06f96b4974601f6f225910de39 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -2,7 +2,7 @@
assert stdenv ? glibc;
-perlPackages.buildPerlPackage rec {
+perlPackages.buildPerlPackage {
pname = "ninka";
version = "2.0-pre";
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index c0e7a3653a869d2f766c1265b216d5c2fdc9f20e..7bfff6328269d8332bb7900a36538591877b2879 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -3,7 +3,7 @@
let
version = "20130503";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "prelink";
inherit version;
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 0c994e88e23fd81a84564f44bd2b2df672d17490..b9a4658d3dee6aa95cbc498593ffc1c5849acd71 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
version = "0.2.10";
- name = "sccache-${version}";
+ pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 7b6048eb475d8ac3c711ca78c17e3bd302a96cf4..e2d507ab80134d1d0e466f26d862b3f1794d6772 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
, libaio }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "sysbench-1.0.17";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
index 29d809b5f05e567e12055064990a3df4a783c162..fb38d096ab4362416860ed6aa38bb15208bb9abe 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
version = "3.8";
pname = "tet";
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 613fd2673d56d0936d0e7b63be64904f831a39dc..7741f2d4ffbcbdafc89d93e2838ea46be7429fab 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -8,7 +8,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "texinfo-${optionalString interactive "interactive-"}${version}";
inherit version;
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 68409a59f37164a3f320670d1bbf158b63692403..bad3ecd924136b362bd601a6919e5e284559a5e7 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "universal-ctags";
version = "unstable-2019-07-30";
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index e2ea96cd590bf381f9179c22841d1bbf1dbf7c8f..e1726efc40c1f2987f8f0298d2d98de8086c5429 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
pname = "watson-ruby";
version = (import ./gemset.nix).watson-ruby.version;
- env = bundlerEnv rec {
+ env = bundlerEnv {
name = "watson-ruby-gems-${version}";
inherit ruby;
# expects Gemfile, Gemfile.lock and gemset.nix in the same directory
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix
index 6edf6551b068cad15c08cb79a593e67fce0ec9d3..caecad4b678a55d8a1bd433fbb2e4fc54407a6b6 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "787";
pname = "xc3sprog";
- src = fetchsvn rec {
+ src = fetchsvn {
url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx";
rev = "${version}";
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
index 1424b8fe19745e0a27581b29d9cc4e1d9253c981..04827fade70dec453cc91bbfe1baa55860b0ae37 100644
--- a/pkgs/development/tools/misc/xxdiff/tip.nix
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xxdiff-5.0b1";
src = fetchFromBitbucket {
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index b409009b524e428fb49d95c1383b7710ec232b65..12f0b13a6602a60171a31709dd341fe13c1e9dc8 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -5,7 +5,7 @@
, fixDarwinDylibNames, Cocoa ? null
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ycmd";
version = "2018-09-20";
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index 689b7da8802117587df23c15f4b3940b06ce6875..6e0014b377325132a7654dfdda623cbe1e928575 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -9,7 +9,7 @@ let
sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nailgun";
inherit version;
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 06945f10eb23a22cbd7ee9f9741be83c189ac52c..b07ab21fdf102d35278cabf9448b1880f790a071 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -30,7 +30,7 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''
sys.symlinkDir=INSTALLDIR/bin
''; };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "neoload-4.1.4";
src = fetchurl (
diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
index 081e86c44dde7b193cedee2a9e1001c8f8c4e768..068028c7da91400d36f29c9d6ce9b643b84755f6 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nrpl";
version = "20150522";
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index 4a4203a2f59d19c9a7d2c6e26720daf23960b8de..a7ef6d7bedd3c6890a300b34f0a19a27397b3701 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -22,7 +22,7 @@ let param = {
"4.08" = {
version = "4.08+1";
sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; };
- }."${ocaml.meta.branch}";
+ }.${ocaml.meta.branch};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 159260750a25e769e9ffac20765bdb792ecca17b..90d74414308e1cf59725e2774ebd291adc34c83a 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -26,7 +26,7 @@ let param =
}
; in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "${pname}-${param.version}";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index 90e88979de409d702740f58104fbdab8841a629c..d1ff9eee817978f5936799b2b879d7546ff4e3f2 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -2,7 +2,7 @@
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index e6fb1b353d2ac39f7f265f297cca28d292b2abc7..e535ba29aeb442644225c0ff1adf5ceb4a50671c 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = {
"2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
"2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
- }."${version}";
+ }.${version};
};
buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 65afee16afbdd738be8f56091724c19c6df73e53..5c8f4377e8d7768673dc8cc92b2041e7e8c2e054 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -3,7 +3,7 @@
, js_of_ocaml, ocaml_lwt, lwt_log
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "js_of_ocaml-lwt";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index 4b2b14d317b498f2b3919b5f1e4205aa9579a738..344352467e9b3d698f2b3d4d943671f2b7f76f9b 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -2,7 +2,7 @@
, ocamlbuild
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "js_of_ocaml-ocamlbuild";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 277973afba8a2517f264a2f173b5ebe18a78e121..3adad22bd9c356fcad6e334e1c3506e3d07ae98c 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -3,7 +3,7 @@
, js_of_ocaml
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "js_of_ocaml-ppx";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index 5b5f7d18f797b5b415d80b9b49ea67ed05693324..2ff9ddbcf9e1292a7ce73c6aa0df7cf3ff4c0699 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -2,7 +2,7 @@
, js_of_ocaml, ppx_deriving
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "js_of_ocaml-ppx_deriving_json";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index c24162cccf75fd613d114da3847fd781426b258b..c39c985183ad9c2dac0aaf6c75ee673f82d88ff2 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -3,7 +3,7 @@
, js_of_ocaml, reactivedata, tyxml
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "js_of_ocaml-tyxml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 90b092f0e4b6c8a8079f297df1efb4ca2a6cc184..04aeab5f4319572df6c36a7cefc280c27baf7140 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4.10";
pname = "ocaml-oasis";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index dbf33424439d3138c217c94409af72ad3b86364d..91e2e67eaf1b13cc72e4a3113523524886daf630 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ocamlmod";
version = "0.0.9";
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 0ed7312660a12eccbc9fa38515bb460db68ba4f9..cf5372bdc202480e13086badb96579759f8d99e9 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -2,7 +2,7 @@
let
version = "1.99.19-beta";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml${ocaml.version}-ocp-build-${version}";
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index 87490bcb617fef9a4d26073cf096cf898690617c..53482598f13415fff57c4c49c717c895c9494624 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -43,7 +43,7 @@ let
sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "opam";
version = "1.2.2";
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 763642e5da1bb54b2e37d020c5badc58ca6b3cfd..df4c0f2d12c2ed62d5c4304f203b61415455a6bb 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -59,7 +59,7 @@ let
sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s";
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "opam";
version = "2.0.5";
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 8b7354ae48abf7bcbcdc5e33109c2739e4bf4412..28ad85b42e94e65ebc430c10db35b7554f408738 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# derivation of just runtime deps so env vars created by
# setup-hooks can be saved for use at runtime
- runtime = stdenv.mkDerivation rec {
+ runtime = stdenv.mkDerivation {
pname = "utop-runtime-env";
inherit version;
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix
index 137f56bee59e61c5534c3273b87920d860418ddd..cc33b675954a5efcc9073520e73c0cf2880083e9 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/development/tools/ofono-phonesim/default.nix
@@ -7,7 +7,7 @@
, qtscript
}:
-mkDerivation rec {
+mkDerivation {
pname = "ofono-phonesim";
version = "unstable-2014-04-22";
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index f29153334273c05d82a76052c023097323692f6c..af295eb242f6d2722f9756b95d00762e3daf2356 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "4.2.3";
- src = fetchurl rec {
+ src = fetchurl {
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96";
};
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
index 7064cb8285eebdc303c4756e8e039082b07afca4..0e4810f0ba413013ff2f08afabcf8fb6877f5e2a 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "out-of-tree";
- version = "1.0.1";
+ version = "1.1.1";
buildInputs = [ makeWrapper ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchgit {
rev = "refs/tags/v${version}";
url = "https://code.dumpstack.io/tools/${pname}.git";
- sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx";
+ sha256 = "048jda3vng11mg62fd3d8vs9yjsp569zlfylnkqv8sb6wd1qn66d";
};
goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 6f96b81e7a46eb8f1512bb0c1fac9c7e827dbdb6..fac5b8e583098c1a324aa364981a3bb4600527e4 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "parinfer-rust-${version}";
+ pname = "parinfer-rust";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index 7e09b0a8cd382f8276377594e06a334f5c1da348..e555f1d598547e283decf7bad65bd669d223c63a 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "flex-2.5.35";
src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
index 3a46c6c8f01e32afa75bba089f900f025556944a..fc2c769958393a5865bbecad9002a647dd865605 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, bison, m4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "flex-2.6.1";
src = fetchurl {
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index d41c113821adb2e049348b48ef03fb3ad7db33be..e10fe49b1e45df4584237dd866b087cb7faff461 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, glib, pkgconfig, python, scons }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hammer";
version = "e7aa734";
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix
index aa7b63dafea981b3aaf51debe8d3de4029b33d95..009ebe8e2ff0c3d635da46a12db1b735d5c16a79 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/pkgs/development/tools/parsing/lemon/default.nix
@@ -15,7 +15,7 @@ let
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "lemon";
version = "1.69";
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index ee6a7ec78c201d592ead87670230353f8e65f332..f1bda9997ac6ada9aaedc7612318709386b354fc 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -2,7 +2,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "pax-rs-${version}";
+ pname = "pax-rs";
version = "0.4.0";
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
index 6d6a02ab49f4e9fc4b8ff08e97d9235ace23333f..77c1df6f43e3e184d50163a1dea43a2fe74fdced 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -1,6 +1,6 @@
{ buildGoModule, fetchFromGitHub, lib }:
-buildGoModule rec {
+buildGoModule {
pname = "protoc-gen-doc-unstable";
version = "2019-04-22";
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index b5dfe3c8bfd9df63d073f9d80ca02c5181898d53..060875924d80b3d7e4c20a411a305f4cc0348218 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -91,7 +91,7 @@ typeshed = stdenv.mkDerivation {
phases = [ "unpackPhase" "installPhase" ];
installPhase = "cp -r $src $out";
};
-in python3.pkgs.buildPythonApplication rec {
+in python3.pkgs.buildPythonApplication {
pname = "pyre-check";
version = pyre-version;
src = pyre-src;
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 1b3bc7a2162664fdba5b381459663266f821701c..c8f7ccb18d599363d17a40282e94ac17024b8527 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -11,7 +11,7 @@ let
# Fetch clang from qt vendor, this contains submodules like this:
# clang<-clang-tools-extra<-clazy.
- clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec {
+ clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: {
src = fetchgit {
url = "https://code.qt.io/clang/clang.git";
rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 6af444c7ce04624fb9b442db1daee226cd919128..d9433f535dad83767d066e4c611e977f8dbb8340 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "quicktemplate";
version = "unstable-2019-07-08";
goPackagePath = "github.com/valyala/quicktemplate";
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix
index a2ab9a47a79a2f702a7be178309044aaf7f3b658..d92003a575e151c016d4a23070b6d8e328101014 100644
--- a/pkgs/development/tools/rdocker/default.nix
+++ b/pkgs/development/tools/rdocker/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, openssh }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rdocker";
version = "unstable-2018-07-17";
diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix
index 51801864796e9a76005109460e9bbc3792e2b40a..e4762796c18a8ac2c8d223f1eab6425498e59302 100644
--- a/pkgs/development/tools/ronn/default.nix
+++ b/pkgs/development/tools/ronn/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "ronn";
version = env.gems.ronn.version;
- env = bundlerEnv rec {
+ env = bundlerEnv {
name = "ronn-gems";
gemdir = ./.;
};
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 72b9406211cb007ac1e644dad87554ec0919ab44..e00f0ae7dd04afedc9ae2265cd1ed956da88b0ad 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "rq-${version}";
+ pname = "rq";
version = "0.10.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix
index 5d965fc87a7eeee4c4d736025e77d6e0249fa35d..9a6393977d7fbee1b373f7a096931ac863dac519 100644
--- a/pkgs/development/tools/rubocop/default.nix
+++ b/pkgs/development/tools/rubocop/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
-bundlerEnv rec {
+bundlerEnv {
pname = "rubocop";
inherit ruby;
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 8fb0b63727a2c29da7f45ec544577adb6de193ef..17103bae50a62df0c04eddda711b1981e6dca387 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "cargo-asm-${version}";
+ pname = "cargo-asm";
version = "0.1.17";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index f19aabae7a1887941730d2ab75c15790ec214c9e..7ccc852835993f69fcb1b09ac05a4bb30b706977 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "cargo-fuzz-${version}";
+ pname = "cargo-fuzz";
version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock
src =
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 0ca12bd7bf4fab0330428c33158d3ea139a899ca..144e1d71a110a262846f19a9bca2c51734877986 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
rustPlatform.buildRustPackage rec {
- name = "cargo-generate-${version}";
+ pname = "cargo-generate";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5ea935babd195561efc7afccb627f248b81b317e
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-watch";
+ version = "7.2.1";
+
+ src = fetchFromGitHub {
+ owner = "passcod";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "13zjsypj0ay9xb5j5fhl3yfn57kp2yngl138vmnyfk1h7gjdxpk3";
+ };
+
+ cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg";
+
+ buildInputs = lib.optional stdenv.isDarwin CoreServices;
+
+ # `test with_cargo` tries to call cargo-watch as a cargo subcommand
+ # (calling cargo-watch with command `cargo watch`)
+ checkPhase = "PATH=target/debug:$PATH cargo test";
+
+ meta = with lib; {
+ description = "A Cargo subcommand for watching over Cargo project's source";
+ homepage = https://github.com/passcod/cargo-watch;
+ license = licenses.cc0;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ xrelkd ivan ];
+ };
+}
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 945b78caccc7aa322a4c8f4942e64da3e55413be..d58b848c87e9a4aeaa39ff987482bedd95329759 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "rust-cbindgen-${version}";
+ pname = "rust-cbindgen";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index b2f6701be8769d54aa6a9a177d0dfe2817779277..a06723fc28c82908404512dc7b6f4678f5be7d09 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }:
rustPlatform.buildRustPackage rec {
- name = "racer-${version}";
+ pname = "racer";
version = "2.1.22";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index aa33f04123f54aa754ecfff828fd0e8ce4e036fd..bfc30193eeda2637451f1484c9a36127fbd6e6f5 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "racerd-${version}";
+ pname = "racerd";
version = "2019-03-20";
src = fetchFromGitHub {
owner = "jwilm";
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index fd5bc6978310b4e8717a066b37330f2714b4c918..8a87bf5cf4df2c2ed38a254ec07039e82a29f459 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "rainicorn-${version}";
+ pname = "rainicorn";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index 4e7032025c3da20f37eda56f7c27a55c4d77d373..32cc66f76e924e6f7f725cbf215bbe42f6615223 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "svd2rust-${version}";
+ pname = "svd2rust";
version = "0.14.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix
index bd8a013fe2d05e885ae5270b35145523a3b9ecf8..ab70552c2e8c509181002c4bfb5133c55eb40ba7 100644
--- a/pkgs/development/tools/scalafix/default.nix
+++ b/pkgs/development/tools/scalafix/default.nix
@@ -16,7 +16,7 @@ let
outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
buildInputs = [ jdk makeWrapper deps ];
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 79afb54bfb70278e499aa1681740550566533d96..1f789a6ade5da0ca67de99ad477bf071ca33fbc5 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -16,7 +16,7 @@ let
outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
index 05f7805a55acaec5c6d9e87b43a93af26df7f86f..9a87f5f936941d8803a1b48d2f54fc3da418575d 100644
--- a/pkgs/development/tools/scry/default.nix
+++ b/pkgs/development/tools/scry/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "scry";
version = "0.8.0";
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 5937b00f459430b0e3f6f2f1529380569ab42b8c..eff06daac064a5cbc693a640f084a70208341ade 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -4,18 +4,18 @@
}:
let
allSpecs = {
- "x86_64-linux" = {
+ x86_64-linux = {
system = "linux64";
sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
system = "mac64";
sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09";
};
};
- spec = allSpecs."${stdenv.hostPlatform.system}"
+ spec = allSpecs.${stdenv.hostPlatform.system}
or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
libs = stdenv.lib.makeLibraryPath [
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix
index 82b6d7e1161abdc2641907cb69d6d6b2d211414e..27e87d212e68bedc3447f42237b7e58674e8b49a 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/pkgs/development/tools/selenium/selendroid/default.nix
@@ -16,7 +16,7 @@ let
};
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name;
inherit version;
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 786cac68425a6bf2d894b6593a9d5c64d7c540cb..e7b21c40f17bdcc8f680d00edc9a46fa5f5d2beb 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -19,7 +19,7 @@ let
goPackagePath = "github.com/containers/skopeo";
in
-buildGoPackage rec {
+buildGoPackage {
pname = "skopeo";
inherit version;
inherit src goPackagePath;
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix
index d24c3e88b8cb09b659551f51294937873e463e98..e26431b268751f261dd30680afaeacc9dc865b71 100644
--- a/pkgs/development/tools/statik/default.nix
+++ b/pkgs/development/tools/statik/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "statik";
version = "unstable-2019-07-31";
goPackagePath = "github.com/rakyll/statik";
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 7f35d3c438d1ac09fe95d7656d481ce35ddb27e8..74f1f22426f9ab8e650aac060d625e0411ebeadc 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,41 +1,37 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
-, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
+, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
+, qscintilla, qtbase, qttools }:
-let
- qscintillaLib = (qscintilla.override { withQt5 = true; });
-
-in mkDerivation rec {
+mkDerivation {
pname = "tora";
- version = "3.1";
+ version = "3.2.176";
src = fetchFromGitHub {
owner = "tora-tool";
repo = "tora";
- rev = "v${version}";
- sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
+ rev = "39bf2837779bf458fc72a9f0e49271152e57829f";
+ sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k";
};
- nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
+ nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
+
buildInputs = [
- boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase
+ boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
];
preConfigure = ''
- sed -i \
- 's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \
- src/widgets/toglobalsetting.cpp
-
- sed -i \
- 's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \
- extlibs/libermodel/dotgraph.cpp
+ substituteInPlace src/widgets/toglobalsetting.cpp \
+ --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"'
+ substituteInPlace extlibs/libermodel/dotgraph.cpp \
+ --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot
'';
cmakeFlags = [
"-DWANT_INTERNAL_LOKI=0"
"-DWANT_INTERNAL_QSCINTILLA=0"
# cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name
- "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include"
- "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so"
+ "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include"
+ "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so"
"-DENABLE_DB2=0"
"-DENABLE_ORACLE=0"
"-DENABLE_TERADATA=0"
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 1deb2c7a8fc06b52f3193610581f5d995e5d36c3..c98529484d51c04df7161446f04ab96d79828606 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,14 +8,16 @@ let
in
stdenv.mkDerivation rec {
pname = "trellis";
- version = "2019.08.09";
+ version = "2019.09.01";
+ realVersion = with stdenv.lib; with builtins;
+ "1.0-53-g${substring 0 7 (elemAt srcs 0).rev}";
srcs = [
(fetchFromGitHub {
owner = "symbiflow";
repo = "prjtrellis";
- rev = "a67379179985bb12a611c75d975548cdf6e7d12e";
- sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35";
+ rev = "98871e0e2959bc8cb4de3c7ebe2b9eddc4efe00c";
+ sha256 = "1yq7ih2xvhfvdpijmbqjq6jcngl6710kiv66hkww5ih8j5dzsq5l";
name = "trellis";
})
(fetchFromGitHub {
@@ -32,6 +34,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ];
preConfigure = with builtins; ''
+ substituteInPlace libtrellis/CMakeLists.txt \
+ --replace "git describe --tags" "echo ${realVersion}"
+
rmdir database && ln -sfv ${elemAt srcs 1} ./database
source environment.sh
diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6996d5bf13fac14fdf31df4af16846e275d42b09
--- /dev/null
+++ b/pkgs/development/tools/udis86/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+
+stdenv.mkDerivation rec {
+ pname = "udis86";
+ version = "1.7.2";
+
+ src = fetchFromGitHub {
+ owner = "vmt";
+ repo = "udis86";
+ rev = "v${version}";
+ url = "https://github.com/vmt/udis86/archive/v${version}.tar.gz";
+ sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
+ };
+
+ nativeBuildInputs = [ autoreconfHook python ];
+
+ configureFlags = [
+ "--enable-shared"
+ ];
+
+ outputs = [ "bin" "out" "dev" "lib" ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://udis86.sourceforge.net";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ timor ];
+ description = ''
+ Easy-to-use, minimalistic x86 disassembler library (libudis86)
+ '';
+ platforms = platforms.all ;
+ };
+}
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 0ca7e37ef70647312741530414ab776da9435990..895cedd70108a2cdbcdc2284b2776004df3a3150 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -22,7 +22,7 @@ let
ver = "2018.3.0";
build = "f2";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "unity-editor";
version = "${ver}x${build}";
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index e8173a6b5b0d4a593b1c92121ec72b89b8ba8515..df0c360f75c37fbc47f0c05e66580476b6ccb6b7 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -7,7 +7,7 @@
, fetchFromGitHub
}:
-buildGoPackage rec {
+buildGoPackage {
pname = "vgo2nix";
version = "unstable-2019-02-06";
goPackagePath = "github.com/adisbladis/vgo2nix";
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index b0768ca4b7e541afdfd850705ede9606985c5ed4..e6dccbd332e185ce9b4a2a6d3fb370c787696a46 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -7,7 +7,7 @@
, fetchpatch
}:
-mkDerivation rec {
+mkDerivation {
pname = "vogl";
version = "2016-05-13";
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index d9ff6f673d8759c252475f85392d22b2a96d7496..3f721eaee2a906264d54ce533ed1f658a129cdf9 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -8,7 +8,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "wasm-pack-${version}";
+ pname = "wasm-pack";
version = "0.8.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 0874c9e5515576d6c97b870508b5e6235b6dc7b4..8090aca5ff30318970a14dbc363801dd1df0b950 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -15,7 +15,7 @@ let
rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "xcbuild";
# Once a version is released that includes
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix
index ece440c692f770991814ea8bd609cc39f3ac1626..f31a119bb657a06b8ca2ffa06a5ba0ee279af24d 100644
--- a/pkgs/development/tools/yaml2json/default.nix
+++ b/pkgs/development/tools/yaml2json/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "yaml2json";
version = "unstable-2017-05-03";
goPackagePath = "github.com/bronze1man/yaml2json";
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index 82e4402361d955b8ae0123de64d0252763b8a39c..f5989390c4b02df7f1789e4cfe82a34bcdc85800 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
@@ -406,7 +406,7 @@ in rec {
'';
};
- fixup_yarn_lock = stdenv.mkDerivation rec {
+ fixup_yarn_lock = stdenv.mkDerivation {
name = "fixup_yarn_lock";
buildInputs = [ nodejs ];
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 10fbc98d51ab31449f8eef985306e78f7bdf6091..bbdaeb5d292653f15a551f84dcd1202dabe6403a 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix
index 82faf32a3210097e820bbc0c848301167c91e7eb..57fedb78407e13070bbb4821d2176cb620ae39e0 100644
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
-perlPackages.buildPerlPackage rec {
+perlPackages.buildPerlPackage {
pname = "wml";
version = "2.0.11";
diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix
index f2be128fd99899a3ad9ce9555dd82fa32ede1cd9..0b0cea70366254653659161368fc8d13ed451057 100644
--- a/pkgs/games/90secondportraits/default.nix
+++ b/pkgs/games/90secondportraits/default.nix
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
index 628a521126f5c2a5a351b7e259bf0779bff230bb..89c74d83b490ae499a7fc0e2eea9c8bf06b7248b 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/pkgs/games/alienarena/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg
, libvorbis, freetype, openal, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "alienarena-7.65";
src = fetchurl {
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index d4ff86c424b1ec6f079aa063c8e4589a8be5dd78..943f9eb881c52b63fefc85076d9ca30da504387a 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -4,7 +4,7 @@ let plainName = "andyetitmoves";
version = "1.2.2";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${plainName}-${version}";
src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 5b1f240e7b5f7868cc02a45a849e1ed0b12630da..c224784e8f249499fb263f1b850506d887df4d24 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -9,7 +9,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "arx-libertatis";
version = "2019-02-16";
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
index bf58b523e76e282cbc5f1c257f8a451df432d5bd..a35b449f92fd1ad2b2e2de9a451e917b77086cba 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/pkgs/games/blackshades/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "blackshades-svn-110";
src = fetchsvn {
url = svn://svn.icculus.org/blackshades/trunk;
diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix
index f4e5290df27b8af7dc0efbc4e340dbcc1a495d0e..24e45719f516f5b8bda1de1a404471b39e26b1f9 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/pkgs/games/cuyo/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, SDL, SDL_mixer, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cuyo";
version = "2.1.0";
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 52d3bdd5b79f8288efc1c78907aa058c1e795365..117ebcc1ac181933d9d37cb1275246b7b526658f 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "unstable-2019-07-28";
pname = "devilutionx";
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 0b25af645cfa602672fb1162ea0a8be93e3664ec..71024f3d5c91d6b19c35af3cae8dabbc5f7a2ad1 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -83,7 +83,7 @@ let
fi
'';
- dfhack = stdenv.mkDerivation rec {
+ dfhack = stdenv.mkDerivation {
pname = "dfhack-base";
inherit version;
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index e3005373b95fc301724280b1ce9b8744b8565e35..6871a611784c402bfe3982a6de1637ad2b6e9e3d 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -7,7 +7,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dwarf-therapist-${dwarf-therapist.version}";
wrapper = ./dwarf-therapist.in;
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index b5c80a0a56dc73f512e407d0b7a73ae49142ea25..291e32b6406cc54e1432f8d332e2276ad1d5b735 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -18,12 +18,12 @@ let
# Other srcs are avilable like 32-bit mac & win, but I have only
# included the ones most likely to be needed by Nixpkgs users.
platforms = {
- "x86_64-linux" = "linux";
- "i686-linux" = "linux32";
- "x86_64-darwin" = "osx";
- "i686-darwin" = "osx32";
- "x86_64-cygwin" = "win";
- "i686-cygwin" = "win32";
+ x86_64-linux = "linux";
+ i686-linux = "linux32";
+ x86_64-darwin = "osx";
+ i686-darwin = "osx32";
+ x86_64-cygwin = "win";
+ i686-cygwin = "win32";
};
dfVersionTriple = splitString "." dfVersion;
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index e1f8e8abab8095ccc7dc6995838ce544f06984b5..e191d372704b33e5a4e6bc2fdfb6a709ca6382e9 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -44,7 +44,7 @@ let
in
stdenvNoCC.mkDerivation rec {
- name = "twbt-${version}";
+ pname = "twbt";
version = release.twbtRelease;
src = fetchurl {
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 06bc6ca1fe510d92cde3b640f98ae385b0c8f6c2..31b21c5a43511079b7877f9e8c8159277fbc81b7 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -80,7 +80,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
dfInit = substituteAll {
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix
index 020a4593de241d5264d8ceb7926ba9f1d08b7e83..7a1e690c39df4a2ff0dc16ee6d65468f8aac41b3 100644
--- a/pkgs/games/dxx-rebirth/full.nix
+++ b/pkgs/games/dxx-rebirth/full.nix
@@ -2,7 +2,7 @@
, dxx-rebirth, descent1-assets, descent2-assets }:
let
- generic = ver: assets: stdenv.mkDerivation rec {
+ generic = ver: assets: stdenv.mkDerivation {
name = "d${toString ver}x-rebirth-full-${assets.version}";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 18c83b8c5a4cb997814019e81067681f97d2e14d..cee9be00a3ab1642f9f6224c60cd32c37caba488 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -8,7 +8,7 @@ let
version = "${major}.${minor}.${patch}";
- serious-proton = stdenv.mkDerivation rec {
+ serious-proton = stdenv.mkDerivation {
pname = "serious-proton";
inherit version;
@@ -34,7 +34,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "empty-epsilon";
inherit version;
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index a138b46f81bd11c2a45c589a73071a79e201ef65..14bea8185c6f41857284ebc4aefdcd1767e72ef4 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -6,7 +6,7 @@ let
version = "0.9.8";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "endless-sky";
inherit version;
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index b269a5d12d6d67c2c82413c678af78f468d9302f..281691d283d7d3a9f8c38dbb80c193e09a896c83 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -2,7 +2,7 @@
let
version = "0.16.1";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "freedroidrpg";
inherit version;
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix
index ec2cb9416661c760446d7f28b804ea4f6ed8c90f..6531d407d21974ef21ff5c945db210940a02605b 100644
--- a/pkgs/games/frogatto/data.nix
+++ b/pkgs/games/frogatto/data.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "frogatto-data";
version = "unstable-2018-12-18";
diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix
index 51975c17a8eea4edc62cff1fabbd9f9da3be8552..4c5f1af8a9be61fcc5f101042b8e64c1361d07c8 100644
--- a/pkgs/games/frogatto/default.nix
+++ b/pkgs/games/frogatto/default.nix
@@ -15,7 +15,7 @@ let
categories = "Application;Game;ArcadeGame;";
};
version = "unstable-2018-12-18";
-in buildEnv rec {
+in buildEnv {
name = "frogatto-${version}";
buildInputs = [ makeWrapper ];
diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix
index 5a01d2512c42994dc2027996355d9b808e6dffab..5254ff25b025da3c6d6a278cbb9575cb51f49dbf 100644
--- a/pkgs/games/frogatto/engine.nix
+++ b/pkgs/games/frogatto/engine.nix
@@ -2,7 +2,7 @@
, boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf
, glew, zlib, icu, pkgconfig, cairo, libvpx }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "anura-engine";
version = "unstable-2018-11-28";
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix
index de4a89eac07fb2b885105a18662c855625363881..6d8d14d8de0d91938d32a72702a0933d6eb1ba01 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/pkgs/games/gambatte/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, scons, qt4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gambatte";
version = "2016-05-03";
diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix
index 7a720239182d801f6b170a896b957fb74758b38c..340dd20aaafeae69768d6af5c0050f70347ca7e0 100644
--- a/pkgs/games/gnome-hexgl/default.nix
+++ b/pkgs/games/gnome-hexgl/default.nix
@@ -9,7 +9,7 @@
, gtk3
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gnome-hexgl";
version = "unstable-2019-08-21";
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index 62c5ee8030478e6ac56ba3841e4aea4aa4d2d4a4..43c60c6673050c72243208f718b99792eda51aba 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -12,7 +12,7 @@ let
flex
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
index fc73f89f66c0b183f5d76a5d1e7ce808567f5cd5..f9dd851af8e9b757a03582804017fac937d76303 100644
--- a/pkgs/games/gscrabble/default.nix
+++ b/pkgs/games/gscrabble/default.nix
@@ -2,7 +2,7 @@
, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection
, python3Packages, gnome3, hicolor-icon-theme }:
-buildPythonApplication rec {
+buildPythonApplication {
pname = "gscrabble";
version = "unstable-2019-03-11";
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 97aee425fd1622c471d1845a0e358d8b702c3463..a770e452ae4c85af94c0a7d95d524b3f159b840d 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -1,6 +1,6 @@
{ fetchgit, stdenv, love, curl, zip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.12.1";
pname = "hawkthorne";
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 7ef5c6a49b3ee2f16bfa464cae68420074c9d2f9..b3764ea1efc801d03db628328db6fe4fe2884209 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -9,7 +9,7 @@ let
SHA entropy pkgs.zlib sandi regex-tdfa
]);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.0.0-beta1";
pname = "hedgewars";
src = fetchhg {
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index b0acd789afeeee75b592c112e506b04d7400c88b..b25341da01d8131de8b5ea9239b2202fb9447565 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -28,7 +28,7 @@ let
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "instead-" + version;
src = fetchurl {
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 94c614598bfe500b0d00b19bfd3373e9ee32ca29..fa0720e51fd9404c0779d8adc200367b8b73a8f4 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -26,7 +26,7 @@ let
doCheck = false;
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ja2-stracciatella";
inherit src;
inherit version;
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix
index 0e819278dc394d6b4f2ee090e38d63e03f1c0a3e..0811c01aa7912dbc0b31e5d5bcefa632b0bf2c8c 100644
--- a/pkgs/games/liberal-crime-squad/default.nix
+++ b/pkgs/games/liberal-crime-squad/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2016-07-06";
pname = "liberal-crime-squad";
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index cfc06e11e1919a9c7bac08d7acfd170d0644327f..3ec508040e7a0c4ea79df83a72546e0bffda8e92 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -3,7 +3,7 @@
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lincity-ng";
version = "2.9beta.20170715";
diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix
index f57571b2a2c4a87b506bf98d3c770bbadb3a2826..a3c9599e7b1d5de48d999bfdf9854a052fa237b0 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/pkgs/games/linux-steam-integration/default.nix
@@ -4,7 +4,7 @@
let
version = "0.7.3";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "linux-steam-integration";
inherit version;
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index 8b0808d8e8cce5674706a705ad44afb165388d61..4a37fc8f6767aa97323def9e83df25aaf28c51e2 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "meritous";
version = "1.4";
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 9ddae8b65bf321aa364c7a63faac5f0bb198e926..2fde729e935e1816874ccbd1bf2bb99e829e8f4b 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, jre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "minecraft-server";
version = "1.14.4";
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index aa4a06bc7d2bf36cf72cd87b5aa7ca60f06502f0..c75fbbb1ca9267a7494dd304532a284c805526c1 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix
index c465b413db12f29792b8f315cbe3399614624d91..a0ae03cefb75b5ed979973da587fb7490bbe7992 100644
--- a/pkgs/games/newtonwars/default.nix
+++ b/pkgs/games/newtonwars/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "newtonwars";
version = "20150609";
diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix
index bcbbc9e7756bef2d050848c2f361eee339ef4cda..6f700ad32045f777afa3e3dfe6609736c52f560a 100644
--- a/pkgs/games/njam/default.nix
+++ b/pkgs/games/njam/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "njam-1.25";
src = fetchurl {
diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix
index c70744ea2991c80f0600fdeed7c4a7d11a865efe..6c6bb9f78bab237ae69806441c7d7b72fb53c253 100644
--- a/pkgs/games/odamex/default.nix
+++ b/pkgs/games/odamex/default.nix
@@ -1,6 +1,6 @@
{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "odamex-0.7.0";
src = fetchurl {
url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2;
diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix
index 921ed8a72f33c4a5bf28932d879ac6f055626ce8..618e78553a545e928be930714829fa350cb06c8e 100644
--- a/pkgs/games/onscripter-en/default.nix
+++ b/pkgs/games/onscripter-en/default.nix
@@ -3,7 +3,7 @@
, SDL, SDL_image, SDL_mixer, SDL_ttf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "onscripter-en-20110930";
src = fetchurl {
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index b39519193e772c3ce226a67b37e80189c3bf7acd..141e0151cfbd2a591fe19302288bb395cc29d4e5 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openarena";
version = "0.8.8";
diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index 1da23a98f71f61455cbf062498518ac8936e854a..9109d2667c3f860ea6ccaa27fa187c976f4c664f 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -19,7 +19,7 @@ let
genericName = "Jedi Academy";
categories = "Game;";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "OpenJK";
version = "2019-06-24";
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e7636e8320e79802e8d04b24b7c710133eab9c5e..d546ff8481e437d8fb5dee7dfb4bee932eef7002 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -28,7 +28,7 @@ let
sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name;
src = openrct2-src;
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index fab4de64ee2c6a7c398e4578061cbcc93ace3fa3..f35077c084aae2205329ca178a859129c6c0c1b7 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal
, SDL2, boost, ffmpeg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2017-09-17";
pname = "openrw";
diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index 377dc8652292b5a4c2310f094cb14693e977448f..461d700857754d5af1e86cc6022f784b0a346132 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
index a0169debfef876dd3edc90b50b1114028c76be7b..d7805ad66fb5070ec1636ea180fc3b8d567cecf9 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/pkgs/games/pacvim/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pacvim";
version = "2018-05-16";
src = fetchFromGitHub {
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 6beb68b97abc7429476e8f29e0677d9b689ad45c..dc47e5aa58e8d6fcd94bb07690a05a9bca550b81 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, libGLU_combined}:
let
s = # Generated upstream information
- rec {
+ {
baseName="pingus";
version="0.7.6";
name="pingus-0.7.6";
@@ -11,7 +11,7 @@ let
sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined];
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 9242921817899b47e1b6c83efd9dcf0392bf2ed2..610be7efdce918ebfdf75d6aa5e140ce44f570a3 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -7,7 +7,7 @@
, qttranslations
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qgo";
version = "unstable-2017-12-18";
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 0602aace319ad9e4280e5e6fa20700b844fc5431..c831163be9709a71e34cf3052912939a66d63c82 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -66,7 +66,7 @@ let
};
};
-in rec {
+in {
inherit yquake2;
yquake2-ctf = wrapper {
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 7f0fb6fd06234cf327a0febb2ed0329a92b30f0d..a592455486b2e56f03540bc28f5aa633f62c2ffd 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -2,7 +2,7 @@
, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ioquake3-git";
version = "2019-05-29";
diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix
index d11315cd6dfa0173293391e059838027b5e83c30..1347f88cc2cb2080f351a6f3325c292521b16b03 100644
--- a/pkgs/games/racer/default.nix
+++ b/pkgs/games/racer/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, allegro, libjpeg, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "racer-1.1";
src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix
index 780025f52226fd092a756d3001e5d3deb36e76e6..1ddca346fbb7cd37d54df2075d832bfae029eddf 100644
--- a/pkgs/games/riko4/default.nix
+++ b/pkgs/games/riko4/default.nix
@@ -4,7 +4,7 @@ let
# Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics),
# and this library does not have a proper release version, so let the
# derivation for this stay next to the Riko4 derivation for now.
- sdl-gpu = stdenv.mkDerivation rec {
+ sdl-gpu = stdenv.mkDerivation {
pname = "sdl-gpu";
version = "2018-11-01";
src = fetchFromGitHub {
diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix
index ac6fdee1f6b5988d163eefb085939e4ba8de683d..2813bbf886927b87b15b154fd0dfca4de6f54b83 100644
--- a/pkgs/games/rimshot/default.nix
+++ b/pkgs/games/rimshot/default.nix
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 040902ffd73db34c4c52377a4d70ef79906e9a0c..048a8fdc09b4d71ac8731f160404904d95b36bc6 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "scid";
version = "4.3";
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 58ed85c79fdb7e0b6da34e72961e3db49e4f6fdf..aa96a5a8ae500ade0e511b329cfb323129e4941a 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index e6889731619fb9b28801941819dad60caa4b6a8a..d8ab792bb62ab7a2b6cb95b6a6bc752192829516 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -106,7 +106,7 @@ let
passthru.binaries = binaries;
};
- binaries = stdenv.mkDerivation rec {
+ binaries = stdenv.mkDerivation {
pname = "simutrans";
inherit version;
diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix
index 1334f555bbdebda2bff709b101b74b008d6b5548..e035bc436cc122dae93e75911022af1602056c1e 100644
--- a/pkgs/games/snipes/default.nix
+++ b/pkgs/games/snipes/default.nix
@@ -6,7 +6,7 @@ let
sha256 = "06n8gq18js0bv4svx84ljzhs9zmi81wy0zqcqj3b4g0rsrkr20a7";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "snipes";
version = "20180930";
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index a851b5b8d978043ce69c4f9d1a46c4fc1383d4f8..8e4f5b866bbccc7b87805bfdadca3dc111accf57 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -26,7 +26,7 @@ let
libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ];
bins = [ "bin" "usr/bin" ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "steam-runtime-wrapped";
nativeBuildInputs = [ perl ];
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 1d1912d97a156bd4ecf06523a905a131b9571ae8..0276122655fe0424ac4743c8cae2648b23182650 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -4,7 +4,7 @@ let
traceLog = "/tmp/steam-trace-dependencies.log";
version = "1.0.0.61";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "steam-original";
inherit version;
diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix
index be865d20f2f4ca1fa4684455d22a529dd1f2eb86..a38122702f25b6bb0efd1d1a943433633527d700 100644
--- a/pkgs/games/steam/steamcmd.nix
+++ b/pkgs/games/steam/steamcmd.nix
@@ -2,7 +2,7 @@
, steamRoot ? "~/.local/share/Steam"
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "steamcmd";
version = "20180104"; # According to steamcmd_linux.tar.gz mtime
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index b9cc8a6cd6dde11bb3741a24f170fa8330a98478..2020066ee651c020e5d0b5717fd9ad6c976ace4e 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -57,7 +57,7 @@ let
};
in {
- tappy_chicken = buildDemo rec {
+ tappy_chicken = buildDemo {
name = "ue4demos-tappy_chicken";
src = fetchurl {
urls = urls "tappy_chicken.zip";
@@ -65,7 +65,7 @@ in {
};
};
- swing_ninja = buildDemo rec {
+ swing_ninja = buildDemo {
name = "ue4demos-swing_ninja";
src = fetchurl {
urls = urls "swing_ninja.zip";
@@ -73,7 +73,7 @@ in {
};
};
- card_game = buildDemo rec {
+ card_game = buildDemo {
name = "ue4demos-card_game";
src = fetchurl {
urls = urls "card_game.zip";
@@ -81,7 +81,7 @@ in {
};
};
- vehicle_game = buildDemo rec {
+ vehicle_game = buildDemo {
name = "ue4demos-vehicle_game";
src = fetchurl {
urls = urls "vehicle_game.zip";
@@ -89,7 +89,7 @@ in {
};
};
- shooter_game = buildDemo rec {
+ shooter_game = buildDemo {
name = "ue4demos-shooter_game";
src = fetchurl {
urls = urls "shooter_game.zip";
@@ -97,7 +97,7 @@ in {
};
};
- strategy_game = buildDemo rec {
+ strategy_game = buildDemo {
name = "ue4demos-strategy_game";
src = fetchurl {
urls = urls "strategy_game.zip";
@@ -105,7 +105,7 @@ in {
};
};
- black_jack = buildDemo rec {
+ black_jack = buildDemo {
name = "ue4demos-black_jack";
src = fetchurl {
urls = urls "black_jack.zip";
@@ -113,7 +113,7 @@ in {
};
};
- landscape_mountains = buildDemo rec {
+ landscape_mountains = buildDemo {
name = "ue4demos-landscape_mountains";
src = fetchurl {
urls = urls "landscape_mountains.zip";
@@ -121,7 +121,7 @@ in {
};
};
- matinee_demo = buildDemo rec {
+ matinee_demo = buildDemo {
name = "ue4demos-matinee_demo";
src = fetchurl {
urls = urls "matinee_demo.zip";
@@ -129,7 +129,7 @@ in {
};
};
- elemental_demo = buildDemo rec {
+ elemental_demo = buildDemo {
name = "ue4demos-elemental_demo";
src = fetchurl {
urls = urls "elemental_demo.zip";
@@ -137,7 +137,7 @@ in {
};
};
- effects_cave_demo = buildDemo rec {
+ effects_cave_demo = buildDemo {
name = "ue4demos-effects_cave_demo";
src = fetchurl {
urls = urls "effects_cave_demo.zip";
@@ -145,7 +145,7 @@ in {
};
};
- realistic_rendering = buildDemo rec {
+ realistic_rendering = buildDemo {
name = "ue4demos-realistic_rendering";
src = fetchurl {
urls = urls "realistic_rendering_demo.zip";
@@ -153,7 +153,7 @@ in {
};
};
- reflections_subway = buildDemo rec {
+ reflections_subway = buildDemo {
name = "ue4demos-reflections_subway";
src = fetchurl {
urls = urls "reflections_subway_demo.zip";
@@ -161,7 +161,7 @@ in {
};
};
- scifi_hallway_demo = buildDemo rec {
+ scifi_hallway_demo = buildDemo {
name = "ue4demos-scifi_hallway_demo";
src = fetchurl {
urls = urls "sci-fi_hallway_demo.zip";
@@ -169,7 +169,7 @@ in {
};
};
- mobile_temple_demo = buildDemo rec {
+ mobile_temple_demo = buildDemo {
name = "ue4demos-mobile_temple_demo";
src = fetchurl {
urls = urls "mobile_temple_demo.zip";
@@ -177,7 +177,7 @@ in {
};
};
- stylized_demo = buildDemo rec {
+ stylized_demo = buildDemo {
name = "ue4demos-stylized_demo";
src = fetchurl {
urls = urls "stylized_demo.zip";
@@ -185,7 +185,7 @@ in {
};
};
- blueprint_examples_demo = buildDemo rec {
+ blueprint_examples_demo = buildDemo {
name = "ue4demos-blueprint_examples_demo";
src = fetchurl {
urls = urls "blueprint_examples_demo.zip";
diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix
index 63da46854857f3845990238c6f18570205e3e928..a7ad366aa195c4a5f145c7130dd76144f13bda6f 100644
--- a/pkgs/games/ultimatestunts/default.nix
+++ b/pkgs/games/ultimatestunts/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis,
pkgconfig}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ultimate-stunts-0.7.6.1";
src = fetchurl {
url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz;
diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix
index 0209fd83b1c6861ccfa2352f0de59cf3e3dc1c2c..7d965dee1c70999bb8bae3c27c0e0390cdec9791 100644
--- a/pkgs/games/vapor/default.nix
+++ b/pkgs/games/vapor/default.nix
@@ -22,7 +22,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index a861e3725a2d23eafebe40cf32b96392abeb205f..c3896f6cf71eb67438c17c6a1c66868e7599993e 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -4,7 +4,7 @@
, gettext, intltool, libtool, perl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "warmux";
version = "unstable-2017-10-20";
diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix
index dd59ebbedd9467a458ac903589ab9e7c3b8e57a6..afac2de9fcec75cf9f1edeeac94f6db92c3ef38d 100644
--- a/pkgs/games/xjump/default.nix
+++ b/pkgs/games/xjump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xjump";
version = "2.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index da2f256aeb7189504eed1282805689802d3f6f7b..c14eda2968e02c136028adc90abcefb3ca5ab66c 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
, mysql, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "zod-engine-2011-03-18";
src = fetchurl {
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 01c35d99ae7e76a29e6f02bc05c04846b399c23b..5ff131dad9ddb6b29620143faf50aa3eb359c7f6 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -8,7 +8,7 @@ let
, extraMeta ? {}
, version ? "2.1"
, ... } @ args:
- stdenv.mkDerivation (rec {
+ stdenv.mkDerivation ({
name = "arm-trusted-firmware-${platform}-${version}";
inherit version;
@@ -53,7 +53,7 @@ let
} // extraMeta;
} // builtins.removeAttrs args [ "extraMeta" ]);
-in rec {
+in {
inherit buildArmTrustedFirmware;
armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index e7b4f81f7e04460adc816339478f1e0f0a5b0e73..735ea6232471749d46f4e37cb85ebf267c9f96bd 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 9c5ef1d0283629c2efb27284fc6b0b2955ca8876..b6219e1c749efebd668627fd940cee34d1168820 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -13,7 +13,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "canon-cups-ufr2-2.90";
src = src_canon;
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index abd50850b18277ce38e6ed673eb8e2314927e694..13e3013267bfa2406871bea928738773b9950c23 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool
, withDebug ? false }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cnijfilter2";
version = "5.30";
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 15e3a1d97a904e7e6ba3dfb473c8b273682e450f..a09311a8292d7ec55321d39c2e0c3bb42f9c6ec8 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -6,7 +6,7 @@
/* this derivation is basically just a transcription of the rpm .spec
file included in the tarball */
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cnijfilter";
/* important note about versions: cnijfilter packages seem to use
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index ba8cffc0e654281cc6928ce21aae8450e28b46aa..8866b425ca8f594f95017154492a3af126207a0b 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -11,7 +11,7 @@ let arch =
else if stdenv.hostPlatform.system == "i686-linux" then "32"
else throw "Unsupported system ${stdenv.hostPlatform.system}";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "cnijfilter";
/* important note about versions: cnijfilter packages seem to use
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index a2fdd1abc1921431f574ce0efdd21c0b8c84c11b..ad8b0089a871021a6a983f36cea268b52bcd41e2 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cups-toshiba-estudio";
version = "7.89";
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index 21a276f9d14265b5c1d97b3d1dea2a861819ebe5..cd4c049e67f7942b1e5116e669a51f089ba3e5f0 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -9,7 +9,7 @@ let
libPath = lib.makeLibraryPath [ cups ];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cups-kyocera";
version = "1.1203";
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix
index b70b5daa7662bcc6a69864ca0676dc81f1c200c6..87a023af1ca76de0f3871cfebecbf13e345c6b3b 100644
--- a/pkgs/misc/cups/drivers/zj-58/default.nix
+++ b/pkgs/misc/cups/drivers/zj-58/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, cups}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cups-zj-58";
version = "2018-02-22";
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index a232552712d622d641aaab2e60621ef16c5bc8e5..bdc8b3a75df82904cc1afa54185e88f784140ecb 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -243,7 +243,7 @@ stdenv.mkDerivation rec {
];
patchFlags = "-p0";
- configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"];
+ configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"];
postConfigure = ''
echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index c65c13e886ffd2bab292a8e37b6cf8900eacf494..3d6fb8f081ab68129bcdc68bc69f5abfe0b15158 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cups }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "epson-escpr";
version = "1.6.16";
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index ebea49d9540a9bea49f33da5fdcd7dc68897c3e3..779325c99b0b0443e80891ef65f2d18b1683d222 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -28,14 +28,14 @@ let
};
hplipPlatforms = {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
- "aarch64-linux" = "arm64";
+ i686-linux = "x86_32";
+ x86_64-linux = "x86_64";
+ armv6l-linux = "arm32";
+ armv7l-linux = "arm32";
+ aarch64-linux = "arm64";
};
- hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
+ hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ];
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix
index 68220392fd001d315cccbf7a39fd76e1ed36e0cb..d95eb85168e2043b3f95d59c6bd1ecae5689d000 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -30,14 +30,14 @@ let
};
hplipPlatforms = {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
- "aarch64-linux" = "arm64";
+ i686-linux = "x86_32";
+ x86_64-linux = "x86_64";
+ armv6l-linux = "arm32";
+ armv7l-linux = "arm32";
+ aarch64-linux = "arm64";
};
- hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
+ hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ];
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 851aa9f3f8824f513114f198dbe7cb4d73328e3f..978fd9b9e0390abb9371eb8cd8dab30655d1c221 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -30,13 +30,13 @@ let
};
hplipPlatforms = {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
+ i686-linux = "x86_32";
+ x86_64-linux = "x86_64";
+ armv6l-linux = "arm32";
+ armv7l-linux = "arm32";
};
- hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
+ hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" ];
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index fb6b4956ef1725d0bf438b2d30f738126bde30f6..2dd32a93219d34bd17ff744506d2fec903e20006 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, udev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "moltengamepad-git";
version = "2016-05-04";
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index 366535b51c65a2f620d744b56111218cd1636c6b..4b19932450eca497cb98d72416f6f55d141f1ea1 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -4,7 +4,7 @@
with python3Packages;
-buildPythonApplication rec {
+buildPythonApplication {
pname = "steamcontroller";
version = "2017-08-11";
diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
index 88e8556ec6c3f154b71377c16de751d048113ec1..39a7e38e034669643369da13863ebc3df749a8e2 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -2,7 +2,7 @@
let
vasm =
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "vasm";
version = "1.8c";
src = fetchFromGitHub {
@@ -18,7 +18,7 @@ let
'';
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "blastem";
version = "0.5.1";
src = fetchurl {
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index efa1a881f4ab864a48c827ee02f2f921645d1cc9..d8717b46eef489020ead55cf90520c44e6b907fa 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "citra";
version = "2019-05-25";
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 7312ad41ada50c860c5aa201b109ded91068131c..d8f5f1cbdb03f34a0486f8704c43f18af0b07d26 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "emulationstation";
version = "2.0.1a";
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index c2494d702708cb447a4439a2dab2b2b7aa8b146e..da6a7c8bf2f304cfd37a098f1b2b568414832632 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -3,7 +3,7 @@
let
libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "kega-fusion";
version = "3.63x";
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index 8a95d6f28837e855ac244c0ec5ea009d754b3af4..6ac6f93750e54fcce87fe6923277c1ff5554beab 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -6,7 +6,7 @@
, freetype, tcl, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openmsx";
version = "git-2017-11-02";
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 3f20390fba73becdbe71e8852f2fefb9d12ae358..fbde2ff54c9e1acfec25eca14581f427b6ef710c 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -67,7 +67,7 @@ in with stdenv.lib.licenses;
buildPhase = "make";
};
- beetle-pce-fast = let der = (mkLibRetroCore rec {
+ beetle-pce-fast = let der = (mkLibRetroCore {
core = "mednafen-pce-fast";
src = fetchRetro {
repo = "beetle-pce-fast-libretro";
@@ -81,7 +81,7 @@ in with stdenv.lib.licenses;
name = "beetle-pce-fast-${der.version}";
};
- beetle-psx = let der = (mkLibRetroCore rec {
+ beetle-psx = let der = (mkLibRetroCore {
core = "mednafen-psx";
src = fetchRetro {
repo = "beetle-psx-libretro";
@@ -95,7 +95,7 @@ in with stdenv.lib.licenses;
name = "beetle-psx-${der.version}";
};
- beetle-saturn = let der = (mkLibRetroCore rec {
+ beetle-saturn = let der = (mkLibRetroCore {
core = "mednafen-saturn";
src = fetchRetro {
repo = "beetle-saturn-libretro";
@@ -110,7 +110,7 @@ in with stdenv.lib.licenses;
meta.platforms = [ "x86_64-linux" ];
};
- bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec {
+ bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore {
core = bname + "-accuracy";
src = fetchRetro {
repo = bname;
@@ -204,7 +204,7 @@ in with stdenv.lib.licenses;
license = gpl2;
};
- genesis-plus-gx = mkLibRetroCore rec {
+ genesis-plus-gx = mkLibRetroCore {
core = "genesis-plus-gx";
src = fetchRetro {
repo = "Genesis-Plus-GX";
@@ -215,7 +215,7 @@ in with stdenv.lib.licenses;
license = "Non-commercial";
};
- higan-sfc = (mkLibRetroCore rec {
+ higan-sfc = (mkLibRetroCore {
core = "higan-sfc";
src = fetchFromGitLab {
owner = "higan";
@@ -346,7 +346,7 @@ in with stdenv.lib.licenses;
buildPhase = "make";
};
- quicknes = (mkLibRetroCore rec {
+ quicknes = (mkLibRetroCore {
core = "quicknes";
src = fetchRetro {
repo = "QuickNES_Core";
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index 8bdc79f2d8ec9fa100d02e1955fe7548319dda9a..d751c4f7fc43c23ac1eee620b3ccb3a447d7607d 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -17,7 +17,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "kodi-retroarch-advanced-launchers";
version = "0.2";
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index 25af4f8d50a706f6d985408627f1008019b5030b..44571de3489d889b75c022d95fae011b1d6544c5 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -2,7 +2,7 @@
, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "retrofe";
version = "0.6.169";
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index ae1b1bf6bda24cfd1d919d04a406d31574fb9733..674222dc35559dc2a9b246ba3148ca8ff52c14c0 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -9,7 +9,7 @@ let
majorVersion = "0.0.6";
gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rpcs3";
version = "${majorVersion}-${gitVersion}";
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index 0f2abedd3b534e44c9266dce0fae162c711f0ef6..e866a1937d69d340132e40a7491b583809e6db31 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -64,7 +64,7 @@ assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"
assert length renderers == 0 -> throw "at least one renderer must be enabled";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gnash";
version = "0.8.11-2019-30-01";
diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index f3d5450c94baa9dca5d51e53ab74bcbe77062be3..4597fa40390de41c5e197df24713f97b9ff4792d 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchgit, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.0.4";
src = fetchgit {
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix
index 06a6a7e655057e6b63c4213408677e6bd75057fd..ec0dd0b1fd52db315cce8157eaadddcf957de680 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/pkgs/misc/mnemonicode/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mnemonicode";
version = "2015-11-30";
src = fetchFromGitHub {
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index 0b840448f2c0814123e7cb4f517826214ca8ec4f..e3d3b109d1a9da8d6d3b9c606b62e942a84abd20 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkgconfig
+ wrapGAppsHook
];
buildInputs = [
@@ -45,7 +46,6 @@ stdenv.mkDerivation rec {
libXext
libXxf86vm
systemd
- wrapGAppsHook
];
mesonFlags = [
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 5cfddaaea571c550ba5860277a90445afd953bba..f69b0794ce3a0e917dca1ba99a45e7c54a0042fb 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pam, systemd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "11-dev";
pname = "physlock";
src = fetchFromGitHub {
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index f61c9f5e1b9bea6de9de2c420ff19586082c9863..1072bac7816a89d4ab44856fce0539aa02d755af 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit
, SDL2, wxGTK }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sound-of-sorting";
version = "unstable-2015-07-21";
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
index b5dc7a13f1838220d00283bf43224782169b18dc..d0d3fbdf2d73f5ff2385c9809cf6553adfe835f6 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/pkgs/misc/stabber/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stabber-unstable";
version = "2016-11-09";
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
index 054cd1aeffc3c56f18485489caac426072f67958..decdbdfac2dcfe3db3620dec44575beab2781463 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/pkgs/misc/themes/arc-kde/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "arc-kde-theme";
version = "2017-11-09";
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
index dfa788f6ea7bcea4257e453637ecb87996450bf8..72e87e2e27401233a7bef017542e11f22dabfeec 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2017-04-24";
pname = "numix-sx-gtk-theme";
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 2f7a53dc2d431f37f980ffdf730b9f0bdb47ff20..e7235a900cf9d29500e6827df96e7ccdc8155b93 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2016-08-16";
pname = "paper-gtk-theme";
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
index 3d9403b84f462d8fe6ae6388fddb386d46096d58..96843e8d78b465979cf4845bb4af06c54dbadff5 100644
--- a/pkgs/misc/themes/solarc/default.nix
+++ b/pkgs/misc/themes/solarc/default.nix
@@ -2,7 +2,7 @@
gtk-engine-murrine, gtk3
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "solarc-gtk-theme";
version = "1.0.2";
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 6fe1a2081d22668a1264564efb426ed4bf0f18a4..6f1c8af390c87d151593c62a62cf8ba7232b485e 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -13,7 +13,7 @@ let
, extraMakeFlags ? []
, extraMeta ? {}
, ... } @ args:
- stdenv.mkDerivation (rec {
+ stdenv.mkDerivation ({
pname = "uboot-${defconfig}";
inherit version;
@@ -86,10 +86,10 @@ let
} // extraMeta;
} // removeAttrs args [ "extraMeta" ]);
-in rec {
+in {
inherit buildUBoot;
- ubootTools = buildUBoot rec {
+ ubootTools = buildUBoot {
defconfig = "allnoconfig";
installDir = "$out/bin";
hardeningDisable = [];
@@ -108,45 +108,45 @@ in rec {
];
};
- ubootA20OlinuxinoLime = buildUBoot rec {
+ ubootA20OlinuxinoLime = buildUBoot {
defconfig = "A20-OLinuXino-Lime_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootBananaPi = buildUBoot rec {
+ ubootBananaPi = buildUBoot {
defconfig = "Bananapi_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootBananaPim64 = buildUBoot rec {
+ ubootBananaPim64 = buildUBoot {
defconfig = "bananapi_m64_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootBeagleboneBlack = buildUBoot rec {
+ ubootBeagleboneBlack = buildUBoot {
defconfig = "am335x_boneblack_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["MLO" "u-boot.img"];
};
# http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
- ubootClearfog = buildUBoot rec {
+ ubootClearfog = buildUBoot {
defconfig = "clearfog_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-spl.kwb"];
};
- ubootGuruplug = buildUBoot rec {
+ ubootGuruplug = buildUBoot {
defconfig = "guruplug_defconfig";
extraMeta.platforms = ["armv5tel-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootJetsonTK1 = buildUBoot rec {
+ ubootJetsonTK1 = buildUBoot {
defconfig = "jetson-tk1_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
@@ -157,114 +157,114 @@ in rec {
'';
};
- ubootNovena = buildUBoot rec {
+ ubootNovena = buildUBoot {
defconfig = "novena_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin" "SPL"];
};
- ubootOdroidXU3 = buildUBoot rec {
+ ubootOdroidXU3 = buildUBoot {
defconfig = "odroid-xu3_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-dtb.bin"];
};
- ubootOrangePiPc = buildUBoot rec {
+ ubootOrangePiPc = buildUBoot {
defconfig = "orangepi_pc_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootOrangePiZeroPlus2H5 = buildUBoot rec {
+ ubootOrangePiZeroPlus2H5 = buildUBoot {
defconfig = "orangepi_zero_plus2_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPcduino3Nano = buildUBoot rec {
+ ubootPcduino3Nano = buildUBoot {
defconfig = "Linksprite_pcDuino3_Nano_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPine64 = buildUBoot rec {
+ ubootPine64 = buildUBoot {
defconfig = "pine64_plus_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPine64LTS = buildUBoot rec {
+ ubootPine64LTS = buildUBoot {
defconfig = "pine64-lts_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPinebook = buildUBoot rec {
+ ubootPinebook = buildUBoot {
defconfig = "pinebook_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootQemuAarch64 = buildUBoot rec {
+ ubootQemuAarch64 = buildUBoot {
defconfig = "qemu_arm64_defconfig";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootQemuArm = buildUBoot rec {
+ ubootQemuArm = buildUBoot {
defconfig = "qemu_arm_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi = buildUBoot rec {
+ ubootRaspberryPi = buildUBoot {
defconfig = "rpi_defconfig";
extraMeta.platforms = ["armv6l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi2 = buildUBoot rec {
+ ubootRaspberryPi2 = buildUBoot {
defconfig = "rpi_2_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi3_32bit = buildUBoot rec {
+ ubootRaspberryPi3_32bit = buildUBoot {
defconfig = "rpi_3_32b_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi3_64bit = buildUBoot rec {
+ ubootRaspberryPi3_64bit = buildUBoot {
defconfig = "rpi_3_defconfig";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPiZero = buildUBoot rec {
+ ubootRaspberryPiZero = buildUBoot {
defconfig = "rpi_0_w_defconfig";
extraMeta.platforms = ["armv6l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootSheevaplug = buildUBoot rec {
+ ubootSheevaplug = buildUBoot {
defconfig = "sheevaplug_defconfig";
extraMeta.platforms = ["armv5tel-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootSopine = buildUBoot rec {
+ ubootSopine = buildUBoot {
defconfig = "sopine_baseboard_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootUtilite = buildUBoot rec {
+ ubootUtilite = buildUBoot {
defconfig = "cm_fx6_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-with-nand-spl.imx"];
@@ -276,7 +276,7 @@ in rec {
# sf probe; sf update $loadaddr 0 80000
};
- ubootWandboard = buildUBoot rec {
+ ubootWandboard = buildUBoot {
defconfig = "wandboard_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.img" "SPL"];
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
index e49b4b519f1c74cd725ca7971a462644498bffd1..9dd43f5fe7e007c5f365f2232314b7d89d4af06d 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/pkgs/misc/uboot/rock64.nix
@@ -5,7 +5,7 @@
rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
};
-in buildUBoot rec {
+in buildUBoot {
version = "2017.09";
src = fetchFromGitHub {
diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix
index 45f6d5de2a9ae388c35e4d71bdc98b81d4651021..436e1bcdf878a36dbe00d31f79619822f86f226a 100644
--- a/pkgs/misc/uboot/rockpro64.nix
+++ b/pkgs/misc/uboot/rockpro64.nix
@@ -5,7 +5,7 @@
rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
};
-in buildUBoot rec {
+in buildUBoot {
version = "2017.09";
src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 44bc7ec3ced1dab44598630ca5f635b233522eca..c7b618323fc1e2314ca272989bb110a84e0ba242 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -264,7 +264,7 @@ let
${lib.concatMapStrings (plugin: ''
let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}"
'') plugins}
- let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}"
+ let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}"
let g:vim_addon_manager = {}
@@ -316,7 +316,7 @@ let
++ (builtins.map (link packageName "opt") opt)
);
packDir = (packages:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
name = "vim-pack-dir";
src = ./.;
installPhase = lib.concatStringsSep
@@ -513,7 +513,7 @@ rec {
name = "vim_with_custom_plugin";
vimrcConfig.vam.knownPlugins =
vimPlugins // ({
- "vim-trailing-whitespace" = buildVimPluginFrom2Nix {
+ vim-trailing-whitespace = buildVimPluginFrom2Nix {
name = "vim-trailing-whitespace";
src = fetchFromGitHub {
owner = "bronson";
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index c4742253120676988cf42966fae1a2aede778a37..e1b928b137317220240a4d99a8bd2d5ff4e2ee85 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -10,7 +10,7 @@ in
# So an extension's attribute name should be of the form:
# "${mktplcRef.publisher}.${mktplcRef.name}".
#
-rec {
+{
alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
mktplcRef = {
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 423f39f9bbccc026c3cf835bc9ab35387a834c4f..f4ebea8e438313bfd12cd23d908380872105dc72 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -23,9 +23,9 @@ let
else throw "Only x86_64 Linux and Darwin are supported.";
languageServerSha256 = {
- "linux-x64" = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
- "osx-x64" = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
- }."${arch}";
+ linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
+ osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
+ }.${arch};
# version is languageServerVersion in the package.json
languageServer = extractNuGet rec {
diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix
index a75c132b55a2db50489af6e6dbd0492106948473..ee7158e2a8c531dd0a9c08ace4811ed8a54bba06 100644
--- a/pkgs/os-specific/bsd/default.nix
+++ b/pkgs/os-specific/bsd/default.nix
@@ -1,5 +1,5 @@
{ callPackages, recurseIntoAttrs }:
-rec {
+{
netbsd = recurseIntoAttrs (callPackages ./netbsd {});
}
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 93b6f4a6209747f7f59fa410b116ab172c6854f1..7370901f3193f4e1bec866f10dcf2d245db9affa 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -38,14 +38,14 @@ let
HOST_SH = "${buildPackages.bash}/bin/sh";
MACHINE_ARCH = {
- "i686" = "i386";
+ i686 = "i386";
}.${stdenv'.hostPlatform.parsed.cpu.name}
or stdenv'.hostPlatform.parsed.cpu.name;
MACHINE = {
- "x86_64" = "amd64";
- "aarch64" = "evbarm64";
- "i686" = "i386";
+ x86_64 = "amd64";
+ aarch64 = "evbarm64";
+ i686 = "i386";
}.${stdenv'.hostPlatform.parsed.cpu.name}
or stdenv'.hostPlatform.parsed.cpu.name;
@@ -79,7 +79,7 @@ let
##
## START BOOTSTRAPPING
##
- makeMinimal = mkDerivation rec {
+ makeMinimal = mkDerivation {
path = "tools/make";
sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1";
version = "8.0";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
index 7002f82fe5615659d85d16c2092a25961e050424..a7b2bd7d981d700edb7da6216678b0fff4e6f906 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, developer_cmds }:
-appleDerivation rec {
+appleDerivation {
buildInputs = [ developer_cmds ];
installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 7b19194be96ec5fe6d69635ce3367005c7d37c5d..99d6700280326f6642966b8b3ea2c7c8089b2550 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -3,7 +3,7 @@
, copyfile, removefile, libresolv, Libnotify, libplatform, libpthread
, mDNSResponder, launchd, libutil, hfs, darling }:
-appleDerivation rec {
+appleDerivation {
dontBuild = true;
dontFixup = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index 4a0180dda7aee502e3f38b9bdf2b15d6d5a23f42..eadf18e028ee4f620a2fcbc6d7f2771387fd7fae 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
# These PBXcp calls should be patched in xcbuild to allow them to
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index b2d8522f3264427bb33947d9689ffcd9f376f412..21971ea2e284d33fcc0157edef64054f447f41bf 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
patchPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index f0394a20c2cc95d4cf5653ec43ddd3cefac52056..5de84d2a6e5dafc760236c633dcbe2787bf915bd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ zlib bzip2 lzma ncurses libutil ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 9ca0f3b4e56dcd56d658e6e85e7bdafe732ccd64..82be7dc860eca6e8bab41f6509601e30d39e1163 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,7 +1,7 @@
{ stdenv, appleDerivation, xcbuildHook
, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index 5b2322915dc974fc14bb3b7c9de2caa8796b6a81..b87dadd391d2ed589014ee87766ae91045c9ca25 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
patchPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 39c903a2e7b99cd47111db4d07afcca33bfcb035..03556296ca1d1e517bc50aa6dc8ff6cdd6c430c7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -1,7 +1,7 @@
{ stdenv, appleDerivation, lib
, Librpcsvc, apple_sdk, pam, CF, openbsm }:
-appleDerivation rec {
+appleDerivation {
# xcbuild fails with:
# /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build
# see issue facebook/xcbuild#188
diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix
index cb81c2e81495a168aac69e646307c8092c1270fb..02821fe61ef9854ba3693ba89efe6d1f7aa3d910 100644
--- a/pkgs/os-specific/darwin/lsusb/default.nix
+++ b/pkgs/os-specific/darwin/lsusb/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.0";
pname = "lsusb";
diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix
index 77e63c779b9c3880180a668c8ba7e44c70ccd92b..e1a00c71cb856995a3454e2ccde53027924a10c8 100644
--- a/pkgs/os-specific/darwin/osxfuse/default.nix
+++ b/pkgs/os-specific/darwin/osxfuse/default.nix
@@ -16,7 +16,7 @@ let
'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "osxfuse";
inherit version;
diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix
index 19ab34145e80e80fc48231852656fd61d666ac08..21b0d605021d185c20e70fb9dce87c66028e5258 100644
--- a/pkgs/os-specific/darwin/qes/default.nix
+++ b/pkgs/os-specific/darwin/qes/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, Carbon }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qes";
version = "0.0.2";
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index bb9dc0a03b5fd3fde39ac35f857d39f6ed1c886a..d25edff49560f59d65cca475972baed0f47f563c 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -14,9 +14,9 @@ let
minSdkVersion = "9.0";
iosPlatformArch = { parsed, ... }: {
- "armv7a" = "armv7";
- "aarch64" = "arm64";
- "x86_64" = "x86_64";
+ armv7a = "armv7";
+ aarch64 = "arm64";
+ x86_64 = "x86_64";
}.${parsed.cpu.name};
in
diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix
index 2f5c392c1730268bc55c6c2c45ebfba41ce8c8d0..fee8d1e7a4201b652d58e01c9ad6d483e52c0609 100644
--- a/pkgs/os-specific/linux/anbox/kmod.nix
+++ b/pkgs/os-specific/linux/anbox/kmod.nix
@@ -1,6 +1,6 @@
{ stdenv, kernel, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "anbox-modules";
version = "2019-07-13-" + kernel.version;
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index d7d25e696642d2dbca1ac55dbf981e0405010436..456872cdbd489bbb3c9644be81f007b94d5d8b2f 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -2,7 +2,7 @@
let base = "batman-adv-2019.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${base}-${kernel.version}";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index 205d788da6e563249df17c2f2a9503a6fe7dbb96..7ce2fea692453e40a77c214e99934917913e70b9 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -26,7 +26,7 @@ let
"upgrade/beegfs_mirror_md/build"
];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "beegfs";
inherit version;
diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix
index ac444c28d75dd59cfa9d8e5de3b59dcef17b307a..c54e3e38e9b5f48e833bf3e80b5041f67d32371a 100644
--- a/pkgs/os-specific/linux/bpftool/default.nix
+++ b/pkgs/os-specific/linux/bpftool/default.nix
@@ -3,7 +3,7 @@
, linuxPackages_latest
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bpftool";
inherit (linuxPackages_latest.kernel) version src;
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix
index 0149398bfa3e712b5d4b79615b245d5e6989de6a..7f16ecb9e6d458ab1173a4c3c5e72c8d95ead5e5 100644
--- a/pkgs/os-specific/linux/can-isotp/default.nix
+++ b/pkgs/os-specific/linux/can-isotp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, kernel, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "can-isotp";
version = "20180629";
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 7913c703b5bcf344c187b91bd272e650739e5363..6e26ef4bbce87dc589582b5212e6b700af9e1051 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "can-utils";
# There are no releases (source archives or git tags), so use the date of the
# latest commit in git master as version number.
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index b724112af8863ee1c074ec88d1c816ff0d05f6e1..fc2faa5b8f571a5df29d8f94b41680f8d71d6305 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "checkpolicy";
- version = "2.7";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
- sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl";
+ sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9";
};
nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix
index cd1400b41fc27554be023642a3baa4d56a4a5ea4..77fa7fe3b1b6e8da68a7f3a4619255c3b8d468ca 100644
--- a/pkgs/os-specific/linux/devmem2/default.nix
+++ b/pkgs/os-specific/linux/devmem2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "devmem2-2004-08-05";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index 5896262ac217d9cdd429240d3d1c911c017567f1..a880f699b699771e39a396c49508d61660e0d055 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "directvnc";
version = "0.7.7.2015-04-16";
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 63b766b21a5c05925d44a30d89ed3b61a8e967e9..25d0eb1fd029f6008558c35c71bb8d9b217b02c9 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "dstat-${version}";
+ pname = "dstat";
format = "other";
version = "0.7.3";
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index defb45d7a861267998b2f04263423d7084732019..c8fc633f8bd3e3d4776cccfa993caca13808ffac 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -1,7 +1,7 @@
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
let
s = # Generated upstream information
- rec {
+ {
baseName="fbterm";
version="1.7.0";
name="fbterm-1.7.0";
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index 26ed20206359e69d55859621997b0407a4ec182f..e9ee91a2de7bbeba8da6f46bbe661cdf51ef7e3a 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2018-08-20";
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 321ce8ffc06d0c4124566ef10d038d1555ff3c77..1ea2b5e4e3d40072ea99f981abff79d179ff63f2 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "raspberrypi-tools";
version = "2018-10-03";
diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix
index 0abd458aa8f3d988eb2a2645a44f3f667347225f..bf3d2ef8d6dbd5ad320a8258de47bc4059226610 100644
--- a/pkgs/os-specific/linux/flashbench/default.nix
+++ b/pkgs/os-specific/linux/flashbench/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "flashbench";
version = "2012-06-06";
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index 09774016ef266abe00a57735ec367216b6310b8f..a6c5a6593d1c8bff1b003e3936c619fcacf51516 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -1,6 +1,6 @@
{ stdenv, kernel }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (kernel) version src;
pname = "freefall";
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix
index 0325461763a26bcd4e4a3eb16607e1acf0164117..ea1051c5f05806024e0f5a2e624a6598a9220700 100644
--- a/pkgs/os-specific/linux/gpu-switch/default.nix
+++ b/pkgs/os-specific/linux/gpu-switch/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gpu-switch-unstable";
version = "2017-04-28";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix
index 53924a782df79371bcc02cd59216f84feed4deae..893eb4fdd999a0ea4a6c7afae42626cc01859cd8 100644
--- a/pkgs/os-specific/linux/hdapsd/default.nix
+++ b/pkgs/os-specific/linux/hdapsd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
let version = "20141203"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "hdapsd-"+version;
src = fetchurl {
diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix
index d2319fdcf5c7cd040ef8909f659b4f0784e6b785..3d759001d01c6a9b183fae4530c268d26d1587be 100644
--- a/pkgs/os-specific/linux/hibernate/default.nix
+++ b/pkgs/os-specific/linux/hibernate/default.nix
@@ -2,7 +2,7 @@
let version = "2.0";
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "hibernate";
inherit version;
src = fetchurl {
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index 36ca1eb16b49d9a790bdf6970f53d04eff79cbe3..a209f1ab4bb95319459d833626cf513ea79b3a6f 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, python, kernel, makeWrapper, writeText }:
let
- daemons = stdenv.mkDerivation rec {
+ daemons = stdenv.mkDerivation {
pname = "hyperv-daemons-bin";
inherit (kernel) src version;
@@ -54,7 +54,7 @@ let
WantedBy=hyperv-daemons.target
'';
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "hyperv-daemons";
inherit (kernel) version;
diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix
index e6e8981189445e9b11894518250f0200fc73bb52..b3d5fe1b63cc5df55fa6c3d9f84bd1165364470b 100644
--- a/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/pkgs/os-specific/linux/kbd/keymaps.nix
@@ -18,7 +18,7 @@
'';
};
- neo = stdenv.mkDerivation rec {
+ neo = stdenv.mkDerivation {
pname = "neo";
version = "2476";
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 1e9b1c276d0cd15bd80c9b12a0d4290347b151c1..1699324546d1489d5742656393ffa95b78b01c6b 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -7,7 +7,8 @@ let
makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation {
inherit src;
- name = "linux-headers-${version}";
+ pname = "linux-headers";
+ inherit version;
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b392dc853d35effe7b40847acdd1603235c5730e..42230fe31ecdfc9ff395c917aa909e6291bf46fb 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -123,6 +123,7 @@ let
IPV6_FOU_TUNNEL = whenAtLeast "4.7" module;
NET_CLS_BPF = whenAtLeast "4.4" module;
NET_ACT_BPF = whenAtLeast "4.4" module;
+ NET_SCHED = yes;
L2TP_V3 = yes;
L2TP_IP = module;
L2TP_ETH = module;
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 5eb050cbdff9c05fe3628b89b24b31612c29f83e..e4a4e40f370c5515ebec771380d394730b10307e 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -4,8 +4,8 @@
# Update this if linux_latest-libre fails to build.
# $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
- rev = "16330";
- sha256 = "1d7rsq2m6lp1784cgdg95aspgrnzxm6q9dxqalxja5cac8n6p11y";
+ rev = "16604";
+ sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
}
, ...
}:
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d2e1a35cb2e697cb19810aa5d912cbf48714e93b..1b4700a2e3923f8dc5ec55b5220534ac4e54f326 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -4,7 +4,7 @@ let
modDirVersion = "4.14.98";
tag = "1.20190215";
in
-lib.overrideDerivation (buildLinux (args // rec {
+lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
inherit modDirVersion;
@@ -16,9 +16,9 @@ lib.overrideDerivation (buildLinux (args // rec {
};
defconfig = {
- "armv6l-linux" = "bcmrpi_defconfig";
- "armv7l-linux" = "bcm2709_defconfig";
- "aarch64-linux" = "bcmrpi3_defconfig";
+ armv6l-linux = "bcmrpi_defconfig";
+ armv7l-linux = "bcm2709_defconfig";
+ aarch64-linux = "bcmrpi3_defconfig";
}.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'");
features = {
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 4516af19a4e77e4ce15dfd69aa894399fa616b4a..0b2ed76a4b4b42d7a821b6db9cf2e5dd72331b1f 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
-buildLinux (args // rec {
+buildLinux (args // {
version = "5.1.2019.08.21";
modDirVersion = "5.1.0";
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index edca017b3c7062e1c228f08111b6d4a802ef9bd4..b80320db282e907f135d7f898743d5995cddae40 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,6 +1,6 @@
{ fetchpatch }:
-rec {
+{
bridge_stp_helper =
{ name = "bridge-stp-helper";
patch = ./bridge-stp-helper.patch;
@@ -23,7 +23,7 @@ rec {
cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
- tag_hardened = rec {
+ tag_hardened = {
name = "tag-hardened";
patch = ./tag-hardened.patch;
};
@@ -58,7 +58,7 @@ rec {
};
};
- export_kernel_fpu_functions = rec {
+ export_kernel_fpu_functions = {
name = "export_kernel_fpu_functions";
patch = ./export_kernel_fpu_functions.patch;
};
diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index f738b9f6da5fec6eee40e92d63bdbe01a062eedc..12463c736a6296fff6abee0ad0aa58bf25263094 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kmscube-2018-06-17";
src = fetchgit {
diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix
index 28027fd4510a510c3ac1e9dfc7c705e333baf0be..96c60f6ea56e068a851b12c5a40046b205e11112 100644
--- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ledger-udev-rules";
version = "unstable-2019-02-13";
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 028c008eccf6ae2fd4e3bbda31b812dc921108b4..d8a2298f3d3f9a74f3fd0b9fc4457f3a1bd47890 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -9,14 +9,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libselinux";
- version = "2.7";
+ version = "2.9";
inherit (libsepol) se_release se_url;
- outputs = [ "bin" "out" "dev" "man" "py" ];
+ outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py";
src = fetchurl {
url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
- sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh";
+ sha256 = "14r69mgmz7najf9wbizvp68q56mqx4yjbkxjlbcqg5a47s3wik0v";
};
nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ];
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
"MAN3DIR=$(man)/share/man/man3"
"MAN5DIR=$(man)/share/man/man5"
"MAN8DIR=$(man)/share/man/man8"
- "PYSITEDIR=$(py)/${python.sitePackages}"
+ "PYTHON=python"
+ "PYTHONLIBDIR=$(py)/${python.sitePackages}"
"SBINDIR=$(bin)/sbin"
"SHLIBDIR=$(out)/lib"
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 4fe323ee23de1dfdcd005e4ed98d26b9aef704db..70b2508451bb3752c4c257018e068ad2dca55fc0 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -6,25 +6,29 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libsemanage";
- version = "2.7";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
- sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87";
- };
+ sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5";
+ };
+
+ outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
nativeBuildInputs = [ bison flex pkgconfig ];
buildInputs = [ libsepol libselinux bzip2 audit ]
++ optionals enablePython [ swig python ];
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
- makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
- makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "INCLUDEDIR=$(dev)/include"
+ "MAN3DIR=$(man)/share/man/man3"
+ "MAN5DIR=$(man)/share/man/man5"
+ "PYTHON=python"
+ "PYTHONLIBDIR=$(py)/${python.sitePackages}"
+ "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf"
+ ];
installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index e96ea01cce421f3d4d2e4ea08fa6461fa6dab42b..03bd0252c5ca84235fa77d6def4cb56ef3ddca16 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "libsepol";
- version = "2.7";
- se_release = "20170804";
- se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+ version = "2.9";
+ se_release = "20190315";
+ se_url = "https://github.com/SELinuxProject/selinux/releases/download";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
- sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn";
+ sha256 = "0p8x7w73jn1nysx1d7416wqrhbi0r6isrjxib7jf68fi72q14jx3";
};
nativeBuildInputs = [ flex ];
diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
index 9aa1698b766509129dfbe1597cb6e0e301a01053..369f412fbfc5211f463a4917b0919c2dd46d79ec 100644
--- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
@@ -3,7 +3,7 @@
# ltunifi and solaar both provide udev rules but solaar's rules are more
# up-to-date so we simply use that instead of having to maintain our own rules
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "logitech-udev-rules";
inherit (solaar) version;
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix
index b2d1ca4791a688e31bb0f7d9a43d01b56bbe8f91..63155e66678afc8c625cd0a5772f60e13a70f4c0 100644
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -12,7 +12,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lsiutils";
inherit version;
diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix
index 0a6fc3c977c89ede1cde2ef84299c20d8a366e6f..7c72c8a2dbf55bdd57fff93f8e99d7d6be4f4eeb 100644
--- a/pkgs/os-specific/linux/mba6x_bl/default.nix
+++ b/pkgs/os-specific/linux/mba6x_bl/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, kernel, stdenv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mba6x_bl-2016-12-08";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index 34f19db524cebe94e0d40408d46857c81bcf7efd..1a24ae3b9a26b0859a90215356e4e843ae284666 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -1,6 +1,6 @@
{ stdenv, firmwareLinuxNonfree, libarchive }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "amd-ucode-${firmwareLinuxNonfree.version}";
src = firmwareLinuxNonfree;
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index 0edf322cce5477efbee540e56d7cd40988aa71ce..6b67401b9b2345b502b7c7ec489b7254ca2a4743 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
, glib, readline, pcre, systemd, udev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "miraclecast";
version = "1.0-20190403";
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
index a7f0a332bebd44bc8b204fd3e2d9718d5e7e57f6..e0b87f2010acc81739b20fb936be2d00654f1fa1 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mmc-utils";
version = "2018-03-27";
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 843676b9ccac7bbe1fbe18416dc8da087f851a99..9b4f2f1c544a46813b3e2792011d99eb43ac414d 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -7,12 +7,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.9.1";
+ version = "0.9.2";
pname = "nftables";
src = fetchurl {
url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
- sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza";
+ sha256 = "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw";
};
configureFlags = [
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 2290a7e80a1eb204546d0c716578657265fd2c70..c41ce5994a1ba379d3875175c74d14c9ecb04144 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -20,16 +20,16 @@ if ((!lib.versionOlder args.version "391")
in
rec {
# Policy: use the highest stable version as the default (on our master).
- stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_430 else legacy_390;
+ stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_43x else legacy_390;
# No active beta right now
beta = stable;
- stable_430 = generic {
- version = "430.40";
- sha256_64bit = "1myzhy1mf27dcx0admm3pbbkfdd9p66lw0cq2mz1nwds92gqj07p";
- settingsSha256 = "0rg9dxg02pnpi0a1yi3a41wn6kmlk0dm6dvfbazyqi4gbzr12qrl";
- persistencedSha256 = "0findlrs5v1m7gl0vxkpd04lh54pib80w5vp4j77qb5snhgvckhq";
+ stable_43x = generic {
+ version = "435.21";
+ sha256_64bit = "0v3pq677ab01qdmwl5dawk8hn39qlwj05p8s9qzh9irmrlnc1izs";
+ settingsSha256 = "1p13cz79kncwx5067a3d7dbz6a1ibp611zynp1qdxpa65hwp2pxa";
+ persistencedSha256 = "0br8znxhz2ryzdj0j4jhqzvdgw9h899q8yz0p9429xz4wxkavgdr";
};
# Last one supporting x86
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index cfe79d4c0b7906166f0a98f13b310d904d54e729..4f8a0b68664098097e2d5b34da00672a60ce98ff 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -2,7 +2,7 @@ nvidia_x11: sha256:
{ stdenv, fetchFromGitHub, m4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nvidia-persistenced";
inherit (nvidia_x11) version;
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 1867c1a133af3dabace87b2d0dfc4a1cc3c8bb59..101f61f302072ebeaeacfd8db38f297fb59594c6 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -40,7 +40,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nvidia-settings";
inherit (nvidia_x11) version;
inherit src;
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index 62aa18fa643e75cd8ea214b7e5795c8c3d22c98d..044f75cbd6fbb466eadd0941055957380031f98e 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -2,7 +2,7 @@
, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pipework";
version = "2017-08-22";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index fb507d4da4856516e1d65aa58251632f07e1e5f8..9d229c50000eb686a308110b60ab052d65472a96 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "policycoreutils";
- version = "2.7";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
- sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa";
+ sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65";
};
postPatch = ''
@@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext ];
buildInputs = [ libsepol libselinux libsemanage ];
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
- makeFlagsArray+=("LOCALEDIR=$out/share/locale")
- makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "SBINDIR=$(out)/sbin"
+ "ETCDIR=$(out)/etc"
+ "BASHCOMPLETIONDIR=$out/share/bash-completion/completions"
+ "LOCALEDIR=$(out)/share/locale"
+ "MAN5DIR=$(out)/share/man/man5"
+ ];
meta = with stdenv.lib; {
description = "SELinux policy core utilities";
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index b1afbfea0de2bfdd9d8c9af086347901bf0ba3a5..710eba642cb0c4eb13049bdbeb92c7912d62dae7 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rewritefs";
version = "2017-08-14";
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
index b8f80a0124c2aef62c29d5c70fd408582b8df4c2..2ca88c32f13f3e36fbd7cf2fbcc4659da66db7c4 100644
--- a/pkgs/os-specific/linux/selinux-python/default.nix
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -8,13 +8,13 @@ with python3.pkgs;
stdenv.mkDerivation rec {
pname = "selinux-python";
- version = "2.7";
- se_release = "20170804";
- se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+ version = "2.9";
+
+ inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
- sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2";
+ sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n";
};
nativeBuildInputs = [ wrapPython ];
@@ -23,17 +23,19 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix"
+ substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \
+ "\$PREFIX/var/lib/sepolgen"
'';
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- makeFlagsArray+=("LOCALEDIR=$out/share/locale")
- makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a")
- makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
- makeFlagsArray+=("PYTHON=${python3}/bin/python")
- makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "LOCALEDIR=$(out)/share/locale"
+ "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions"
+ "PYTHON=python"
+ "PYTHONLIBDIR=$(out)/${python.sitePackages}"
+ "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
+ ];
+
postFixup = ''
wrapPythonPrograms
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
index 99bbfbe7287a49cb59713c2ba712f41792ca3981..5343c5fae1a917bc7135d6fc3337da06c33eaa77 100644
--- a/pkgs/os-specific/linux/selinux-sandbox/default.nix
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -9,12 +9,12 @@ with python3.pkgs;
stdenv.mkDerivation rec {
pname = "selinux-sandbox";
- version = "2.7";
- se_release = "20170804";
+ version = "2.9";
+ inherit (policycoreutils) se_release se_url;
src = fetchurl {
- url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz";
- sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l";
+ url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz";
+ sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481";
};
nativeBuildInputs = [ wrapPython ];
@@ -42,10 +42,10 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/test" "${coreutils}/bin/test" \
'';
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "SYSCONFDIR=$(out)/etc/sysconfig"
+ ];
postFixup = ''
wrapPythonPrograms
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix
index 178d102381e094071d5c1c42bb76fee581dce385..bf1f36835b476791eb89af86683beb34defc9bb9 100644
--- a/pkgs/os-specific/linux/semodule-utils/default.nix
+++ b/pkgs/os-specific/linux/semodule-utils/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "semodule-utils";
- version = "2.7";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/${pname}-${version}.tar.gz";
- sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch";
+ sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0";
};
buildInputs = [ libsepol ];
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix
index db362613d374249c89e442c2f8ed6e58a3f13537..ef13e5ded024bcc0e117d278185673b770fb9e19 100644
--- a/pkgs/os-specific/linux/syscall_limiter/default.nix
+++ b/pkgs/os-specific/linux/syscall_limiter/default.nix
@@ -5,7 +5,7 @@
, which
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "syscall_limiter";
version = "2017-01-23";
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 8965b5da4f49df333f099ca833600b83977ec234..8631ddf01d089037603f825678e32b11f5231359 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "syslinux-2015-11-09";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 45f4d60e4e3101a03d5cccac2407f7a7d10a641b..ea82d92f17ae6e5df7db6852dd9f0b3a3d199cb1 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,7 +15,7 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "242";
pname = "systemd";
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index e6571b46ee055459f99a04ba7eb4bfb259979675..567dcd1068c5281f3aa8376413cae32e44f40f68 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "trace-cmd";
version = "2.8.3";
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 8e49af7713947fc9fb7c3de5373ba6b64cfac625..b73de3193d225a28d2bc9bcac258ebadc90eb2fd 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
-mkDerivation rec {
+mkDerivation {
pname = "kernelshark";
version = "0.9.8";
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 14458356a790b8359d9f51d9330836d00d5c46fd..1836748d5fcfa470bca10195a9f6da6b8399b463 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -12,7 +12,7 @@
, useSystemd ? true, systemd
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "upower";
version = "0.99.10";
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index 497b5c191669d78af265dea149d039ec17a9aba9..1bb92d7dce1b270858ec84aa5358380b7c39e306 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -1,6 +1,6 @@
{ stdenv, kernel, udev, autoconf, automake, libtool }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "usbip-${kernel.name}";
src = kernel.src;
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix
index 19f59d0068064f62031766fb0265caafb2a34e13..cfb93684f3bd0c32df5d86eb89e5cc73cc7d24d6 100644
--- a/pkgs/os-specific/linux/uvcdynctrl/default.nix
+++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.3.0";
pname = "uvcdynctrl";
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 9bb6fcdd0a0069941fe8290a73a5768589aa0a09..caa233af46952f96045dde3520cf5e7fb7f01a23 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation
+{ stdenv, lib, fetchurl, pkgconfig, perl
, libjpeg, udev
, withUtils ? true
-, withGUI ? true, alsaLib, libX11, qtbase, libGLU
+, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook
}:
# See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
-mkDerivation rec {
+let
+ withQt = withUtils && withGUI;
+
+# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
+in stdenv.mkDerivation rec {
pname = "v4l-utils";
version = "1.16.6";
@@ -29,13 +33,13 @@ mkDerivation rec {
ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
'';
- nativeBuildInputs = [ pkgconfig perl ];
+ nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook;
- buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ];
+ buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ];
propagatedBuildInputs = [ libjpeg ];
- NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11";
+ NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11";
postPatch = ''
patchShebangs .
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 570eb4ca4ef3e594f37f3c5e9ba63ed0d04554f0..c2dca6696165fbaded4cc0ee1079a16bc2e2be6a 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -3,7 +3,7 @@
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert stdenv.lib.versionAtLeast kernel.version "3.10";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "wireguard";
inherit (wireguard-tools) src version;
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 03e11d1a8ed93ac9ab10f3897f3429659e586c71..1b9b5a3ba5159beec63f6dd5acd550ed80492664 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -30,7 +30,7 @@ let
Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
''
- else stdenv.mkDerivation rec {
+ else stdenv.mkDerivation {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
src = fetchFromGitHub {
@@ -163,7 +163,7 @@ in {
];
};
- zfsUnstable = common rec {
+ zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = "4.19";
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index 286f4a0d41fb6b8e02bb8d8e2880c72f72ec321c..257067339674c67153e10f1edce025953a9135a5 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pthreads-w32";
version = "2.9.1";
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 6e47fce3e4862f4d31e1e71c51241b13070eac56..1e5ba46d38232affde7b194d1b56f6f078e68b42 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -6,7 +6,7 @@
}:
let
- common = {version, sha256, externals}: stdenv.mkDerivation rec {
+ common = {version, sha256, externals}: stdenv.mkDerivation {
inherit version;
pname = "asterisk";
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index e21ad5723b0197d4cbb84c5ef74f2758c8136cab..ee8925e117099629f8aee033a1ccd23476017013 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -11,7 +11,7 @@ daemonlib = fetchgit {
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "brickd";
inherit version;
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index f9532d48a11de238a9b8d9c55f43c49acee48e7c..c9a39b691e7c68d87b2ccc314de1f68e18b192cf 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "cayley";
- version = "0.6.1";
+ version = "0.7.5";
goPackagePath = "github.com/cayleygraph/cayley";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "cayleygraph";
repo = "cayley";
rev = "v${version}";
- sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry";
+ sha256 = "1zfxa9z6spi6xw028mvbc7c3g517gn82g77ywr6picl47fr2blnd";
};
goDeps = ./deps.nix;
diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix
index 1e6fadf9f4d8198c7162dd7bb02f3a68ce673055..eb3dce827bd3810335a1357c4f48989ed3cd8a6f 100644
--- a/pkgs/servers/cayley/deps.nix
+++ b/pkgs/servers/cayley/deps.nix
@@ -1,272 +1,471 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
- goPackagePath = "github.com/badgerodon/peg";
+ goPackagePath = "github.com/badgerodon/peg";
fetch = {
type = "git";
url = "https://github.com/badgerodon/peg";
- rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
+ rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11";
};
}
{
- goPackagePath = "github.com/boltdb/bolt";
+ goPackagePath = "github.com/boltdb/bolt";
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
- rev = "a705895fdad108f053eae7ee011ed94a0541ee13";
- sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r";
+ rev = "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd";
+ sha256 = "1sjxzz88bw0y37mk3xvwb9j5v7bz3r80rwg79jml6liqk1arnl99";
};
}
{
- goPackagePath = "github.com/cznic/mathutil";
+ goPackagePath = "github.com/cznic/mathutil";
fetch = {
type = "git";
url = "https://github.com/cznic/mathutil";
- rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd";
- sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75";
+ rev = "1447ad269d64ca91aa8d7079baa40b6fc8b965e7";
+ sha256 = "1r9c20k2h65g38yxf3vd46nbayx1cz5w4q4yr1xfggcs0mmrb87i";
};
}
{
- goPackagePath = "github.com/davecgh/go-spew";
+ goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
- rev = "2df174808ee097f90d259e432cc04442cf60be21";
- sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g";
+ rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
- goPackagePath = "github.com/dlclark/regexp2";
+ goPackagePath = "github.com/dennwc/graphql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dennwc/graphql";
+ rev = "12cfed44bc5de083875506a36d30f9798f9bca47";
+ sha256 = "1rfsxjjsik5618y2741lcyw56a4d4l6r04sbj1igrvcck9bz0k6a";
+ };
+ }
+ {
+ goPackagePath = "github.com/dlclark/regexp2";
fetch = {
type = "git";
url = "https://github.com/dlclark/regexp2";
- rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5";
- sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz";
+ rev = "902a5ce7a7812e2ba9f73b9d96c09d5136df39cd";
+ sha256 = "0ypmdayq50ilbmqa1wjq5nvs9igbxkzlc8phlknw244935wz3v15";
};
}
{
- goPackagePath = "github.com/dop251/goja";
+ goPackagePath = "github.com/dop251/goja";
fetch = {
type = "git";
url = "https://github.com/dop251/goja";
- rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca";
- sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h";
+ rev = "ef8c030e3c96c5054c2f10ef925e7041e0583c07";
+ sha256 = "15419apwdpbl0lgnl9xj9wyl05vpiz6jqgj8zbcyxhzy0wycj445";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
+ sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kivik/couchdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kivik/couchdb";
+ rev = "74d231fe43245e77840213724894264f0f61ffd3";
+ sha256 = "0ga6d6y44wg8ync73wcyc7q7r3sr5vdj5qkn3yqn9yn4p0k2w89i";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kivik/kivik";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kivik/kivik";
+ rev = "2a1f6b9dd407886bc59c0c28faed28fbce3b0ece";
+ sha256 = "0fpa62mriyiyl5dh5kg8858bqrwiwscpbkg9np69lk302znxalij";
};
}
{
- goPackagePath = "github.com/gogo/protobuf";
+ goPackagePath = "github.com/go-kivik/pouchdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kivik/pouchdb";
+ rev = "bbd1ab79be17c809842e193b1f84e924b6b599ba";
+ sha256 = "15kv6i94j73c8zzy5hnmf051d3i65wxc07hvass9lc4g5ad7f9vf";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sourcemap/sourcemap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sourcemap/sourcemap";
+ rev = "b019cc30c1eaa584753491b0d8f8c1534bf1eb44";
+ sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "147bd02c2c516cf9a8878cb75898ee8a9eea0228";
+ sha256 = "0s75nilz1jx0vgc69jgmys95lsq9j9nfdjcc8inc8mhzh3qpjb74";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
- rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61";
- sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1";
+ rev = "30433562cfbf487fe1df7cd26c7bab168d2f14d0";
+ sha256 = "155iv0jqgh0d8cykghw3ifwk8pjyyq1w4gr9khhf78n01k6180hj";
};
}
{
- goPackagePath = "github.com/golang/glog";
+ goPackagePath = "github.com/golang/glog";
fetch = {
type = "git";
url = "https://github.com/golang/glog";
- rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+ rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
{
- goPackagePath = "github.com/golang/protobuf";
+ goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "888eb0692c857ec880338addf316bd662d5e630e";
- sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0";
+ rev = "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8";
+ sha256 = "0fbf8ymrcb23imkhlrlyq6i0x5w8gxzilljjsgd4hnvjgpgp3r4v";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/snappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/snappy";
+ rev = "553a641470496b2327abcac10b36396bd98e45c9";
+ sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk";
+ };
+ }
+ {
+ goPackagePath = "github.com/gopherjs/gopherjs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherjs";
+ rev = "558a9132744c22476178edf3126fd35a9754f565";
+ sha256 = "13mn0li83amgm4fgsm6l3shs2r4kjddr10xn0ydnr9ymg1y887vi";
+ };
+ }
+ {
+ goPackagePath = "github.com/gopherjs/jsbuiltin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/jsbuiltin";
+ rev = "67703bfb044e3192fbcab025c3aeaeedafad1f2f";
+ sha256 = "1k0df0z9fiyzbr1g1736zdp238j9z82q3gwkk060h2n84rg4c7lh";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "7fa7fff964d035e8a162cce3a164b3ad02ad651b";
+ sha256 = "0p3dyhpc0ajakcww3a45n750z2030xqhlswzf51d5rzid27681wp";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "0d4b488675fdec1dde48751b05ab530cf0b630e1";
+ sha256 = "071rram7aib70f3gk4ansgwns82w9i6m1px8mgc8x4rs9ana4qhf";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
- goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ goPackagePath = "github.com/jackc/pgx";
fetch = {
type = "git";
- url = "https://github.com/hashicorp/go-cleanhttp";
- rev = "ad28ea4487f05916463e2423a55166280e8254b5";
- sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm";
+ url = "https://github.com/jackc/pgx";
+ rev = "606697ffdfe6603013560dbc171656de57b4f542";
+ sha256 = "0818yb2vjjwwmscdab7wnxbyiabvy544icdczdlr5kswbqq5h25m";
};
}
{
- goPackagePath = "github.com/julienschmidt/httprouter";
+ goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
type = "git";
url = "https://github.com/julienschmidt/httprouter";
- rev = "b59a38004596b696aca7aa2adccfa68760864d86";
- sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac";
+ rev = "6f3f3919c8781ce5c0509c83fffc887a7830c938";
+ sha256 = "1hmqdpv2zywwglmnjnxfn27mkac81n3nqs1wandlpybsww4vn4kx";
};
}
{
- goPackagePath = "github.com/lib/pq";
+ goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
- rev = "0dad96c0b94f8dee039aa40467f767467392a0af";
- sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
+ rev = "2704adc878c21e1329f46f6e56a1c387d788ff94";
+ sha256 = "160fmvi7bczxw3i3h5s821hv029ph5ld8x3c36b4cz2sr30wp110";
};
}
{
- goPackagePath = "github.com/linkeddata/gojsonld";
+ goPackagePath = "github.com/linkeddata/gojsonld";
fetch = {
type = "git";
url = "https://github.com/linkeddata/gojsonld";
- rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31";
- sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i";
+ rev = "4f5db6791326b8962ede4edbba693edcf20fd1ad";
+ sha256 = "11g1kygkn55whaf49q2bzxk0w8b3nhdhiaixsj2ik65j8bl9g2cq";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "51463bfca2576e06c62a8504b5c0f06d61312647";
+ sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
+ sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
};
}
{
- goPackagePath = "github.com/pborman/uuid";
+ goPackagePath = "github.com/pborman/uuid";
fetch = {
type = "git";
url = "https://github.com/pborman/uuid";
- rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
- sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+ rev = "1b00554d822231195d1babd97ff4a781231955c9";
+ sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-buffruneio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-buffruneio";
+ rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
+ sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
};
}
{
- goPackagePath = "github.com/peterh/liner";
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3";
+ sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterh/liner";
fetch = {
type = "git";
url = "https://github.com/peterh/liner";
- rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
- sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+ rev = "88609521dc4b6c858fd4c98b628147da928ce4ac";
+ sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k";
};
}
{
- goPackagePath = "github.com/pmezard/go-difflib";
+ goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
- sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
+ url = "https://github.com/pkg/errors";
+ rev = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc";
+ sha256 = "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs";
};
}
{
- goPackagePath = "github.com/robertkrimen/otto";
+ goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
- url = "https://github.com/robertkrimen/otto";
- rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d";
- sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+ sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
};
}
{
- goPackagePath = "github.com/russross/blackfriday";
+ goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb";
- sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s";
+ rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c";
+ sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20";
};
}
{
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d";
- sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v";
+ rev = "79c90efaf01eddc01945af5bc1797859189b830b";
+ sha256 = "1dj8v91gv1ssw2j88gjzr1hw0n63qqxykjzfbvspyi529xn3ji3y";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
+ sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
};
}
{
- goPackagePath = "github.com/sirupsen/logrus";
+ goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab";
- sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl";
+ url = "https://github.com/spf13/cast";
+ rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
+ sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
};
}
{
- goPackagePath = "github.com/stretchr/testify";
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "7b1b6e8dc027253d45fc029bc269d1c019f83a34";
+ sha256 = "1nhnlpmbqq1ggix7jaxmzr8awk1zrrzag4vzq1p5q5l25d6kih35";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
+ sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb";
+ sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2";
+ sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18";
- sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g";
+ rev = "87b1dfb5b2fa649f52695dd9eae19abe404a4308";
+ sha256 = "1iyfxs3nxdn1fyfqv3gggxcxab66a3m6cmjkhqhcapxm3qvgbrlc";
};
}
{
- goPackagePath = "github.com/syndtr/goleveldb";
+ goPackagePath = "github.com/syndtr/goleveldb";
fetch = {
type = "git";
url = "https://github.com/syndtr/goleveldb";
- rev = "4875955338b0a434238a31165cb87255ab6e9e4a";
- sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i";
+ rev = "b89cc31ef7977104127d34c1bd31ebd1a9db2199";
+ sha256 = "0pbmssaw7fsgspv0jr3hsd1208qqxcvy4faks9hypqgl5gwday4p";
};
}
{
- goPackagePath = "github.com/syndtr/gosnappy";
+ goPackagePath = "github.com/tylertreat/BoomFilters";
fetch = {
type = "git";
- url = "https://github.com/syndtr/gosnappy";
- rev = "156a073208e131d7d2e212cb749feae7c339e846";
- sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z";
+ url = "https://github.com/tylertreat/BoomFilters";
+ rev = "37e169ae37ed529d93ecacb509c0dc80078478fc";
+ sha256 = "15wwdsxxvkgxbxv3v0ywnwjwndpmps49n3a49z7bzjl7r2nsm7qv";
};
}
{
- goPackagePath = "golang.org/x/net";
+ goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "6a513affb38dc9788b449d59ffed099b8de18fa0";
- sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval";
+ rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344";
+ sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv";
};
}
{
- goPackagePath = "golang.org/x/sys";
+ goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
- sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
+ rev = "9ccfe848b9db8435a24c424abbc07a921adf1df5";
+ sha256 = "0wn3p7nrf9lx5svnya5mxy5b8cxqs2rp8lxc477szna313m1jhs4";
};
}
{
- goPackagePath = "golang.org/x/text";
+ goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c";
- sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s";
+ rev = "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4";
+ sha256 = "1yzh1qxwd0xkh0k04hwp7yii21i26b4ngxvm1g98qlji1g2wbjbc";
};
}
{
- goPackagePath = "google.golang.org/appengine";
+ goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
- rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05";
- sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj";
+ rev = "170382fa85b10b94728989dfcf6cc818b335c952";
+ sha256 = "0dqx24qc7h53p16xnkwn2jpk3wjjlvv48akqk74vx31pr2nn0g56";
};
}
{
- goPackagePath = "gopkg.in/mgo.v2";
+ goPackagePath = "gopkg.in/mgo.v2";
fetch = {
type = "git";
- url = "https://gopkg.in/mgo.v2";
- rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
- sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
+ url = "https://github.com/go-mgo/mgo";
+ rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655";
+ sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
};
}
{
- goPackagePath = "github.com/go-sql-driver/mysql";
+ goPackagePath = "gopkg.in/olivere/elastic.v5";
fetch = {
type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
- sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
+ url = "https://github.com/olivere/elastic";
+ rev = "79ff368708b3a2a9da641dc831d95fd0782bf4ef";
+ sha256 = "1lq8nhjnkf246nl5h40ldh1qz2yx73yaqfmsh9ddvkwn4173c7jj";
};
}
{
- goPackagePath = "github.com/dennwc/graphql";
+ goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
- url = "https://github.com/dennwc/graphql";
- rev = "fd5c4aa13f2119414084f229600de0d73f174436";
- sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
+ sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
};
}
-]
+]
\ No newline at end of file
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 4c8877e92de44a6b46f1fdd1a20a23844e235a63..b7c2e01e97a211806a6754f253d12875a4a48511 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "consul";
- version = "1.5.2";
+ version = "1.6.0";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul";
@@ -17,9 +17,9 @@ buildGoPackage rec {
# to apply your changes as patches on top of a release commit.
src = fetchFromGitHub {
owner = "hashicorp";
- repo = "consul";
+ repo = pname;
inherit rev;
- sha256 = "1fn9xxdszil4zdal08cyq6gbs2larpr4zmjmv2w2ykiacbfhpa6h";
+ sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52";
};
preBuild = ''
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
index 93db472270e2d2170c35c3ea0371bb7858814576..29d00caa02363e967cf847a734c82e4483a3fc12 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/pkgs/servers/demoit/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildGoPackage rec {
+buildGoPackage {
pname = "demoit";
version = "unstable-2019-05-10";
goPackagePath = "github.com/dgageot/demoit";
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 8e89b6f980fa198e9d3b12e7bf2511e8f00bac4f..489f2e297bb4738de2fa32cd4b5f59623125757e 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "dgraph";
- version = "0.8.2";
+ version = "1.0.17";
goPackagePath = "github.com/dgraph-io/dgraph";
@@ -10,32 +10,26 @@ buildGoPackage rec {
owner = "dgraph-io";
repo = "dgraph";
rev = "v${version}";
- sha256 = "0zc5bda8m2srjbk0gy1nnm0bya8if0kmk1szqr1qv3xifdzmi4nf";
+ sha256 = "05z1xwbd76q49zyqahh9krvq78dgkzr22qc6srr4djds0l7y6x5i";
};
- extraOutputsToInstall = [ "dashboard" ];
+ # see licensing
+ buildFlags = [ "-tags oss" ];
goDeps = ./deps.nix;
- subPackages = [ "cmd/dgraph" "cmd/dgraphloader" "cmd/bulkloader"];
-
- # let's move the dashboard to a different output, to prevent $bin from
- # depending on $out
- # TODO: provide a proper npm application for the dashboard.
- postPatch = ''
- mv dashboard/* $dashboard
- '';
+ subPackages = [ "dgraph"];
preBuild = ''
export buildFlagsArray="-ldflags=\
- -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \
- -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/"
+ -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}"
'';
meta = {
homepage = "https://dgraph.io/";
description = "Fast, Distributed Graph DB";
maintainers = with stdenv.lib.maintainers; [ sigma ];
- license = stdenv.lib.licenses.agpl3;
+ # Apache 2.0 because we use only build tag "oss"
+ license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/servers/dgraph/deps.nix b/pkgs/servers/dgraph/deps.nix
index 89e00e0d8cb3b3e13fdeef42c113b081d53fbea5..602233d635e6ee911802ecc152d093879f362b21 100644
--- a/pkgs/servers/dgraph/deps.nix
+++ b/pkgs/servers/dgraph/deps.nix
@@ -1,11 +1,47 @@
[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "v0.34.0";
+ sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/exporter/jaeger";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-ecosystem/opencensus-go-exporter-jaeger";
+ rev = "v0.1.0";
+ sha256 = "0dhf0fhjfk8m6zx7xys5mj51c8gxvlahi4y5fx8l7b7b56bh1rmy";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/exporter/prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-ecosystem/opencensus-go-exporter-prometheus";
+ rev = "6bf73eaafbe9";
+ sha256 = "1509l1xcgp662j7rglmrs35innpbi2s0r14vj9ps6d55j42kifm0";
+ };
+ }
{
goPackagePath = "github.com/AndreasBriese/bbloom";
fetch = {
type = "git";
url = "https://github.com/AndreasBriese/bbloom";
- rev = "28f7e881ca57bc00e028f9ede9f0d9104cfeef5e";
- sha256 = "03cqhqvdz8c9by5w5ls4kwnnwlm6b2kkslc6m120fanw1lgamfzp";
+ rev = "e2d15f34fcf9";
+ sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
@@ -13,44 +49,53 @@
fetch = {
type = "git";
url = "https://github.com/MakeNowJust/heredoc";
- rev = "1d91351acdc1cb2f2c995864674b754134b86ca7";
+ rev = "1d91351acdc1";
sha256 = "0ia1r8ibqmx6zv3wmsvgkpqlhwk79z9l38nzp4gd4f1kcb46856x";
};
}
{
- goPackagePath = "github.com/beorn7/perks";
+ goPackagePath = "github.com/apache/thrift";
fetch = {
type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
- sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+ url = "https://github.com/apache/thrift";
+ rev = "v0.12.0";
+ sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby";
};
}
{
- goPackagePath = "github.com/bkaradzic/go-lz4";
+ goPackagePath = "github.com/armon/consul-api";
fetch = {
type = "git";
- url = "https://github.com/bkaradzic/go-lz4";
- rev = "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a";
- sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb";
+ url = "https://github.com/armon/consul-api";
+ rev = "eb2c6b5be1b6";
+ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
};
}
{
- goPackagePath = "github.com/blevesearch/bleve";
+ goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
- url = "https://github.com/blevesearch/bleve";
- rev = "a7ebb8480579777c6cd1c4750d2e6b5ff2b49bdd";
- sha256 = "121jhd158slf4050kmghz25jrvv7gbsan31wr0nxyw9z32lyf6yx";
+ url = "https://github.com/beorn7/perks";
+ rev = "v1.0.0";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
};
}
{
- goPackagePath = "github.com/blevesearch/blevex";
+ goPackagePath = "github.com/bgentry/speakeasy";
fetch = {
type = "git";
- url = "https://github.com/blevesearch/blevex";
- rev = "507dcd576550f9f3260f11495ba2de4e96773a3e";
- sha256 = "0i9azysvia99fjpx525qnc5rcgv45hfvl3zcs58gvgqyxpzpc78z";
+ url = "https://github.com/bgentry/speakeasy";
+ rev = "v0.1.0";
+ sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
+ };
+ }
+ {
+ goPackagePath = "github.com/blevesearch/bleve";
+ fetch = {
+ type = "git";
+ url = "https://github.com/blevesearch/bleve";
+ rev = "e1f5e6cdcd76";
+ sha256 = "1b2iip9vz71lqvjmj8v21sisk0z2gdsjd5v9750v3q4a3ik3x8m2";
};
}
{
@@ -58,7 +103,7 @@
fetch = {
type = "git";
url = "https://github.com/blevesearch/go-porterstemmer";
- rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e";
+ rev = "v1.0.2";
sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d";
};
}
@@ -67,17 +112,26 @@
fetch = {
type = "git";
url = "https://github.com/blevesearch/segment";
- rev = "762005e7a34fd909a84586299f1dd457371d36ee";
+ rev = "762005e7a34f";
sha256 = "1nrm145sm0xlhqy3d12yipnb16ikjz9ykjcskmkgm7vjm47xkmfl";
};
}
{
- goPackagePath = "github.com/cockroachdb/cmux";
+ goPackagePath = "github.com/blevesearch/snowballstem";
+ fetch = {
+ type = "git";
+ url = "https://github.com/blevesearch/snowballstem";
+ rev = "26b06a2c243d";
+ sha256 = "096wgbpb7qyx055451gam3zb26acaiazjmd58av7ykslmb7wa5gm";
+ };
+ }
+ {
+ goPackagePath = "github.com/client9/misspell";
fetch = {
type = "git";
- url = "https://github.com/cockroachdb/cmux";
- rev = "30d10be492927e2dcae0089c374c455d42414fcb";
- sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
+ url = "https://github.com/client9/misspell";
+ rev = "v0.3.4";
+ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
};
}
{
@@ -85,7 +139,7 @@
fetch = {
type = "git";
url = "https://github.com/codahale/hdrhistogram";
- rev = "3a0bb77429bd3a61596f5e8a3172445844342120";
+ rev = "3a0bb77429bd";
sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
};
}
@@ -94,8 +148,53 @@
fetch = {
type = "git";
url = "https://github.com/coreos/etcd";
- rev = "9d43462d174c664f5edf313dec0de31e1ef4ed47";
- sha256 = "0qxqjxhhciaacag1jz2rlncmlgw861ig2yx993ylvfm30jvyj2cj";
+ rev = "v3.3.10";
+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-etcd";
+ rev = "v2.0.0";
+ sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-semver";
+ rev = "v0.2.0";
+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-systemd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-systemd";
+ rev = "39ca1b05acc7";
+ sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/pkg";
+ rev = "3ac0863d7acf";
+ sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l";
+ };
+ }
+ {
+ goPackagePath = "github.com/cpuguy83/go-md2man";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cpuguy83/go-md2man";
+ rev = "v1.0.10";
+ sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
};
}
{
@@ -103,8 +202,8 @@
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
- rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9";
- sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
@@ -112,8 +211,26 @@
fetch = {
type = "git";
url = "https://github.com/dgraph-io/badger";
- rev = "64df7f57d9ee20d7b28de4a3eea90bf8d7310a77";
- sha256 = "1ikgzn2l62kb238n0wm6s95py5ypv71p09w7zyvzkjf34x675mzz";
+ rev = "v1.6.0";
+ sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgraph-io/dgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgraph-io/dgo";
+ rev = "f8969c1ddf8f";
+ sha256 = "08ycdpxry15r9vgaqrqxcdbw8z216asqarhxq76smi5a82mr56qa";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "v3.2.0";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
};
}
{
@@ -121,8 +238,71 @@
fetch = {
type = "git";
url = "https://github.com/dgryski/go-farm";
- rev = "d1e51a4af19092715f4ce7d8257fe5bc8f8be727";
- sha256 = "00iijjzdg8g6jbzhdbfw8s2rf0k25gxw4x7h7r6mkxcq18n69182";
+ rev = "6a90982ecee2";
+ sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
+ };
+ }
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "v1.0.0";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "v1.7.0";
+ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "25d852aebe32";
+ sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ini/ini";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-ini/ini";
+ rev = "v1.39.0";
+ sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.4.0";
+ sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
};
}
{
@@ -130,8 +310,8 @@
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
- rev = "e57a569e1882958f6b188cb42231d6db87701f2a";
- sha256 = "0r3jpmp6wp4xyrh1ikr8iqld3rg4r1yhv99zxw5zd7d2zprw9yfc";
+ rev = "v1.2.0";
+ sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0";
};
}
{
@@ -139,17 +319,53 @@
fetch = {
type = "git";
url = "https://github.com/golang/geo";
- rev = "31fb0106dc4a947e5aaee1fe186e56447f839510";
+ rev = "31fb0106dc4a";
sha256 = "00w4kwm98hrgr3ggfdk1h7qa5gp00z4s0j0iwgwd9rgadb59kb2c";
};
}
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/groupcache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/groupcache";
+ rev = "02826c3e7903";
+ sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "v1.1.1";
+ sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+ };
+ }
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";
- sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
+ rev = "v1.3.2";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/btree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/btree";
+ rev = "e89373fe6b4a";
+ sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj";
};
}
{
@@ -157,26 +373,305 @@
fetch = {
type = "git";
url = "https://github.com/google/codesearch";
- rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+ rev = "v1.0.0";
sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
};
}
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.3.0";
+ sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "v1.0.0";
+ sha256 = "1922bjrnx66692dm0rrc1ckmznsaqx920ww4jzsds3xzrwf15mqv";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "4201258b820c";
+ sha256 = "1kpdg3m46kp15ixl9ahhchhadyiblz0qpcxzylp8jhffc1rnxjb7";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+ rev = "f849b5445de4";
+ sha256 = "0hscypgj0nd1407jp6y4qrnrr0mrhc4wgxz9b3mj1cs3pkvi61vc";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+ rev = "v1.2.0";
+ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/grpc-gateway";
+ rev = "v1.4.1";
+ sha256 = "0lqpwwyhgw12iw2pfynb8wb06dqfj26rr55sh1v02nvrxbpzfp0a";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "v0.5.0";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "v1.0.0";
+ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "v1.0.0";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/jonboulle/clockwork";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jonboulle/clockwork";
+ rev = "v0.1.0";
+ sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "v1.1.6";
+ sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.0.0";
+ sha256 = "1c8xbp4d4fbmvml70nc7w3jii2fxv4q0141d2zmzi480d5h8xvrv";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "v1.8.0";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.0.9";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.4";
+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "v0.0.2";
+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+ };
+ }
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+ rev = "v1.0.1";
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
+ {
+ goPackagePath = "github.com/minio/minio-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/minio/minio-go";
+ rev = "774475480ffe";
+ sha256 = "1rnzvij1cnqb3brwpyv79bdbaa1sgygyw1x84376fli2pj0n3572";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "v1.1.0";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "v1.1.2";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "v1.0.1";
+ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "a0225b3f23b5";
+ sha256 = "0bp9r6xzy6d3p7l2hjmvr25y3rp3p8c9xv1agkllkksm45ng6681";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/ginkgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/ginkgo";
+ rev = "v1.7.0";
+ sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/gomega";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/gomega";
+ rev = "v1.4.3";
+ sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+ };
+ }
+ {
+ goPackagePath = "github.com/paulmach/go.geojson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/paulmach/go.geojson";
+ rev = "40612a87147b";
+ sha256 = "037j7apv0jljhvn6vk85nhy0ql862nxr5zbmi6a30qdfclrf2q4k";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "v1.2.0";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+ };
+ }
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "17b591df37844cde689f4d5813e5cea0927d8dd2";
- sha256 = "1f400f1682h1wdjknlh1ad95rbss09g0ia36a8w102bf2f1qfq8l";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@@ -184,7 +679,7 @@
fetch = {
type = "git";
url = "https://github.com/pkg/profile";
- rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
+ rev = "v1.2.1";
sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
};
}
@@ -193,7 +688,7 @@
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
@@ -202,8 +697,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
- rev = "310ce84375bb84c5cbbf0d05069c92daa5673740";
- sha256 = "11awb5bjkwqj7va3v7fgniwqkjqhmhjkp01rdvnv4xfp1laxwn7v";
+ rev = "v1.0.0";
+ sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
};
}
{
@@ -211,8 +706,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
- rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
- sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+ rev = "fd36f4220a90";
+ sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
};
}
{
@@ -220,8 +715,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
- rev = "0866df4b85a18d652b6965be022d007cdf076822";
- sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp";
+ rev = "v0.6.0";
+ sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
};
}
{
@@ -229,8 +724,98 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
- rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
- sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+ rev = "v0.0.2";
+ sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "v1.5.2";
+ sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.2.0";
+ sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+ };
+ }
+ {
+ goPackagePath = "github.com/soheilhy/cmux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/soheilhy/cmux";
+ rev = "v0.1.4";
+ sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "v1.1.2";
+ sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "v1.3.0";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "v0.0.5";
+ sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "v1.0.0";
+ sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "v1.0.3";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "v1.3.2";
+ sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
};
}
{
@@ -238,17 +823,17 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "976c720a22c8eb4eb6a0b4348ad85ad12491a506";
- sha256 = "0a2gxvqzacrj9k8h022zhr8fchhn9afc6a511m07j71dzw9g4y3m";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
- goPackagePath = "github.com/tebeka/snowball";
+ goPackagePath = "github.com/tmc/grpc-websocket-proxy";
fetch = {
type = "git";
- url = "https://github.com/tebeka/snowball";
- rev = "6b06bd306c4e4442a63e546752278920ae487934";
- sha256 = "110akijkb55k5h7m6mra8fircvi4sxd5xq7lcjgyiqj96srq8v2k";
+ url = "https://github.com/tmc/grpc-websocket-proxy";
+ rev = "89b8d40f7ca8";
+ sha256 = "1bg6m0cycy5sww175zkbnhi9lvzb08iicc8xka8klrgaa9mc5nsk";
};
}
{
@@ -256,17 +841,134 @@
fetch = {
type = "git";
url = "https://github.com/twpayne/go-geom";
- rev = "6753ad11e46b04e21b3f286b342e73a8c4be8216";
+ rev = "6753ad11e46b";
sha256 = "0qyrdnp7j7lmj0qb0p7k45m757zvbwn78s1apiy46zfnb5415df1";
};
}
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "e444a5086c43";
+ sha256 = "1ri318sf41fdzhj186dg96pixvlhmk1255ymccc9zfayy3z6li3h";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "v1.20.0";
+ sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+ };
+ }
+ {
+ goPackagePath = "github.com/willf/bitset";
+ fetch = {
+ type = "git";
+ url = "https://github.com/willf/bitset";
+ rev = "71fa2377963f";
+ sha256 = "092lpf2qm3zyvm35inam4b7y3kjpvpx7ylkgn31x6wbxfbamp37a";
+ };
+ }
+ {
+ goPackagePath = "github.com/xiang90/probing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xiang90/probing";
+ rev = "43a291ad63a2";
+ sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i";
+ };
+ }
+ {
+ goPackagePath = "github.com/xordataexchange/crypt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xordataexchange/crypt";
+ rev = "b2862e3d0a77";
+ sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/bbolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/bbolt";
+ rev = "v1.3.2";
+ sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/etcd";
+ rev = "a943ad0ee4c9";
+ sha256 = "1p0s383qw7rdcg2zs5ysk70dkjhpyyqn2qgqgbxdvrv5cjgna1hm";
+ };
+ }
+ {
+ goPackagePath = "go.opencensus.io";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-instrumentation/opencensus-go";
+ rev = "v0.21.0";
+ sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "v1.3.2";
+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/multierr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/multierr";
+ rev = "v1.1.0";
+ sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/zap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/zap";
+ rev = "v1.9.1";
+ sha256 = "19a1i6fipqj8w7h6qjmg1sfbg18yzzqsgfn0vmr55hkgc0y6nmny";
+ };
+ }
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "22ddb68eccda408bbf17759ac18d3120ce0d4f3f";
- sha256 = "07ks6qal02iz24vv54qyb90wmsg9vwqc14abf68rakprpy26qwsg";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "509febef88a4";
+ sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "5614ed5bae6f";
+ sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx";
};
}
{
@@ -274,8 +976,26 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "d1e1b351919c6738fdeb9893d5c998b161464f0c";
- sha256 = "0qzbfah03z992zyygfp7imjjas5np2gcar5aanx5y3av5g68ggjp";
+ rev = "da137c7871d7";
+ sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "e64efc72b421";
+ sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "e225da77a7e6";
+ sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p";
};
}
{
@@ -283,8 +1003,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "abf9c25f54453410d0c6668e519582a9e1115027";
- sha256 = "0dmpqjfif2zg6776d366js60k21g81jvsr3jm9dc7fv7w3282al4";
+ rev = "04f50cda93cb";
+ sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw";
};
}
{
@@ -292,8 +1012,44 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a";
- sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "fbb02b2291d2";
+ sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "e65039ee4138";
+ sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/api";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/google-api-go-client";
+ rev = "v0.3.2";
+ sha256 = "1x1nbsd3gjgmv833gpgq79m5d15p31k1dfn8gglkvjanjiin747j";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.4.0";
+ sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
};
}
{
@@ -301,8 +1057,8 @@
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
- rev = "1e559d0a00eef8a9a43151db4665280bd8dd5886";
- sha256 = "1dfm8zd9mif1aswks79wgyi7n818s5brbdnnrrlg79whfhaf20hd";
+ rev = "5fe7a883aa19";
+ sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs";
};
}
{
@@ -310,8 +1066,71 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
- rev = "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3";
- sha256 = "1li8rn2s4f8qc77npamlm2ijin44scb8vvd8c4cr0l7za2m89jfn";
+ rev = "v1.19.0";
+ sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/airbrake/gobrake.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/airbrake/gobrake.v2";
+ rev = "v2.0.9";
+ sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/cheggaaa/pb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/cheggaaa/pb.v1";
+ rev = "v1.0.25";
+ sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+ rev = "v2.1.2";
+ sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
};
}
{
@@ -319,8 +1138,17 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
- sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "c2f93a96b099";
+ sha256 = "07lg29aiap80ca9f201jzng9vjr168cv3qmvjmbd7v5pmww9kmr8";
};
}
]
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 065218a5b95d8e9b0111e7322b316c65b4fbb958..442ef45d1bff93288620afb054f529928f714a1b 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -7,7 +7,7 @@ let
makeDictdDB src name "{.,bin}" locale;
makeDictdDB = src: _name: _subdir: _locale:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
name = "dictd-db-${_name}";
inherit src;
locale = _locale;
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index 0a0b6c0e1d1ab03c1a92cb4ef9594b0af2021796..d55eb1d0bbdf60442dbeea601ff91dc606fbceec 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "echoip";
version = "unstable-2018-11-20";
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index d5671921abad72136cc3f615291634edd0525f24..999718160215e6780cc28e2465af90e4b67e9fc9 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -2,7 +2,7 @@
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bsd-fingerd-0.17";
src = fetchurl {
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 31de5925916147d1eac590b62df6e6dfa800becc..40780c9a97b207ae6e706ff14a83c02946779632 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-serivec-port=${builtins.toString port}"
"--with-service-name=${serviceName}"
- # "--disable-static"
"--with-system-editline"
"--with-fblog=/var/log/firebird"
"--with-fbconf=/etc/firebird"
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index e8a1a633e4db4233b3c2b2c0bd4e29ad8bc615ea..ac7733986ce64db4e3b1c0ad87709d91d426b281 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -21,7 +21,7 @@ let
, rev ? "refs/tags/${version}"
, officialRelease ? true
, patches ? []
- }: stdenv.mkDerivation rec {
+ }: stdenv.mkDerivation {
pname = "foundationdb";
inherit version;
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index b29c5298b77de755153d2c938b716fd01b70a24c..b3ca7038ebeb6b11c04cadfa627bd346cb9bff33 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -29,7 +29,7 @@ in with builtins; {
# Older versions use the bespoke 'vsmake' build system
# ------------------------------------------------------
- foundationdb51 = vsmakeBuild rec {
+ foundationdb51 = vsmakeBuild {
version = "5.1.7";
branch = "release-5.1";
sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
@@ -42,7 +42,7 @@ in with builtins; {
];
};
- foundationdb52 = vsmakeBuild rec {
+ foundationdb52 = vsmakeBuild {
version = "5.2.8";
branch = "release-5.2";
sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb";
@@ -55,7 +55,7 @@ in with builtins; {
];
};
- foundationdb60 = vsmakeBuild rec {
+ foundationdb60 = vsmakeBuild {
version = "6.0.18";
branch = "release-6.0";
sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p";
@@ -68,7 +68,7 @@ in with builtins; {
# 6.1 and later versions should always use CMake
# ------------------------------------------------------
- foundationdb61 = cmakeBuild rec {
+ foundationdb61 = cmakeBuild {
version = "6.1.10";
branch = "release-6.1";
sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry";
diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix
index 55b834c543694da8446c5172cf0b66dd29b5b874..e4256fab0fa972b3213adcbabd449a543fa514a0 100644
--- a/pkgs/servers/foundationdb/python.nix
+++ b/pkgs/servers/foundationdb/python.nix
@@ -1,6 +1,6 @@
{ buildPythonPackage, lib, foundationdb }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "foundationdb";
version = foundationdb.version;
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index 34b9f6ecaf0d19b3a11a3516e24b83c6fcb2b8db..0265e18861e078db6e788b6e48b176407b7ba3e0 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -12,7 +12,7 @@ let
# hysterical raisins dictate a version of boost this old. however,
# we luckily do not need to build anything, we just need the header
# files.
- boost152 = stdenv49.mkDerivation rec {
+ boost152 = stdenv49.mkDerivation {
name = "boost-headers-1.52.0";
src = fetchurl {
@@ -45,7 +45,7 @@ let
, officialRelease ? true
, patches ? []
- }: stdenv.mkDerivation rec {
+ }: stdenv.mkDerivation {
pname = "foundationdb";
inherit version;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8a2c8d0e7195901ea15da650a16e1c749f7af57b..104a11ad28176043375236c19d03890e07738961 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,11 +2,12 @@
# Do not edit!
{
- version = "0.93.2";
+ version = "0.96.2";
components = {
"abode" = ps: with ps; [ ];
"acer_projector" = ps: with ps; [ pyserial ];
"actiontec" = ps: with ps; [ ];
+ "adguard" = ps: with ps; [ ];
"ads" = ps: with ps; [ ];
"aftership" = ps: with ps; [ ];
"air_quality" = ps: with ps; [ ];
@@ -31,8 +32,10 @@
"api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ];
"apple_tv" = ps: with ps; [ pyatv ];
+ "aprs" = ps: with ps; [ ];
"aqualogic" = ps: with ps; [ ];
"aquostv" = ps: with ps; [ ];
+ "arcam_fmj" = ps: with ps; [ ];
"arduino" = ps: with ps; [ ];
"arest" = ps: with ps; [ ];
"arlo" = ps: with ps; [ ha-ffmpeg ];
@@ -43,6 +46,7 @@
"asuswrt" = ps: with ps; [ ];
"august" = ps: with ps; [ ];
"aurora" = ps: with ps; [ ];
+ "aurora_abb_powerone" = ps: with ps; [ ];
"auth" = ps: with ps; [ aiohttp-cors ];
"automatic" = ps: with ps; [ aiohttp-cors ];
"automation" = ps: with ps; [ aiohttp-cors ];
@@ -50,6 +54,7 @@
"awair" = ps: with ps; [ ];
"aws" = ps: with ps; [ ];
"axis" = ps: with ps; [ ];
+ "azure_event_hub" = ps: with ps; [ ];
"baidu" = ps: with ps; [ ];
"bayesian" = ps: with ps; [ ];
"bbb_gpio" = ps: with ps; [ ];
@@ -125,12 +130,13 @@
"deconz" = ps: with ps; [ ];
"decora" = ps: with ps; [ ];
"decora_wifi" = ps: with ps; [ ];
- "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ];
+ "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ];
"deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ];
"denon" = ps: with ps; [ ];
"denonavr" = ps: with ps; [ ];
"deutsche_bahn" = ps: with ps; [ ];
+ "device_automation" = ps: with ps; [ aiohttp-cors ];
"device_sun_light_trigger" = ps: with ps; [ ];
"device_tracker" = ps: with ps; [ ];
"dht" = ps: with ps; [ ];
@@ -174,6 +180,7 @@
"eight_sleep" = ps: with ps; [ ];
"eliqonline" = ps: with ps; [ ];
"elkm1" = ps: with ps; [ ];
+ "elv" = ps: with ps; [ ];
"emby" = ps: with ps; [ ];
"emoncms" = ps: with ps; [ ];
"emoncms_history" = ps: with ps; [ ];
@@ -183,6 +190,7 @@
"enocean" = ps: with ps; [ ];
"enphase_envoy" = ps: with ps; [ ];
"entur_public_transport" = ps: with ps; [ ];
+ "environment_canada" = ps: with ps; [ ];
"envirophat" = ps: with ps; [ ];
"envisalink" = ps: with ps; [ ];
"ephember" = ps: with ps; [ ];
@@ -233,6 +241,7 @@
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
"fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
"fritzdect" = ps: with ps; [ ];
+ "fronius" = ps: with ps; [ ];
"frontend" = ps: with ps; [ aiohttp-cors ];
"frontier_silicon" = ps: with ps; [ ];
"futurenow" = ps: with ps; [ ];
@@ -256,6 +265,7 @@
"gogogate2" = ps: with ps; [ ];
"google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ];
+ "google_cloud" = ps: with ps; [ google_cloud_texttospeech ];
"google_domains" = ps: with ps; [ ];
"google_maps" = ps: with ps; [ ];
"google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
@@ -364,6 +374,7 @@
"lcn" = ps: with ps; [ ];
"lg_netcast" = ps: with ps; [ ];
"lg_soundbar" = ps: with ps; [ ];
+ "life360" = ps: with ps; [ ];
"lifx" = ps: with ps; [ aiolifx aiolifx-effects ];
"lifx_cloud" = ps: with ps; [ ];
"lifx_legacy" = ps: with ps; [ ];
@@ -408,6 +419,7 @@
"mastodon" = ps: with ps; [ ];
"matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ ];
+ "mcp23017" = ps: with ps; [ ];
"media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
"media_player" = ps: with ps; [ aiohttp-cors ];
"mediaroom" = ps: with ps; [ ];
@@ -478,6 +490,7 @@
"noaa_tides" = ps: with ps; [ ];
"norway_air" = ps: with ps; [ ];
"notify" = ps: with ps; [ ];
+ "notion" = ps: with ps; [ ];
"nsw_fuel_station" = ps: with ps; [ ];
"nsw_rural_fire_service_feed" = ps: with ps; [ ];
"nuheat" = ps: with ps; [ ];
@@ -530,6 +543,7 @@
"ping" = ps: with ps; [ ];
"pioneer" = ps: with ps; [ ];
"pjlink" = ps: with ps; [ ];
+ "plaato" = ps: with ps; [ aiohttp-cors ];
"plant" = ps: with ps; [ ];
"plex" = ps: with ps; [ ];
"plum_lightpad" = ps: with ps; [ ];
@@ -554,6 +568,7 @@
"pyload" = ps: with ps; [ ];
"python_script" = ps: with ps; [ ];
"qbittorrent" = ps: with ps; [ ];
+ "qld_bushfire" = ps: with ps; [ ];
"qnap" = ps: with ps; [ ];
"qrcode" = ps: with ps; [ pillow ];
"quantum_gateway" = ps: with ps; [ ];
@@ -574,6 +589,8 @@
"rejseplanen" = ps: with ps; [ ];
"remember_the_milk" = ps: with ps; [ httplib2 ];
"remote" = ps: with ps; [ ];
+ "remote_rpi_gpio" = ps: with ps; [ ];
+ "repetier" = ps: with ps; [ ];
"rest" = ps: with ps; [ ];
"rest_command" = ps: with ps; [ ];
"rflink" = ps: with ps; [ ];
@@ -632,7 +649,9 @@
"sleepiq" = ps: with ps; [ ];
"sma" = ps: with ps; [ ];
"smappee" = ps: with ps; [ ];
+ "smarthab" = ps: with ps; [ ];
"smartthings" = ps: with ps; [ aiohttp-cors ];
+ "smarty" = ps: with ps; [ ];
"smhi" = ps: with ps; [ ];
"smtp" = ps: with ps; [ ];
"snapcast" = ps: with ps; [ snapcast ];
@@ -640,7 +659,10 @@
"snmp" = ps: with ps; [ pysnmp ];
"sochain" = ps: with ps; [ ];
"socialblade" = ps: with ps; [ ];
- "solaredge" = ps: with ps; [ ];
+ "solaredge" = ps: with ps; [ stringcase ];
+ "solaredge_local" = ps: with ps; [ ];
+ "solax" = ps: with ps; [ ];
+ "somfy" = ps: with ps; [ ];
"somfy_mylink" = ps: with ps; [ ];
"sonarr" = ps: with ps; [ ];
"songpal" = ps: with ps; [ ];
@@ -657,6 +679,7 @@
"sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ ];
"srp_energy" = ps: with ps; [ ];
+ "ssdp" = ps: with ps; [ netdisco ];
"starlingbank" = ps: with ps; [ ];
"startca" = ps: with ps; [ xmltodict ];
"statistics" = ps: with ps; [ ];
@@ -664,6 +687,7 @@
"steam_online" = ps: with ps; [ ];
"stiebel_eltron" = ps: with ps; [ ];
"stream" = ps: with ps; [ aiohttp-cors av ];
+ "streamlabswater" = ps: with ps; [ ];
"stride" = ps: with ps; [ ];
"sun" = ps: with ps; [ ];
"supervisord" = ps: with ps; [ ];
@@ -703,7 +727,7 @@
"tensorflow" = ps: with ps; [ numpy pillow protobuf ];
"tesla" = ps: with ps; [ ];
"tfiac" = ps: with ps; [ ];
- "thermoworks_smoke" = ps: with ps; [ ];
+ "thermoworks_smoke" = ps: with ps; [ stringcase ];
"thethingsnetwork" = ps: with ps; [ ];
"thingspeak" = ps: with ps; [ ];
"thinkingcleaner" = ps: with ps; [ ];
@@ -724,9 +748,10 @@
"touchline" = ps: with ps; [ ];
"tplink" = ps: with ps; [ ];
"tplink_lte" = ps: with ps; [ ];
- "traccar" = ps: with ps; [ ];
+ "traccar" = ps: with ps; [ stringcase ];
"trackr" = ps: with ps; [ ];
"tradfri" = ps: with ps; [ ];
+ "trafikverket_train" = ps: with ps; [ ];
"trafikverket_weatherstation" = ps: with ps; [ ];
"transmission" = ps: with ps; [ transmissionrpc ];
"transport_nsw" = ps: with ps; [ ];
@@ -740,11 +765,10 @@
"twitch" = ps: with ps; [ ];
"twitter" = ps: with ps; [ ];
"ubee" = ps: with ps; [ ];
- "uber" = ps: with ps; [ ];
"ubus" = ps: with ps; [ ];
"ue_smart_radio" = ps: with ps; [ ];
"uk_transport" = ps: with ps; [ ];
- "unifi" = ps: with ps; [ aiounifi pyunifi ];
+ "unifi" = ps: with ps; [ aiounifi ];
"unifi_direct" = ps: with ps; [ pexpect ];
"universal" = ps: with ps; [ ];
"upc_connect" = ps: with ps; [ defusedxml ];
@@ -760,6 +784,7 @@
"utility_meter" = ps: with ps; [ ];
"uvc" = ps: with ps; [ ];
"vacuum" = ps: with ps; [ ];
+ "vallox" = ps: with ps; [ ];
"vasttrafik" = ps: with ps; [ ];
"velbus" = ps: with ps; [ ];
"velux" = ps: with ps; [ ];
@@ -771,6 +796,7 @@
"viaggiatreno" = ps: with ps; [ ];
"vizio" = ps: with ps; [ ];
"vlc" = ps: with ps; [ ];
+ "vlc_telnet" = ps: with ps; [ ];
"voicerss" = ps: with ps; [ ];
"volkszaehler" = ps: with ps; [ ];
"volumio" = ps: with ps; [ ];
@@ -782,6 +808,7 @@
"water_heater" = ps: with ps; [ ];
"waterfurnace" = ps: with ps; [ ];
"watson_iot" = ps: with ps; [ ];
+ "watson_tts" = ps: with ps; [ ];
"waze_travel_time" = ps: with ps; [ WazeRouteCalculator ];
"weather" = ps: with ps; [ ];
"webhook" = ps: with ps; [ aiohttp-cors ];
@@ -799,6 +826,7 @@
"wsdot" = ps: with ps; [ ];
"wunderground" = ps: with ps; [ ];
"wunderlist" = ps: with ps; [ ];
+ "wwlln" = ps: with ps; [ ];
"x10" = ps: with ps; [ ];
"xbox_live" = ps: with ps; [ ];
"xeoma" = ps: with ps; [ ];
@@ -816,7 +844,7 @@
"yeelight" = ps: with ps; [ ];
"yeelightsunflower" = ps: with ps; [ ];
"yessssms" = ps: with ps; [ ];
- "yi" = ps: with ps; [ ha-ffmpeg ];
+ "yi" = ps: with ps; [ aioftp ha-ffmpeg ];
"yr" = ps: with ps; [ xmltodict ];
"yweather" = ps: with ps; [ yahooweather ];
"zabbix" = ps: with ps; [ ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 03f247e3bc5f420732429e4bfd0612e6afe34256..43633b07818fe9fa1a17231fdd4d25ff3a4c54ae 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3, protobuf3_6
+{ lib, fetchurl, fetchFromGitHub, python3, protobuf3_6
# Look up dependencies of specified components in component-packages.nix
, extraComponents ? []
@@ -26,20 +26,24 @@ let
"0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
(mkOverride "attrs" "19.1.0"
"f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399")
- (mkOverride "bcrypt" "3.1.6"
- "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea")
+ (mkOverride "bcrypt" "3.1.7"
+ "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42")
(mkOverride "pyjwt" "1.7.1"
"8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96")
- (mkOverride "cryptography" "2.6.1"
- "26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6")
- (mkOverride "cryptography_vectors" "2.6.1" # required by cryptography==2.6.1
- "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af")
+ (mkOverride "cryptography" "2.7"
+ "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6")
+ (mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7
+ "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc")
+ (mkOverride "importlib-metadata" "0.18"
+ "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db")
(mkOverride "python-slugify" "3.0.2"
"57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758")
- (mkOverride "requests" "2.21.0"
- "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e")
- (mkOverride "ruamel_yaml" "0.15.94"
- "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8")
+ (mkOverride "pyyaml" "5.1.1"
+ "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955")
+ (mkOverride "requests" "2.22.0"
+ "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4")
+ (mkOverride "ruamel_yaml" "0.15.97"
+ "17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845")
(mkOverride "voluptuous" "0.11.5"
"567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
(mkOverride "voluptuous-serialize" "2.1.0"
@@ -98,7 +102,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.93.2";
+ hassVersion = "0.96.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -113,13 +117,14 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
- sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8";
+ sha256 = "0qxdsr7zh2yqzignbhi8gcp67ba6gcp2yiyr1rww33a42r4fi0g5";
};
propagatedBuildInputs = [
# From setup.py
- aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip
- python-slugify pytz pyyaml requests ruamel_yaml voluptuous voluptuous-serialize
+ aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2
+ pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
+ voluptuous voluptuous-serialize
# From http, frontend and recorder components and auth.mfa_modules.totp
sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode
] ++ componentBuildInputs ++ extraBuildInputs;
@@ -144,6 +149,6 @@ in with py.pkgs; buildPythonApplication rec {
homepage = https://home-assistant.io/;
description = "Open-source home automation platform running on Python 3";
license = licenses.asl20;
- maintainers = with maintainers; [ f-breidenstein dotlambda globin ];
+ maintainers = with maintainers; [ fleaz dotlambda globin ];
};
}
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 4ffbb0100167a1917408413b725708a5526414a6..638617141457a40090f41f2255eb7307c1c06ae3 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
- version = "2.4.39";
+ version = "2.4.41";
pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml";
+ sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k";
};
# FIXME: -dev depends on -doc
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix
index b636f79e6c60d75b2ff73e94df73019d758d36d9..d99af7a81aefc2aada7f83c8438481b8d52bfaef 100644
--- a/pkgs/servers/http/micro-httpd/default.nix
+++ b/pkgs/servers/http/micro-httpd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "micro-httpd-20140814";
src = fetchurl {
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 075226f36078d98f9b6c246200d259fab381fba9..6ac37a98deead641c985e125361ffa4075cdbc74 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick
, quicktemplate, go-bindata, easyjson }:
-buildGoPackage rec {
+buildGoPackage {
pname = "hydron-unstable";
version = "2019-02-17";
goPackagePath = "github.com/bakape/hydron";
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index e7d6d9ac52a595d5d1bf072924a70b8c76412aad..c056a543aa1d74f8a9aa77d0550759174f3366f5 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, python, pkgconfig
, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "irker";
version = "2017-02-12";
diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix
index 4eb0b26c30665b68e424a3ff42d40602b618f99a..e65e6b5ab59ab6c597fcb515210463c00e197e1e 100644
--- a/pkgs/servers/kwakd/default.nix
+++ b/pkgs/servers/kwakd/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, stdenv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "kwakd";
version = "0.5";
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 3d79d8421dd218d8455303fae837cf682f3dcc33..fa9de8d5eef6aba617d995e7adca8c9efc2e9d86 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "mautrix-unstable";
version = "2019-07-04";
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 326fae6bcf7a62e82986cd5a51a74be79582067b..47530ba9db60d3d42692b551bd906fe53c3d2f8d 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -2,7 +2,7 @@
, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson
, nodePackages, emscripten, opencv, statik }:
-buildGoPackage rec {
+buildGoPackage {
pname = "meguca-unstable";
version = "2019-03-12";
goPackagePath = "github.com/bakape/meguca";
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index d367bcfd2e3129ef48ec156f2f1b8a949cb9b218..6f9c22ebecf0065c3c98745f0b37ec0d739ed874 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -4,7 +4,7 @@ let
version = "1.8.1";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
pname = "meteor";
src = fetchurl {
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 557a4b4842db000ccf2e3204d6cd4744be087877..615edeb81ec136c0072c20bb692405bfdb91a979 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "grafana";
- version = "6.3.4";
+ version = "6.3.5";
goPackagePath = "github.com/grafana/grafana";
@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2";
+ sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8";
+ sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101";
};
postPatch = ''
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index cb12fe819a95a810f0270368ac528963b07d1664..9f23cc3e54c386e17594df7524d7375bb0ba69dd 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -11,7 +11,7 @@ let
binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "monitoring-plugins-${majorVersion}${minorVersion}";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix
index 79303849156a572c028d5748fbe82eee865b869d..9b4f3144a372c1306e9c381c6c5327a3c6dad68b 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/pkgs/servers/monitoring/plugins/uptime.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "check-uptime";
version = "20161112";
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index f126b8a7da1c280312bd01ee9271ee5bf653cd4a..4d92532c90e1b76c05a5807992aa9a47f5ce7e35 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -1,7 +1,7 @@
# This file was generated by go2nix.
{ buildGoPackage, fetchFromGitHub, fetchpatch, lib }:
-buildGoPackage rec {
+buildGoPackage {
pname = "prometheus-json-exporter";
version = "unstable-2017-10-06";
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index 947dfc2b70c3e6ecc7a72a1dbe9729582859f888..1e29eefba2b216af837a00e5621ef67789153188 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "mailexporter";
version = "2019-07-14";
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index 331503dfe7d4090eb221df8dadac710b738fc682..c6af09743ce9e725eb095f87ada209c6865a55a2 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -1,7 +1,7 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "rabbitmq_exporter";
version = "0.25.2";
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix
index c1f4746fadfeb9c43ae21a20ccb06592de0d2e68..fafe8ad3046e1276e9082b83a67021d224ee1fb8 100644
--- a/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/pkgs/servers/monitoring/uchiwa/default.nix
@@ -27,7 +27,7 @@ let
inherit src;
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "uchiwa";
inherit version;
diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix
index 4465febf39a93a96cf9b0ef33106744219bb792d..3cc3f338f2f6d93c1e1bd23a0faf02a47f86da0a 100644
--- a/pkgs/servers/mumsi/default.nix
+++ b/pkgs/servers/mumsi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost
, log4cpp, pjsip, openssl, alsaLib, mumlib }:
-with lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation {
pname = "mumsi";
version = "unstable-2018-12-12";
diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 955547289bc6add89d2c6b1343e8ed6b35f6d035..0f1a8e120f65b0f4b25ec19a5b56fea5dcb60ff1 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pcre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "leafnode-2.0.0.alpha20121101a.12";
src = fetchurl {
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 11695d753e286353107abac339c400315224d4dc..871e335628ce0dd43f9d82ec7cbdb5c377da2e70 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -33,13 +33,13 @@ let
"-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF"
# also avoid using builder's /proc/cpuinfo
] ++
- { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ];
enableParallelBuilding = true;
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 2864449267a685fcc37246fdc4b2294f2ca3851b..4c4ac4c5cb63f3c4fc413d5795a0021b9cf8e72d 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -20,7 +20,7 @@ let version = "3.4.10";
"yaml"
] ++ optionals stdenv.isLinux [ "tcmalloc" ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "mongodb";
inherit version;
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
index 36b29b57bf9759ebce0611f3ab5b4dcb08a301df..4ebcbafde5dcce63f415ef13e4d5303bef640f9f 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
, Carbon ? null, Cocoa ? null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "riak_cs-2.1.1";
buildInputs = [
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
index 1524ca207009cfdb051aee2dcad499c25a14f778..5fe4ce45f84bf2a28aefbc221da6b7eaefc33ad0 100644
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
, Carbon ? null, Cocoa ? null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "stanchion-2.1.1";
buildInputs = [
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index 170b0d5f22f9496e5ad6535d219b92c1168ffa61..efa43f7a844f8491d5420d64afdc92c7620ac73c 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -25,7 +25,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "riak-2.2.0";
buildInputs = [
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 6fbabc3d0030ad229d61976b2027d9ed32e0f6f3..8155a95106137fb703b87a66e160540ceee17d40 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
@@ -6,7 +6,7 @@
with (import ./srcs.nix { inherit fetchurl; });
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openafs";
inherit version srcs;
diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index 6f771e2bf33a53c9854a7ae7522067d23ba93bbb..d410a4e55e57706239b15aaddcee883f6626f7e0 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
@@ -7,7 +7,7 @@ let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 23e1cfae47ce03b42f90f45eb3aade6a1ab16598..fca872a4a2b5b25f134e96493700f65f1f484545 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -7,7 +7,7 @@
with (import ./srcs.nix { inherit fetchurl; });
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "openafs";
inherit version srcs;
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 958fcd578c2b94ecc83f6b26d020e7b10303b915..95084458f47f1ec1fdff4cd4597dd6d9bebc96d5 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -7,7 +7,7 @@ let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 2f2b1195cf32d182949b6c2e561f12c12ae4cdec..267bd4c2600fbf8d8a721c5cba4b2de5c0d19682 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,7 +9,7 @@
, dataDir ? "/var/lib/plex"
}:
-buildFHSUserEnv rec {
+buildFHSUserEnv {
name = "plexmediaserver";
inherit (plexRaw) meta;
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix
index 86a96dde5406290c66c7e20cb76fcf9644f12d65..7e6b92a037647e1bef62569045259cb66868d997 100644
--- a/pkgs/servers/ps3netsrv/default.nix
+++ b/pkgs/servers/ps3netsrv/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ps3netsrv";
version = "1.1.0";
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 4000c25aceaee4452d184759edc4c3e16654d284..840f63f3e0581927a4fdeb3f080de2ffd863c8ee 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -49,7 +49,7 @@ let
postFetch = "cd $out && git tag ${rev}";
};
- soci = fetchgit rec {
+ soci = fetchgit {
url = "https://github.com/SOCI/soci.git";
rev = "3a1f602b3021b925d38828e3ff95f9e7f8887ff7";
sha256 = "0lnps42cidlrn43h13b9yc8cs3fwgz7wb6a1kfc9rnw7swkh757f";
@@ -84,7 +84,7 @@ let
postFetch = "cd $out && git tag ${rev}";
};
- google-test = fetchgit rec {
+ google-test = fetchgit {
url = "https://github.com/google/googletest.git";
rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2";
sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k";
@@ -92,7 +92,7 @@ let
fetchSubmodules = false;
};
- google-benchmark = fetchgit rec {
+ google-benchmark = fetchgit {
url = "https://github.com/google/benchmark.git";
rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8";
sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i";
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index c8fd5c059a88afba4bdba4227f2678ba61bfa6a1..00d01b01efee0fa2b5e538e1422d98765ddfa585 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook
, useSystemd ? true, systemd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rpcbind";
version = "1.2.5";
diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index 1a168608bec24abddacf2fbdadd9eafa6d1c8534..f48ace22f8fb843caa6d109b82a888540f510697 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -30,7 +30,7 @@
libtool,
thrift
}:
-gcc8Stdenv.mkDerivation rec {
+gcc8Stdenv.mkDerivation {
pname = "scylladb";
version = "3.0.5";
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index ddb1d2299cbb457ab6ac75f958ee74394379dad3..b94a736a4ca8f8154c56a5c9e77b867c07b75763 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -17,12 +17,12 @@ let
shas =
if enableUnfree
then {
- "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik";
- "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18";
+ x86_64-linux = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik";
+ x86_64-darwin = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18";
}
else {
- "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10";
- "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2";
+ x86_64-linux = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10";
+ x86_64-darwin = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2";
};
in
stdenv.mkDerivation (rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
patches = [ ./es-home-6.x.patch ];
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 1238778658a44714e501034ec5cd08ca753f1e8d..6241380ea0c6da75f18fac878299bf9fa32bc507 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -6,7 +6,7 @@
}
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sphinxsearch";
inherit version;
src = mainSrc;
diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix
index 6dc044092ad5a7918910ea7be4959c43475e5cf9..6cca58a175e8dcba17362fdc26a9441d04abd043 100644
--- a/pkgs/servers/sickbeard/default.nix
+++ b/pkgs/servers/sickbeard/default.nix
@@ -2,7 +2,7 @@
let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "sickbeard";
version = "2016-03-21";
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 0770191c1b9f0636db145e698a75ba81648aff92..245bd811c1a23992c4ff56d681a65a32c1a7e1b6 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -4,7 +4,7 @@
let
version = "11.33.3";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "monetdb";
inherit version;
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index ac79c1b3b3815be80d1f77a910131395228e1860..7dcaac07d877e2c44e009bd47cdfd8372fdeb5e0 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pgjwt";
version = "unstable-2017-04-24";
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 9e3fe74aa6ce0cffd48ead9871149586f2a495ec..9bc556c700dc050c5f48799b1846c568998f263f 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, postgresql }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tsearch-extras";
version = "0.4";
diff --git a/pkgs/servers/tacacs+/default.nix b/pkgs/servers/tacacs+/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..01d8affd1e855e535141847eae64093c17a8dca1
--- /dev/null
+++ b/pkgs/servers/tacacs+/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl }:
+
+stdenv.mkDerivation rec {
+ pname = "tacacs+";
+ version = "4.0.4.28";
+
+ src = fetchurl {
+ url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz";
+ sha256 = "17i18z3s58c8yy8jxp01q3hzz5nirs4cjxms18zzkli6ip4jszql";
+ };
+
+ nativeBuildInputs = [ flex bison ];
+ buildInputs = [ tcp_wrappers perl ];
+
+ meta = with stdenv.lib; {
+ description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices";
+ homepage = "http://www.shrubbery.net/tac_plus/";
+ license = licenses.free;
+ maintainers = [ maintainers."0x4A6F" ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
index 7ddc3abb0b4ee1c77378344f9eab0507e42b55dd..fd6ca9909470a21cd3a056f6a0572b3654fb4634 100644
--- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
+++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation {
pname = "tt-rss-plugin-ff-instagram";
version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index c996d7c0c8b4781cf6ab086acedf553edc4c7d33..dd66259eed6f18ab22ad13b153c4be2291027142 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -5,7 +5,7 @@
let
version = "4.2.8";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "tvheadend";
inherit version;
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index 12f2a08c7f487ebc4d9b96f7d1937708e2814b55..cddfdf9f48f6f48832a6fbec430603b6cf80d4a6 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "udpt";
version = "2017-09-27";
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index eb7a072799dccf1d7520b45885fd95f335f3d9d9..d462a0a12111494c02cb7f39536f93a51ce5206f 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -2,7 +2,7 @@
let
generic = { version, sha256, suffix ? "" }:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
pname = "unifi-controller";
inherit version;
@@ -40,7 +40,7 @@ let
};
};
-in rec {
+in {
# https://community.ui.com/releases / https://www.ui.com/download/unifi
# Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 8d3d3def695f2a9cea7b4a2f3f57c48970b9d536..9b87924e0b963890cee6fe7b7c26d12618b5eccc 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
@@ -13,7 +13,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
(fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
(fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5")
- (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc")
+ (fetchbower "chainpad-listmap" "0.7.0" "^0.7.0" "141hk4x7kwzgiazsghyg4h4df519m72qh3xfb3lzwy245c2nh1ak")
(fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc")
(fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
(fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
@@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
(fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9")
(fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
- (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8")
+ (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
(fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
(fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
(fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
@@ -33,7 +33,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
(fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp")
(fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
- (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc")
- (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s")
+ (fetchbower "chainpad-netflux" "0.9.0" "^0.9.0" "0qx9ihnpmcrmg2lwkpm330bhj8zsp1gdxxrbsd05bwd8pm2x11av")
+ (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz")
(fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
]; }
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
index f406aa83e350b7e35208117ba475f9aa4808f935..77e529f26abf4229ed379db3ffc044ac041e14f9 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/pkgs/servers/web-apps/cryptpad/default.nix
@@ -15,7 +15,6 @@ let
bowerPackages = buildBowerComponents {
name = "${cryptpad.name}-bower-packages";
# this list had to be tweaked by hand:
- # * remove the # in the sortablejs dependency
# * add the second bootstrap ~3.1.1 entry
generated = ./bower-packages.nix;
src = cryptpad.src;
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index b2a943dc2dfc8bb7c3b22c849d43cb88dfaf77b7..6189bfdf4cb8c9c918c9f940083c90f12cc0bbbf 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -364,13 +364,13 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
- "nthen-0.1.10" = {
+ "nthen-0.1.8" = {
name = "nthen";
packageName = "nthen";
- version = "0.1.10";
+ version = "0.1.8";
src = fetchurl {
- url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz";
- sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA==";
+ url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz";
+ sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw==";
};
};
"on-finished-2.3.0" = {
@@ -619,14 +619,14 @@ let
};
in
{
- "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage {
+ "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" = nodeEnv.buildNodePackage {
name = "cryptpad";
packageName = "cryptpad";
- version = "2.25.0";
+ version = "3.0.0";
src = fetchgit {
url = "https://github.com/xwiki-labs/cryptpad.git";
- rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8";
- sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7";
+ rev = "166ab65cd47a64e020528089244ed5be34f6e3c8";
+ sha256 = "35a3b733b5c128b7c7e1c0e7473f4a6a446d663f4c787745b36b1071205c1fd7";
};
dependencies = [
sources."accepts-1.3.7"
@@ -669,7 +669,7 @@ in
sources."mime-types-2.1.24"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
- sources."nthen-0.1.10"
+ sources."nthen-0.1.8"
sources."on-finished-2.3.0"
sources."parseurl-1.3.3"
sources."path-to-regexp-0.1.7"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
index c37d984ae1210ae970e4415a82338a5821b5863b..b370e09931b6b2183a0e70907d2d924ad4b1385e 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.json
@@ -1,3 +1,3 @@
[
- { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" }
+ { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" }
]
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 36c5996286ff22c33cd0000551896106fd8395ad..cae300a53f40513a946bfcd476b74ab727675fd8 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -14,4 +14,4 @@ in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix
index d6a5128b81303d05c8f74ecbec06197017504e8c..0b0583f1fb6fe37c151472b5ce83b367782a79d6 100644
--- a/pkgs/servers/web-apps/frab/default.nix
+++ b/pkgs/servers/web-apps/frab/default.nix
@@ -11,7 +11,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "frab-2016-12-28";
src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index e3adeb0fe660ca8bcc21f20e2eae042e5d06ef1e..1b61632824f26549305198183327881fa80bc9d7 100644
--- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pgpkeyserver-lite";
version = "2017-07-18";
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index 30ab9374cba02a462a5bb8fafcdad18237235eb1..352c5a80e1f40e43526a6eaa4acdc9fe5ab9b793 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -2,7 +2,6 @@
rustPlatform.buildRustPackage rec {
pname = "webmetro";
- name = "${pname}-${version}";
version = "unstable-20180426";
src = fetchFromGitHub {
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 66d4643de39fafa86919cb60727333bdc6e50f87..bd8bba93b4e6110512d0acfe4cf9bef2de7810d6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1132,11 +1132,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation {
- name = "libpciaccess-0.14";
+ name = "libpciaccess-0.16";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2;
- sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x";
+ url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2;
+ sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 80b0addd6ec8bdd2b7e6ccf855d568264eaaa527..b581b7e8a4c201db451a78ce065a5031c4749397 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -340,7 +340,7 @@ self: super:
installFlags = "sdkdir=\${out}/include/xorg";
});
- xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
+ xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
installFlags = "sdkdir=\${dev}/include/xorg";
});
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index beeffc21e56280c2dd48edd97a266f452c00acf7..fc8f2ee46bc54fb62c88c1d58d4e3c1ac0002536 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 7bf21cbf22f2ff56718dcf1899bc907b049e87e9..549b55705c495adef8a6e57fc156b301d2b0cd28 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
'') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
wrapProgram $out/bin/prosody \
- --prefix LUA_PATH ';' "$NIX_LUA_PATH" \
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
+ --prefix LUA_PATH ';' "$LUA_PATH" \
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
wrapProgram $out/bin/prosodyctl \
--add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
- --prefix LUA_PATH ';' "$NIX_LUA_PATH" \
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
+ --prefix LUA_PATH ';' "$LUA_PATH" \
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
'';
passthru.communityModules = withCommunityModules;
diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix
index 4fd88d3261b32c8fcda28895accce81bc52761a8..e2fd845c286e51a6c332ecbd08c90951628efca4 100644
--- a/pkgs/shells/dgsh/default.nix
+++ b/pkgs/shells/dgsh/default.nix
@@ -3,7 +3,7 @@
perl, texinfo, help2man, gettext, ncurses
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dgsh-unstable";
version = "2017-02-05";
diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
index b2aecdf6c14e8f8409aad3a1a7b65df1a7a20bb7..a5f429ed37321ef69c104962e42044cb6d32de30 100644
--- a/pkgs/shells/fish/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish/fish-foreign-env/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, gnused, bash, coreutils }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fish-foreign-env";
version = "git-20170324";
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 383387b4056c257a75aa0b61765385577a680c07..2bd376593879ce04785f2d10239955cfb406d0ee 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "ion-${version}";
+ pname = "ion";
version = "1.0.5";
src = fetchFromGitHub {
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix
index 74e70feaa8d71aec56b236fe52420551a11dc15f..80059e448c9e83851c70d8d1f91c607b83ebabbd 100644
--- a/pkgs/shells/ksh/default.nix
+++ b/pkgs/shells/ksh/default.nix
@@ -1,6 +1,6 @@
{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ksh";
version = "93v";
diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix
index 78d508840ba8aa1d04ea288e65472d16424b38dc..8b8601e326cc5a3a263756246723e0c3aae16bbd 100644
--- a/pkgs/shells/pash/default.nix
+++ b/pkgs/shells/pash/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildDotnetPackage }:
-buildDotnetPackage rec {
+buildDotnetPackage {
baseName = "pash";
version = "git-2016-07-06";
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 3ce32a5e43625f3973f42423083008e4c571eb18..b1e403e7de344bdcfc83604e8a8076cdb71d8136 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -4,7 +4,7 @@ let
version = "0.4.3";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nix-zsh-completions";
inherit version;
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index 4e089dd4d73c0c56cadb28e0310a326b908cc01a..ad7b46a907e44769de94278a4cf87c622e9eb4e2 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec{
+stdenv.mkDerivation {
pname = "spaceship-prompt";
version = "3.7.1";
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index 3e403b62322262d7e5a602cd823c064b33b9ddc7..6228b97685ab2f9f41fde9d7f3fcf071c73d6b74 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -8,7 +8,7 @@
# ZSH_COMMAND_TIME_ECHO=1
# '';
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-04-30";
pname = "zsh-command-time";
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 00e7612b17be33278d00d686b27e79ba13caae27..c80ff0da60af16cabbc33e06d63e58d9a6e56015 100644
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
@@ -3,7 +3,7 @@
# To make use of this derivation, use
# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "powerlevel9k";
version = "2017-11-10";
src = fetchFromGitHub {
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index efb62c2a0fd8a52ecc954e6c03d3dece42d60eee..383d19675314a04178a39aec80f556276120b4bc 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "zsh-prezto-2019-03-18";
src = fetchgit {
url = "https://github.com/sorin-ionescu/prezto";
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 3bc4cd9a8faaff3f22da3a0e371584f4897718a1..4e5c4cc2e8333a06a3767aaf6913195b14353e62 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -55,6 +55,8 @@ in lib.init bootStages ++ [
then buildPackages.darwin.iosSdkPkgs.clang
else if crossSystem.useAndroidPrebuilt or false
then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang
+ else if targetPlatform.isGhcjs
+ then null
else if crossSystem.useLLVM or false
then buildPackages.llvmPackages_8.lldClang
else buildPackages.gcc;
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index b6a488ed2f232a3ad5ee8470a0c848db7981ac65..86a6e33c9424874bdcb177c98dde866ff2839663 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -39,7 +39,7 @@ in rec {
export gl_cv_func_getcwd_abort_bug=no
'';
- bootstrapTools = derivation rec {
+ bootstrapTools = derivation {
inherit system;
name = "bootstrap-tools";
@@ -142,7 +142,7 @@ in rec {
};
stage0 = stageFun 0 null {
- overrides = self: super: with stage0; rec {
+ overrides = self: super: with stage0; {
darwin = super.darwin // {
Libsystem = stdenv.mkDerivation {
name = "bootstrap-stage0-Libsystem";
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 1f752f021524a7ed2d7ebe50fcb5c19ddc98ba43..b0db1be5f4466838563425c8f3b0dc5dfb867a17 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -39,25 +39,25 @@ in
if crossSystem != localSystem || crossOverlays != [] then stagesCross
else if config ? replaceStdenv then stagesCustom
else { # switch
- "i686-linux" = stagesLinux;
- "x86_64-linux" = stagesLinux;
- "armv5tel-linux" = stagesLinux;
- "armv6l-linux" = stagesLinux;
- "armv6m-linux" = stagesLinux;
- "armv7a-linux" = stagesLinux;
- "armv7l-linux" = stagesLinux;
- "armv7r-linux" = stagesLinux;
- "armv7m-linux" = stagesLinux;
- "armv8a-linux" = stagesLinux;
- "armv8r-linux" = stagesLinux;
- "armv8m-linux" = stagesLinux;
- "aarch64-linux" = stagesLinux;
- "mipsel-linux" = stagesLinux;
- "powerpc-linux" = /* stagesLinux */ stagesNative;
- "powerpc64le-linux" = stagesLinux;
- "x86_64-darwin" = stagesDarwin;
- "x86_64-solaris" = stagesNix;
- "i686-cygwin" = stagesNative;
- "x86_64-cygwin" = stagesNative;
- "x86_64-freebsd" = stagesFreeBSD;
+ i686-linux = stagesLinux;
+ x86_64-linux = stagesLinux;
+ armv5tel-linux = stagesLinux;
+ armv6l-linux = stagesLinux;
+ armv6m-linux = stagesLinux;
+ armv7a-linux = stagesLinux;
+ armv7l-linux = stagesLinux;
+ armv7r-linux = stagesLinux;
+ armv7m-linux = stagesLinux;
+ armv8a-linux = stagesLinux;
+ armv8r-linux = stagesLinux;
+ armv8m-linux = stagesLinux;
+ aarch64-linux = stagesLinux;
+ mipsel-linux = stagesLinux;
+ powerpc-linux = /* stagesLinux */ stagesNative;
+ powerpc64le-linux = stagesLinux;
+ x86_64-darwin = stagesDarwin;
+ x86_64-solaris = stagesNix;
+ i686-cygwin = stagesNative;
+ x86_64-cygwin = stagesNative;
+ x86_64-freebsd = stagesFreeBSD;
}.${localSystem.system} or stagesNative
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 1a96d9b3acf77d58090c054460648d483350d0c2..b754230b0be9572dda07ad785e3d1d52dcbaadc1 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -153,7 +153,7 @@ let
'' + (builtins.getAttr reason remediation) attrs;
- handler = if config ? "handleEvalIssue"
+ handler = if config ? handleEvalIssue
then config.handleEvalIssue reason
else throw;
in handler msg;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 1ef2ab52029b42a4b596caaf9c2bfd06050a8d5e..2f43db9cfc24b6f4d09889bcebdfa1611a3f2aab 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -108,7 +108,7 @@ let
__impureHostDeps = __stdenvImpureHostDeps;
})
- // rec {
+ // {
meta = {
description = "The default build environment for Unix packages in Nixpkgs";
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ebcedce60b87a38964b34b310048af70c012decf..311292169ecde699aacd3c61a5c2bc4bacf04909 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -212,6 +212,18 @@ isELF() {
if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi
}
+# Return success if the specified file is an ELF object
+# and its e_type is ET_EXEC (executable file)
+isELFExec() {
+ grep -ao -P '^\177ELF.{11}\x00\x02' "$1" >/dev/null
+}
+
+# Return success if the specified file is an ELF object
+# and its e_type is ET_DYN (shared object file)
+isELFDyn() {
+ grep -ao -P '^\177ELF.{11}\x00\x03' "$1" >/dev/null
+}
+
# Return success if the specified file is a script (i.e. starts with
# "#!").
isScript() {
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 390c7f1123ecc96d9f13fca07ae590e2eb8d0028..8344c9dfb2b87bbbe2a582e245680929a1733c14 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -8,21 +8,21 @@
, bootstrapFiles ?
let table = {
- "glibc" = {
- "i686-linux" = import ./bootstrap-files/i686.nix;
- "x86_64-linux" = import ./bootstrap-files/x86_64.nix;
- "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;
- "armv6l-linux" = import ./bootstrap-files/armv6l.nix;
- "armv7l-linux" = import ./bootstrap-files/armv7l.nix;
- "aarch64-linux" = import ./bootstrap-files/aarch64.nix;
- "mipsel-linux" = import ./bootstrap-files/loongson2f.nix;
- "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix;
+ glibc = {
+ i686-linux = import ./bootstrap-files/i686.nix;
+ x86_64-linux = import ./bootstrap-files/x86_64.nix;
+ armv5tel-linux = import ./bootstrap-files/armv5tel.nix;
+ armv6l-linux = import ./bootstrap-files/armv6l.nix;
+ armv7l-linux = import ./bootstrap-files/armv7l.nix;
+ aarch64-linux = import ./bootstrap-files/aarch64.nix;
+ mipsel-linux = import ./bootstrap-files/loongson2f.nix;
+ powerpc64le-linux = import ./bootstrap-files/ppc64le.nix;
};
- "musl" = {
- "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;
- "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix;
- "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix;
- "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix;
+ musl = {
+ aarch64-linux = import ./bootstrap-files/aarch64-musl.nix;
+ armv6l-linux = import ./bootstrap-files/armv6l-musl.nix;
+ x86_64-linux = import ./bootstrap-files/x86_64-musl.nix;
+ powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix;
};
};
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index ba53a6f1d1421b1ac1ab563f8c94e2d3b152276d..f6e0df161ad00b5354cccdf9f6cf3bcf41cc6a3f 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -121,8 +121,8 @@ in
cc = let
nativePrefix = { # switch
- "i686-solaris" = "/usr/gnu";
- "x86_64-solaris" = "/opt/local/gcc47";
+ i686-solaris = "/usr/gnu";
+ x86_64-solaris = "/opt/local/gcc47";
}.${system} or "/usr";
in
import ../../build-support/cc-wrapper {
diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 73b359ffe6a499de6621f0d5143ce4bd9f0d7b32..810d5d97829baeb705847a90899b567f05e878e3 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -25,7 +25,7 @@ let
meta.platforms = lib.platforms.darwin;
}) count;
- finalExe = stdenv.mkDerivation rec {
+ finalExe = stdenv.mkDerivation {
name = "${prefix}-final-asdf";
unpackPhase = ''
src=$PWD
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index f917bda6f71be1cceb465c9d955b5606f27fa2c7..976cabc33f8be29aaf13ad1610e6e7f68918351b 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
-buildGoPackage rec {
+buildGoPackage {
version = "0.5.1";
pname = "grobi";
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 7863542d19000ec14b08cf21da49f5412d95db17..5eb74a267983c3251d6dfa9a1cca65a7bfcd3021 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -2,7 +2,7 @@
, libXinerama, libXrandr, glib, cairo, xdotool }:
let release = "20180821"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "keynav-0.${release}.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix
index f7d8914722a9fba627d63c1adc6ebbcb781cc1e8..1472e39c83c2d3ac8235ca155d428eebfcaf23e0 100644
--- a/pkgs/tools/X11/ksuperkey/default.nix
+++ b/pkgs/tools/X11/ksuperkey/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ksuperkey-git-2015-07-21";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
index ad2ee549a6d72dd677c7d14b2a011d9e896bf9da..9acd113d0ab3775599dbf45ebb912b44a8a4bf61 100644
--- a/pkgs/tools/X11/oblogout/default.nix
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
pname = "oblogout-unstable";
version = "2009-11-18";
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix
index ae4dc08770ddc92c01eddfc40b375333eda65bfd..fc0068e6e278378c0f2f784f8b73076c1148b047 100644
--- a/pkgs/tools/X11/run-scaled/default.nix
+++ b/pkgs/tools/X11/run-scaled/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2018-06-03";
pname = "run-scaled";
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix
index 479617b6b93ab4b3ce61d1feb6a665e7b1c3c73e..31e2320e1b9fd6b3cafde984de26e0f137e6df09 100644
--- a/pkgs/tools/X11/runningx/default.nix
+++ b/pkgs/tools/X11/runningx/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "runningx";
version = "1.0";
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index cb01d0a4d4a41e4f4f30c9a4542125b4dfe11c89..6075f0070f90fdb6c87d5bf28169637c53349333 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "x2vnc-1.7.2";
src = fetchurl {
diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix
index c36334d478dfbdafbf382a0ad46fab0ff08eccba..48cab6529ccbbb81ee9c0b114be9c0a77d87e946 100644
--- a/pkgs/tools/X11/xcwd/default.nix
+++ b/pkgs/tools/X11/xcwd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2016-09-30";
pname = "xcwd";
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index edafbf5525bf38fe402c0f6f8ebff3d4f47d3795..b1770af2406ec2b41cda3ecd99685c7516458de3 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -2,7 +2,7 @@
, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }:
rustPlatform.buildRustPackage rec {
- name = "xidlehook-${version}";
+ pname = "xidlehook";
version = "0.7.0";
doCheck = false;
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix
index 463df6ad9351622cbdcbb72155d74e726f93de7a..dfd28e31771873698b9b5945ee98ebac8a77172a 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/pkgs/tools/X11/xmagnify/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, libX11, xorgproto }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xmagnify-0.1.0";
src = fetchFromGitLab {
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
index 70b471c795ef5ed4b9f0ae3787ab9bb0137bb723..6f75d2360cf4916339d70f94d01f42007f787a38 100644
--- a/pkgs/tools/X11/xrestop/default.nix
+++ b/pkgs/tools/X11/xrestop/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, xorg, pkgconfig, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xrestop";
version = "0.4";
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index 8db15a8f03343b78f167d89df184b236fc01f2ce..aae31d649f44f01dfa0cf0e244cf556ccfb6dc28 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "xtrace";
version = "1.4.0";
- src = fetchFromGitLab rec {
+ src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = pname;
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 5f789a0151f4d8ad83e3115842a8e65d1d6dc4e8..3c1dc3de2b420e28f19e038706931df853fd3528 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, imake, libXt, libXaw, libXtst
, libXi, libXpm, xorgproto, gccmakedep, Xaw3d }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xvkbd";
version = "3.9";
src = fetchurl {
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 61f284cf85f172aa10180de26d4ab8b2b9fe534c..8195207ef60a9c804e53bc093ddf5e7361f465de 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,7 +1,7 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "cli53";
version = "0.8.12";
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 1225441392c49e3a4d8b8039060286c243e4e8ec..f0945d7d778b7e567240e388834dc84730c4fff6 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "intecture-agent-${version}";
+ pname = "intecture-agent";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index 577d439c805a862f3eac6faa4002bcd295aebc7c..a3208bddabe97c3aafb6603830cc5a749b071e0c 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "intecture-auth-${version}";
+ pname = "intecture-auth";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index b0bb63984f0df1e055cb3cede8f513dd7c3e6a6f..90d65a3f2951defb143242b4605915879c893558 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "intecture-cli-${version}";
+ pname = "intecture-cli";
version = "0.3.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
index e49d3957659115ef62c9feb766f901a3c40b56eb..a11906e80f0405e8c67b25bfdf9b3ac85e254193 100644
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -1,6 +1,6 @@
{ lib, ruby, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "oxidized";
gemdir = ./.;
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 2df63ea1e15a7f5d8f85e5f50f4fa44f57c06996..de09931e7c10394167cfbb26e549928cfedd68fb 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -8,17 +8,17 @@ let
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
pulumiArchPackage = {
- "x86_64-linux" = {
+ x86_64-linux = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
pname = "pulumi";
diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix
index 538464499fa6ae87ad3ace21d72d4723156b949d..a126a430e52c2029151b5a6081dc3ad7b5addc40 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/pkgs/tools/admin/vncdo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, pythonPackages
}:
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
pname = "vncdo";
version = "0.11.2";
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index e305a1739f7c900c2c8e8cdee743030c89b13348..64a606a4cb502a37ef870b6b576f78bea16b6746 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, perl, bash}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "atool-0.39.0";
src = fetchurl {
url = mirror://savannah/atool/atool-0.39.0.tar.gz;
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix
index 7f813dd76c897d58f280d302d5300090d03d6efd..b507b60287c9d7c0acb3e71735a80d748f21f863 100644
--- a/pkgs/tools/archivers/pxattr/default.nix
+++ b/pkgs/tools/archivers/pxattr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gcc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pxattr-2.1.0";
src = fetchurl {
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index 3c515b8c195d78bfe8610828b0728ff54bacfaa4..59ff67e3eefbc7698e4b0bd177c218e92edf648b 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -1,6 +1,6 @@
{ stdenv, rpm, cpio, substituteAll }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rpmextract";
buildCommand = ''
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index e1cac4fc61f79d42d8a82a1aab315b105e595cee..82e83a8c6a3812406086a80bfe406faff1804043 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -7,7 +7,7 @@
let
runtime_bins = [ file unzip gzip ] ++ extraBackends;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "unp";
version = "2.0-pre7";
buildInputs = [ perl makeWrapper ];
diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index 3c9cc5639a8ff6329918f6cb6d5dc95235c30435..fac37962f3cf062c0b09839f2add5966f80975ec 100644
--- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
name = "beets-copyartifacts";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix
index fb3d0e51341c93bf3dfe9c78dba5ede6414e2bdf..35d1af1e76761b9494880537a3a76925e84296ee 100644
--- a/pkgs/tools/audio/mididings/default.nix
+++ b/pkgs/tools/audio/mididings/default.nix
@@ -1,6 +1,6 @@
{ stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
version = "20151117";
pname = "mididings";
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index 3b59d5aceb056ef9fadcdeffbd9104b6fc3df432..a791a81db351710184ab6752e03f5b597e9f1029 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -6,7 +6,7 @@ let
name = "mpdcron-bundle";
gemdir = ./.;
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
version = "20161228";
pname = "mpdcron";
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index 239e4b3fcca395c295b4a3c44a43d5a7087a0dba..69e5976e6d5ead45d4697a6e49756c5523ac7750 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pa-applet-2012-04-11";
src = fetchgit {
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
index d72cb85643735940b30225a00566789e52790c71..5d31193ee8d4fa7b12d5b8e5b0a71071bdb4436f 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/pkgs/tools/audio/trx/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "trx-unstable";
version = "2018-01-23";
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index 36afd11aa2c390256ffbe074b7fa6c593370a312..3871bbd39a16774e3c151e1e251f75b75f57a58a 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -1,6 +1,6 @@
{ pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "volumeicon";
version = "0.5.1";
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
index 472b4a6508f20a91e63af822c4902edaa090b63f..3d219eed012c4ed06bfe477b069b83052e05d99a 100644
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "amazon-glacier-cmd-interface-${version}";
+ pname = "amazon-glacier-cmd-interface";
version = "2016-09-01";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 8f4cd60e1ee05b5643318f7a0abf3075d8c204c6..3097756ddf8eb80da99c035ebcb93e368f1609fe 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -9,7 +9,7 @@ let version = "0.29.2"; in
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bup";
inherit version;
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index b090da8526384a50a9e202db1472d93817d599fd..1cf7a19014e4d980e2da63556bb6a33b85e9f49b 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -5,11 +5,11 @@
, rsync, makeWrapper }:
python2Packages.buildPythonApplication rec {
- name = "duplicity-${version}";
+ pname = "duplicity";
version = "0.7.19";
src = fetchurl {
- url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
+ url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6";
};
patches = [
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix
index 412c9696d02aaafdf2bc57be27c5615c0c4337f6..a56d1274f92e89e5f9636993153dfe415bb8f52f 100644
--- a/pkgs/tools/backup/easysnap/default.nix
+++ b/pkgs/tools/backup/easysnap/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, zfs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "easysnap";
version = "unstable-2019-02-17";
diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix
index 739f14ca1a6188b4ac92547b81e184829690e512..8d71671f6fece90d88558c04363e1d71a41120d2 100644
--- a/pkgs/tools/backup/flockit/default.nix
+++ b/pkgs/tools/backup/flockit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "flockit";
version = "2012-08-11";
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix
index 0ed70ade829577a77a6a326f43b912edb2afe763..814c02267ba941ef66ad5632465c644460d9b381 100644
--- a/pkgs/tools/backup/lvmsync/default.nix
+++ b/pkgs/tools/backup/lvmsync/default.nix
@@ -3,7 +3,7 @@
let
pname = "lvmsync";
- version = (import ./gemset.nix)."${pname}".version;
+ version = (import ./gemset.nix).${pname}.version;
in stdenv.mkDerivation rec {
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index e07eb33abb587818e8eb1f0d7a4a6b3360f41b86..30ee0041c7cc738c2eb94e425b7e426faa6afe37 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.8.1";
pname = "ori";
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index e0ac2c3f2328c446e972c4362109757807d7d2fe..bd5c10ea122c0521bb75e650f75b80a3440eb8ce 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -3,7 +3,7 @@
, Security }:
rustPlatform.buildRustPackage rec {
- name = "rdedup-${version}";
+ pname = "rdedup";
version = "3.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix
index 56f9c4f9dafe87bfc9f52d0dfd1250aa5b3d645e..0df4ecda89eff5c78e7dc7b42b55f12960e0ee4f 100644
--- a/pkgs/tools/backup/rdup/default.nix
+++ b/pkgs/tools/backup/rdup/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rdup";
version = "1.1.15";
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index 4c13c831ba94caec5e51a1f78ddc38f6837a7473..90a8c665cd43a615f3bce8b57e20252b4fa1c18a 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, coreutils, gnused, gawk, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rsbep";
version = "0.1.0";
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index 928ba9842b256469fac8aedcb29283fec0c88c6a..d7a160328ed1c2ebf3397eb9653f8c61961b30b5 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "zbackup";
version = "1.4.4";
src = fetchurl {
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 973e92176443cd5e2d5545f40354cb86ce1430b4..b44564efb8275dc0261498c5f34befe52609df1f 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -23,7 +23,7 @@ let
version = "0.18.0";
checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "znapzend";
inherit version;
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 4ddc75542945ebbea5b40a2fe8fb8f60abcbc432..cf0ad78d1d7eadba0261c1d2a87dcc6a0a433928 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -2,9 +2,9 @@
let
archids = {
- "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; };
- "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; };
- "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; };
+ x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; };
+ i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; };
+ aarch64-linux = { hostarch = "aarch64"; efiPlatform = "aa64"; };
};
inherit
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix
index d617a9a6c542ea3130b7d963172cf204cbdd9ee0..ece45944c5c0c88440f5902a7f8e7e60edf8b98c 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cdimgtools";
version = "0.3";
diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix
index 970b32eb08fbc0aa181dbd3da0fd61863faa9943..2ee69682a1d51e65a59ea7f40be39d5f665df856 100644
--- a/pkgs/tools/cd-dvd/cue2pops/default.nix
+++ b/pkgs/tools/cd-dvd/cue2pops/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cue2pops";
version = "git-2018-01-04";
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index ef185f706dce9d4e34c15278faadb56138c7c357..0c54c3b452b601592451d968b029634cd15aa0fa 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "lzfse";
version = "2017-03-08";
diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix
index cdc155474a78765cc18636ea0edb056d9f6e03de..0aa30ceb6632f10d09226cc53b02a9a084cf87bb 100644
--- a/pkgs/tools/compression/lzham/default.nix
+++ b/pkgs/tools/compression/lzham/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "lzham-1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix
index 2e34c9dd485726d9695aa4ff0b7c9465092e0009..b9c5c55a8e47f0599d9acaf1b0c1d3a3a89c1ae5 100644
--- a/pkgs/tools/filesystems/9pfs/default.nix
+++ b/pkgs/tools/filesystems/9pfs/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fuse }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "9pfs-20150918";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix
index 137b00802dfd5bf699c2915e79b7e65fa059c59d..7f8a8c4f931fd8923e0e3c8d744865f9c60dda84 100644
--- a/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/pkgs/tools/filesystems/afpfs-ng/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "afpfs-ng";
version = "0.8.2";
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix
index 9ee0b8133260e193006fc5ef0c397eb4d3473d73..2c7b1c271569f8fbcdd6bfd022bddab567adaaaf 100644
--- a/pkgs/tools/filesystems/apfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/apfs-fuse/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "apfs-fuse-unstable";
version = "2019-07-23";
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index b95a9ad68a82431ababec95a94e2c3549b982ec1..b66d67fbc9f2a5ccc73023c5cfbcc422f7e23414 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-library"
"--enable-fuse"
- "--disable-static"
];
meta = {
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 95923f202cf458e018183f69c9b0ac3c5e444749..98dab6278b01b1f7360519e111735ad63ab6c5d5 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
, liburcu, zlib, libaio, zstd, lz4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "2019-08-21";
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index 842ef6712ac9ed646a0a7e1685d26fefc7c1c2be..94573bcd2010272bfad98d738b43ce1ea2d13c14 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -5,7 +5,7 @@ let
version = "0.6.1";
sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
- bees = stdenv.mkDerivation rec {
+ bees = stdenv.mkDerivation {
pname = "bees";
inherit version;
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index a0983004fccdf70a99398db56f3ab5163cab4796..3ddc95273972897f5abc425ae8ac5868ea9cea64 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -21,7 +21,7 @@ let
owner = "vincenthz";
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "boxfs";
version = "2-20150109";
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index ebab6c5b16ba12f806958f26067f6dba1d7e40e6..e2538387d450bf08a2053f3c08b4bb938cce85ca 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "btrfs-dedupe-${version}";
+ pname = "btrfs-dedupe";
version = "1.1.0";
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index e6c4474765c3751c34677938c3eda58e7f7fcdbd..81faed5bfa8dfa1f02553da8bad6c9778f7ab05b 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
let
version = "0.7.1";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dislocker";
inherit version;
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index a61c3c80e6d2f477569a73cb5329f9d87b62e485..3981521097a9495f15e59384478ab3edeaf9f2e6 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "duff";
# The last release (0.5.2) is more than 2 years old and lacks features like -D,
# limiting its usefulness. Upstream appears comatose if not dead.
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index d8ddde24ade36a06f3668704f04caf71888873ef..ee3cce37bc7c97b40b93a00efd1fa4c5593d93e4 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -26,6 +26,14 @@ stdenv.mkDerivation rec {
})
];
+ postPatch = ''
+ # Remove six failing tests
+ # https://github.com/NixOS/nixpkgs/issues/65471
+ for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do
+ rm -r "tests/$test"
+ done
+ '';
+
configureFlags =
if stdenv.isLinux then [
"--enable-elf-shlibs"
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index 274126e1a7186f6825d0981a8359fccfd1575772..b84992e1acbbc99ab3cd2494f3f6d4f04f1db0b6 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, e2fsprogs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2.4";
pname = "extundelete";
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index 8a417cfe397d42011f7989bda6f2e48a1e90517b..41c4cc84f966a7e61f06d8106d7bdca372206c6d 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fuseiso-20070708";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index ec734e52f73381d96ca42d3b2afddd2a7880b3dd..614e323e6b294865286f220d0a091e30f2cdf884 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "gitfs-${version}";
+ pname = "gitfs";
version = "0.4.5.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 606e41e582ee19028fd7091fbe369d4c4bb02472..07ba47dda4d50d10073fb96575b91cc2c0f518c7 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -62,7 +62,7 @@ let
];
in
stdenv.mkDerivation
-rec {
+{
inherit (s) name version;
inherit buildInputs propagatedBuildInputs;
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
index 25ec31ea698acbd49c42a24453ae774844d0a7df..2032ca1c1e75c8dd67fa67de1239802fd8f0178d 100644
--- a/pkgs/tools/filesystems/hfsprogs/default.nix
+++ b/pkgs/tools/filesystems/hfsprogs/default.nix
@@ -2,7 +2,7 @@
let version = "332.25";
package_name = "hfsprogs"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${package_name}-${version}";
srcs = [
(fetchurl {
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index c4910b166de7c2d4ddaba586b13864937b8a60a4..049a616587438803c032ab3445a8792fbfd52d78 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libuuid, lzo, zlib, acl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mtd-utils";
version = "1.5.2";
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index ea321200fb981db19b49590637e939ea080c1adf..dd8116ff40130af02b53cc494bcd07a05ab4313a 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -8,7 +8,7 @@ let
name = "${baseName}-${version}";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.sha256;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
index 408d02bced74d3c4bc2ebdeb24a8d2daa587081d..2abab9057376f255e36650cf5fc4d881ff9cacf5 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.53";
md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
- src = fetchurl rec {
+ src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
+ "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index ffe31b464b8ab9277019b67129843233f5d21147..8a1fce780378298553d5625f4656638fc4f4ab95 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -5,7 +5,7 @@ buildPythonApplication rec {
version = "1.99.39";
md5_path = "d249f60aa89b1b4facd63f776925116d";
- src = fetchurl rec {
+ src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
+ "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 04a15dfa22be3909122bbea79f0b77b1766b66dc..c99a95714c09f1d0bea6338a93338458c75c9dc9 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre
, libuuid, gnome_vfs, pkgconfig, GConf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "relfs-2008.03.05";
src = fetchcvs {
diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix
index cdc90097653fa090b29a8ca74ccf47f4ffc39df5..46be9e30f70f248775e924232fe5b0b1e91388ae 100644
--- a/pkgs/tools/filesystems/rmount/default.nix
+++ b/pkgs/tools/filesystems/rmount/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
pname = "rmount";
version = "1.0.1";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
rev = "v${version}";
owner = "Luis-Hebendanz";
repo = "rmount";
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 9a0073f939fb45d6a7c2e17879e471915a374881..5bd3b27eded180f80dd9c42b3995e6a4f32d7719 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -6,7 +6,7 @@
assert lz4Support -> (lz4 != null);
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "squashfs";
version = "4.4dev_20180612";
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
index 6cc049a44092315c31b8f7590457ed64a0a40c76..c15a782fa3c6f68a26c66e4d68ab9b221e0207a8 100644
--- a/pkgs/tools/filesystems/vmfs-tools/default.nix
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig
, asciidoc, docbook_xsl, fuse, libuuid, libxslt }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vmfs-tools";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix
index 135373e09f42fb33dbb242b37c84ea258e551c39..50a50ad18f05284440f777afc7b97ecd802c631b 100644
--- a/pkgs/tools/filesystems/wdfs/default.nix
+++ b/pkgs/tools/filesystems/wdfs/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchurl, glib, neon, fuse, pkgconfig}:
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation {
name = "wdfs-fuse-1.4.2";
src = fetchurl {
url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz";
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 557367ea22cd5cb3da5eb598f6f14e74a986163b..ea25b302e355c0f06a907dccaa2b764d4ab884b5 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
, lib, valgrind, makeWrapper, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = fetchFromGitHub {
# using unstable release because stable (v1.5.1) has broken repl java plugin
rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3";
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 0269df84634f421587bbccc02d43f3e44fa109de..89516d525af6ef1313be60b576c43df820950afc 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "zkfuse";
inherit (zookeeper) version src;
diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix
index 179f0432dd10597c0a7a733825b801dea360cd29..6d98ea240de616e256808841b5d7f33345e760bd 100644
--- a/pkgs/tools/graphics/cfdg/src-for-default.nix
+++ b/pkgs/tools/graphics/cfdg/src-for-default.nix
@@ -1,4 +1,4 @@
-rec {
+{
version="3.0.2";
name="cfdg-3.0.2";
hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p";
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 04b73995580bcc41c7725109b306076e5dc7b6be..3d48b328934b5860ab96f3d996104ead14aadcb3 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, imagemagick }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cuneiform";
version = "1.1.0";
diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix
index ad8d9ebc6a22d836b708e1ab36688083d00a6cef..ff2091fc299870d5ec686d41b3dec8038354cac2 100644
--- a/pkgs/tools/graphics/eplot/default.nix
+++ b/pkgs/tools/graphics/eplot/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gnuplot, ruby }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "eplot-2.07";
# Upstream has been contacted (2015-03) regarding providing versioned
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 7719406cb6bf5bbc592c5774651d93852a6b8ae1..5875f64f7ef34ea3002eb5ef82b2e7ea0dbbae82 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "gifski-${version}";
+ pname = "gifski";
version = "0.8.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 111a9b59afdacaba56a8ffd2e0ea2c01bc854ad5..5668e755d0174cd97b4b313d229f963c0d21c48d 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
python27, wayland, udev, mesa, wafHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "glmark2";
version = "2017-09-01";
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 848d804bb38545976434bdb1eae70a975e8fc08d..c487e42329d8e66ff4665a526c889ff24ab83429 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -12,7 +12,7 @@ let
url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "gmic";
inherit version;
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index 6cdd6dd71c1dcda5f3e0176bd1788c44fa0a1f26..cd2302efd165d3d6ec83b6ea2cb353fc7c7b5b03 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -24,7 +24,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "graphviz";
inherit version;
diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix
index b0836d670862ea6be4940be0ec68d2b91130550b..0b6c126394237c5ee82eefe16c95584865de8cf7 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/pkgs/tools/graphics/lepton/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, git, glibc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.2.1";
pname = "lepton";
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index b65cbfca7bbe06964867bc407c28a52de82c99c7..4826bd64984b7ab3b93b5fb885acc57eb8e9816d 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -13,7 +13,7 @@ let boost_static = boost165.override {
enablePython = true;
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "luxcorerender";
version = "2.0";
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 534cefe9bf6c367b2188f26ea1792101337aa576..9de7603c9730fc1b051fa1b16fbf14173eb1b22d 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -2,7 +2,7 @@
, makeWrapper, libtiff
, enableX11 ? false, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
name = "netpbm-10.82.01";
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
index ebebe50875223c802a42807ca2dc50a17bc289d1..0e545fbfab9f573b838ba23dd4be2caaeb184215 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nifskope";
version = "2.0.dev7";
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix
index c1138e5f45840080a7bbbc1342fd8aef8cb37b3d..b831e359e9cc8669256dd8540f7f23cc071fd9d6 100644
--- a/pkgs/tools/graphics/optar/default.nix
+++ b/pkgs/tools/graphics/optar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, imagemagick, libpng }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "optar";
version = "20150210";
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix
index e4163cd93a87943acbd8f96b3580773b9ed4b07d..ed8fa5ee5192fac28bd5389bd7d0ee9fc6e7e585 100644
--- a/pkgs/tools/graphics/pngtoico/default.nix
+++ b/pkgs/tools/graphics/pngtoico/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libpng }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pngtoico-1.0";
src = fetchurl {
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index eec8c5158b438e02a962d17259ab8e7163b69092..909f0e397268017e811f6fb66a821cd9efbc94e9 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qrcode-git";
version = "20160804";
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
index 8628b72bbae28a91b6773d8230f0bb44348397ad..97c400fbc9e32d80e7b77f3103c7426b8ea9e664 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qtbase }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rocket";
version = "2018-06-09";
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix
index a3497aefe1022768d2edd1dd2b78753b0f18e211..2c586cd3b1f6b416d5dda7b6bfdb7e579dd8d6c6 100644
--- a/pkgs/tools/graphics/structure-synth/default.nix
+++ b/pkgs/tools/graphics/structure-synth/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "structure-synth";
version = "v1.5";
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index 6e455caf9066ca79962be2efdfa5afd907bf3e3f..50aeae78fce8ef46cc6a3e2943020275068854dd 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "svgcleaner-${version}";
+ pname = "svgcleaner";
version = "0.9.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix
index ceee3b7674d90469ffafcfa29d9b92a256610eef..db204113226e25cf80de772ff90c9c56674bc32c 100644
--- a/pkgs/tools/graphics/transfig/default.nix
+++ b/pkgs/tools/graphics/transfig/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "transfig-3.2.4";
src = fetchurl {
url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz;
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 9ea1c2d73438ea795e4a7b82573c1a1594439f76..5851e4a2d46acaecb813567698c7d02d51cede0b 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "vulkan-tools";
- version = "1.1.106.0";
+ version = "1.1.114.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
index cf0a0f1fa17e9a4b011055f728887ff091b46f9d..187587fbfb49e41caae651f95ce6e072dc98d786 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fcitx-skk";
version = "0.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index c3ee5eafd7befa32be8794ef111a5ff428a40a85..b77394f218b89ede954c64048644926b0b6801a6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -13,7 +13,7 @@ let
rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992";
sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "ibus-table-chinese";
version = "1.8.2";
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index d36697221a4f8187d24be93daad8b92d0ac8512c..a6c2404ef34796ebf4af38445e2e69107465f85c 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -60,7 +60,7 @@ let
sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10";
};
};
- ucd = stdenv.mkDerivation rec {
+ ucd = stdenv.mkDerivation {
name = "ucd-12.0.0";
dontUnpack = true;
installPhase = ''
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
index cd7d1cd8bbfc1be6bf8ad44303b977bed880c8a7..a2f01c7367c8154661970454ae0bb282bdc31772 100644
--- a/pkgs/tools/inputmethods/keyfuzz/default.nix
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "keyfuzz";
version = "0.2";
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index cf32e8d51ca30e8468bd441c1f8228a6384ddb83..2f8425bd8b541db071ad4982b6b0463c9b2a1333 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -27,7 +27,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "skk-dicts-unstable";
version = "2017-10-26";
srcs = [ small medium large edict assoc ];
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix
index d4ef2e2422ec1d39a516a5f0905558faba72edb2..19d871bc77fc051978a963510f350669fead98f0 100644
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -8,7 +8,7 @@
# dependencies on a Ruby interpreter etc.
# - We for the moment do not package them to keep the dependencies slim.
# Probably, shall package the newer tools as skktools-extra in the future.
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "skktools";
version = "1.3.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index 02993b248ab708ead05236465388393026c50124..afacc302eda1ef8e6782ad7f03fc0d87d555dac7 100644
--- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tegaki-zinnia-japanese";
version = "0.3";
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index ce87e1a71412e708914ffae4fdc1dabf8d499d0e..b23e0c369a62abe3d93cf4b6ca776267a80a82c3 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "zinnia";
version = "2016-08-28";
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix
index a349a3f2fc0e9ad083bde33bb6a19a6a1b024343..d78846922c6e64bc9b3a52382ce1551624d496d6 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/pkgs/tools/misc/0x0/default.nix
@@ -1,6 +1,6 @@
{ stdenv, xsel, curl, fetchFromGitLab, makeWrapper}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "0x0";
version = "2018-06-24";
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 8b2a2a4b21500682d55c3bd29ddea7533303ab49..c16e4aded0d0134c3704f3374f142282c0873320 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, fetchgit
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "argtable";
version = "3.0.1";
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
index 79f72746f905a674533dc0d784f22a65390bea3f..14ab790d9c7688fd30a6fd8db95cf1006767909d 100644
--- a/pkgs/tools/misc/bashplotlib/default.nix
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python3Packages, fetchFromGitHub }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "bashplotlib";
version = "2019-01-02";
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 205bc196811b14fcd46a414280f4480a3781c951..267b820df0733da9daa94b449e798a7dd0aa4d9d 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib
+{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib
, Security, libiconv
}:
rustPlatform.buildRustPackage rec {
pname = "bat";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw";
+ sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6";
fetchSubmodules = true;
};
- cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517";
+ cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz";
- nativeBuildInputs = [ cmake pkgconfig zlib ];
+ nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
+ LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+
postInstall = ''
install -m 444 -Dt $out/share/man/man1 doc/bat.1
install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index c7a9af4abd1a7d0cc3276fc9104802d5e63283ef..c0339834b649b7def9b21b69950185effa5f08b0 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocaml }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bibtex2html";
version = "1.99";
diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
index 655fd44c03997ae4868dd72a2b80de1b07036fc4..23bd7ed172c4102a6a94a4b5c19555fb0e77b0f1 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/pkgs/tools/misc/blsd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }:
-buildGoPackage rec {
+buildGoPackage {
pname = "blsd";
version = "2017-07-27";
diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix
index 7391c271cd1765d4077b276b3c8945c4411da9d9..6b7a51e08f51b87fb61d6cf3a4e836e6ebcfdc8c 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/tools/misc/bmap-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "bmap-tools-${version}";
+ pname = "bmap-tools";
version = "3.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index 2ba5499d7f77c93a359a8fd58e42aedacda5a2cf..c40ccad5e39624c8e6c96e5d7920847cd6409029 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python2Packages, fetchFromGitHub }:
-python2Packages.buildPythonApplication rec {
+python2Packages.buildPythonApplication {
pname = "broadlink-cli";
inherit (python2Packages.broadlink) version;
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix
index 377297ee47992803650ac7c0a4711fbd19ebc1d9..e7134961c25205d802e94aab00f2a8caeb6f5d5f 100644
--- a/pkgs/tools/misc/capture/default.nix
+++ b/pkgs/tools/misc/capture/default.nix
@@ -1,6 +1,6 @@
{ stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "capture-unstable";
version = "2019-03-10";
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index a1b1b4eac2d5d6b2172a02c3b7c6f1078942a6e0..4d33d957b4d102e238e505f994f6745a7acb6917 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -7,7 +7,7 @@
, xsel
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cht.sh";
version = "unstable-2019-08-06";
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index 1b3c5f169699e2ef3b19e8b1f14b757323132b7d..f3d7fbd8127354dfc774702db63eaa33d8d37a31 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.1a-3";
pname = "contacts";
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index f35da52081bc142521cb63a3e4dd77305d2e9131..5792fa4121b450169250f98d85220ab59626b7c7 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -5,7 +5,7 @@ let
rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4";
date = "20160316";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
src = fetchgit {
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index 7ca103062c1133aaea0992932ca0f08c0f6d0b01..f5291d0789e69bd4d4aadc47123c13dc55db3529 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages, help2man }:
python2Packages.buildPythonApplication rec {
- name = "crudini-${version}";
+ pname = "crudini";
version = "0.9";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index ab52d73ac27b5e09cd290fea912c2b22d7330354..72687f4bfa48221f0d410b867637ec85880820be 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dbus-map";
version = "2015-05-28";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index ef00c753d3aa6f37598b22aba2cec02604d422c1..591cd5fe04080c61831592bc9601e3e878f48bc7 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "diskus-${version}";
+ pname = "diskus";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index b9a66ba95d9f7bcd44e4793dcec8eb5831748d3a..4dffae557a4e3471fdb390f96e9202e7205badf9 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "dust-${version}";
+ pname = "dust";
version = "0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix
index 10fb4cd89bd9fc19cfa62d7dd7e31ff8009221af..df2e25c7ea33bece2f96e7f2e9edc035dcffea4e 100644
--- a/pkgs/tools/misc/dvtm/dvtm.nix
+++ b/pkgs/tools/misc/dvtm/dvtm.nix
@@ -1,5 +1,5 @@
{ stdenv, ncurses, customConfig ? null, name, src, patches ? [] }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name src patches;
diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix
index c88e29bb45533c7d0519cafcefe2bb4477400c73..6bb9924ddd090bdeace3a3b2e8bfbe904d66fa15 100644
--- a/pkgs/tools/misc/dylibbundler/default.nix
+++ b/pkgs/tools/misc/dylibbundler/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dylibbundler";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index bcd3ec6d8f7f1f173056d1bc5829f2ddac5f5cfc..11a46f620c0a14c6f965a11aa56b5b88ab5a9f6e 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit }:
let
version = "2018-12-06";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "edid-decode-unstable";
inherit version;
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 160c3982cc154f1db63121228ca49b1376a8f4fa..6a5fcfb12174d3a4f04d47f47dbd0a77688a0439 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "emv";
version = "1.95";
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index d4f69340d0ae7af40174c1d8167e57c9fc625100..1c0401e2eadce261dc9040d1f0cf9c833f2adc7b 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ent-1.1";
src = fetchurl {
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 1447c70412b6987ca302f92b7ad531a8f345e34d..d94f1c1929ffcd4fffef92db47797f1f4d152015 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -5,7 +5,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "exa-${version}";
+ pname = "exa";
version = "0.9.0";
cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf";
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 91c1b3b707194871959aefd38ef9abbb6985fcc1..7465cb67f61aca4ff5c126c1a0f7c7b4eb587137 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "fd-${version}";
+ pname = "fd";
version = "7.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix
index 7b275220c1976802d87aec9dc046d76cc259a1fa..5d79b26f23089e73e2e2c41b9bbc4ce5d015a30c 100644
--- a/pkgs/tools/misc/fffuu/default.nix
+++ b/pkgs/tools/misc/fffuu/default.nix
@@ -1,6 +1,6 @@
{ mkDerivation, haskellPackages, fetchFromGitHub, lib }:
-mkDerivation rec {
+mkDerivation {
pname = "fffuu";
version = "unstable-2018-05-26";
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 9db66480cb107651f9df22ad1f59bda0dc1ec7b5..2df8ee420fae4cf19430a7b2f26465828b70dd65 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,20 +3,16 @@
}:
stdenv.mkDerivation rec {
- name = "findutils-4.6.0";
+ pname = "findutils";
+ version = "4.7.0";
src = fetchurl {
- url = "mirror://gnu/findutils/${name}.tar.gz";
- sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
+ url = "mirror://gnu/findutils/${pname}-${version}.tar.xz";
+ sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5";
};
patches = [
- ./memory-leak.patch
./no-install-statedir.patch
-
- # Prevent tests from failing on old kernels (2.6x)
- # getdtablesize reports incorrect values if getrlimit() fails
- ./disable-getdtablesize-test.patch
];
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
deleted file mode 100644
index 611df364b6874db992f2e78889120a2f16c6dad8..0000000000000000000000000000000000000000
--- a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test-dup2.c b/tests/test-dup2.c
---- a/tests/test-dup2.c
-+++ b/tests/test-dup2.c
-@@ -157,8 +157,6 @@ main (void)
- ASSERT (close (255) == 0);
- ASSERT (close (256) == 0);
- }
-- ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
-- ASSERT (close (bad_fd - 1) == 0);
- errno = 0;
- ASSERT (dup2 (fd, bad_fd) == -1);
- ASSERT (errno == EBADF);
-diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c
-index a0325af..a83f8ec 100644
---- a/tests/test-getdtablesize.c
-+++ b/tests/test-getdtablesize.c
-@@ -29,8 +29,6 @@ int
- main (int argc, char *argv[])
- {
- ASSERT (getdtablesize () >= 3);
-- ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
-- ASSERT (dup2 (0, getdtablesize()) == -1);
-
- return 0;
- }
diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/pkgs/tools/misc/findutils/memory-leak.patch
deleted file mode 100644
index 56f65f85622463b3e11e0181c88c0286bb506838..0000000000000000000000000000000000000000
--- a/pkgs/tools/misc/findutils/memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a
-diff --git a/find/fstype.c b/find/fstype.c
-index 535f920..a0ac8bc 100644
---- a/find/fstype.c
-+++ b/find/fstype.c
-@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p)
- while (p)
- {
- struct mount_entry *pnext = p->me_next;
--
-- free (p->me_devname);
-- free (p->me_mountdir);
--
-- if (p->me_type_malloced)
-- free (p->me_type);
-- p->me_next = NULL;
-- free (p);
-+ free_mount_entry (p);
- p = pnext;
- }
- }
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 6d24f3a447358315a9a9d686067828466d7894c4..08d091cb30020f2a42dd026de4529282f3e20224 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fluent-bit";
version = "1.0.6";
diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix
index b8b86e07abb0fb48330d3e9ae3fd39de33095c2c..771fc354da423d4ce6b4bbd5e8b3de81a6abe57f 100644
--- a/pkgs/tools/misc/gif-for-cli/default.nix
+++ b/pkgs/tools/misc/gif-for-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gif-for-cli";
version = "unstable-2018-08-14";
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
index 51c6d9c20758d92eebed0eaefe2d96b48f993437..705c1a7e1d6a92eddb292899291151a9551306e1 100644
--- a/pkgs/tools/misc/gringo/default.nix
+++ b/pkgs/tools/misc/gringo/default.nix
@@ -7,7 +7,7 @@ let
version = "4.5.4";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gringo";
inherit version;
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index a176ef13fccbf735a5c727153117c496b5b8d7c0..3f5485718dc5b4a8dacbd30101f27c89628e32ea 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -10,28 +10,28 @@
with stdenv.lib;
let
pcSystems = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "i386";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "i386";
};
efiSystemsBuild = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "x86_64";
- "aarch64-linux".target = "aarch64";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "x86_64";
+ aarch64-linux.target = "aarch64";
};
# For aarch64, we need to use '--target=aarch64-efi' when building,
# but '--target=arm64-efi' when installing. Insanity!
efiSystemsInstall = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "x86_64";
- "aarch64-linux".target = "arm64";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "x86_64";
+ aarch64-linux.target = "arm64";
};
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
- version = "2.04-rc1";
+ version = "2.04";
in (
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "${pname}-${version}";
- sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0";
+ sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w";
};
patches = [
diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix
index 19d8afb1857523a4f23ed1ebdc29e58368091b23..6b796dedb0adec3cf1b5b3c96ea6b469cbe868c4 100644
--- a/pkgs/tools/misc/grub/pvgrub_image/default.nix
+++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix
@@ -3,9 +3,9 @@
with stdenv.lib;
let
efiSystemsBuild = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "x86_64";
- "aarch64-linux".target = "aarch64";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "x86_64";
+ aarch64-linux.target = "aarch64";
};
in (
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 7b432df3e8b884ec281a589a50f6f1f394845008..1033a489c76709ee8fb250bcb55fbc1f33a0afab 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -6,8 +6,8 @@
with stdenv.lib;
let
pcSystems = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "i386";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "i386";
};
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index edb9508df31ade0a4328f9ec35af5fb76f0fef57..2dd8688232f8a5b5b2d03637b82ff378a537ec05 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -4,7 +4,7 @@ let arch =
if stdenv.isi686 then "i386"
else if stdenv.isx86_64 then "x86_64"
else throw "Unknown architecture";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "grub4dos";
version = "0.4.6a-2019-05-12";
diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix
index 8657e34e1608e1f154493088fcdedd31d454c533..4b5973e7eecaeaeea3dddb18d0f6c4d7bc1eb323 100644
--- a/pkgs/tools/misc/hackertyper/default.nix
+++ b/pkgs/tools/misc/hackertyper/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hackertyper";
version = "2.1";
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 76795892e715ba08447c7445ca8f1063f2e41cce..bf6740d7ee4a4704bbeee10e15fa489914b1bb47 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "heatseeker-${version}";
+ pname = "heatseeker";
version = "1.5.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix
index 61832a5d3260047acf51ea2fe83d7211d134dacc..a6ed7bf92ff99573d2600028a62f75539cdd5be6 100644
--- a/pkgs/tools/misc/hostsblock/default.nix
+++ b/pkgs/tools/misc/hostsblock/default.nix
@@ -19,7 +19,7 @@
".bp.blogspot.com"
] }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hostsblock";
version = "20161213";
diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix
index fdbd7611dce50ad46030fb3a9bf0e03c53a5ff6a..cedaa13b74a03a15cb630032065e398779804d4b 100644
--- a/pkgs/tools/misc/ix/default.nix
+++ b/pkgs/tools/misc/ix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ix";
version = "20190815";
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 08fbba873e5bd2fc09ef93ee1d8821c9b9f6628d..b1d71a892d6fb4cb5669879c4615a3f5213617c3 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, jre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "jdiskreport-1.4.1";
builder = ./builder.sh;
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index 7e6b6124024a79254f3b782fc767607313041433..56a1dc75a455c63171225a84daeceaa8d4d9e6d4 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }:
rustPlatform.buildRustPackage rec {
- name = "journaldriver-${version}";
+ pname = "journaldriver";
version = "1.1.0";
cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g";
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 822932dc5ac48f0dfa1a5fe2bafcc866d93391b0..480c0abc728d2bfb80f982c981bb009211d3c4fa 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -2,10 +2,10 @@
python2Packages.buildPythonApplication rec {
version = "0.4.6";
- name = "kargo-${version}";
+ pname = "kargo";
src = fetchurl {
- url = "mirror://pypi/k/kargo/${name}.tar.gz";
+ url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz";
sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
};
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
index ce343c7cc39496ee918be8a609ab2be6670e9604..0fd1c7c5cd733402c359ff94aef9da90f90787a0 100644
--- a/pkgs/tools/misc/kdecoration-viewer/default.nix
+++ b/pkgs/tools/misc/kdecoration-viewer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, mkDerivation
, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
-mkDerivation rec {
+mkDerivation {
name = "kdecoration-viewer-2018-07-24";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix
index a021064a5ff9740bceed771a3e70bec5a4a7756c..9f739da0afa03a982cf9d59eee98bd00c33ba8bc 100644
--- a/pkgs/tools/misc/kermit/default.nix
+++ b/pkgs/tools/misc/kermit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ncurses, glibc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kermit-9.0.302";
src = fetchurl {
diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix
index b6b56e1df937f8f7ed0b5711e24feeb51e5fd865..3667b483383b81418162aa21b554d77ad9ffd6cc 100644
--- a/pkgs/tools/misc/kisslicer/default.nix
+++ b/pkgs/tools/misc/kisslicer/default.nix
@@ -17,7 +17,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kisslicer-1.6.3";
src = fetchzip {
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 4e83c2479f1d6ef70dd26842f8234745fd8fa3b2..632001f6329a8c752605c77330fa0ae9673c956f 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -4,15 +4,12 @@
kconfig, kcrash, kinit
}:
-let
+mkDerivation rec {
pname = "kronometer";
version = "2.2.3";
-in
-mkDerivation rec {
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm";
};
@@ -22,6 +19,6 @@ mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kcrash kinit ];
}
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 5955c1104d3fa932ec912fa1975064591e197986..3d2b7c5b214cd7a218219ce45b9c4aada8117bbd 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ldapvi";
version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg";
diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
index f6aa88bbdea13d2762481adb9f6c19b4d715df82..ed48cc5921b03c02419f59ed34bdfdacc911586c 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -1,13 +1,13 @@
GEM
remote: https://rubygems.org/
specs:
- lolcat (99.9.99)
+ lolcat (100.0.0)
manpages (~> 0.6.1)
optimist (~> 3.0.0)
- paint (~> 2.0.0)
+ paint (~> 2.1.0)
manpages (0.6.1)
optimist (3.0.0)
- paint (2.0.3)
+ paint (2.1.1)
PLATFORMS
ruby
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index f21e5637993d9679e51d7026698b2e2844c9f2cf..2c2bc9cead1013dc8752b0072e7454768411cb56 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4";
+ sha256 = "0k1m2ihcprjq9jdmq2v3xlf27hqbpr2vjnnyfwp3z2zspzbl0nys";
type = "gem";
};
- version = "99.9.99";
+ version = "100.0.0";
};
manpages = {
groups = ["default"];
@@ -35,9 +35,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2";
+ sha256 = "0rrb2p2yk6ffhm0gz8ba431mf63kq7w27gwavxl7n8qd2splj4mh";
type = "gem";
};
- version = "2.0.3";
+ version = "2.1.1";
};
-}
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index 4521f8b407a6b49612582072071e4cf7572deffd..84a92ec771281d84b0bd9fc559b6a43216c498c9 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -3,7 +3,7 @@
# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of
# adding this to services.udev.packages on NixOS
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ltunify";
version = "unstable-20180330";
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index ced4a156137dd09d533ce9304848e2ee0ad46316..df1a2daddb9101c5286193f2f7d9e251afbb41c8 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,33 +1,47 @@
{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }:
stdenv.mkDerivation rec {
- name = "man-db-2.7.5";
+ name = "man-db-2.8.6.1";
src = fetchurl {
url = "mirror://savannah/man-db/${name}.tar.xz";
- sha256 = "056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw";
+ sha256 = "0a1sh5gxa16k6irzf3q2lli8m204w9ik1xm62wjgf1mzknxs4xrc";
};
outputs = [ "out" "doc" ];
outputMan = "out"; # users will want `man man` to work
- nativeBuildInputs = [ pkgconfig makeWrapper groff ]
- ++ stdenv.lib.optionals doCheck checkInputs;
+ nativeBuildInputs = [ pkgconfig makeWrapper groff ];
buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input)
checkInputs = [ libiconv /* for 'iconv' binary */ ];
postPatch = ''
- substituteInPlace src/man_db.conf.in \
- --replace "/usr/local/share" "/run/current-system/sw/share" \
- --replace "/usr/share" "/run/current-system/sw/share"
+ # Remove all mandatory manpaths. Nixpkgs makes no requirements on
+ # these directories existing.
+ sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in
+
+ # Add Nixpkgs and NixOS-related manpaths
+ echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in
+ echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in
+ echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in
+
+ # Add mandb locations for the above
+ echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in
+ echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in
'';
configureFlags = [
"--disable-setuid"
+ "--disable-cache-owner"
"--localstatedir=/var"
# Don't try /etc/man_db.conf by default, so we avoid error messages.
- "--with-config-file=\${out}/etc/man_db.conf"
- "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
+ "--with-config-file=${placeholder "out"}/etc/man_db.conf"
+ "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
+ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [
+ "ac_cv_func__set_invalid_parameter_handler=no"
+ "ac_cv_func_posix_fadvise=no"
+ "ac_cv_func_mempcpy=no"
];
preConfigure = ''
@@ -57,7 +71,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */
+ doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin;
meta = with stdenv.lib; {
homepage = http://man-db.nongnu.org;
diff --git a/pkgs/tools/misc/man/conf.patch b/pkgs/tools/misc/man/conf.patch
deleted file mode 100644
index 43e8642fb34a3e368135fc6ace25b1afbbc76923..0000000000000000000000000000000000000000
--- a/pkgs/tools/misc/man/conf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' man-1.6g-orig/src/man-config.c man-1.6g/src/man-config.c
---- man-1.6g-orig/src/man-config.c 2005-08-21 01:26:06.000000000 +0200
-+++ man-1.6g/src/man-config.c 2012-03-06 11:11:28.159050524 +0100
-@@ -214,8 +214,9 @@
- const char *configuration_file = "[no configuration file]";
-
- char *default_config_files[] = {
-+ "/etc/man.conf",
- CONFIG_FILE, /* compiled-in default */
-- "/etc/man.conf", "/etc/man.config",
-+ "/etc/man.config",
- "/usr/lib/man.conf", "/usr/lib/man.config",
- "/usr/share/misc/man.conf", "/usr/share/misc/man.config"
- };
diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix
deleted file mode 100644
index 2f61a30714e2020aeade33f1f4d1a7079f28a21f..0000000000000000000000000000000000000000
--- a/pkgs/tools/misc/man/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchurl, groff, less }:
-
-stdenv.mkDerivation rec {
- name = "man-1.6g";
-
- src = fetchurl {
- url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz";
- sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c";
- };
-
- buildInputs = [ groff less ];
-
- preBuild = ''
- makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man)
- '';
-
- patches = [
- # Search in "share/man" relative to each path in $PATH (in addition to "man").
- ./share.patch
-
- # Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the
- # first file that exists, so this is necessary to allow the
- # builtin config to be overriden.
- ./conf.patch
- ];
-
- preConfigure = ''
- sed 's/^PREPATH=.*/PREPATH=$PATH/' -i configure
- '';
-
- postInstall =
- ''
- # Use UTF-8 by default. Otherwise man won't know how to deal
- # with certain characters.
- substituteInPlace $out/lib/man.conf \
- --replace "nroff -Tlatin1" "nroff" \
- --replace "eqn -Tlatin1" "eqn -Tutf8"
-
- # Work around a bug in substituteInPlace. It loses the final
- # newline, and man requires every line in man.conf to be
- # terminated by a newline.
- echo >> $out/lib/man.conf
- '';
-
- meta = {
- homepage = http://primates.ximian.com/~flucifredi/man/;
- description = "Tool to read online Unix documentation";
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/tools/misc/man/share.patch b/pkgs/tools/misc/man/share.patch
deleted file mode 100644
index 837786e28eba1f5b86a1a1a6891f12f9af86c262..0000000000000000000000000000000000000000
--- a/pkgs/tools/misc/man/share.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -rc man-1.6f-orig/src/manpath.c man-1.6f/src/manpath.c
-*** man-1.6f-orig/src/manpath.c 2006-08-03 23:18:33.000000000 +0200
---- man-1.6f/src/manpath.c 2008-02-07 15:31:43.000000000 +0100
-***************
-*** 109,121 ****
- * or ../man or ../man1 or ../man8 subdirectories.
- */
- static char *
-! find_man_subdir (char *p) {
- int len;
- char *t, *sp;
-
- len = strlen (p);
-
-! t = my_malloc ((unsigned) len + 20);
-
- memcpy (t, p, len);
- strcpy (t + len, "/man");
---- 109,121 ----
- * or ../man or ../man1 or ../man8 subdirectories.
- */
- static char *
-! find_man_subdir (char *p, char * maybe_share) {
- int len;
- char *t, *sp;
-
- len = strlen (p);
-
-! t = my_malloc ((unsigned) len + 30);
-
- memcpy (t, p, len);
- strcpy (t + len, "/man");
-***************
-*** 139,159 ****
- }
-
- /* look for the situation with packagedir/bin and packagedir/man */
-! strcpy (t + len, "/man");
-
- if (is_directory (t) == 1)
- return t;
-
- /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */
- /* (looking for all man[1-9] would probably be a waste of stats) */
-! strcpy (t + len, "/man1");
-
- if (is_directory (t) == 1) {
- t[len] = 0;
- return t;
- }
-
-! strcpy (t + len, "/man8");
-
- if (is_directory (t) == 1) {
- t[len] = 0;
---- 139,159 ----
- }
-
- /* look for the situation with packagedir/bin and packagedir/man */
-! sprintf (t + len, "%s/man", maybe_share);
-
- if (is_directory (t) == 1)
- return t;
-
- /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */
- /* (looking for all man[1-9] would probably be a waste of stats) */
-! sprintf (t + len, "%s/man1", maybe_share);
-
- if (is_directory (t) == 1) {
- t[len] = 0;
- return t;
- }
-
-! sprintf (t + len, "%s/man8", maybe_share);
-
- if (is_directory (t) == 1) {
- t[len] = 0;
-***************
-*** 341,347 ****
- if (debug)
- gripe (IS_NOT_IN_CONFIG);
-
-! t = find_man_subdir (dir);
- if (t != NULL) {
- if (debug)
- gripe (MAN_NEARBY);
---- 341,347 ----
- if (debug)
- gripe (IS_NOT_IN_CONFIG);
-
-! t = find_man_subdir (dir, "");
- if (t != NULL) {
- if (debug)
- gripe (MAN_NEARBY);
-***************
-*** 352,357 ****
---- 352,370 ----
- if (debug)
- gripe (NO_MAN_NEARBY);
- }
-+
-+ t = find_man_subdir (dir, "/share");
-+ if (t != NULL) {
-+ if (debug)
-+ gripe (MAN_NEARBY);
-+
-+ add_to_mandirlist (t, perrs);
-+ free (t);
-+ } else {
-+ if (debug)
-+ gripe (NO_MAN_NEARBY);
-+ }
-+
- }
- }
-
diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix
index 34b10a550f6b0955a90732017f9fa115c7e9c018..5c175053fc9920f010a8d3a72a797903fd1611f9 100644
--- a/pkgs/tools/misc/marlin-calc/default.nix
+++ b/pkgs/tools/misc/marlin-calc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "marlin-calc";
version = "2019-06-04";
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index 334daef4481766ca2e9f8944225e3a252a94a9b0..ebf93f0684f03b1e5e749cbf46125a6f74ea1349 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "mcfly-${version}";
+ pname = "mcfly";
version = "v0.3.1";
rev = "${version}";
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index b1d1971c75c7ffda6d8f30f84524239b2ac19684..48f048b3abf8d106d82ea82b3e0f14c75fad06d3 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "memtest86+";
version = "5.01-coreboot-002";
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 3e23e2bddcc14c29d7c0fa4435ed3ede23793f61..168e1dac3a321741d36391298e8669b24f02c944 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig
, lrzsz, ncurses, libiconv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "minicom";
version = "2.7.1";
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 8e65d4d2a54302e63d0fc52cd49ed1e9b7c2ed6c..412726e276d6758494abcf35353d8c681051b8ad 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }:
rustPlatform.buildRustPackage rec {
- name = "miniserve-${version}";
+ pname = "miniserve";
version = "0.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix
index 91dd56c9b0f4f473f728b1d7e457f560d80bcb07..db60010490e512acfeb2208408b2f2f7b36bc6c2 100644
--- a/pkgs/tools/misc/nginx-config-formatter/default.nix
+++ b/pkgs/tools/misc/nginx-config-formatter/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2019-02-13";
pname = "nginx-config-formatter";
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix
index 307a08bbdf937af1df475390e3aa5d46181d0340..61aa2c41c4fc0d33aa80edb40e64fa37df47d29a 100644
--- a/pkgs/tools/misc/notify-desktop/default.nix
+++ b/pkgs/tools/misc/notify-desktop/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, dbus, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "notify-desktop";
version = "0.2.0";
diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix
index 37cbea46c813e5dea90f339750dc904fd41b9c15..c77ca56655ab171f30bb73e9b36d5ad1f016459a 100644
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ b/pkgs/tools/misc/parallel-rust/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "parallel-rust-${version}";
+ pname = "parallel-rust";
version = "0.11.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 045c004fb6ac1973d9fbc91dc0e7ebaa9fdc6b95..80583ea19cfeec3aab423b144b10648e2bedcf65 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -8,7 +8,7 @@ let
pname = "peruse";
version = "1.2.20180816";
-in mkDerivation rec {
+in mkDerivation {
name = "${pname}-${version}";
# The last formal release from 2016 uses kirigami1 which is deprecated
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index e366a03a7f42082f3a1e246e32204fd5d2c6bab0..1aa7dbedd9300ee69f15adfe09ad0e5f7b3af377 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ponysay-3.0.3";
src = fetchurl {
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 7acbbc2106147c1030238cfbba0f12009c13fea0..ff98bce39d8c3b9cc2358420191b4df83f27b41d 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,7 +1,6 @@
{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
rustPlatform.buildRustPackage rec {
pname = "powerline-rs";
- name = "${pname}-${version}";
version = "0.1.9";
src = fetchFromGitLab {
diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/tools/misc/q-text-as-data/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dbd4a4c465caed45b8fc160b3ad0ce838ae530ca
--- /dev/null
+++ b/pkgs/tools/misc/q-text-as-data/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC, fetchFromGitHub, python2 }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "q-text-as-data";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "harelba";
+ repo = "q";
+ rev = version;
+ sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2";
+ };
+
+ buildInputs = [ python2 ];
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp bin/q $out/bin
+ chmod +x $out/bin/q
+ '';
+
+ meta = with stdenvNoCC.lib; {
+ description = "Run SQL directly on CSV or TSV files";
+ longDescription = ''
+ q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).
+
+ q treats ordinary files as database tables, and supports all SQL constructs, such as WHERE, GROUP BY, JOINs etc. It supports automatic column name and column type detection, and provides full support for multiple encodings.
+ '';
+ homepage = "http://harelba.github.io/q/";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.taneb ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index a2087902c93b5a1c176b7bfe1f869533563a8ca9..770b229a3159a3269488eadc270443e7a9e15fcf 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, perlPackages }:
-perlPackages.buildPerlPackage rec {
+perlPackages.buildPerlPackage {
pname = "rename";
version = "1.9";
outputs = [ "out" ];
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix
index 2ba3224a5f8b48cf2482f5a7d30555d20321cea0..f66567798ffbdf04a558f647163103ff9bdaad6f 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/pkgs/tools/misc/scfbuild/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }:
-buildPythonApplication rec {
+buildPythonApplication {
pname = "scfbuild";
version = "1.0.3";
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index e821d5e4332a27dc01e57aaad918f1b2b2c8127b..0be5b8d137965f79c23ae49ba854009bbdde396a 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sdl-jstest";
version = "2018-06-15";
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index 0e84f738e80eb05a0cd07af94341d3912b43d041..f442df399d90fe78198c6557e90c8396bf264898 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, jre, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "smc-6.6.3";
src = fetchurl {
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index ce633ac4447ad880b9f384c702b14fa713f84e4f..85f90ed1692f366c93e17f5f2f5602df3c090003 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }:
rustPlatform.buildRustPackage rec {
- name = "tealdeer-${version}";
+ pname = "tealdeer";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix
index 82aba61269924dc80e1e2418dd4e496f6b31c87b..a5e356edbf481c791d062e6b7a57a2743feff8ed 100644
--- a/pkgs/tools/misc/teamocil/default.nix
+++ b/pkgs/tools/misc/teamocil/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
-bundlerEnv rec {
+bundlerEnv {
inherit ruby;
pname = "teamocil";
gemdir = ./.;
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index 4f6a71135aa861f7852b76e71f16698b811c44f2..f9ccec87adc0c5cc48c89fd2460b0c8327cb51f2 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -1,6 +1,6 @@
{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }:
rustPlatform.buildRustPackage rec {
- name = "termplay-${version}";
+ pname = "termplay";
version = "2.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
index d79e480327c218648245941c78e4c2e75734a986..59aa3861510c00cc7df6d5791e4db72ec2b2651b 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, psmisc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tmpwatch-2.11";
src = fetchurl {
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index fa024e58fa815184c16ff79507dc49662a562ff9..e2d263817ee7533d22034c72f4ed20d87dca874b 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
pname = "togglesg-download-git";
version = "2017-12-07";
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix
index 59091bcd2bd1648c24b510be1814129c703d0696..5a2d1aaa4279aafebaea6ccc7b59379dba93f669 100644
--- a/pkgs/tools/misc/ttwatch/default.nix
+++ b/pkgs/tools/misc/ttwatch/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1
, enableUnsafe ? false }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ttwatch";
version = "2018-12-04";
diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix
index 5c858944b3feb08f1db4fd7de2c9f9e3a7352e8a..f2c0f43cca9599a1d2e248f1bf017fc578f673e7 100644
--- a/pkgs/tools/misc/uhubctl/default.nix
+++ b/pkgs/tools/misc/uhubctl/default.nix
@@ -3,7 +3,7 @@
, libusb
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "uhubctl";
version = "unstable-2019-07-31";
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index d80af088342a0521d38091eff6ebb2f6914f2c23..d70fded5e3e441faa2d1a8e4ed712a0fd796a321 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -6,7 +6,7 @@
# there’s a WIP branch here:
# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ultrastar-creator";
version = "2019-04-23";
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index fe89e74cb697a404efbc4b34a6b4b613b8745299..865fd4f44f8453b0bb240db25b450bf2e39157f6 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -7,7 +7,7 @@
, jedecSupport ? true
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.10";
pname = "urjtag";
diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix
index 858cbe9e317a4064e43317538919014c89aa0024..19cc6cd2234fe710f8bb4c0306cfb8e8555b3951 100644
--- a/pkgs/tools/misc/vimpager/build.nix
+++ b/pkgs/tools/misc/vimpager/build.nix
@@ -6,7 +6,7 @@
, sha256
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
pname = "vimpager";
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index 856bda755cb4ae2ecb2a8510d52058e708d00bd6..4ffa250bdf53c05c7fb85abb9be500803e3855a4 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "${pname}-${version}";
pname = "vivid";
version = "0.4.0";
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index be8745802dad7109754f376b9963ce66494beeb8..eb14d89bfc92ee9111e4557663a6111d634fded3 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "void-${version}";
+ pname = "void";
version = "1.1.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index a276b13a59ca8fcaebf9ed142b39bb2a6c03f7b2..b994aecfc0e0cf5f766c8d8a77a2c350b52c6fdd 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -2,7 +2,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "websocat-${version}";
+ pname = "websocat";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix
index 444b14c5a63f33bd4eefd61377ae28d2e55792d3..b6801130a45d8361221a49abc5ee8d4295ca857c 100644
--- a/pkgs/tools/misc/xdxf2slob/default.nix
+++ b/pkgs/tools/misc/xdxf2slob/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
name = "xdxf2slob-unstable-2015-06-30";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index cd4d709fb7690091b24188583b78d78d4c9cabfd..3d2fb50371eef64866a0b6fcb52807f6d7819d4f 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -1,6 +1,6 @@
{stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xsel-unstable";
version = "2018-01-10";
diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix
index fb4257b35e6bc84dd13796a7a049b2450ffbc6f3..84cf506fb6316bc4af0b52f7a14cfe5d9ee38224 100644
--- a/pkgs/tools/misc/xtitle/default.nix
+++ b/pkgs/tools/misc/xtitle/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xtitle-0.4.4";
src = fetchurl {
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1fe58f94504117f8b4c7041aa42a25e370fe0971..d378e541b503528cb96fc4a1c7199ca7491fc425 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2019.08.13";
+ version = "2019.09.01";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj";
+ sha256 = "0jbby0x5krww1acc8qxhmmwg0dsqmj6yjnynfm7r6k3rxbvlydqr";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix
index 657d93a3ca0e9e6ac4e7588f904d0eede2472788..4b19331f3925340717390b860eea38d439ffd629 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "zsh-autoenv";
version = "2017-12-16";
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 8fe405e1b3e909e4e31b752ec73a8fc05b7fad5e..4377681e20d83bfba771dabbbbb148648cc116b3 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix
index 55b168a21aecd43e18e99c075e63ff0bc7774b3c..2f74ac713d7d4796a0cc4bec7d46c523b832e8da 100644
--- a/pkgs/tools/networking/bgpdump/default.nix
+++ b/pkgs/tools/networking/bgpdump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, autoreconfHook, zlib, bzip2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bgpdump-2017-09-29";
src = fetchzip {
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 2c5e1a2f8f4a2c9ecf25e46a0c228e793ebb1e2d..a79cbdc8bbd8ab9ee4c7e25c14d549e552061d27 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchgit, python, gyp, utillinux }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bud";
version = "0.34.1";
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index 34b227d5a6d3adbe02bd11a79dd0b2ac554ca5c8..aee1b5c0e1d9050c9645f0053764c3e8cb3d5ce7 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, sqlite }:
rustPlatform.buildRustPackage rec {
- name = "bukubrow-${version}";
+ pname = "bukubrow";
version = "2.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
index 7cc89bebf4775893912b8fa492410b62979dc6d9..08014ed1226971c66dbb97fd9ff008d74bdf360f 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, python, pythonPackages, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "carddav-0.1-2014-02-26";
diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix
index dd636173cb714a1ecbd64aee1517f3c3c9a5c5f5..140105c247549366ea235c0a3f07d9d785b680df 100644
--- a/pkgs/tools/networking/connman/connman-ncurses/default.nix
+++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "connman-ncurses";
version = "2015-07-21";
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix
index 3b30935d6cf1c3f0cff0c06cd6c8b626efd4963d..0cb32ca415f1029fcc8ea3abf9776b2b48630ce8 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman/connman-notify/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "connman-notify";
version = "2014-06-23";
diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix
index 0d91dabaaebbc1b10aaf6771ed7e231a949a9274..7096b9b758614c5e2e60c75ba56733f9b1ba10d8 100644
--- a/pkgs/tools/networking/connman/connman_dmenu/default.nix
+++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, connman, dmenu }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "connman_dmenu";
version = "git-29-9-2015";
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index f0ae7e014beb022006e192220f2163b995b8818b..dfc56d440e62f3af9f8d21db71dbb8a77af0bb04 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
pname = "dhcpcd";
- version = "8.0.2";
+ version = "8.0.3";
src = fetchurl {
url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik";
+ sha256 = "07cg0sp8sk9b6ch2ajmvkbn6z08bgyx8xbd004s5mkasrlgrfx4n";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index 8ed9d1d1d7068f0b76b82fec15f04577b7f130c2..a7cc90c2b33ae3e8f953e98e259fc9f0750b362f 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libpcap, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dhcpdump-1.8";
src = fetchurl {
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 566579555d339857d6263ac2940d2519e1b30adf..a0f5b5b08420ca4d5cef365ba500b438374c1ead 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -4,7 +4,7 @@
with lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "driftnet";
version = "1.1.5";
diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix
index 3c6c5f3d29927fdf2f77e690d9792fb7636ebd6f..9d6a1712e6736b09b2cb1ce1fdac2e72e7222fba 100644
--- a/pkgs/tools/networking/easyrsa/2.x.nix
+++ b/pkgs/tools/networking/easyrsa/2.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, makeWrapper
, gnugrep, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "easyrsa-2.2.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index b5d4d5e6dcbea85a297e968e3a26c10dd3dcbf1a..4d374cece3d747a24952f1210d92ed96fce9cbd3 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -2,7 +2,7 @@
let
version = "3.0.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "easyrsa";
inherit version;
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index f5dfff62a9658fb7e22d71cad4301c37322be606..c490464c31ababbe6a7fd6f69071d50b6ab25910 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, tcl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "eggdrop";
version = "1.6.21-nix1";
diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix
index 2800139f8fac1841e2ee3ca16707658f75b149ce..f35a902735300c83b271088f5eb10dc81f941a81 100644
--- a/pkgs/tools/networking/envoy/default.nix
+++ b/pkgs/tools/networking/envoy/default.nix
@@ -127,7 +127,7 @@ let
# Generate the BUILD file.
buildFile =
let field = name: attrs:
- if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else "";
+ if attrs ? ${name} then " ${name} = ${attrs.${name}},\n" else "";
in
''
licenses(["notice"]) # Apache 2
diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 54e2053906665414efbcf2e1c9278c5fe686a702..abb76e633ee71e1cfecde3ea453e731f807e93d8 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -7,7 +7,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix
index 4ac979cc4a6ccdde766d4fcf812258d6608859d4..0c74f14e17446a41ec5710933c28ae2799190d19 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/pkgs/tools/networking/freebind/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "freebind";
version = "2017-12-27";
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index 8261ba6e28423373e01c7054a745e168886a48fc..37d2eea825f04a35fb0fab6606f04feaa2b80d98 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -14,8 +14,9 @@ apk = stdenv.mkDerivation {
'';
};
in
-rustPlatform.buildRustPackage rec {
- name = "gnirehtet-${version}";
+rustPlatform.buildRustPackage {
+ pname = "gnirehtet";
+ inherit version;
src = fetchFromGitHub {
owner = "Genymobile";
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index 96723146ad41410685ee39e33fdfbc76b5efded1..bc6f657f3781ecde648bde6fbf9de9293f6edcaf 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, ncurses, libpcap, automake}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "iftop-1.0pre4";
src = fetchurl {
diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix
index 5b54e4099f56558f5eae2a4b320c301b4494bd69..984b0a2f87ea31336e3eabe13d5bdf11b257fa63 100644
--- a/pkgs/tools/networking/imapproxy/default.nix
+++ b/pkgs/tools/networking/imapproxy/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, openssl, ncurses}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "imapproxy-1.2.7";
src = fetchurl {
url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2;
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index 47aeb8574b68c9857731d71948175e6fbbc21eac..083ec23af569451ed283880768c196253161b7a2 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "jnettop-0.13.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index 134e9b6df76d3125dceee8ad47030fee651e9ec4..44c8b9a9c4d5049025ae4afb7034d50a63057d8a 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, pcre, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "maildrop-2.6.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index ebd6e7c57993780d731a835033ecca8ab978f77a..3c8d15346849bd0b711fa2d29b97c9bf27e3a970 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,7 +2,6 @@
buildGoPackage rec {
pname = "minio-client";
-
version = "2019-01-30T19-57-22Z";
src = fetchFromGitHub {
@@ -14,9 +13,9 @@ buildGoPackage rec {
goPackagePath = "github.com/minio/mc";
- buildFlagsArray = [''-ldflags=
- -X github.com/minio/mc/cmd.Version=${version}
- ''];
+ preBuild = ''
+ buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")
+ '';
meta = with stdenv.lib; {
homepage = https://github.com/minio/mc;
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
index 77f797fc7c7cc251b9e2dac54b03ad44ab4d4d26..85de6d131837cae3495a3083dc43720fbf96c950 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.06";
pname = "ndjbdns";
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix
index 940a37ab86fa113f5a3b1a3fdc083d5685db1046..969084582aee98c9a8a0c35add857e439bdc3d50 100644
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ b/pkgs/tools/networking/netalyzr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, jre, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "netalyzr";
version = "57861";
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 062d6e2d0a9c54c20696aadb226060372e9b3ea0..8da36d72fda28b7d797d7b7b3b9babe32dfe55be 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.6.6";
# Upstream recommends and supports git
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
repo = pname;
owner = pname;
rev = "v${version}";
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index 0fb11e1b0ebbdd4eb0d2c08f6944bf74e0c24531..1a6538ad1044b72a74f5a4f354837f098ab09709 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -2,7 +2,7 @@
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3
-, libappindicator-gtk3, withGnome ? false, gcr }:
+, libappindicator-gtk3, withGnome ? false, gcr, glib }:
let
pname = "network-manager-applet";
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
- substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS $lib/share/gsettings-schemas/${name}/glib-2.0/schemas
+ substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name}
'';
passthru = {
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index f4ffe620e744dc52a516e2df82045bbb24835a56..7773548576b0271eae61c0d438bf17a32b737495 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -4,7 +4,7 @@ networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
let
pname = "NetworkManager-fortisslvpn";
version = "1.2.10";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index d3eb3f7993360bd211624ff992ac95c8041f82ee..27e091b6b602754fc3f28b2739b157efce3e357a 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -4,7 +4,7 @@
let
pname = "NetworkManager-iodine";
version = "1.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 566179d85b36128c79396be020518bf1280a3fbf..1fb50686d0d009229ef175890e85dd49aae7708e 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -4,7 +4,7 @@
let
pname = "NetworkManager-openconnect";
version = "1.2.4";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index fa764788e2c696de4c3c81478b91a73bcca73f8f..04ec49f7b9b1c36791729c5796dca9c3ae92d739 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -4,7 +4,7 @@
let
pname = "NetworkManager-openvpn";
version = "1.8.10";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix
index 3231c276be5b0d28d7efcf4c64200f89676576a4..1aa4cd5658bb70dda6b8ff91ac7da1f44913088d 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/pkgs/tools/networking/network-manager/vpnc/default.nix
@@ -3,7 +3,7 @@
let
pname = "NetworkManager-vpnc";
version = "1.2.6";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix
index c63d7ac057b1fd41bad3770d782c8204b5ebf559..0ef2ce508671c75507cedf9ca37b20d945b3b627 100644
--- a/pkgs/tools/networking/noip/default.nix
+++ b/pkgs/tools/networking/noip/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "noip-2.1.9-1";
src = fetchurl {
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index 154788b3c5d37dfaa934bc184cb633b721efa060..7e614629484845dc375dac4dae322e315f28d50b 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null);
stdenv.mkDerivation rec {
pname = "openconnect";
- version = "8.03";
+ version = "8.04";
src = fetchurl {
urls = [
"ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"
];
- sha256 = "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h";
+ sha256 = "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix
index ba8fc6694d17c95c5927c838faa8422745c73004..68d18bff777bcc5acead0d725e7c902a5c5ec8d2 100644
--- a/pkgs/tools/networking/openconnect_pa/default.nix
+++ b/pkgs/tools/networking/openconnect_pa/default.nix
@@ -2,7 +2,7 @@
assert (openssl != null) == (gnutls == null);
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "unstable-2018-10-08";
pname = "openconnect_pa";
diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
index 706f2434a9552eae7419fa0406bc3a156d8f5812..d86934d079b1fbbcf5db8606799f9c7ba98e36fb 100644
--- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
src = fetchgit {
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index e96aa25feded8cb2fcdaa6e3c6d73890398c47eb..0f7e8f2c44500fe3b4b878e9733eb96c8afe4ee9 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -3,7 +3,7 @@
let
binPath = lib.makeBinPath [ coreutils openresolv systemd ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "update-resolv-conf-2017-06-21";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix
index 13aa8fcbd00af16b49d53b56aad4b249ecef2cf3..2041d935c94264390e28969c6778b16df1d78457 100644
--- a/pkgs/tools/networking/packetdrill/default.nix
+++ b/pkgs/tools/networking/packetdrill/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, bison, flex }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.0";
pname = "packetdrill";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index 10c004ecd94f079f55dceabb96fc842050319831..f5d30fa32a8b76d709558c65c29c937c2d69d6dd 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pdnsd-1.2.9a-par";
src = fetchurl {
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index 57cd093e1cd633a854d9ffc12b5b7fb9702ee5eb..fdfa0f808ecd16fbc4bc1ed3984897fd55673450 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -29,7 +29,7 @@ let
fi
'');
-in buildPythonApplication rec {
+in buildPythonApplication {
pname = "pykms";
version = "20180208";
diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix
index b1d972a733b61799c390b24fa10e5ab7147ba692..b95d0facda89344c579bf3eaf3b3901b3408b527 100644
--- a/pkgs/tools/networking/qr-filetransfer/default.nix
+++ b/pkgs/tools/networking/qr-filetransfer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "qr-filetransfer-unstable";
version = "2018-10-22";
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 12e073865166bae1b45f95821772014cf8ae3b5e..87071e23a9663254e937e6c0c0b92645b555facf 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libsodium }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "quicktun";
version = "2.2.5";
diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix
index 641513eaf472f9a64ed9ef5a63959fe176f74abb..32a30f48ec652750bef0984134c537f52e25eb07 100644
--- a/pkgs/tools/networking/redsocks/default.nix
+++ b/pkgs/tools/networking/redsocks/default.nix
@@ -4,7 +4,7 @@ let
pkg = "redsocks";
version = "0.5";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pkg}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index 2beb8aec389311e4087b1e9327ef9db388a1a982..bdb526c70543eb980ecad1cab6b8e6671478ffd6 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -2,7 +2,7 @@
let
version = "3.12";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rp-pppoe-" + version;
src = fetchurl {
url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index e74a3554dc293597c16ec8b6e6e157b533a4002d..31b111f2b83df1e8b8c26a44b366afbe355cdedc 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "s3cmd-${version}";
+ pname = "s3cmd";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index b42b3ff5b73907914c5a219ce577571d596cc001..8dfaae63ffaf2ed7a9f812230520d83a12b724dc 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -11,7 +11,7 @@ let
inherit (stdenv) lib;
sslSupportEnabled = sslSupport != false;
sslLibs = {
- "libressl" = libressl;
+ libressl = libressl;
};
in
diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix
index 211758f692b7d478ab5e5568e770aa3974f30537..be861654f658d76cab11916f0ebb1e2672f94e8d 100644
--- a/pkgs/tools/networking/shncpd/default.nix
+++ b/pkgs/tools/networking/shncpd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "shncpd";
version = "2016-06-22";
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index 7d3f773b1930bfecadc4eab6d3112b514b3b005c..b55860a20c1729da6f3a22e4aa698bbbce75e03a 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "srelay-0.4.8";
src = fetchurl {
diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix
index 84e7558713c956a145adbcde3cecce15e28017c1..b01d373088b7b227ad986be8d4628ff2b38e3988 100644
--- a/pkgs/tools/networking/ssh-agents/default.nix
+++ b/pkgs/tools/networking/ssh-agents/default.nix
@@ -4,7 +4,7 @@
}:
stdenvNoCC.mkDerivation rec {
- name = "ssh-agents-${version}";
+ pname = "ssh-agents";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix
index 0264da5c81754d5552df185baf7b4b0803904214..cb07d73a63199fe06ad0b6cd5572db9879a30aef 100644
--- a/pkgs/tools/networking/ssh-ident/default.nix
+++ b/pkgs/tools/networking/ssh-ident/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, python }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ssh-ident";
version = "2016-04-21";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index ad8f98302642eed98bc91b1e4754355fa88715c6..0081e7d1ddb971f70b0230ad15573f7ec39dc39f 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, openssl, libpcap }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ssldump";
version = "0.9b3";
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index b05ab3eeb88be52be98275029b23e2d4e3500cf3..65b88a34fb099a269b4baa9c09cd25a7ff987f61 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "subfinder-git";
version = "2018-07-15";
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index 80daf6447efa2faf3e5dafefba54d6abf1ff8d1f..d69221d9d50f857fd7ff8bf97673be945a96d74b 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, perl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "surfraw-2.3.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index a04d47b64144b336ea970bf6b28462a4d2f8bcd6..9cebc267260b7f70d5f4a2ce43ae1ac798f0cf32 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libpcap, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tcpdump";
version = "4.9.2";
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
index b992fef2253f47901b16624292fe93f5f9f0f3e9..df199869e6050eac7ca11d7d0409fae444e038d5 100644
--- a/pkgs/tools/networking/tlspool/default.nix
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -9,7 +9,7 @@ let
version = "20180227";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "arpa2";
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index f72d004c291b5f227bf1b15992027d13b86ca45e..f47ccab45ea41becafef08a9d9f6126233e2d2bc 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -6,7 +6,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "tox-node-${version}";
+ pname = "tox-node";
version = "0.0.8";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index ccb9f3bc0d6b6375d1dc049554672b71224eb6c6..fed7eccdf48173a45918bb49325160326b89d982 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "toxvpn-2018-04-17";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 660ffcb823b37e9eecaa82876717187692fd103f..8a4b6e6650e66703938e4396a36d1ec4b8448670 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "unbound";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchurl {
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
- sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg";
+ sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index f6b5852a6752298024e09549ae1ee6460a99bab6..fdd110e14b3ccf367450c13032c74643363eb497 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -4,11 +4,11 @@ let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
pname = "pyunbound";
- version = "1.9.0";
+ version = "1.9.3";
src = fetchurl {
url = "http://unbound.net/downloads/unbound-${version}.tar.gz";
- sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1";
+ sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v";
};
buildInputs = [ openssl expat libevent swig python ];
diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix
index 1684da45ccc33ec5ec2871cf3e9975feb81728c0..7a6a37c911287cd3b393e15028bf4d2df69b2528 100644
--- a/pkgs/tools/networking/vlan/default.nix
+++ b/pkgs/tools/networking/vlan/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vlan-1.9";
src = fetchurl {
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 6a23c81569f0a16d5bba76a456b59a8a4c7a503f..424355e41df8f4cace0e3595df75d5104aaa202b 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vpnc-0.5.3-post-r550";
src = fetchsvn {
url = "https://svn.unix-ag.uni-kl.de/vpnc";
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index e9b9452c756313813e4665b0d8db91cb4a359cab..bd80eae2bebc6a26f43954d42b8e677e9fa93f93 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
configureFlags = [
"--enable-dns"
"--enable-geoip"
- "--disable-static"
"--enable-shared"
];
diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix
index 664e55125b54b0523108390414074cb71229f686..d69b5943123ca3803e0394acec7592e41a36cb59 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/pkgs/tools/nix/nix-script/default.nix
@@ -1,6 +1,6 @@
{ stdenv, haskellPackages, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nix-script";
version = "2015-09-22";
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
index 69f4fc435c91e28677254e3ae1503f024ec1021e..13b7ffd2af7180f2ffd1fd478135c70b0a100838 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
- name = "nixdoc-${version}";
+ pname = "nixdoc";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4e51b9b46dd3e67aa3f72948bde420a471cd129f
--- /dev/null
+++ b/pkgs/tools/nix/nixos-generators/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix }:
+
+stdenv.mkDerivation rec {
+ pname = "nixos-generators";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "nix-community";
+ repo = "nixos-generators";
+ rev = version;
+ sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq";
+ };
+ nativeBuildInputs = [ makeWrapper ];
+ installFlags = [ "PREFIX=$(out)" ];
+ postFixup = ''
+ wrapProgram $out/bin/nixos-generate \
+ --prefix PATH : ${lib.makeBinPath [ jq coreutils findutils nix ] }
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Collection of image builders";
+ homepage = "https://github.com/nix-community/nixos-generators";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lassulus ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/tools/package-management/cargo-download/crates-io.nix
index d120a05e00d7a7fa08995c9d491875a41bec7f74..e0c0abf4dc6ed07a55243a6668da1491a89efc99 100644
--- a/pkgs/tools/package-management/cargo-download/crates-io.nix
+++ b/pkgs/tools/package-management/cargo-download/crates-io.nix
@@ -14,7 +14,7 @@ rec {
authors = [ "Remi Rampin " ];
sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4";
};
- features_.adler32."1.0.2" = deps: f: updateFeatures f (rec {
+ features_.adler32."1.0.2" = deps: f: updateFeatures f ({
adler32."1.0.2".default = (f.adler32."1.0.2".default or true);
}) [];
@@ -35,7 +35,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({
aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true);
memchr."${deps.aho_corasick."0.5.3".memchr}".default = true;
}) [
@@ -53,7 +53,7 @@ rec {
authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ];
sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
};
- features_.ansi_term."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.ansi_term."0.9.0" = deps: f: updateFeatures f ({
ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true);
}) [];
@@ -110,7 +110,7 @@ rec {
(crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps)
]) else []);
};
- features_.atty."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.atty."0.2.3" = deps: f: updateFeatures f ({
atty."0.2.3".default = (f.atty."0.2.3".default or true);
kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true;
libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false);
@@ -138,7 +138,7 @@ rec {
(crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps)
]);
};
- features_.base64."0.9.3" = deps: f: updateFeatures f (rec {
+ features_.base64."0.9.3" = deps: f: updateFeatures f ({
base64."0.9.3".default = (f.base64."0.9.3".default or true);
byteorder."${deps.base64."0.9.3".byteorder}".default = true;
safemem."${deps.base64."0.9.3".safemem}".default = true;
@@ -158,7 +158,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
};
- features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.7.0" = deps: f: updateFeatures f ({
bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true);
}) [];
@@ -196,7 +196,7 @@ rec {
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
};
- features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
}) [];
@@ -288,7 +288,7 @@ rec {
(crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps)
]);
};
- features_.cargo_download."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.cargo_download."0.1.2" = deps: f: updateFeatures f ({
ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true;
cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true);
clap."${deps.cargo_download."0.1.2".clap}".default = true;
@@ -344,7 +344,7 @@ rec {
authors = [ "Skyler Lipthay " ];
sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n";
};
- features_.case."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.case."0.1.0" = deps: f: updateFeatures f ({
case."0.1.0".default = (f.case."0.1.0".default or true);
}) [];
@@ -383,7 +383,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
};
- features_.cfg_if."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.2" = deps: f: updateFeatures f ({
cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true);
}) [];
@@ -402,7 +402,7 @@ rec {
(crates."time"."${deps."chrono"."0.2.25"."time"}" deps)
]);
};
- features_.chrono."0.2.25" = deps: f: updateFeatures f (rec {
+ features_.chrono."0.2.25" = deps: f: updateFeatures f ({
chrono."0.2.25".default = (f.chrono."0.2.25".default or true);
num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false);
time."${deps.chrono."0.2.25".time}".default = true;
@@ -542,7 +542,7 @@ rec {
(crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps)
]);
};
- features_.conv."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.conv."0.3.3" = deps: f: updateFeatures f ({
conv."0.3.3".default = (f.conv."0.3.3".default or true);
custom_derive."${deps.conv."0.3.3".custom_derive}".default = true;
}) [
@@ -610,7 +610,7 @@ rec {
]);
features = mkFeatures (features."core_foundation_sys"."0.5.1" or {});
};
- features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f ({
core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true);
libc."${deps.core_foundation_sys."0.5.1".libc}".default = true;
}) [
@@ -628,7 +628,7 @@ rec {
authors = [ "Sam Rijs " "Alex Crichton " ];
sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy";
};
- features_.crc32fast."1.1.1" = deps: f: updateFeatures f (rec {
+ features_.crc32fast."1.1.1" = deps: f: updateFeatures f ({
crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true);
}) [];
@@ -644,7 +644,7 @@ rec {
sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq";
features = mkFeatures (features."crossbeam"."0.2.10" or {});
};
- features_.crossbeam."0.2.10" = deps: f: updateFeatures f (rec {
+ features_.crossbeam."0.2.10" = deps: f: updateFeatures f ({
crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true);
}) [];
@@ -663,7 +663,7 @@ rec {
(crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps)
]);
};
- features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f (rec {
+ features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f ({
crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true);
crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true;
crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true;
@@ -798,7 +798,7 @@ rec {
(crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps)
]);
};
- features_.derive_error."0.0.3" = deps: f: updateFeatures f (rec {
+ features_.derive_error."0.0.3" = deps: f: updateFeatures f ({
case."${deps.derive_error."0.0.3".case}".default = true;
derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true);
quote."${deps.derive_error."0.0.3".quote}".default = true;
@@ -820,7 +820,7 @@ rec {
authors = [ "David Tolnay " ];
sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
};
- features_.dtoa."0.4.2" = deps: f: updateFeatures f (rec {
+ features_.dtoa."0.4.2" = deps: f: updateFeatures f ({
dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true);
}) [];
@@ -907,7 +907,7 @@ rec {
authors = [ "Ben Wilber " ];
sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip";
};
- features_.exitcode."1.1.2" = deps: f: updateFeatures f (rec {
+ features_.exitcode."1.1.2" = deps: f: updateFeatures f ({
exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true);
}) [];
@@ -931,7 +931,7 @@ rec {
(crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps)
]) else []);
};
- features_.filetime."0.1.14" = deps: f: updateFeatures f (rec {
+ features_.filetime."0.1.14" = deps: f: updateFeatures f ({
cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true;
filetime."0.1.14".default = (f.filetime."0.1.14".default or true);
libc."${deps.filetime."0.1.14".libc}".default = true;
@@ -997,7 +997,7 @@ rec {
sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip";
libPath = "lib.rs";
};
- features_.fnv."1.0.6" = deps: f: updateFeatures f (rec {
+ features_.fnv."1.0.6" = deps: f: updateFeatures f ({
fnv."1.0.6".default = (f.fnv."1.0.6".default or true);
}) [];
@@ -1015,7 +1015,7 @@ rec {
(crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps)
]);
};
- features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({
foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true);
foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true;
}) [
@@ -1033,7 +1033,7 @@ rec {
authors = [ "Steven Fackler " ];
sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
};
- features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({
foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true);
}) [];
@@ -1051,7 +1051,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f ({
fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true;
}) [
@@ -1073,7 +1073,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -1096,7 +1096,7 @@ rec {
(crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps)
]);
};
- features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true;
fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true);
}) [
@@ -1114,7 +1114,7 @@ rec {
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
- features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
}) [];
@@ -1206,7 +1206,7 @@ rec {
]);
features = mkFeatures (features."h2"."0.1.13" or {});
};
- features_.h2."0.1.13" = deps: f: updateFeatures f (rec {
+ features_.h2."0.1.13" = deps: f: updateFeatures f ({
byteorder."${deps.h2."0.1.13".byteorder}".default = true;
bytes."${deps.h2."0.1.13".bytes}".default = true;
fnv."${deps.h2."0.1.13".fnv}".default = true;
@@ -1247,7 +1247,7 @@ rec {
(crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps)
]);
};
- features_.http."0.1.14" = deps: f: updateFeatures f (rec {
+ features_.http."0.1.14" = deps: f: updateFeatures f ({
bytes."${deps.http."0.1.14".bytes}".default = true;
fnv."${deps.http."0.1.14".fnv}".default = true;
http."0.1.14".default = (f.http."0.1.14".default or true);
@@ -1454,7 +1454,7 @@ rec {
(crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps)
]);
};
- features_.idna."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.idna."0.1.4" = deps: f: updateFeatures f ({
idna."0.1.4".default = (f.idna."0.1.4".default or true);
matches."${deps.idna."0.1.4".matches}".default = true;
unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true;
@@ -1506,7 +1506,7 @@ rec {
(crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps)
]) else []);
};
- features_.iovec."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.iovec."0.1.1" = deps: f: updateFeatures f ({
iovec."0.1.1".default = (f.iovec."0.1.1".default or true);
libc."${deps.iovec."0.1.1".libc}".default = true;
winapi."${deps.iovec."0.1.1".winapi}".default = true;
@@ -1533,7 +1533,7 @@ rec {
(crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps)
]) else []);
};
- features_.isatty."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.isatty."0.1.5" = deps: f: updateFeatures f ({
isatty."0.1.5".default = (f.isatty."0.1.5".default or true);
kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true;
libc."${deps.isatty."0.1.5".libc}".default = true;
@@ -1558,7 +1558,7 @@ rec {
(crates."either"."${deps."itertools"."0.6.5"."either"}" deps)
]);
};
- features_.itertools."0.6.5" = deps: f: updateFeatures f (rec {
+ features_.itertools."0.6.5" = deps: f: updateFeatures f ({
either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false);
itertools."0.6.5".default = (f.itertools."0.6.5".default or true);
}) [
@@ -1577,7 +1577,7 @@ rec {
sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
features = mkFeatures (features."itoa"."0.3.4" or {});
};
- features_.itoa."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.itoa."0.3.4" = deps: f: updateFeatures f ({
itoa."0.3.4".default = (f.itoa."0.3.4".default or true);
}) [];
@@ -1623,7 +1623,7 @@ rec {
(crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
]);
};
- features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -1765,7 +1765,7 @@ rec {
(crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps)
]);
};
- features_.libflate."0.1.19" = deps: f: updateFeatures f (rec {
+ features_.libflate."0.1.19" = deps: f: updateFeatures f ({
adler32."${deps.libflate."0.1.19".adler32}".default = true;
byteorder."${deps.libflate."0.1.19".byteorder}".default = true;
crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true;
@@ -1792,7 +1792,7 @@ rec {
++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else []));
features = mkFeatures (features."lock_api"."0.1.5" or {});
};
- features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.lock_api."0.1.5" = deps: f: updateFeatures f ({
lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true);
owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true;
scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false);
@@ -1838,7 +1838,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.6" or {});
};
- features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.6" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
log."0.4.6".default = (f.log."0.4.6".default or true);
}) [
@@ -1856,7 +1856,7 @@ rec {
authors = [ "bluss" ];
sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h";
};
- features_.maplit."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.maplit."0.1.6" = deps: f: updateFeatures f ({
maplit."0.1.6".default = (f.maplit."0.1.6".default or true);
}) [];
@@ -1872,7 +1872,7 @@ rec {
sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
libPath = "lib.rs";
};
- features_.matches."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.matches."0.1.6" = deps: f: updateFeatures f ({
matches."0.1.6".default = (f.matches."0.1.6".default or true);
}) [];
@@ -1890,7 +1890,7 @@ rec {
(crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps)
]);
};
- features_.memchr."0.1.11" = deps: f: updateFeatures f (rec {
+ features_.memchr."0.1.11" = deps: f: updateFeatures f ({
libc."${deps.memchr."0.1.11".libc}".default = true;
memchr."0.1.11".default = (f.memchr."0.1.11".default or true);
}) [
@@ -1908,7 +1908,7 @@ rec {
authors = [ "Gilad Naaman " ];
sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf";
};
- features_.memoffset."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.memoffset."0.2.1" = deps: f: updateFeatures f ({
memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true);
}) [];
@@ -1926,7 +1926,7 @@ rec {
(crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps)
]);
};
- features_.mime."0.3.12" = deps: f: updateFeatures f (rec {
+ features_.mime."0.3.12" = deps: f: updateFeatures f ({
mime."0.3.12".default = (f.mime."0.3.12".default or true);
unicase."${deps.mime."0.3.12".unicase}".default = true;
}) [
@@ -1955,7 +1955,7 @@ rec {
]);
features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {});
};
- features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f (rec {
+ features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f ({
mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true;
mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true);
phf = fold recursiveUpdate {} [
@@ -1993,7 +1993,7 @@ rec {
(crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps)
]);
};
- features_.miniz_sys."0.1.10" = deps: f: updateFeatures f (rec {
+ features_.miniz_sys."0.1.10" = deps: f: updateFeatures f ({
cc."${deps.miniz_sys."0.1.10".cc}".default = true;
libc."${deps.miniz_sys."0.1.10".libc}".default = true;
miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true);
@@ -2083,7 +2083,7 @@ rec {
(crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps)
]);
};
- features_.miow."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.miow."0.2.1" = deps: f: updateFeatures f ({
kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true;
miow."0.2.1".default = (f.miow."0.2.1".default or true);
net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false);
@@ -2126,7 +2126,7 @@ rec {
]) else []);
features = mkFeatures (features."native_tls"."0.2.2" or {});
};
- features_.native_tls."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.native_tls."0.2.2" = deps: f: updateFeatures f ({
lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true;
libc."${deps.native_tls."0.2.2".libc}".default = true;
log."${deps.native_tls."0.2.2".log}".default = true;
@@ -2296,7 +2296,7 @@ rec {
(crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps)
]);
};
- features_.num_integer."0.1.35" = deps: f: updateFeatures f (rec {
+ features_.num_integer."0.1.35" = deps: f: updateFeatures f ({
num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true);
num_traits."${deps.num_integer."0.1.35".num_traits}".default = true;
}) [
@@ -2318,7 +2318,7 @@ rec {
(crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps)
]);
};
- features_.num_iter."0.1.34" = deps: f: updateFeatures f (rec {
+ features_.num_iter."0.1.34" = deps: f: updateFeatures f ({
num_integer."${deps.num_iter."0.1.34".num_integer}".default = true;
num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true);
num_traits."${deps.num_iter."0.1.34".num_traits}".default = true;
@@ -2338,7 +2338,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
};
- features_.num_traits."0.1.40" = deps: f: updateFeatures f (rec {
+ features_.num_traits."0.1.40" = deps: f: updateFeatures f ({
num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true);
}) [];
@@ -2356,7 +2356,7 @@ rec {
(crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps)
]);
};
- features_.num_cpus."1.8.0" = deps: f: updateFeatures f (rec {
+ features_.num_cpus."1.8.0" = deps: f: updateFeatures f ({
libc."${deps.num_cpus."1.8.0".libc}".default = true;
num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true);
}) [
@@ -2417,7 +2417,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a";
};
- features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({
openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true);
}) [];
@@ -2475,7 +2475,7 @@ rec {
(crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps)
]);
};
- features_.owning_ref."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.owning_ref."0.4.0" = deps: f: updateFeatures f ({
owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true);
stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true;
}) [
@@ -2609,7 +2609,7 @@ rec {
sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
libPath = "lib.rs";
};
- features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({
percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true);
}) [];
@@ -2661,7 +2661,7 @@ rec {
(crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps)
]);
};
- features_.phf_codegen."0.7.21" = deps: f: updateFeatures f (rec {
+ features_.phf_codegen."0.7.21" = deps: f: updateFeatures f ({
phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true);
phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true;
phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true;
@@ -2685,7 +2685,7 @@ rec {
(crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps)
]);
};
- features_.phf_generator."0.7.21" = deps: f: updateFeatures f (rec {
+ features_.phf_generator."0.7.21" = deps: f: updateFeatures f ({
phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true);
phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true;
rand."${deps.phf_generator."0.7.21".rand}".default = true;
@@ -2711,7 +2711,7 @@ rec {
++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else []));
features = mkFeatures (features."phf_shared"."0.7.21" or {});
};
- features_.phf_shared."0.7.21" = deps: f: updateFeatures f (rec {
+ features_.phf_shared."0.7.21" = deps: f: updateFeatures f ({
phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true);
siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true;
unicase."${deps.phf_shared."0.7.21".unicase}".default = true;
@@ -2731,7 +2731,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
};
- features_.pkg_config."0.3.9" = deps: f: updateFeatures f (rec {
+ features_.pkg_config."0.3.9" = deps: f: updateFeatures f ({
pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true);
}) [];
@@ -2746,7 +2746,7 @@ rec {
authors = [ "David Tolnay " ];
sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
};
- features_.quote."0.3.15" = deps: f: updateFeatures f (rec {
+ features_.quote."0.3.15" = deps: f: updateFeatures f ({
quote."0.3.15".default = (f.quote."0.3.15".default or true);
}) [];
@@ -3036,7 +3036,7 @@ rec {
(crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps)
]);
};
- features_.rand_chacha."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rand_chacha."0.1.0" = deps: f: updateFeatures f ({
rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true);
rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false);
rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true;
@@ -3131,7 +3131,7 @@ rec {
(crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps)
]);
};
- features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({
rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false);
rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true);
}) [
@@ -3259,7 +3259,7 @@ rec {
sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4";
libName = "syscall";
};
- features_.redox_syscall."0.1.31" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.31" = deps: f: updateFeatures f ({
redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true);
}) [];
@@ -3278,7 +3278,7 @@ rec {
(crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
]);
};
- features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({
redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
}) [
@@ -3336,7 +3336,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
};
- features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({
regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true);
}) [];
@@ -3354,7 +3354,7 @@ rec {
(crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
]) else []);
};
- features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({
remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
winapi = fold recursiveUpdate {} [
{ "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
@@ -3479,7 +3479,7 @@ rec {
(crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps)
]);
};
- features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({
rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true);
semver."${deps.rustc_version."0.2.3".semver}".default = true;
}) [
@@ -3523,7 +3523,7 @@ rec {
(crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps)
]);
};
- features_.schannel."0.1.14" = deps: f: updateFeatures f (rec {
+ features_.schannel."0.1.14" = deps: f: updateFeatures f ({
lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true;
schannel."0.1.14".default = (f.schannel."0.1.14".default or true);
winapi = fold recursiveUpdate {} [
@@ -3706,7 +3706,7 @@ rec {
authors = [ "Steve Klabnik " ];
sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
};
- features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({
semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true);
}) [];
@@ -3798,7 +3798,7 @@ rec {
(crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps)
]);
};
- features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f ({
dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true;
itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true;
serde."${deps.serde_urlencoded."0.5.1".serde}".default = true;
@@ -3824,7 +3824,7 @@ rec {
dependencies = mapFeatures features ([
]);
};
- features_.siphasher."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.siphasher."0.2.2" = deps: f: updateFeatures f ({
siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true);
}) [];
@@ -3839,7 +3839,7 @@ rec {
authors = [ "Carl Lerche " ];
sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0";
};
- features_.slab."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.slab."0.4.0" = deps: f: updateFeatures f ({
slab."0.4.0".default = (f.slab."0.4.0".default or true);
}) [];
@@ -3884,7 +3884,7 @@ rec {
(crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps)
]);
};
- features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f (rec {
+ features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f ({
log."${deps.slog_envlogger."0.5.0".log}".default = true;
regex."${deps.slog_envlogger."0.5.0".regex}".default = true;
slog."${deps.slog_envlogger."0.5.0".slog}".default = true;
@@ -3915,7 +3915,7 @@ rec {
(crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps)
]);
};
- features_.slog_extra."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.slog_extra."0.1.2" = deps: f: updateFeatures f ({
slog."${deps.slog_extra."0.1.2".slog}".default = true;
slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true);
thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true;
@@ -3943,7 +3943,7 @@ rec {
(crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps)
]);
};
- features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f (rec {
+ features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f ({
crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true;
lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true;
log."${deps.slog_stdlog."1.1.0".log}".default = true;
@@ -3975,7 +3975,7 @@ rec {
(crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps)
]);
};
- features_.slog_stream."1.2.1" = deps: f: updateFeatures f (rec {
+ features_.slog_stream."1.2.1" = deps: f: updateFeatures f ({
slog."${deps.slog_stream."1.2.1".slog}".default = true;
slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true;
slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true);
@@ -4005,7 +4005,7 @@ rec {
(crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps)
]);
};
- features_.slog_term."1.5.0" = deps: f: updateFeatures f (rec {
+ features_.slog_term."1.5.0" = deps: f: updateFeatures f ({
chrono."${deps.slog_term."1.5.0".chrono}".default = true;
isatty."${deps.slog_term."1.5.0".isatty}".default = true;
slog."${deps.slog_term."1.5.0".slog}".default = true;
@@ -4082,7 +4082,7 @@ rec {
authors = [ "Carl Lerche " ];
sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6";
};
- features_.string."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.string."0.1.2" = deps: f: updateFeatures f ({
string."0.1.2".default = (f.string."0.1.2".default or true);
}) [];
@@ -4097,7 +4097,7 @@ rec {
authors = [ "Danny Guo " ];
sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
};
- features_.strsim."0.6.0" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.6.0" = deps: f: updateFeatures f ({
strsim."0.6.0".default = (f.strsim."0.6.0".default or true);
}) [];
@@ -4165,7 +4165,7 @@ rec {
(crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps)
]);
};
- features_.synom."0.11.3" = deps: f: updateFeatures f (rec {
+ features_.synom."0.11.3" = deps: f: updateFeatures f ({
synom."0.11.3".default = (f.synom."0.11.3".default or true);
unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true;
}) [
@@ -4233,7 +4233,7 @@ rec {
(crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps)
]) else []);
};
- features_.tempfile."3.0.5" = deps: f: updateFeatures f (rec {
+ features_.tempfile."3.0.5" = deps: f: updateFeatures f ({
cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true;
libc."${deps.tempfile."3.0.5".libc}".default = true;
rand."${deps.tempfile."3.0.5".rand}".default = true;
@@ -4273,7 +4273,7 @@ rec {
(crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
]) else []);
};
- features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+ features_.termion."1.5.1" = deps: f: updateFeatures f ({
libc."${deps.termion."1.5.1".libc}".default = true;
redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
@@ -4298,7 +4298,7 @@ rec {
(crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps)
]);
};
- features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.textwrap."0.9.0" = deps: f: updateFeatures f ({
textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true);
unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true;
}) [
@@ -4320,7 +4320,7 @@ rec {
(crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps)
]);
};
- features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec {
+ features_.thread_id."2.0.0" = deps: f: updateFeatures f ({
kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true;
libc."${deps.thread_id."2.0.0".libc}".default = true;
thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true);
@@ -4343,7 +4343,7 @@ rec {
(crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps)
]);
};
- features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.2.7" = deps: f: updateFeatures f ({
thread_id."${deps.thread_local."0.2.7".thread_id}".default = true;
thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true);
}) [
@@ -4365,7 +4365,7 @@ rec {
(crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps)
]);
};
- features_.thread_local."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.3.4" = deps: f: updateFeatures f ({
lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true;
thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true);
unreachable."${deps.thread_local."0.3.4".unreachable}".default = true;
@@ -4395,7 +4395,7 @@ rec {
(crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps)
]) else []);
};
- features_.time."0.1.38" = deps: f: updateFeatures f (rec {
+ features_.time."0.1.38" = deps: f: updateFeatures f ({
kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true;
libc."${deps.time."0.1.38".libc}".default = true;
redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true;
@@ -4431,7 +4431,7 @@ rec {
(crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps)
]);
};
- features_.tokio."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.tokio."0.1.7" = deps: f: updateFeatures f ({
futures."${deps.tokio."0.1.7".futures}".default = true;
mio."${deps.tokio."0.1.7".mio}".default = true;
tokio."0.1.7".default = (f.tokio."0.1.7".default or true);
@@ -4472,7 +4472,7 @@ rec {
(crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps)
]);
};
- features_.tokio_codec."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.tokio_codec."0.1.1" = deps: f: updateFeatures f ({
bytes."${deps.tokio_codec."0.1.1".bytes}".default = true;
futures."${deps.tokio_codec."0.1.1".futures}".default = true;
tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true);
@@ -4497,7 +4497,7 @@ rec {
(crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps)
]);
};
- features_.tokio_executor."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.tokio_executor."0.1.5" = deps: f: updateFeatures f ({
futures."${deps.tokio_executor."0.1.5".futures}".default = true;
tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true);
}) [
@@ -4520,7 +4520,7 @@ rec {
(crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps)
]);
};
- features_.tokio_fs."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.tokio_fs."0.1.4" = deps: f: updateFeatures f ({
futures."${deps.tokio_fs."0.1.4".futures}".default = true;
tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true);
tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true;
@@ -4547,7 +4547,7 @@ rec {
(crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps)
]);
};
- features_.tokio_io."0.1.10" = deps: f: updateFeatures f (rec {
+ features_.tokio_io."0.1.10" = deps: f: updateFeatures f ({
bytes."${deps.tokio_io."0.1.10".bytes}".default = true;
futures."${deps.tokio_io."0.1.10".futures}".default = true;
log."${deps.tokio_io."0.1.10".log}".default = true;
@@ -4581,7 +4581,7 @@ rec {
(crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps)
]);
};
- features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f ({
crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true;
futures."${deps.tokio_reactor."0.1.7".futures}".default = true;
lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true;
@@ -4625,7 +4625,7 @@ rec {
(crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps)
]);
};
- features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f ({
bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true;
futures."${deps.tokio_tcp."0.1.2".futures}".default = true;
iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true;
@@ -4662,7 +4662,7 @@ rec {
(crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps)
]);
};
- features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f ({
crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true;
crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true;
futures."${deps.tokio_threadpool."0.1.9".futures}".default = true;
@@ -4696,7 +4696,7 @@ rec {
(crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps)
]);
};
- features_.tokio_timer."0.2.5" = deps: f: updateFeatures f (rec {
+ features_.tokio_timer."0.2.5" = deps: f: updateFeatures f ({
futures."${deps.tokio_timer."0.2.5".futures}".default = true;
tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true;
tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true);
@@ -4725,7 +4725,7 @@ rec {
(crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps)
]);
};
- features_.tokio_udp."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.tokio_udp."0.1.3" = deps: f: updateFeatures f ({
bytes."${deps.tokio_udp."0.1.3".bytes}".default = true;
futures."${deps.tokio_udp."0.1.3".futures}".default = true;
log."${deps.tokio_udp."0.1.3".log}".default = true;
@@ -4755,7 +4755,7 @@ rec {
authors = [ "Sean McArthur " ];
sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv";
};
- features_.try_lock."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.try_lock."0.2.2" = deps: f: updateFeatures f ({
try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true);
}) [];
@@ -4812,7 +4812,7 @@ rec {
]);
features = mkFeatures (features."unicase"."2.1.0" or {});
};
- features_.unicase."2.1.0" = deps: f: updateFeatures f (rec {
+ features_.unicase."2.1.0" = deps: f: updateFeatures f ({
unicase."2.1.0".default = (f.unicase."2.1.0".default or true);
version_check."${deps.unicase."2.1.0".version_check}".default = true;
}) [
@@ -4867,7 +4867,7 @@ rec {
authors = [ "kwantam " ];
sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5";
};
- features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f ({
unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true);
}) [];
@@ -4883,7 +4883,7 @@ rec {
sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
features = mkFeatures (features."unicode_width"."0.1.4" or {});
};
- features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.unicode_width."0.1.4" = deps: f: updateFeatures f ({
unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true);
}) [];
@@ -4899,7 +4899,7 @@ rec {
sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
features = mkFeatures (features."unicode_xid"."0.0.4" or {});
};
- features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec {
+ features_.unicode_xid."0.0.4" = deps: f: updateFeatures f ({
unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true);
}) [];
@@ -4917,7 +4917,7 @@ rec {
(crates."void"."${deps."unreachable"."1.0.0"."void"}" deps)
]);
};
- features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec {
+ features_.unreachable."1.0.0" = deps: f: updateFeatures f ({
unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true);
void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false);
}) [
@@ -4973,7 +4973,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
};
- features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({
utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true);
}) [];
@@ -5040,7 +5040,7 @@ rec {
authors = [ "Jim McGrath " ];
sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a";
};
- features_.vcpkg."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.vcpkg."0.2.2" = deps: f: updateFeatures f ({
vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true);
}) [];
@@ -5083,7 +5083,7 @@ rec {
authors = [ "Sergio Benitez " ];
sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg";
};
- features_.version_check."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.version_check."0.1.3" = deps: f: updateFeatures f ({
version_check."0.1.3".default = (f.version_check."0.1.3".default or true);
}) [];
@@ -5125,7 +5125,7 @@ rec {
(crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps)
]);
};
- features_.want."0.0.6" = deps: f: updateFeatures f (rec {
+ features_.want."0.0.6" = deps: f: updateFeatures f ({
futures."${deps.want."0.0.6".futures}".default = true;
log."${deps.want."0.0.6".log}".default = true;
try_lock."${deps.want."0.0.6".try_lock}".default = true;
@@ -5147,7 +5147,7 @@ rec {
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
- features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.2.8" = deps: f: updateFeatures f ({
winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
}) [];
@@ -5170,7 +5170,7 @@ rec {
]) else []);
features = mkFeatures (features."winapi"."0.3.6" or {});
};
- features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.3.6" = deps: f: updateFeatures f ({
winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -5191,7 +5191,7 @@ rec {
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
};
- features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
}) [];
@@ -5207,7 +5207,7 @@ rec {
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
};
- features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -5223,7 +5223,7 @@ rec {
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
};
- features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -5247,7 +5247,7 @@ rec {
(crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps)
]);
};
- features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f ({
winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true;
winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true;
ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true);
diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix
index 5e635f0fc26f5b75f9bdfc7d122c0e94846623f4..2fe89ccfa986478cd85c2e2b9784238b1fa18fa3 100644
--- a/pkgs/tools/package-management/cargo-graph/default.nix
+++ b/pkgs/tools/package-management/cargo-graph/default.nix
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "cargo-graph-${version}";
+ pname = "cargo-graph";
version = "0.2.0-d895af1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix
index 619fbb115976df9af04a1f10b8b4831e2114f0f9..c8a43bda64a43bdc17c50d2330d3ed5f28972a80 100644
--- a/pkgs/tools/package-management/cargo-license/default.nix
+++ b/pkgs/tools/package-management/cargo-license/default.nix
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "cargo-license-${version}";
+ pname = "cargo-license";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 2521a2ceebf62d5f344b266f02be4e75f0b10201..2dcb030485770d56cf04e4c48c6a0cc29341af87 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
- name = "cargo-release-${version}";
+ pname = "cargo-release";
version = "0.10.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 8b654188c51a6b1d511d6b69cc614d15fef2fbf6..8c3035ae79aac7f924cf0d7646d873a389e66991 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
rustPlatform.buildRustPackage rec {
- name = "cargo-tree-${version}";
+ pname = "cargo-tree";
version = "0.26.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix
index 1bd8aadf498265135d7acbdc769d5225675f25b5..9b8cf24605a5c1a94aa215bbc135d886354b2ef5 100644
--- a/pkgs/tools/package-management/cargo-update/cargo-update.nix
+++ b/pkgs/tools/package-management/cargo-update/cargo-update.nix
@@ -520,7 +520,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- advapi32_sys_0_2_0_features = f: updateFeatures f (rec {
+ advapi32_sys_0_2_0_features = f: updateFeatures f ({
advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -528,14 +528,14 @@ rec {
aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
dependencies = mapFeatures features ([ memchr_2_0_1 ]);
};
- aho_corasick_0_6_4_features = f: updateFeatures f (rec {
+ aho_corasick_0_6_4_features = f: updateFeatures f ({
aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
memchr_2_0_1.default = true;
}) [ memchr_2_0_1_features ];
ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
};
- ansi_term_0_11_0_features = f: updateFeatures f (rec {
+ ansi_term_0_11_0_features = f: updateFeatures f ({
ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
winapi_0_3_4.consoleapi = true;
winapi_0_3_4.default = true;
@@ -543,7 +543,7 @@ rec {
winapi_0_3_4.processenv = true;
}) [ winapi_0_3_4_features ];
array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {};
- array_tool_1_0_3_features = f: updateFeatures f (rec {
+ array_tool_1_0_3_features = f: updateFeatures f ({
array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true);
}) [];
atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ {
@@ -551,7 +551,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
};
- atty_0_2_10_features = f: updateFeatures f (rec {
+ atty_0_2_10_features = f: updateFeatures f ({
atty_0_2_10.default = (f.atty_0_2_10.default or true);
libc_0_2_40.default = (f.libc_0_2_40.default or false);
termion_1_5_1.default = true;
@@ -575,14 +575,14 @@ rec {
bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
features = mkFeatures (features.bitflags_1_0_3 or {});
};
- bitflags_1_0_3_features = f: updateFeatures f (rec {
+ bitflags_1_0_3_features = f: updateFeatures f ({
bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
}) [];
cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ {
dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]);
buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]);
};
- cargo_update_1_5_2_features = f: updateFeatures f (rec {
+ cargo_update_1_5_2_features = f: updateFeatures f ({
array_tool_1_0_3.default = true;
cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true);
clap_2_31_2.default = true;
@@ -677,7 +677,7 @@ rec {
cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ {
dependencies = mapFeatures features ([ cc_1_0_15 ]);
};
- cmake_0_1_31_features = f: updateFeatures f (rec {
+ cmake_0_1_31_features = f: updateFeatures f ({
cc_1_0_15.default = true;
cmake_0_1_31.default = (f.cmake_0_1_31.default or true);
}) [ cc_1_0_15_features ];
@@ -688,7 +688,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
};
- curl_sys_0_4_5_features = f: updateFeatures f (rec {
+ curl_sys_0_4_5_features = f: updateFeatures f ({
cc_1_0_15.default = true;
curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true);
libc_0_2_40.default = true;
@@ -702,20 +702,20 @@ rec {
embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ {
dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []);
};
- embed_resource_1_1_4_features = f: updateFeatures f (rec {
+ embed_resource_1_1_4_features = f: updateFeatures f ({
embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true);
winreg_0_4_0.default = (f.winreg_0_4_0.default or false);
}) [ winreg_0_4_0_features ];
fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
};
- fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
+ fuchsia_zircon_0_3_3_features = f: updateFeatures f ({
bitflags_1_0_3.default = true;
fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
fuchsia_zircon_sys_0_3_3.default = true;
}) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
- fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
+ fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({
fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
}) [];
git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ {
@@ -769,21 +769,21 @@ rec {
idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ {
dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
};
- idna_0_1_4_features = f: updateFeatures f (rec {
+ idna_0_1_4_features = f: updateFeatures f ({
idna_0_1_4.default = (f.idna_0_1_4.default or true);
matches_0_1_6.default = true;
unicode_bidi_0_3_4.default = true;
unicode_normalization_0_1_7.default = true;
}) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {};
- json_0_11_13_features = f: updateFeatures f (rec {
+ json_0_11_13_features = f: updateFeatures f ({
json_0_11_13.default = (f.json_0_11_13.default or true);
}) [];
kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -811,7 +811,7 @@ rec {
dependencies = mapFeatures features ([ rand_0_3_22 ]);
features = mkFeatures (features.lazysort_0_2_0 or {});
};
- lazysort_0_2_0_features = f: updateFeatures f (rec {
+ lazysort_0_2_0_features = f: updateFeatures f ({
lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true);
rand_0_3_22.default = true;
}) [ rand_0_3_22_features ];
@@ -863,7 +863,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []);
buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]);
};
- libssh2_sys_0_2_7_features = f: updateFeatures f (rec {
+ libssh2_sys_0_2_7_features = f: updateFeatures f ({
cmake_0_1_31.default = true;
libc_0_2_40.default = true;
libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true);
@@ -876,14 +876,14 @@ rec {
++ (if abi == "msvc" then mapFeatures features ([]) else []);
buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
};
- libz_sys_1_0_18_features = f: updateFeatures f (rec {
+ libz_sys_1_0_18_features = f: updateFeatures f ({
cc_1_0_15.default = true;
libc_0_2_40.default = true;
libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true);
pkg_config_0_3_11.default = true;
}) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {};
- matches_0_1_6_features = f: updateFeatures f (rec {
+ matches_0_1_6_features = f: updateFeatures f ({
matches_0_1_6.default = (f.matches_0_1_6.default or true);
}) [];
memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
@@ -910,7 +910,7 @@ rec {
(memchr_2_0_1.default or false);
}) [ libc_0_2_40_features ];
openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {};
- openssl_probe_0_1_2_features = f: updateFeatures f (rec {
+ openssl_probe_0_1_2_features = f: updateFeatures f ({
openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true);
}) [];
openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ {
@@ -918,18 +918,18 @@ rec {
++ (if abi == "msvc" then mapFeatures features ([]) else []);
buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
};
- openssl_sys_0_9_30_features = f: updateFeatures f (rec {
+ openssl_sys_0_9_30_features = f: updateFeatures f ({
cc_1_0_15.default = true;
libc_0_2_40.default = true;
openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true);
pkg_config_0_3_11.default = true;
}) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
- percent_encoding_1_0_1_features = f: updateFeatures f (rec {
+ percent_encoding_1_0_1_features = f: updateFeatures f ({
percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
}) [];
pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {};
- pkg_config_0_3_11_features = f: updateFeatures f (rec {
+ pkg_config_0_3_11_features = f: updateFeatures f ({
pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true);
}) [];
proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ {
@@ -1007,13 +1007,13 @@ rec {
winapi_0_3_4.winnt = true;
}) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
- redox_syscall_0_1_37_features = f: updateFeatures f (rec {
+ redox_syscall_0_1_37_features = f: updateFeatures f ({
redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
}) [];
redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
};
- redox_termios_0_1_1_features = f: updateFeatures f (rec {
+ redox_termios_0_1_1_features = f: updateFeatures f ({
redox_syscall_0_1_37.default = true;
redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
}) [ redox_syscall_0_1_37_features ];
@@ -1036,7 +1036,7 @@ rec {
regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ {
dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
};
- regex_syntax_0_5_6_features = f: updateFeatures f (rec {
+ regex_syntax_0_5_6_features = f: updateFeatures f ({
regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true);
ucd_util_0_1_1.default = true;
}) [ ucd_util_0_1_1_features ];
@@ -1055,7 +1055,7 @@ rec {
serde_1_0_55.default = true;
}) [ semver_parser_0_7_0_features serde_1_0_55_features ];
semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
- semver_parser_0_7_0_features = f: updateFeatures f (rec {
+ semver_parser_0_7_0_features = f: updateFeatures f ({
semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
}) [];
serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ {
@@ -1081,7 +1081,7 @@ rec {
dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]);
features = mkFeatures (features.serde_derive_1_0_55 or {});
};
- serde_derive_1_0_55_features = f: updateFeatures f (rec {
+ serde_derive_1_0_55_features = f: updateFeatures f ({
proc_macro2_0_3_8.default = true;
quote_0_5_2.default = true;
serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true);
@@ -1089,7 +1089,7 @@ rec {
syn_0_13_10.visit = true;
}) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ];
strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
- strsim_0_7_0_features = f: updateFeatures f (rec {
+ strsim_0_7_0_features = f: updateFeatures f ({
strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
}) [];
syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ {
@@ -1155,7 +1155,7 @@ rec {
dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
};
- termion_1_5_1_features = f: updateFeatures f (rec {
+ termion_1_5_1_features = f: updateFeatures f ({
libc_0_2_40.default = true;
redox_syscall_0_1_37.default = true;
redox_termios_0_1_1.default = true;
@@ -1164,14 +1164,14 @@ rec {
textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
};
- textwrap_0_9_0_features = f: updateFeatures f (rec {
+ textwrap_0_9_0_features = f: updateFeatures f ({
textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
unicode_width_0_1_4.default = true;
}) [ unicode_width_0_1_4_features ];
thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
};
- thread_local_0_3_5_features = f: updateFeatures f (rec {
+ thread_local_0_3_5_features = f: updateFeatures f ({
lazy_static_1_0_0.default = true;
thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
unreachable_1_0_0.default = true;
@@ -1179,12 +1179,12 @@ rec {
toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
dependencies = mapFeatures features ([ serde_1_0_55 ]);
};
- toml_0_4_6_features = f: updateFeatures f (rec {
+ toml_0_4_6_features = f: updateFeatures f ({
serde_1_0_55.default = true;
toml_0_4_6.default = (f.toml_0_4_6.default or true);
}) [ serde_1_0_55_features ];
ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
- ucd_util_0_1_1_features = f: updateFeatures f (rec {
+ ucd_util_0_1_1_features = f: updateFeatures f ({
ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
}) [];
unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
@@ -1208,25 +1208,25 @@ rec {
(unicode_bidi_0_3_4.with_serde or false);
}) [ matches_0_1_6_features ];
unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
- unicode_normalization_0_1_7_features = f: updateFeatures f (rec {
+ unicode_normalization_0_1_7_features = f: updateFeatures f ({
unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
}) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
features = mkFeatures (features.unicode_xid_0_1_0 or {});
};
- unicode_xid_0_1_0_features = f: updateFeatures f (rec {
+ unicode_xid_0_1_0_features = f: updateFeatures f ({
unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
}) [];
unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
dependencies = mapFeatures features ([ void_1_0_2 ]);
};
- unreachable_1_0_0_features = f: updateFeatures f (rec {
+ unreachable_1_0_0_features = f: updateFeatures f ({
unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
void_1_0_2.default = (f.void_1_0_2.default or false);
}) [ void_1_0_2_features ];
@@ -1249,11 +1249,11 @@ rec {
(url_1_7_0.heap_size or false);
}) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ];
utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
- utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
+ utf8_ranges_1_0_0_features = f: updateFeatures f ({
utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
}) [];
vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
- vcpkg_0_2_3_features = f: updateFeatures f (rec {
+ vcpkg_0_2_3_features = f: updateFeatures f ({
vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
}) [];
vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ {
@@ -1278,7 +1278,7 @@ rec {
(void_1_0_2.default or false);
}) [];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
@@ -1286,21 +1286,21 @@ rec {
++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
features = mkFeatures (features.winapi_0_3_4 or {});
};
- winapi_0_3_4_features = f: updateFeatures f (rec {
+ winapi_0_3_4_features = f: updateFeatures f ({
winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
winapi_i686_pc_windows_gnu_0_4_0.default = true;
winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
}) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
- winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+ winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
}) [];
winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
- winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+ winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
}) [];
winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ {
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 9b666dbfa642ee357e0dcf17d991f6a4d30cbfc9..17d023f6daf34291fcaa31bc88b888a2b6162ba6 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
rustPlatform.buildRustPackage rec {
- name = "nix-du-${version}";
+ pname = "nix-du";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 62e0bc81afaf37155ddcee0de08647f4e857099b..1d025581b614dae37c8e7f6c7f58b9213af459c5 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -3,7 +3,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "nix-index-${version}";
+ pname = "nix-index";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 660dce347a5b0a0bbf62e666c0776cbe7d27b0cf..b191d1c32111592252bfaab8e0e3ffd34ab329f3 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -9,7 +9,7 @@ let
sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nix-serve-0.2-${substring 0 7 rev}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index b495577ef664aab8fdb4e71652bdb2e24724cd32..131a3bb5fddcd4d5a8346d6027eafb132ed38381 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -24,7 +24,7 @@ let
genericName = "NixUI";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nixui";
inherit version src;
installPhase = ''
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 8fe405e1b3e909e4e31b752ec73a8fc05b7fad5e..4377681e20d83bfba771dabbbbb148648cc116b3 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix
index 8575f126e6247b22c035b30d850e74b5651e771d..1c97757ff8a650df51dd46e06af0d8a16d465376 100644
--- a/pkgs/tools/package-management/opkg-utils/default.nix
+++ b/pkgs/tools/package-management/opkg-utils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "opkg-utils-20141030";
# No releases, only a git tree
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index 1a7c24e2c38a2fde7f5b31b532f6976e85c9b0c2..675ec61f4db920daee5e844a32ff32b35c3d9963 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
name = "python2nix-20140927";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix
index 58b25e6d3ee59cbb46d09c4b03cc8458c7ba8fe1..47e74573b81f5afa0ef8ac2b29e4cb06b9aae7e0 100644
--- a/pkgs/tools/security/afl/libdislocator.nix
+++ b/pkgs/tools/security/afl/libdislocator.nix
@@ -1,6 +1,6 @@
{ stdenv, afl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = (builtins.parseDrvName afl.name).version;
pname = "libdislocator";
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index 9e0f19361fb016c7fabaf4f8a2a04faf914c7df3..d80d301351f4314a9ef04b040e4361b838225bb8 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -11,7 +11,7 @@ let
else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user"
else throw "afl: no support for ${stdenv.hostPlatform.system}!";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "afl-${qemuName}";
srcs = [
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index 19c9acc0a457752d54006413063a97c90ddb7c67..6b3a922bbe5c324e20c0a879c4c607cfb0751be7 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -4,7 +4,7 @@
assert testQR -> zbar != false;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "asc-key-to-qr-code-gif";
version = "20180613";
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 2fa50f91111a51d533c60bacc3e31ad51f163618..fdd4f2c73fd40fa57192beccffb6526601e1f47f 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "b2sum";
version = "unstable-2018-06-11";
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
index c6d2cbd53c9db2596675e08b6ed8342b1c297fe5..b745a2c872e7b1af7efa2e88423b4b494d1f0e25 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bash-supergenpass-unstable";
version = "2018-04-18";
diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix
index 41e23864c44d8d3d2c3bc846c78f00c0cf2758ad..66560873b4c50306bef712d2a6d2ae7dea11dd74 100644
--- a/pkgs/tools/security/bitwarden-cli/node-packages.nix
+++ b/pkgs/tools/security/bitwarden-cli/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index e6874d085d297fbbd435a780e0e9aaa1c2a5e7d7..d94e02c4adcadde6645e40423bd3b6119fdb5dca 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
pname = "bitwarden";
version = {
- "x86_64-linux" = "1.15.2";
+ x86_64-linux = "1.15.2";
}.${system} or "";
sha256 = {
- "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f";
+ x86_64-linux = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f";
}.${system} or "";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix
index cee198c1b3be4cb722d97249a42283bbd4f8d59d..0e57a5bab884c17ef353867b755cc64262390e38 100644
--- a/pkgs/tools/security/default.nix
+++ b/pkgs/tools/security/default.nix
@@ -1,6 +1,6 @@
{ stdenv, pkgs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.0.1";
pname = "ecdsatool";
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix
index 00dac6e94294def3343eca6b4b39e0e6a2a4dfa4..13280e3226d9412148948816ce594581e7f2e1b7 100644
--- a/pkgs/tools/security/ecdsautils/default.nix
+++ b/pkgs/tools/security/ecdsautils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, pkgs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4.0";
pname = "ecdsautils";
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 4acef56a2c58c9ddff9b4da7f7d873d965f02a3e..fcb8d091d933e34b5243d5fa8486e6243c5032d7 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -4,7 +4,7 @@
, python2
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ecryptfs-helper";
version = "20160722";
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index 8ba80c4645798981e640d525b216201b0d11f5d8..89e09a47858d4a040ff6f48895a64bcb111722cb 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -39,7 +39,7 @@ let
libuuid
cups
]);
- package = stdenv.mkDerivation rec {
+ package = stdenv.mkDerivation {
inherit (data) version;
pname = "enpass";
@@ -80,7 +80,7 @@ let
'';
};
updater = {
- update = stdenv.mkDerivation rec {
+ update = stdenv.mkDerivation {
name = "enpass-update-script";
SCRIPT =./update_script.py;
diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix
index 59d126c5e2c9ed1aee114a3ab71ba00a2bd3462e..3fff99a6ce10f30d7234e88354370e343b54848d 100644
--- a/pkgs/tools/security/fprot/default.nix
+++ b/pkgs/tools/security/fprot/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "f-prot";
version = "6.2.1";
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
index c4b96f04dc27356d23600432b49d9a9e61acc9c0..bd7d356c1a0e47d7b281c53b632b79ded531ac12 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/pkgs/tools/security/haka/default.nix
@@ -2,7 +2,7 @@
let version = "0.3.0"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "haka";
inherit version;
diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix
index 9efa7e2afa29bc5f5ec6a80f4bcf5a26b54242a8..30ba2fb30872a02b754f3798487244ebc6860157 100644
--- a/pkgs/tools/security/hash_extender/default.nix
+++ b/pkgs/tools/security/hash_extender/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hash_extender";
version = "2017-04-10";
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix
index 8f30b5885e40368b29cdae92fbf1f32b85913451..5ec66a5b98cc9cb0d07e083d99d57e569f3dcef1 100644
--- a/pkgs/tools/security/ifdnfc/default.nix
+++ b/pkgs/tools/security/ifdnfc/default.nix
@@ -4,7 +4,7 @@
, libnfc
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ifdnfc";
version = "2016-03-01";
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index 2eda19088376a2e0d94c3672bc6a0ac987f5069d..213f7c30051a66d774af475c02cdf31bb1436de4 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -63,7 +63,7 @@ let
categories = "Development;Debugger;";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name version src;
nativeBuildInputs = [ gradle_2_5 perl makeWrapper ];
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix
index 302e996213dd0bd59263e6e54409a3112238adbf..9448182a65a71fa59d6eaea2fa792bce31f250fd 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/pkgs/tools/security/keybase/kbfs.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub, keybase }:
-buildGoPackage rec {
+buildGoPackage {
pname = "kbfs";
inherit (keybase) src version;
diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix
index 4af6e3de3cf94e2c0976b0636a51ec41a508e2cf..248fbe008fc72ddb47e406f9f9d01361ea4d352c 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/pkgs/tools/security/libacr38u/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.7.11";
pname = "libacr38u";
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index a325c47ca0d997d5e659bc86755fdf9b302fd8e5..f06ce2f246a4ffcee63e7119ee03312631ef47ef 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "logkeys";
version = "2018-01-22";
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
index 9098457cec1719418cf3199a3f038f4ad1e2d10e..a23e29175615f998da2ae65f287c24f5cdc1ad2c 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libnfc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mfcuk";
version = "0.3.8";
diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix
index 5d1cfdd40232ef9df0ec1be32946fb611ad21883..bb9c932d19e3a0c29cd3f483de3928ccb708cf1f 100644
--- a/pkgs/tools/security/mkrand/default.nix
+++ b/pkgs/tools/security/mkrand/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mkrand-0.1.0";
src = fetchurl {
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 9e154c19a9c0bca7db96d15c35c26bbb3a0c4fd1..e31d62dc8b7afc3df4f1eb1e068d04f3923829b0 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -5,7 +5,7 @@ let
if stdenv.isDarwin then xmlsec
else pam;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "oath-toolkit-2.6.2";
src = fetchFromGitLab {
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 1fbb52985fb191b131f1a5b2e14a2188f7b4953d..25fa180c48b9eef248215ad0119ee97208569229 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pinentry-mac-0.9.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index 5ce5672eb254346001faf2c168efeede7ec77020..fac855f232a6992de5b897d964ab9a2582b98977 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -3,7 +3,7 @@
, pkgconfig, pcsclite, hicolor-icon-theme
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-08-21";
pname = "qesteidutil";
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
index 0227268cf4360d7cc3742ffdf8184767998a4282..65158b3c5fe3d4babf2567667f29383c659fecf9 100644
--- a/pkgs/tools/security/rarcrack/default.nix
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rarcrack";
version = "0.2";
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index aaac975bb8139f2aba8dbb787335646b60e31e94..e0e2896f6ffc87e0b073e37ec918eaca951b19b7 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -3,7 +3,7 @@
, openssl, libuuid, gnu-efi, libbfd
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sbsigntool";
version = "0.9.1";
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix
index c9ba2a8ac6dd2cb9e2b0f080752ae3e203968650..7189032454d648fc11954dac327ca809b46b4314 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/pkgs/tools/security/secp256k1/default.nix
@@ -15,7 +15,7 @@
let inherit (stdenv.lib) optionals; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "secp256k1";
# I can't find any version numbers, so we're just using the date of the
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index 3bbcdafcdcdd5775dede30124d73640a5de3b65a..157e007c534aed0f1e779d5b493e4637ef9f06b2 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ssss-0.5";
src = fetchurl {
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
index ca78c5d73ffbc678457acfe417372621af0b6607..94d833ca7462962c90d0a676149d7b75567286fc 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tpm-luks";
version = "git-2015-07-11";
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index d33cdeb1c56fc49b4f4693dd66cdc88d5ced1030..87f2e922ff743975ed43386a04232ec9e7b01e38 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -6,23 +6,23 @@ let
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0";
};
- "i686-linux" = fetchurl {
+ i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867";
};
- "x86_64-darwin" = fetchurl {
+ x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea";
};
- "i686-darwin" = fetchurl {
+ i686-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_386.zip";
sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be";
};
- "aarch64-linux" = fetchurl {
+ aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f";
};
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
pname = "vault-bin";
inherit version;
- src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix
index cd4770bf609a577010a11e5d31c13a54f1ccefa2..a295da844af2e93e0904c6f1f51e04b50a516c51 100644
--- a/pkgs/tools/system/bar/default.nix
+++ b/pkgs/tools/system/bar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bar-1.11.1";
src = fetchurl {
diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix
index 0874aa7410c0c08496e56f833458e9e7710a6616..378eb62d6cc5b809950a9c7a3a64b8c78b79adf0 100644
--- a/pkgs/tools/system/collectd/data.nix
+++ b/pkgs/tools/system/collectd/data.nix
@@ -1,6 +1,6 @@
{ stdenv, collectd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (collectd) meta version;
pname = "collectd-data";
diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix
index 62670fa11a08bf6531105201a278445fcf5b766c..1631b9f721804f05a9d9134814c4104746845f81 100644
--- a/pkgs/tools/system/colorls/default.nix
+++ b/pkgs/tools/system/colorls/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, ruby, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "colorls";
gemdir = ./.;
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
index c8f7e77b1562d4378d897ac0b83b9ba2b17b4da2..29767c879ffbcfd4d71fce9e1457793b736a561f 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "das_watchdog";
version = "git-2015-09-12";
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index 4018801f2490ed5fe48c1f10cfc4945b76114643..6927c64bf483973d7ed96ec10cdbdf8f39b321f4 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "datefudge";
version = "1.22";
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index 25f2673c0ac74a8f0f1b1d66d054468b4cb90b8d..8bb84c562b6433187b892282bb7dcedbe05d92ab 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dog-1.7";
src = fetchurl {
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index 187c046875f7e79270c8707c888f43befaa9b075..d1d2b7a3e7698e54c8acadc9bbff3dd495d34d7e 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pcre2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hardlink";
version = "1.3-4";
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix
index 9d89e0714c486334dd57facaa2a9edaf8f05c9dd..767fccbd38828b2bd07114b01ddc52a9b631a0b4 100644
--- a/pkgs/tools/system/illum/default.nix
+++ b/pkgs/tools/system/illum/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4";
pname = "illum";
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index 83c0a287533a6681b9544064b7daa9a2f4874dcd..6217f601121c615021fa7afc47dbe270a8af9754 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -5,7 +5,7 @@ let
sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ior";
inherit version;
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
index 078cc614bb4210955684ae7dbe44449578f38d23..930bf8382c64a27ea633a34acc0808e514b47c4c 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "mq-cli-${version}";
+ pname = "mq-cli";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index b5842ad37c318450d60de70f669a81ed94a71cbb..5a1bad1092dbf86d0d9105277cebcd25b501eb80 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "pcstat-unstable";
version = "2017-05-28";
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 4c011a0b212d3a7f9510ff5a14399b84a704ee9f..21487e66bcd9bd4d1f4c407b26d4b91af9516b58 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -5,7 +5,7 @@
, perl ? null # For building web manuals
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "plan9port";
version = "2019-02-25";
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 79b86f1383c0770e3e8d36f6cab58dba13eb8a0b..0764844dbfc947918a713656c53b90fba9736907 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, talloc, docutils, swig, python, coreutils, enablePython ? true }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "proot";
version = "20190510";
diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
index 3e7bb301a6b94b48438cd9fbb9dc1da6a2cdf3c4..6fe35f6dcf387ddf85dc837663fc6af765d6a478 100644
--- a/pkgs/tools/system/ps_mem/default.nix
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -3,7 +3,7 @@
let
version = "3.12";
pname = "ps_mem";
-in pythonPackages.buildPythonApplication rec {
+in pythonPackages.buildPythonApplication {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix
index 4c4ad91e72796beef8493c172111bad9bcf27199..0a2b7ab4f3bcacffd09550f6a6eb5bfbfca53265 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/pkgs/tools/system/systemd-journal2gelf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoModule rec {
+buildGoModule {
pname = "SystemdJournal2Gelf-unstable";
version = "20190702";
diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix
index a37531572d7b83f58fceb1b47e8cade2b554f784..902067b3d5354fcefddad068cad33eed94835308 100644
--- a/pkgs/tools/text/agrep/default.nix
+++ b/pkgs/tools/text/agrep/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "agrep";
version = "3.41.5";
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 49db5e13d7219a2d0150fdb13fdae12a8616571c..212f071f27698481e80057bcf313f210d9ba8e66 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "coloursum-${version}";
+ pname = "coloursum";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f0947004b4b14415e01525789d5309c87238a5df..7a5f6c8dd8189c0e2cfe4f6fc1a8ed2583805765 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -19,11 +19,11 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
- name = "gawk-4.2.1";
+ name = "gawk-5.0.1";
src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz";
- sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi";
+ sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf";
};
# When we do build separate interactive version, it makes sense to always include man.
diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix
index dbec8d353d9467135de0e35e8e9540badbfb1e75..2f61536ed2c00e51f7d01cea35e3e5e88f0a7bd6 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/pkgs/tools/text/ispell/default.nix
@@ -1,14 +1,17 @@
{ stdenv, fetchurl, bison, ncurses }:
stdenv.mkDerivation rec {
- name = "ispell-3.3.02";
+ pname = "ispell";
+ version = "3.4.00";
+
src = fetchurl {
- url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz";
+ url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz";
sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz";
};
+
buildInputs = [ bison ncurses ];
+
patches = [
- ./patches/0005-Do-not-reorder-words.patch
./patches/0007-Use-termios.patch
./patches/0008-Tex-backslash.patch
./patches/0009-Fix-FTBFS-on-glibc.patch
@@ -21,6 +24,7 @@ stdenv.mkDerivation rec {
./patches/0025-Languages.patch
./patches/0030-Display-whole-multibyte-character.patch
];
+
postPatch = ''
cat >> local.h <
-Date: Thu, 3 Nov 2005 14:14:15 -0800
-Subject: 0005 Do not reorder words
-
-ispell reorders words in personal dictionary without good reason.
-
-The correct approach is to build the internal data structure with variant
-spellings stored in the same order as they appear in the personal dictionary.
-Fortunately, this is easy, though the patch is to a different file. This one
-has been tested (That's what I get for trying to rush out a fix before a
-meeting!).
----
- makedent.c | 18 +++++++++++-------
- 1 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/makedent.c b/makedent.c
-index 0453d11..d121345 100644
---- a/makedent.c
-+++ b/makedent.c
-@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp)
- if (retval == 0)
- {
- /*
-- ** Couldn't combine the two entries. Add a new variant. For
-- ** ease, we'll stick it right behind the header, rather than
-- ** at the end of the list.
-+ ** Couldn't combine the two entries. Add a new variant. We
-+ ** stick it at the end of the variant list because it's
-+ ** important to maintain order; this causes the personal
-+ ** dictionary to have a stable ordering.
- */
- forcevheader (hdrp, oldp, newp);
- tdent = (struct dent *) mymalloc (sizeof (struct dent));
-@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp)
- return -1;
- }
- *tdent = *newp;
-- tdent->next = hdrp->next;
-- hdrp->next = tdent;
-- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS);
-- hdrp->flagfield |= MOREVARIANTS;
-+ for (oldp = hdrp;
-+ oldp->next != NULL && oldp->flagfield & MOREVARIANTS;
-+ oldp = oldp->next)
-+ ;
-+ tdent->next = oldp->next;
-+ oldp->next = tdent;
-+ oldp->flagfield |= MOREVARIANTS;
- combineaffixes (hdrp, newp);
- hdrp->flagfield |= (newp->flagfield & KEEP);
- if (captype (newp->flagfield) == FOLLOWCASE)
---
diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix
index 18336fcf059f2eec4a265d6391dd9982cc3bfa66..c7f4002e2d3a6ca2ed97b8952ad5dcbcc442a5da 100644
--- a/pkgs/tools/text/jsawk/default.nix
+++ b/pkgs/tools/text/jsawk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "jsawk";
version = "1.5-pre";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index de395f183d18506a93ea1cbe554726acb9a4d00e..3123d31a7b54c3ef467b7db7a1f77f6c5b226f26 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }:
rustPlatform.buildRustPackage rec {
- name = "mdbook-${version}";
+ pname = "mdbook";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix
index 7509f3e9c48349cdf972e02cafce69e4df0c297a..e97980ef3d2d0c644eff174ca86b0170bc4e0a83 100644
--- a/pkgs/tools/text/mecab/base.nix
+++ b/pkgs/tools/text/mecab/base.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
-rec {
+{
version = "0.996";
src = fetchurl {
diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix
index 991d0735bab277fcd2ceda50cf4cb7064d1303d3..3b011787c7cb03114213f2d653445b4dea502c64 100644
--- a/pkgs/tools/text/mecab/ipadic.nix
+++ b/pkgs/tools/text/mecab/ipadic.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mecab-nodic }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mecab-ipadic";
version = "2.7.0-20070801";
diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix
index 05213ff1a870b28290713b0b3c02ed055f49c2f3..be85511a92b8c4ede47e561a1a19bb1855cb65da 100644
--- a/pkgs/tools/text/papertrail/default.nix
+++ b/pkgs/tools/text/papertrail/default.nix
@@ -1,7 +1,7 @@
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
let
- papertrail-env = bundlerEnv rec {
+ papertrail-env = bundlerEnv {
name = "papertrail-env";
inherit ruby;
gemfile = ./Gemfile;
diff --git a/pkgs/tools/text/patchutils/0.3.3.nix b/pkgs/tools/text/patchutils/0.3.3.nix
index b324137be6aae9cf65317924dcf3d7349255cfb9..f50354199c3fff8cf780acead54008b7d0712d85 100644
--- a/pkgs/tools/text/patchutils/0.3.3.nix
+++ b/pkgs/tools/text/patchutils/0.3.3.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "0.3.3";
sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index eab0e98f95c7cbf0d77da25bc9aecdbfc7a48a27..902773f40fa4f06b7f4eccb246354763ed4159a1 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "0.3.4";
sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
})
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix
index efe19a1b5ceff20d41a26203fa029a49c263b3cb..a71ef2f06bd0dffeaa37f5ee9dfa5b80601ecacb 100644
--- a/pkgs/tools/text/podiff/default.nix
+++ b/pkgs/tools/text/podiff/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "podiff";
version = "1.1";
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index 9edbaff99295979594edc9b61fbad0ac3bfb11f8..3437400269c3ce652bfd5772efd987973482d880 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook
, texinfo, libiconv, libintl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "recode-3.7-2fd838565";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
index f88ac6951bfc801612dcae630917f42656e47fac..a68d2266b431928e0887e23f846f3d6749a02368 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "staccato-${version}";
+ pname = "staccato";
version = "0.1.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index 388dcc6b583f0e804a3bba47b0c1cff36427cd3f..807f53ae42ee11682b04c12e775c5c2b428f6804 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "jing-trang";
version = "20151127";
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix
index 40013c7f46d5a44669ff3ecca6e8b25dd1d750fd..3be952358b65a5579a34e091464738620250cf62 100644
--- a/pkgs/tools/text/xml/xml2/default.nix
+++ b/pkgs/tools/text/xml/xml2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xml2-0.5";
src = fetchurl {
diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 479085be0e1dfa89c114abd5e4df66cabf00c98c..cf44782432c4f65843352ae10babfcc5cfaafc60 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "xsv-${version}";
+ pname = "xsv";
version = "0.13.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix
index 00673341cfc66d0e176e7f9aeb43c7b2df4a2382..95a94cee7c4bb9e291327703c68e4fc5b083d30d 100644
--- a/pkgs/tools/text/yaml-merge/default.nix
+++ b/pkgs/tools/text/yaml-merge/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name= "yaml-merge-2016-02-16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index fbd9bc3fa20a4811e14f855bb386440d60a1caca..15e5ddf2f199c66fb586a0a897263d978483e84f 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -2,7 +2,7 @@
, zimlib, cxxtools, tntnet
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "zimreader-0.92";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index d18a5e2c7442594d1f62c8054898c7dd81faa1a2..83aa667f58fd245546b10e4baac7493110db3689 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -111,7 +111,7 @@ let
};
# there are no archives or tags, using latest commit in master branch as per 2013-09-22
- matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl rec {
+ matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl {
name = "mplw-${commit}.tar.gz";
url = "https://api.github.com/repos/lvv/mplw/tarball/${commit}";
sha256 = "0yfhkm2dr8gnp0fcg25x89hwiymkri2m5cyqzmzragzwj0hbmcf1";
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix
index 2c0e2f29d24f249aab10bff1b079a7a3bb410424..ff63ece34173a6537ddcc5c912b9fe668d5bde24 100644
--- a/pkgs/tools/typesetting/kindlegen/default.nix
+++ b/pkgs/tools/typesetting/kindlegen/default.nix
@@ -5,24 +5,24 @@ let
fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version;
sha256 = {
- "x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
- "i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
- "x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
- "i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
- "x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
- "i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
- }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported");
+ x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
+ i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
+ x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
+ i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
+ x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
+ i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
+ }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
url = {
- "x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
- "i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
- "x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
- "i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
- "x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
- "i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
- }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported");
-
-in stdenv.mkDerivation rec {
+ x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
+ i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
+ x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
+ i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
+ x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
+ i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
+ }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
+
+in stdenv.mkDerivation {
pname = "kindlegen";
inherit version;
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
index cd78f63ef78c0ecfb9a34d3c4842d6d7ed1cbd8f..4cdbac7d6381360f05fae963c79bf0157b4bd1ab 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "multimarkdown";
version = "4.7.1";
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
index ad9684910c0bba449ab4f916ed581d6598d3daa9..dee6ec3c6fffb44816bf08d67a76e512a55e0fb8 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -3,7 +3,7 @@
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pdf2htmlEX-0.14.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix
index 31184e11399bac2b9ea869c3965d6ff4c650b115..f8b17be01ddc308badc66dbe23da6af63962a14b 100644
--- a/pkgs/tools/typesetting/pdfsandwich/default.nix
+++ b/pkgs/tools/typesetting/pdfsandwich/default.nix
@@ -1,6 +1,6 @@
{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.1.7";
pname = "pdfsandwich";
diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix
index 25f12838be0804af5cef4ddb0d72fb7939511b28..39beab751a7aed349437bf40decc01b375ec4d39 100644
--- a/pkgs/tools/typesetting/psutils/default.nix
+++ b/pkgs/tools/typesetting/psutils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "psutils-17";
src = fetchurl {
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index a7886f317c15479fe8ee44ca2a6c711b3c9af94c..98c80da5b2c1cae7b69267951a809e343a40bf70 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -2,7 +2,7 @@
, darwin, fontconfig, harfbuzz, openssl, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "tectonic-${version}";
+ pname = "tectonic";
version = "0.1.11";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index c27c68741fc7cecd93b68bffbbcff86438bf5ae1..f250dfb69dece2d2cc9e6917de77a066de48c3d0 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -17,7 +17,7 @@ let
year = "2018";
version = year; # keep names simple for now
- common = rec {
+ common = {
src = fetchurl {
urls = [
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz"
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index a3b58e7274deddcfa9ad66cf0aef652ec5ebf320..651ff88b6f2e6fe443a94e45bf5d49dc36d17053 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -84,8 +84,8 @@ let
# the fake derivations are used for filtering of hyphenation patterns
else { inherit pname version; tlType = "run"; }
)]
- ++ lib.optional (attrs.sha512 ? "doc") (mkPkgV "doc")
- ++ lib.optional (attrs.sha512 ? "source") (mkPkgV "source")
+ ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc")
+ ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source")
++ lib.optional (bin ? ${pname})
( bin.${pname} // { inherit pname; tlType = "bin"; } )
++ combinePkgs (attrs.deps or {});
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index a08f32ce9c2988aba91c1724e7d8e90db61c4d9d..5ee1adda483b9cde1e9b6d5971489d53924030a5 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tikzit";
version = "2.1.4";
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index b136e9c5ab75dce9adbedb0fb7659697dbdc64f4..a4089636b951a1e28d20a6905ca7f7d03b891796 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "atomicparsley";
version = "0.9.6";
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 752a6f3143255bbbce57d850224b424c6fc52d58..8fe2a70dcb44dd9a618253f82cf6a5400895116a 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv
, libavc1394, pkgconfig, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dvgrab-2016-05-16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index af56ba3e7ebb2dd20b71587c1ed976007c7702b1..06c035552e54cb45aa2e8d3d84d49dfd1d651d26 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, zlib
+{ stdenv, fetchgit, fetchpatch, zlib
, gnutlsSupport ? false, gnutls ? null, nettle ? null
, opensslSupport ? true, openssl ? null
}:
@@ -9,17 +9,25 @@ assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSuppo
assert opensslSupport -> openssl != null && !gnutlsSupport;
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "rtmpdump";
- version = "2015-12-30";
+ version = "2019-03-30";
src = fetchgit {
- url = git://git.ffmpeg.org/rtmpdump;
+ url = "git://git.ffmpeg.org/rtmpdump";
# Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4')
- rev = "fa8646daeb19dfd12c181f7d19de708d623704c0";
- sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig";
+ rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3";
+ sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb";
};
+ patches = [
+ # Fix build with OpenSSL 1.1
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b";
+ sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1";
+ })
+ ];
+
makeFlags = [ ''prefix=$(out)'' ]
++ optional gnutlsSupport "CRYPTO=GNUTLS"
++ optional opensslSupport "CRYPTO=OPENSSL"
@@ -32,9 +40,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ separateDebugInfo = true;
+
meta = {
description = "Toolkit for RTMP streams";
- homepage = http://rtmpdump.mplayerhq.hu/;
+ homepage = "http://rtmpdump.mplayerhq.hu/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ codyopel ];
diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix
index a87015ecf96bffa657c0bbde69e51f25fe2c5f7a..c7b76e0cb6ea50f2d79aaf1a889fe28a60decc1a 100644
--- a/pkgs/tools/video/untrunc/default.nix
+++ b/pkgs/tools/video/untrunc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, gcc, libav_12, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "untrunc";
version = "2018.01.13";
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 4114094959346f8fb0433b3d25bfa167a7500589..c09da3dd23161710a74af5b725e3132f4c7a1ce9 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -2,7 +2,7 @@
, libXaw, libXext, libSM, libICE, libXpm, libXp
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vncrec-0.2"; # version taken from Arch AUR
src = fetchurl {
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 76813f4f246c7ea0a3efe25b4cc726cda1a31a73..580c2f9a01f3c77c08a963e5cab0879fe325e420 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -2,7 +2,7 @@
let version = "0.7.9";
-in pythonPackages.buildPythonApplication rec {
+in pythonPackages.buildPythonApplication {
pname = "cloud-init";
inherit version;
namePrefix = "";
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index 5b310992afb6f95337e89fa561e15e0fb65ea2c3..cb31a66ea72d8ec9af5510f17d6eb6a639199943 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -2,7 +2,7 @@
let
inherit (python2Packages) buildPythonApplication boto m2crypto;
-in buildPythonApplication rec {
+in buildPythonApplication {
name = "euca2ools-2.1.4";
namePrefix = "";
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 5abdcc23a74cce4b1c24efb09b3578d063fd3c18..48255ca68a735e454af6f3c71023b902de95447e 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -22,13 +22,16 @@ buildPythonApplication rec {
sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
};
+ buildInputs = [ bash ];
+ propagatedBuildInputs = [ boto setuptools distro ];
+
+
postPatch = ''
for file in $(find google_compute_engine -type f); do
substituteInPlace "$file" \
- --replace /bin/systemctl "${systemd}/bin/systemctl" \
+ --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
--replace /sbin/hwclock "${utillinux}/bin/hwclock"
-
# SELinux tool ??? /sbin/restorecon
done
@@ -42,9 +45,13 @@ buildPythonApplication rec {
# allows to install the package in `services.udev.packages` in NixOS
mkdir -p $out/lib/udev/rules.d
cp -r google_config/udev/*.rules $out/lib/udev/rules.d
- '';
- propagatedBuildInputs = [ boto setuptools distro ];
+ # sysctl snippets will be used by google-compute-config.nix
+ mkdir -p $out/sysctl.d
+ cp google_config/sysctl/*.conf $out/sysctl.d
+
+ patchShebangs $out/bin/*
+ '';
doCheck = false;
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index 0d239547752a0087d1a48cae843173faa583ceac..b53c211d379f6fe5e181881259c346805bb33e4f 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "govc";
- version = "0.20.0";
+ version = "0.21.0";
goPackagePath = "github.com/vmware/govmomi";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "vmware";
repo = "govmomi";
- sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk";
+ sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130";
};
meta = {
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
index 8dbeecc56054f27741eed323fd07f155978f2507..10103be26308911175e0abf106444f0efe0bb27c 100644
--- a/pkgs/tools/virtualization/marathonctl/default.nix
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "marathonctl-unstable";
version = "2017-03-06";
diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix
index 7d06b59b013ced3ba0a30228ff37da9d7a91e60d..5f4d982d86d94723961828ba7b1e29512b43116b 100644
--- a/pkgs/tools/virtualization/udocker/default.nix
+++ b/pkgs/tools/virtualization/udocker/default.nix
@@ -5,7 +5,7 @@ buildPythonApplication rec {
version = "1.1.3";
pname = "udocker";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "indigo-dc";
repo = "udocker" ;
rev = "v${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce548576820d3f6fa07a783174a3b0f043a54dee..a0205c331b893d28a8b6e87ac63330c71e4ff054 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -293,6 +293,14 @@ in
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
fetchurl = stdenv.fetchurlBoot;
+ coreutils = buildPackages.coreutils.override {
+ fetchurl = stdenv.fetchurlBoot;
+ inherit perl;
+ xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
+ gmp = null;
+ aclSupport = false;
+ attrSupport = false;
+ };
inherit perl;
buildPackages = { inherit perl; };
};
@@ -818,6 +826,8 @@ in
ezstream = callPackage ../tools/audio/ezstream { };
+ libfx2 = with python3Packages; toPythonApplication fx2;
+
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
genymotion = callPackage ../development/mobile/genymotion { };
@@ -842,6 +852,8 @@ in
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
+ glasgow = with python3Packages; toPythonApplication glasgow;
+
gucci = callPackage ../tools/text/gucci { };
grc = callPackage ../tools/misc/grc { };
@@ -1483,6 +1495,10 @@ in
dibbler = callPackage ../tools/networking/dibbler { };
+ diesel-cli = callPackage ../development/tools/diesel-cli {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
ding = callPackage ../applications/misc/ding {
aspellDicts_de = aspellDicts.de;
aspellDicts_en = aspellDicts.en;
@@ -2355,7 +2371,7 @@ in
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
- mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec {
+ mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
python = python2;
inherit (python2Packages) gyp;
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
@@ -2503,7 +2519,7 @@ in
curl = callPackage ../tools/networking/curl { };
- curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
+ curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };
curlie = callPackage ../tools/networking/curlie { };
@@ -3030,7 +3046,7 @@ in
m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
- mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec {
+ mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
python = python2;
inherit (python2Packages) gyp;
protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
@@ -4680,12 +4696,7 @@ in
makefile2graph = callPackage ../development/tools/analysis/makefile2graph { };
- # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because
- # it looks like gnulib is broken on non-linux, so it seems likely that this would cause
- # trouble on bsd and/or cygwin as well.
- man = if stdenv.isLinux then man-db else man-old;
-
- man-old = callPackage ../tools/misc/man { };
+ man = man-db;
man-db = callPackage ../tools/misc/man-db { };
@@ -4773,9 +4784,7 @@ in
minetime = callPackage ../applications/office/minetime { };
- minio-client = callPackage ../tools/networking/minio-client {
- buildGoPackage = buildGo110Package;
- };
+ minio-client = callPackage ../tools/networking/minio-client { };
minissdpd = callPackage ../tools/networking/minissdpd { };
@@ -4872,7 +4881,7 @@ in
mt-st = callPackage ../tools/backup/mt-st {};
- multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
+ multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in {
multitrandata = callPackage ../tools/text/multitran/data { };
libbtree = callPackage ../tools/text/multitran/libbtree { };
@@ -5701,6 +5710,8 @@ in
ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
+ q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
+
qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
qastools = libsForQt5.callPackage ../tools/audio/qastools { };
@@ -5792,9 +5803,7 @@ in
rt = callPackage ../servers/rt { };
- rtmpdump = callPackage ../tools/video/rtmpdump {
- openssl = openssl_1_0_2;
- };
+ rtmpdump = callPackage ../tools/video/rtmpdump { };
rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
reaverwps = callPackage ../tools/networking/reaver-wps {};
@@ -7344,6 +7353,24 @@ in
then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
+ adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix;
+ adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;
+
+ adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {};
+ adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {};
+
+ adoptopenjdk-openj9-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {};
+
+ adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {};
+
adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
@@ -7823,6 +7850,8 @@ in
psc-package = haskell.lib.justStaticExecutables
(haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
+ "tacacs+" = callPackage ../servers/tacacs+ { };
+
tamarin-prover =
(haskellPackages.callPackage ../applications/science/logic/tamarin-prover {
# NOTE: do not use the haskell packages 'graphviz' and 'maude'
@@ -7929,15 +7958,15 @@ in
hugs = callPackage ../development/interpreters/hugs { };
- bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
+ openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
- openjfx11 =
- if stdenv.isDarwin then
- null
+ openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { };
+
+ openjdk8-bootstrap =
+ if adoptopenjdk-hotspot-bin-8.meta.available then
+ adoptopenjdk-hotspot-bin-8
else
- callPackage ../development/compilers/openjdk/openjfx/11.nix {
- openjdk = openjdk11;
- };
+ callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
/* legacy jdk for use as needed by older apps */
openjdk8 =
@@ -7945,10 +7974,21 @@ in
callPackage ../development/compilers/openjdk/darwin/8.nix { }
else
callPackage ../development/compilers/openjdk/8.nix {
- bootjdk = bootjdk.override { version = "8"; };
inherit (gnome2) GConf gnome_vfs;
};
+ openjdk8_headless =
+ if stdenv.isDarwin || stdenv.isAarch64 then
+ openjdk8
+ else
+ openjdk8.override { headless = true; };
+
+ openjdk11-bootstrap =
+ if adoptopenjdk-hotspot-bin-11.meta.available then
+ adoptopenjdk-hotspot-bin-11
+ else
+ callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
+
/* currently maintained LTS JDK */
openjdk11 =
if stdenv.isDarwin then
@@ -7959,62 +7999,43 @@ in
inherit (gnome2) GConf gnome_vfs;
};
- openjfx12 =
+ openjdk11_headless =
if stdenv.isDarwin then
- null
+ openjdk11
else
- callPackage ../development/compilers/openjdk/openjfx/12.nix {
- openjdk = openjdk12;
- bootjdk = openjdk11;
- };
+ openjdk11.override { headless = true; };
/* current JDK */
openjdk12 =
if stdenv.isDarwin then
- callPackage ../development/compilers/openjdk/darwin/default.nix { }
+ callPackage ../development/compilers/openjdk/darwin { }
else
- callPackage ../development/compilers/openjdk/default.nix {
+ callPackage ../development/compilers/openjdk {
openjfx = openjfx12;
inherit (gnome2) GConf gnome_vfs;
- bootjdk = openjdk11;
};
+ openjdk12_headless =
+ if stdenv.isDarwin then
+ openjdk12
+ else
+ openjdk12.override { headless = true; };
+
openjdk = openjdk8;
+ openjdk_headless = openjdk8_headless;
- jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
- jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
- (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
- (openjdk8.jre // { outputs = [ "jre" ]; }));
- jre8_headless =
- if stdenv.isAarch32 || stdenv.isAarch64 then
- oraclejre8
- else if stdenv.isDarwin then
- jre8
- else
- lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless"
- (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
- ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+ jdk8 = openjdk8;
+ jre8 = openjdk8.jre;
+ jre8_headless = openjdk8_headless.jre;
- jdk11 = openjdk11 // { outputs = [ "out" ]; };
- jdk11_headless =
- if stdenv.isDarwin then
- jdk11
- else
- lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless"
- (lib.addMetaAttrs {}
- ((openjdk11.override { minimal = true; }) // {}));
+ jdk11 = openjdk11;
+ jdk11_headless = openjdk11_headless;
- jdk12 = openjdk12 // { outputs = [ "out" ]; };
- jdk12_headless =
- if stdenv.isDarwin then
- jdk12
- else
- lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless"
- (lib.addMetaAttrs {}
- ((openjdk12.override { minimal = true; }) // {}));
+ jdk12 = openjdk12;
+ jdk12_headless = openjdk12_headless;
jdk = jdk8;
- jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8;
+ jre = jre8;
jre_headless = jre8_headless;
inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8;
@@ -8249,7 +8270,9 @@ in
neko = callPackage ../development/compilers/neko { };
- nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { };
+ nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr {
+ inherit (darwin.apple_sdk.frameworks) OpenGL;
+ };
nasm = callPackage ../development/compilers/nasm { };
@@ -8359,6 +8382,9 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
+ cargo-watch = callPackage ../development/tools/rust/cargo-watch {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
cargo-generate = callPackage ../development/tools/rust/cargo-generate {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -8940,7 +8966,7 @@ in
ruby_2_5
ruby_2_6;
- ruby = ruby_2_5;
+ ruby = ruby_2_6;
mruby = callPackage ../development/compilers/mruby { };
@@ -10115,6 +10141,8 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
+ udis86 = callPackage ../development/tools/udis86 { };
+
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
uhd = callPackage ../applications/radio/uhd { };
@@ -10954,6 +10982,7 @@ in
else if name == "libSystem" then targetPackages.darwin.xcode
else if name == "nblibc" then targetPackages.netbsdCross.libc
else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
+ else if stdenv.targetPlatform.isGhcjs then null
else throw "Unknown libc ${name}";
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
@@ -12542,7 +12571,7 @@ in
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
- libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec {
+ libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: {
src = pkgs.fetchurl {
url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz";
sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db";
@@ -17907,7 +17936,7 @@ in
electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
- electrum = callPackage ../applications/misc/electrum { };
+ electrum = libsForQt5.callPackage ../applications/misc/electrum { };
electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
@@ -19197,7 +19226,7 @@ in
links2 = callPackage ../applications/networking/browsers/links2 { };
- linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
+ linphone = callPackage ../applications/networking/instant-messengers/linphone {
polarssl = mbedtls_1_3;
};
@@ -21152,6 +21181,8 @@ in
way-cooler = callPackage ../applications/window-managers/way-cooler {};
+ waypipe = callPackage ../applications/networking/remote/waypipe { };
+
wayv = callPackage ../tools/X11/wayv {};
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
@@ -21176,6 +21207,7 @@ in
libva = null;
libwebp = null;
xwayland = null;
+ pipewire = null;
};
chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};
@@ -23637,9 +23669,6 @@ in
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
- crashplan = callPackage ../applications/backup/crashplan { };
- crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; };
-
colort = callPackage ../applications/misc/colort { };
terminal-parrot = callPackage ../applications/misc/terminal-parrot { };
@@ -23928,6 +23957,8 @@ in
initialRamdisk.
The result can be extended in the modules by defining
extra attributes in system.build.
+ Alternatively, you may use the result's config and
+ options attributes to query any option.
Example:
@@ -23965,10 +23996,13 @@ in
Note that you will need to have called Nixpkgs with the system
parameter set to the right value for your deployment target.
*/
- nixos = configuration:
- (import (pkgs.path + "/nixos/lib/eval-config.nix") {
- inherit (pkgs.stdenv.hostPlatform) system;
- modules = [(
+ nixos =
+ configuration:
+ let
+ c = import (pkgs.path + "/nixos/lib/eval-config.nix") {
+ inherit (pkgs.stdenv.hostPlatform) system;
+ modules =
+ [(
{ lib, ... }: {
config.nixpkgs.pkgs = lib.mkDefault pkgs;
}
@@ -23977,7 +24011,9 @@ in
then configuration
else [configuration]
);
- }).config.system.build;
+ };
+ in
+ c.config.system.build // c;
/*
@@ -24101,6 +24137,8 @@ in
nixos-container = callPackage ../tools/virtualization/nixos-container { };
+ nixos-generators = callPackage ../tools/nix/nixos-generators { };
+
norwester-font = callPackage ../data/fonts/norwester {};
nut = callPackage ../applications/misc/nut { };
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index df9d3dbcff5b7ce209b8b1e1c07609d876e009d7..7496449c044c1c7c3656a85093aef9663932f7cc 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -82,7 +82,7 @@ rec {
# Each field in this tuple represents all Beam packages in nixpkgs built with
# appropriate Erlang/OTP version.
- packages = rec {
+ packages = {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index e89a7d9df2aabe53c5d3cdd6f9cd1495f5b023eb..f06b4f1c2866dbbf105db361117ce30988cba266 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -430,14 +430,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- Deedle = fetchNuGet rec {
+ Deedle = fetchNuGet {
baseName = "Deedle";
version = "1.2.5";
sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw";
outputFiles = [ "*" ];
};
- ExcelDna = buildDotnetPackage rec {
+ ExcelDna = buildDotnetPackage {
baseName = "Excel-DNA";
version = "0.32.0";
@@ -496,7 +496,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- ExtCore = buildDotnetPackage rec {
+ ExtCore = buildDotnetPackage {
baseName = "ExtCore";
version = "0.8.46";
@@ -564,7 +564,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- FSharpCompilerService = buildDotnetPackage rec {
+ FSharpCompilerService = buildDotnetPackage {
baseName = "FSharp.Compiler.Service";
version = "0.0.90";
@@ -667,7 +667,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
# };
# };
- GitVersionTree = buildDotnetPackage rec {
+ GitVersionTree = buildDotnetPackage {
baseName = "GitVersionTree";
version = "2013-10-01";
@@ -927,7 +927,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- UnionArgParser = buildDotnetPackage rec {
+ UnionArgParser = buildDotnetPackage {
baseName = "UnionArgParser";
version = "0.8.7";
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix
index 5b5b32b89da5ad954aa1a55300ec13961e7bb677..a36c89fac0ab1eb7c8857a3aa99f22962eb80b0c 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/pkgs/top-level/emscripten-packages.nix
@@ -134,7 +134,7 @@ rec {
zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
- (old: rec {
+ (old: {
buildInputs = old.buildInputs ++ [ pkgconfig ];
# we need to reset this setting!
NIX_CFLAGS_COMPILE="";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 86e8228f1870ddb36162df6e2b9cdc3eada9b537..49bfc58adf0678762e75dc47eb6a2abe09c284e3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -105,7 +105,7 @@ in {
(pkgs.lib.attrNames compiler);
in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs
integerSimpleGhcNames
- (name: compiler."${name}".override { enableIntegerSimple = true; }));
+ (name: compiler.${name}.override { enableIntegerSimple = true; }));
};
# Default overrides that are applied to all package sets.
@@ -176,9 +176,9 @@ in {
integerSimpleGhcNames = pkgs.lib.filter
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames packages);
- in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
- ghc = bh.compiler.integer-simple."${name}";
- buildHaskellPackages = bh.packages.integer-simple."${name}";
+ in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override {
+ ghc = bh.compiler.integer-simple.${name};
+ buildHaskellPackages = bh.packages.integer-simple.${name};
overrides = _self : _super : {
integer-simple = null;
integer-gmp = null;
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 35b0b42da3fe18d6d678478834fc38f8b7916f59..06b82a478a872f9eaf421705a199201b0102b5e5 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -99,7 +99,7 @@ let
hxnodejs_6 = let
libname = "hxnodejs";
version = "6.9.0";
- in stdenv.mkDerivation rec {
+ in stdenv.mkDerivation {
name = "${libname}-${version}";
src = fetchFromGitHub {
owner = "HaxeFoundation";
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 2d34bdaabc005ea2c87b9d269beb14a8201bc3ad..c9e9305666e2e39aea4749a01595050fa88e28f6 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -64,17 +64,18 @@ in
with self; {
getLuaPathList = majorVersion: [
- "lib/lua/${majorVersion}/?.lua" "share/lua/${majorVersion}/?.lua"
- "share/lua/${majorVersion}/?/init.lua" "lib/lua/${majorVersion}/?/init.lua"
+ "share/lua/${majorVersion}/?.lua"
+ "share/lua/${majorVersion}/?/init.lua"
];
getLuaCPathList = majorVersion: [
- "lib/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?/init.so"
+ "lib/lua/${majorVersion}/?.so"
];
# helper functions for dealing with LUA_PATH and LUA_CPATH
- getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
- getLuaPath = lib : getPath lib "lua";
- getLuaCPath = lib : getPath lib "so";
+ getPath = drv: pathListForVersion:
+ lib.concatMapStringsSep ";" (path: "${drv}/${path}") (pathListForVersion lua.luaversion);
+ getLuaPath = drv: getPath drv getLuaPathList;
+ getLuaCPath = drv: getPath drv getLuaCPathList;
#define build lua package function
buildLuaPackage = callPackage ../development/lua-modules/generic {
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 6f30bd06a81c91c91c3c1d3f875e9a8668a4e429..288971403f1af0f7b330b747479ee6a1342e624a 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -11,7 +11,7 @@
with pkgs;
-releaseTools.sourceTarball rec {
+releaseTools.sourceTarball {
name = "nixpkgs-tarball";
src = nixpkgs;
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 879ffc9f441c704323b10c2e16ffea2cbdf5089f..fc6d76743385e0e618d862013a50cb85494c5f1c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -15,7 +15,7 @@ let
isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
- apcu = buildPecl rec {
+ apcu = buildPecl {
version = "5.1.17";
pname = "apcu";
@@ -29,7 +29,7 @@ let
outputs = [ "out" "dev" ];
};
- apcu_bc = buildPecl rec {
+ apcu_bc = buildPecl {
version = "1.0.5";
pname = "apcu_bc";
@@ -38,7 +38,7 @@ let
buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
};
- ast = buildPecl rec {
+ ast = buildPecl {
version = "1.0.3";
pname = "ast";
@@ -142,7 +142,7 @@ let
];
};
- event = buildPecl rec {
+ event = buildPecl {
version = "2.5.3";
pname = "event";
@@ -167,7 +167,7 @@ let
};
};
- igbinary = buildPecl rec {
+ igbinary = buildPecl {
version = "3.0.1";
pname = "igbinary";
@@ -178,7 +178,7 @@ let
outputs = [ "out" "dev" ];
};
- imagick = buildPecl rec {
+ imagick = buildPecl {
version = "3.4.4";
pname = "imagick";
@@ -189,7 +189,7 @@ let
buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
};
- mailparse = buildPecl rec {
+ mailparse = buildPecl {
version = "3.0.3";
pname = "mailparse";
@@ -232,7 +232,7 @@ let
] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security;
};
- oci8 = buildPecl rec {
+ oci8 = buildPecl {
version = "2.2.0";
pname = "oci8";
@@ -245,14 +245,14 @@ let
'';
};
- pcs = buildPecl rec {
+ pcs = buildPecl {
version = "1.3.3";
pname = "pcs";
sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
};
- pdo_sqlsrv = buildPecl rec {
+ pdo_sqlsrv = buildPecl {
version = "5.6.1";
pname = "pdo_sqlsrv";
@@ -427,7 +427,7 @@ let
pinba = if isPhp73 then pinba73 else pinba7;
- pinba7 = assert !isPhp73; buildPecl rec {
+ pinba7 = assert !isPhp73; buildPecl {
version = "1.1.1";
pname = "pinba";
@@ -448,7 +448,7 @@ let
};
};
- pinba73 = assert isPhp73; buildPecl rec {
+ pinba73 = assert isPhp73; buildPecl {
version = "1.1.2-dev";
pname = "pinba";
@@ -469,7 +469,7 @@ let
};
};
- protobuf = buildPecl rec {
+ protobuf = buildPecl {
version = "3.9.0";
pname = "protobuf";
@@ -529,7 +529,7 @@ let
buildInputs = with pkgs; [ pcre.dev ];
};
- pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec {
+ pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl {
version = "3.2.0-dev";
pname = "pthreads";
@@ -543,14 +543,14 @@ let
buildInputs = with pkgs; [ pcre2.dev ];
};
- redis = buildPecl rec {
+ redis = buildPecl {
version = "5.0.2";
pname = "redis";
sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f";
};
- sqlsrv = buildPecl rec {
+ sqlsrv = buildPecl {
version = "5.6.1";
pname = "sqlsrv";
@@ -559,7 +559,7 @@ let
buildInputs = [ pkgs.unixODBC ];
};
- v8 = buildPecl rec {
+ v8 = buildPecl {
version = "0.2.2";
pname = "v8";
@@ -570,7 +570,7 @@ let
meta.broken = true;
};
- v8js = assert !isPhp73; buildPecl rec {
+ v8js = assert !isPhp73; buildPecl {
version = "2.1.0";
pname = "v8js";
@@ -581,7 +581,7 @@ let
meta.broken = true;
};
- xdebug = buildPecl rec {
+ xdebug = buildPecl {
version = "2.7.1";
pname = "xdebug";
@@ -591,7 +591,7 @@ let
checkTarget = "test";
};
- yaml = buildPecl rec {
+ yaml = buildPecl {
version = "2.0.4";
pname = "yaml";
@@ -604,7 +604,7 @@ let
nativeBuildInputs = [ pkgs.pkgconfig ];
};
- zmq = assert !isPhp73; buildPecl rec {
+ zmq = assert !isPhp73; buildPecl {
version = "1.1.3";
pname = "zmq";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7482ec7a9b2fafbf1e6d74e160097c7e746d192a..5565162328c62c33c1d59e651b821cdf6d92ffed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1239,7 +1239,9 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
- uvloop = callPackage ../development/python-modules/uvloop { };
+ uvloop = callPackage ../development/python-modules/uvloop {
+ inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
+ };
pyunifi = callPackage ../development/python-modules/pyunifi { };
@@ -2059,6 +2061,8 @@ in {
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
+ pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
+
pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
pytestrunner = callPackage ../development/python-modules/pytestrunner { };
@@ -2338,16 +2342,14 @@ in {
future-fstrings = callPackage ../development/python-modules/future-fstrings { };
- gateone = callPackage ../development/python-modules/gateone { };
+ fx2 = callPackage ../development/python-modules/fx2 { };
- # TODO: Remove after 19.03 is branched off:
- gcutil = throw ''
- pythonPackages.gcutil is deprecated and can be replaced with "gcloud
- compute" from the package google-cloud-sdk.
- '';
+ gateone = callPackage ../development/python-modules/gateone { };
GeoIP = callPackage ../development/python-modules/GeoIP { };
+ glasgow = callPackage ../development/python-modules/glasgow { };
+
gmpy = callPackage ../development/python-modules/gmpy { };
gmpy2 = callPackage ../development/python-modules/gmpy2 { };
@@ -2578,6 +2580,10 @@ in {
Nikola = callPackage ../development/python-modules/Nikola { };
+ nmigen = callPackage ../development/python-modules/nmigen { };
+
+ nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
+
nxt-python = callPackage ../development/python-modules/nxt-python { };
odfpy = callPackage ../development/python-modules/odfpy { };
@@ -2660,7 +2666,7 @@ in {
pycares = callPackage ../development/python-modules/pycares { };
- pycuda = callPackage ../development/python-modules/pycuda rec {
+ pycuda = callPackage ../development/python-modules/pycuda {
cudatoolkit = pkgs.cudatoolkit_7_5;
inherit (pkgs.stdenv) mkDerivation;
};
@@ -3969,10 +3975,10 @@ in {
blas = pkgs.openblasCompat;
};
numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec {
- version = "1.16.4";
+ version = "1.16.5";
src = oldAttrs.src.override {
inherit version;
- sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj";
+ sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c";
};
});
in if pythonOlder "3.5" then numpy_2 else numpy_;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 17239c6d879b04909fe486af78a0be6db13c3c5c..1ed3601270f8884d4b84174c379ae26b194f7603 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -14,7 +14,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
officialRelease = false;
};
-} // (mapTestOn (rec {
+} // (mapTestOn ({
aspell = all;
at = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9ae5a9e1fbdc13e3adfce93dc52e0ae6d991e1a7..e459002c8bd9034f1943413b4ae958a0dd3e6ada 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -185,7 +185,7 @@ let
};
};
- } // (mapTestOn ((packagePlatforms pkgs) // rec {
+ } // (mapTestOn ((packagePlatforms pkgs) // {
haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages;
idrisPackages = packagePlatforms pkgs.idrisPackages;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 9f4b63293ef605579883eca62aac3bc9709105dc..4fe067694dcdc714c18c4838c85645a66c1bb823 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -169,9 +169,9 @@ let
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
abi = {
- "gnu" = lib.systems.parse.abis.musl;
- "gnueabi" = lib.systems.parse.abis.musleabi;
- "gnueabihf" = lib.systems.parse.abis.musleabihf;
+ gnu = lib.systems.parse.abis.musl;
+ gnueabi = lib.systems.parse.abis.musleabi;
+ gnueabihf = lib.systems.parse.abis.musleabihf;
}.${stdenv.hostPlatform.parsed.abi.name}
or lib.systems.parse.abis.musl;
};
@@ -217,9 +217,9 @@ let
crossSystem = {
parsed = stdenv.hostPlatform.parsed // {
abi = {
- "gnu" = lib.systems.parse.abis.musl;
- "gnueabi" = lib.systems.parse.abis.musleabi;
- "gnueabihf" = lib.systems.parse.abis.musleabihf;
+ gnu = lib.systems.parse.abis.musl;
+ gnueabi = lib.systems.parse.abis.musleabi;
+ gnueabihf = lib.systems.parse.abis.musleabihf;
}.${stdenv.hostPlatform.parsed.abi.name}
or lib.systems.parse.abis.musl;
};