diff --git a/doc/default.nix b/doc/default.nix index fa2e4a88738d5364aff8f9531354cd76190a0af0..4c04128052bc570c93b8e6e103dd21a59d627cd9 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,8 +1,6 @@ let pkgs = import ./.. { }; lib = pkgs.lib; - sources = lib.sourceFilesBySuffices ./. [".xml"]; - sources-langs = ./languages-frameworks; in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; diff --git a/lib/attrsets.nix b/lib/attrsets.nix index dca39cf79ffa32ad5a41dde472b45e4d8436eb66..0066fba362ae9b03b145e6557b8e261b5cc344d3 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -3,9 +3,9 @@ let inherit (builtins) head tail length; - inherit (lib.trivial) and or; + inherit (lib.trivial) and; inherit (lib.strings) concatStringsSep; - inherit (lib.lists) fold concatMap concatLists all deepSeqList; + inherit (lib.lists) fold concatMap concatLists; in rec { diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index 5e55ac023f148c4622b81e289ab39d79159ad16f..cb1fdc121e11b7bfbcf4a25864568fe3077df2e3 100644 --- a/lib/composable-derivation.nix +++ b/lib/composable-derivation.nix @@ -1,5 +1,5 @@ {lib, pkgs}: -let inherit (lib) nv nvs; in +let inherit (lib) nvs; in { # composableDerivation basically mixes these features: diff --git a/lib/customisation.nix b/lib/customisation.nix index d942f54ee7989f66b51dd252f6671d872e8dfcff..480280428909d48c4450f6f2159123131a5c9352 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -1,9 +1,4 @@ { lib }: -let - - inherit (builtins) attrNames; - -in rec { diff --git a/lib/generators.nix b/lib/generators.nix index aa67590870313bbd6a0c782b28097f41d2bc06de..f5faf70078605698b808210a58db7bae94b1c644 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -19,8 +19,6 @@ let libStr = lib.strings; libAttr = lib.attrsets; - flipMapAttrs = flip libAttr.mapAttrs; - inherit (lib) isFunction; in diff --git a/lib/lists.nix b/lib/lists.nix index 231c2317c0c420f67223025b09d0601d9f2ec280..288882924fff103bf670de01e212b67f317f202f 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -64,7 +64,6 @@ rec { */ foldl = op: nul: list: let - len = length list; foldl' = n: if n == -1 then nul diff --git a/lib/modules.nix b/lib/modules.nix index 20207b31d35bff10dfd511a761512272636669e8..a443d5ec5d161861938a2bb841ecceafb789f202 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -670,7 +670,6 @@ rec { { config, options, ... }: let fromOpt = getAttrFromPath from options; - toOpt = getAttrFromPath to options; toOf = attrByPath to (abort "Renaming error: option `${showOption to}' does not exist."); in diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index eab20d0f14dc641d28cfc129350838cbb744fc9d..3f2d742e7884aff81552395d90338ecba73a83ea 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -380,10 +380,6 @@ runTests { resRem7 = res6.replace (a: removeAttrs a ["a"]); - resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; }; - x2 = x.merge { a = 20; }; # now we have 27 - in (x2.replace) { a = 10; }; # and override the value by 10 - # fixed tests (delayed args): (when using them add some comments, please) resFixed1 = let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; }); diff --git a/lib/types.nix b/lib/types.nix index cf6f2aa46e40e4d4325ebb04fd3a314036fca393..4d6ac51c89882c7652e8427ab28f8d5b8c8185ee 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -8,7 +8,7 @@ with lib.trivial; with lib.strings; let - inherit (lib.modules) mergeDefinitions filterOverrides; + inherit (lib.modules) mergeDefinitions; outer_types = rec { isType = type: x: (x._type or "") == type; @@ -309,7 +309,6 @@ rec { } else def; - listOnly = listOf elemType; attrOnly = attrsOf elemType; in mkOptionType rec { name = "loaOf"; diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index e14105f5f011be00c159ce30b8ccde374eb9af8e..48288cf5962c4f30f72ad727bbab1e2528738755 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -47,7 +47,7 @@ rec { machinesNumbered = zipLists machines (range 1 254); nodes_ = flip map machinesNumbered (m: nameValuePair m.fst - [ ( { config, pkgs, nodes, ... }: + [ ( { config, nodes, ... }: let interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ fst, snd }: diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index ebfb09db7b7e4e91f869d1d952f7b08a37ed4a6c..bf32a36895c5e1f837730624f3b46cdf4e034845 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -24,9 +24,6 @@ # most likely fails as GRUB will probably refuse to install. partitionTableType ? "legacy" - # Whether to invoke switch-to-configuration boot during image creation -, installBootLoader ? true - , # The root file system type. fsType ? "ext4" diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index c6bafd48f9dbd80a8d56fd233a368f1788af06d1..8cd19b6e1874b1f8e0f51017f76faea7b1420c96 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, closureInfo, xorriso, syslinux +{ stdenv, closureInfo, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 57acc990a48f719622dd7de0753b500373f3de9b..42a0c60c7e19c893ad57d49a9b03ddb0f6e19a6d 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -222,7 +222,7 @@ in rec { runInMachineWithX = { require ? [], ... } @ args: let client = - { config, pkgs, ... }: + { ... }: { inherit require; virtualisation.memorySize = 1024; diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 371ee7d91808d691d8a1017f33bccd4bcfc451d1..242c2a4dd442f2e15b5c44d023d20dde54c3da83 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -149,7 +149,7 @@ let else testOptions; checkAll = checkList == []; in - flip filter graph ({option, usedBy}: + flip filter graph ({option, ...}: (checkAll || elem option checkList) && !(elem option excludedTestOptions) ); @@ -165,7 +165,7 @@ let ''; graphToText = graph: - concatMapStrings ({option, usedBy}: + concatMapStrings ({usedBy, ...}: concatMapStrings (user: '' ${user} '') usedBy diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index c7654ca78c3a1c2f1712ed587a0629d93fe224d0..7549dc6c0651c029221b79a760d7fccadb50a080 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -2,9 +2,7 @@ with lib; -let fcBool = x: if x then "true" else "false"; - - cfg = config.fonts.fontconfig.ultimate; +let cfg = config.fonts.fontconfig.ultimate; latestVersion = pkgs.fontconfig.configVersion; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index c7a6c943bc27da79b9cdd92d22f66f367295b7ed..d9ecaa4818ba66f101928109114e1c353b6848cf 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -1,7 +1,7 @@ # This module gets rid of all dependencies on X11 client libraries # (including fontconfig). -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index c595c693294694ba7fb3b2292c9ecb4752863955..a74d551f50df47240f622ffb221c6278f9eef707 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -1,6 +1,6 @@ # Configuration for the Name Service Switch (/etc/nsswitch.conf). -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index 4c37e8a6208caa04c37f4970564048c38cfa575d..0277f1ad11e9c4d2ba96e9d4a8536a0cc6b96bd0 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 2114fb2b9d49cf1eeefea606bcd242dfaf001c75..74bff602a4771ec6bdfd5fa82e1835f415163f3f 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index 9565a09b3a1e0be9a5257d2d14e019b37a4782f2..8dd811727389a3926cba1ac10bb5b8b57866970e 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 621ca36fb6b82c6c13e74e2b620f658fa3f917ba..0290eff22fbd9f133c4edbe4ed978a32da440a93 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -282,7 +282,7 @@ let }; - groupOpts = { name, config, ... }: { + groupOpts = { name, ... }: { options = { diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix index c7ac1b3530e14a25dc93ef073c0d4ac190404dad..356e007c0a3e94663bc58a8481a762def4e46a83 100644 --- a/nixos/modules/config/vpnc.nix +++ b/nixos/modules/config/vpnc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix index 650011aca8173eaccc0109a17bbb7c007b63764a..b00286464f348e1407fd4794a6fa3268dd1537d2 100644 --- a/nixos/modules/hardware/network/smc-2632w/default.nix +++ b/nixos/modules/hardware/network/smc-2632w/default.nix @@ -1,4 +1,4 @@ -{lib, config, ...}: +{lib, ...}: { hardware = { diff --git a/nixos/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix index c8428a7241b1c85485767c8971c44fa90e37cc6f..5dd7f30ed82b181f3b68a94462f195b2a9d7e4c8 100644 --- a/nixos/modules/hardware/network/zydas-zd1211.nix +++ b/nixos/modules/hardware/network/zydas-zd1211.nix @@ -1,4 +1,4 @@ -{pkgs, config, ...}: +{pkgs, ...}: { hardware.firmware = [ pkgs.zd1211fw ]; diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index 022fdea0a0a3ed362a2731a6dcfd25ecf76145cb..2fa37af6ca58836d8c82fb0223f8af066dedda67 100644 --- a/nixos/modules/hardware/video/ati.nix +++ b/nixos/modules/hardware/video/ati.nix @@ -1,6 +1,6 @@ # This module provides the proprietary ATI X11 / OpenGL drivers. -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs_i686, ... }: with lib; diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix index aee15dcec6e56ed41428e17ec11609a98becdabf..61bab533edaf7b343b193e13a4c77787d20f92d5 100644 --- a/nixos/modules/hardware/video/capture/mwprocapture.nix +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix index 832e61966120220e86382dbdd6ef3fd9e629a520..2cf5f13bc159e6259d9c6cdefecf3b5834c91420 100644 --- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix +++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -, buildEnv +{ buildEnv , libwebcam , makeWrapper , runCommand diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix index a4bcd7079a4f91ae5a3aebc13313e9deea4caaf7..3336d512cfd86e58c2be5685af09f551cff1bd8a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./installation-cd-graphical-kde.nix ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix index 4363c8e6c93b149dca47a8fdbeeefebe8c18a375..3911a2b01b1e4c84d02162bc51dd305f5d1e1911 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./installation-cd-minimal.nix ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 7ec55f159d0e63ccf5019eb6ce8daf06e26c18b3..3dc0f606bf6090b7278a53485ec0eb7f98429d7c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,7 +1,7 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, lib, pkgs, ... }: +{ ... }: { imports = diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index 5e8f7f93d92a9c06fee08ec1aa04849fe19ddce5..da7d760ad2fc0cbdfb7c26d71162677aba96bd2b 100644 --- a/nixos/modules/installer/netboot/netboot-base.nix +++ b/nixos/modules/installer/netboot/netboot-base.nix @@ -1,7 +1,7 @@ # This module contains the basic configuration for building netboot # images -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixos/modules/installer/netboot/netboot-minimal.nix index 8ad6234edc775eb8e293359201c371f2f0c4acfc..1563501a7e01108af486be35796ba7b4acae2ac9 100644 --- a/nixos/modules/installer/netboot/netboot-minimal.nix +++ b/nixos/modules/installer/netboot/netboot-minimal.nix @@ -1,6 +1,6 @@ # This module defines a small netboot environment. -{ config, lib, ... }: +{ ... }: { imports = diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index 7e181acb93b1965690c6fdb605b2fd724793c82c..5c5fba56f517847e77b65b97b05649d3e7331e7b 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -1,6 +1,6 @@ # List all devices which are detected by nixos-generate-config. # Common devices are enabled by default. -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 42b00b2025d835dab8dcc6c50a5a4c873633da86..af0a3a2fcc882f6c81accdcececca47f66b77000 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,13 +1,11 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, pkgs, ... }: with lib; let - cfg = config.installer; - makeProg = args: pkgs.substituteAll (args // { dir = "bin"; isExecutable = true; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index f58c3658780138ba2059e361782f2529efc99d93..f823c0d83bb60f6feb08b77e0bb1fe742bc9f6d1 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix index 3b50e60a0ffbde4a1a0e434823eb10355bb2c42e..550b3ac97f6a8fed00d69ce0c9c3829e493c15b1 100644 --- a/nixos/modules/misc/assertions.nix +++ b/nixos/modules/misc/assertions.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index f4ee94ecc0d7e427208b49e2abb4f83416e65b51..8716e3d9fef22d62969bf60199d2f33e1c1c33d9 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ pkgs, ... }: { _module.args = { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 14c661553c6bfd77eb2caebda1dc3444cda1a445..782f6c8f69df58580a181e2c7e451d86cc6ca5e7 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -9,7 +9,7 @@ # Systemd can also change ownership of service directories using the # RuntimeDirectory/StateDirectory options. -{ config, pkgs, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix index 8e5e57b3b83b71b6cb0cc707809c833f6f984571..02b91555b3c218f52d6919871d72a032c117da29 100644 --- a/nixos/modules/misc/label.nix +++ b/nixos/modules/misc/label.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/misc/lib.nix b/nixos/modules/misc/lib.nix index be8000ac029dfe03961f98a97d5626f77fc9ff70..121f396701eae5395ad0bdf01778b7ddc07d7f3d 100644 --- a/nixos/modules/misc/lib.nix +++ b/nixos/modules/misc/lib.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index dd6a2f67b30de90c25f7f21d05dd7372381cae1d..449149e4bb65fca6cc3ba1a0fb61c606f4be6717 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index 7a1e751394c0ae3d42d7871c6aa9ab487bc788ef..be3f4cbbcfe4e8ae5758c77c4a3cad79a3af10c1 100644 --- a/nixos/modules/misc/meta.nix +++ b/nixos/modules/misc/meta.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix index f3c9f6ba651bf3c510a067285b64c98160415a26..4e99631fdd85c5cff07ba8413194b4c8bc39d0bc 100644 --- a/nixos/modules/misc/passthru.nix +++ b/nixos/modules/misc/passthru.nix @@ -1,7 +1,7 @@ # This module allows you to export something from configuration # Use case: export kernel source expression for ease of configuring -{ config, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index f56640f19782efef9589dadf367e8e448ac606fe..0d7124be0a5c62d67688329e6d0822a7eed1129a 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -3,7 +3,7 @@ # enabled in the initrd. Its primary use is in the NixOS installation # CDs. -{ config, pkgs, ... }: +{ ... }: { diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 406a69722de6eb1c42381d468874e651539286fc..5aaffa4f1f2a1272ab76868c5ae27f67d02e33a6 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -1,7 +1,7 @@ # This module defines the software packages included in the "minimal" # installation CD. It might be useful elsewhere. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: { # Include some utilities that are useful for installing or repairing diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index 5b4e68beb6a6928021e7022b89d221282b480b01..99d4774584f1eb527d44dad10e3bb7ae791f90ee 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -31,7 +31,6 @@ let let relocateNixOS = path: ""; - relocateOthers = null; in { nixos = map relocateNixOS partitionedModuleFiles.nixos; others = []; # TODO: copy the modules to the install-device repository. diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index 7477795a94e965e49343abd4029365c78ec673d6..18f190071bad8ef2f9fdc6e78432cda815dc7b79 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ./graphical.nix ]; diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index fe9851e79a6d46446561088b0b64aceeb9a9eb8d..332cf58aa538224ceb1ad1e3f84a340efcb1bb88 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -1,7 +1,7 @@ # This module defines a NixOS configuration with the Plasma 5 desktop. # It's used by the graphical installation CD. -{ config, pkgs, ... }: +{ pkgs, ... }: { services.xserver = { diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 456538742f5174feee3dd0ccced39d1ae11ce3b9..2af8bf1f8e30cb38fa2779aa4aea2a36c9b2367a 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -1,7 +1,7 @@ # A profile with most (vanilla) hardening options enabled by default, # potentially at the cost of features and performance. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix index 67f8d633bab560c4ffcfde4d830ec5625a17f589..131ee272859a914899406a6344c47c8843667988 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -1,7 +1,7 @@ # Common configuration for headless machines (e.g., Amazon EC2 # instances). -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 40df7063a9bf371d9d248e523474b9f8bbd102a5..ed04e46c77d1d35199c8aac45880440a923c12e2 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -1,7 +1,7 @@ # This module defines a small NixOS configuration. It does not # contain any graphical stuff. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index a1ec1d45395e96925032cc0841e452753970ae1e..315d04093b134df806997b68f18c1d9e0b82ae3a 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ config, pkgs, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index b91bd98047ee156f21683e898014f835f4b0fc73..4651cdb76e0b833f162305d0b36921f24b0402e5 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -1,6 +1,6 @@ # Global configuration for atop. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix index 3522ab22fa8ea4320e8c1a1af747e69a467a098e..d76249bb5cab4f1644f9c2506fc31df4f6c67787 100644 --- a/nixos/modules/programs/bcc.nix +++ b/nixos/modules/programs/bcc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options.programs.bcc.enable = lib.mkEnableOption "bcc"; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 06ebb7bc729b1e6e581309a1ab52fb83c467aa4c..3bac8d98990ab5c48165de40233cfe119d6c5d15 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -2,7 +2,7 @@ # Most of the stuff here should probably be moved elsewhere sometime. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix index 9a6cf755f2a27a2415766f189257f86277b5a360..08a6cd0a6049be2fccf33cc7407013e2de394f7c 100644 --- a/nixos/modules/programs/nylas-mail.nix +++ b/nixos/modules/programs/nylas-mail.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.nylas-mail; - defaultUser = "nylas-mail"; in { ###### interface options = { diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 56fe347528bdea03ff9e2c38c23c134b74adeff7..3b5212c9e76bcab4d3ceead161e6402d1c7e377b 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -1,15 +1,9 @@ # This module defines a standard configuration for NixOS shells. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; -let - - cfg = config.environment; - -in - { config = { diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 36289080a82ac6fc337a604ece836140b84a2d83..cc398174e6ce03418cc45ffedc3b32603fc2155e 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -7,7 +7,6 @@ with lib; let cfg = config.programs.ssh; - cfgd = config.services.openssh; askPassword = cfg.askPassword; @@ -62,6 +61,29 @@ in ''; }; + # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) + pubkeyAcceptedKeyTypes = mkOption { + type = types.listOf types.str; + default = [ + "+ssh-dss" + ]; + example = [ "ssh-ed25519" "ssh-rsa" ]; + description = '' + Specifies the key types that will be used for public key authentication. + ''; + }; + + hostKeyAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "+ssh-dss" + ]; + example = [ "ssh-ed25519" "ssh-rsa" ]; + description = '' + Specifies the host key algorithms that the client wants to use in order of preference. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -189,9 +211,8 @@ in ForwardX11 ${if cfg.forwardX11 then "yes" else "no"} - # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss - HostKeyAlgorithms +ssh-dss + ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"} + ${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"} ${cfg.extraConfig} ''; diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix index fd84732cd4125945e7b1173e85d2daf3a61f30c2..ca81e018c9dc21a1e9bd3491165bbca53f970a19 100644 --- a/nixos/modules/programs/systemtap.nix +++ b/nixos/modules/programs/systemtap.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 4a60403a2827edb22980593a922cbcb59b6481f8..3d5a37274ae2da8a330fc2e6e729f8c6967dbc77 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption mkEnableOption mkIf mkMerge types; + inherit (lib) mkOption mkIf types; cfg = config.programs.tmux; diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 49cc4906e0385cddfab1a1461df707471758800c..f967ca82ac8c78b22bac51c3233677463e266ade 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -6,8 +6,6 @@ with lib; let - cfge = config.environment; - cfg = config.programs.xonsh; in diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 9e5d636241e973ca700d6a8e269ad3b25e37a5ef..946da92d80e76525662c4d1561df4111c6c551b1 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -209,7 +209,6 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let - domain = if data.domain != null then data.domain else cert; cpath = lpath + optionalString (data.activationDelay != null) ".staging"; lpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 96443fda758c5f563e3d505e26fe8f16435abbf0..55a48ea3c9c62cea4b2034016ca649424ec3db93 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; { diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix index 20f3e2dd9f838709f3b9fafbca9f90871cf330ff..93bdc851117ae31de41961a3ae2a9124871b87b5 100644 --- a/nixos/modules/security/oath.nix +++ b/nixos/modules/security/oath.nix @@ -1,6 +1,6 @@ # This module provides configuration for the OATH PAM modules. -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index 9bc73bf0b85c3202492b162c2b0fec64ebba16d2..c695ba075ca94cce53ae16abf7466b1ed136d758 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -4,8 +4,6 @@ with lib; let - inherit (pkgs) pam_usb; - cfg = config.security.pam.usb; anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services); diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index e2806a69539862818d05902ea81a0ff2cd62fc91..a0565ca26204b6c1be1c1f69dacd8517be83821f 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -97,18 +97,7 @@ let ${dir_cfg.extraConfig} ''; - # TODO: by default use this config - bconsole_conf = pkgs.writeText "bconsole.conf" - '' - Director { - Name = ${dir_cfg.name}; - Address = "localhost"; - DirPort = ${toString dir_cfg.port}; - Password = "${dir_cfg.password}"; - } - ''; - - directorOptions = {name, config, ...}: + directorOptions = {...}: { options = { password = mkOption { @@ -128,7 +117,7 @@ let }; }; - deviceOptions = {name, config, ...}: + deviceOptions = {...}: { options = { archiveDevice = mkOption { diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 0c3fc9af6f887c18c1814e7e87b7c85549f72fe2..415a70ea5ad41e41dbc6f3c70df361d68f32a8ae 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -510,7 +510,7 @@ in { ''; default = { }; type = types.attrsOf (types.submodule ( - { name, config, ... }: { + { ... }: { options = { path = mkOption { diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix index 9497d8c18bb76b0a558661d7008834a0aaaac391..790dafefe66fd22003a4409409a904dc55fc9f81 100644 --- a/nixos/modules/services/backup/crashplan-small-business.nix +++ b/nixos/modules/services/backup/crashplan-small-business.nix @@ -3,7 +3,6 @@ let cfg = config.services.crashplansb; crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; }; - varDir = "/var/lib/crashplan"; in with lib; diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index d0af2e416b63cdd99feee91570959e17985a4832..c540cc6e2aee6a0da6683db36f8fab8ceca2b65c 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -3,7 +3,6 @@ let cfg = config.services.crashplan; crashplan = pkgs.crashplan; - varDir = "/var/lib/crashplan"; in with lib; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 2d14762e868530c6e72b57a755db09fc7506ae16..9b31ff3b58246bff84b8ab5f000cf89ea373faa5 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -6,7 +6,7 @@ with lib; description = '' Periodic backups to create with Restic. ''; - type = types.attrsOf (types.submodule ({ name, config, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { options = { passwordFile = mkOption { type = types.str; @@ -127,7 +127,6 @@ with lib; mapAttrs' (name: backup: let extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; - connectTo = elemAt (splitString ":" backup.repository) 1; resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; in nameValuePair "restic-backups-${name}" ({ environment = { diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 3d133f82d204878ab6d88e6a88055936bd36ed76..fc8a424190f7ee7ffced2ad4fcb0ad5f4b25aff7 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -5,13 +5,6 @@ with types; let - # Converts a plan like - # { "1d" = "1h"; "1w" = "1d"; } - # into - # "1d=>1h,1w=>1d" - attrToPlan = attrs: concatStringsSep "," (builtins.attrValues ( - mapAttrs (n: v: "${n}=>${v}") attrs)); - planDescription = '' The znapzend backup plan to use for the source. diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index 240938f0d621dbb4301ac77cf05f8adf23b6c1e4..f0f5a6ecbfc54cb2c0ce7a639938a0cb6d26f6c0 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -1,8 +1,5 @@ { config, lib, pkgs, ...}: -let - cfg = config.services.hadoop; - hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; }; -in + with lib; { imports = [ ./yarn.nix ./hdfs.nix ]; diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index e5aba210b0190981c4430f45bd4d7609d53167eb..f56a529afdf61d12c9bc6b62166dc2fe427039e5 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -36,9 +36,6 @@ let })} ''; - skipAttrs = attrs: map (filterAttrs (k: v: k != "enable")) - (filter (v: !(hasAttr "enable" v) || v.enable) attrs); - infraContainer = pkgs.dockerTools.buildImage { name = "pause"; tag = "latest"; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index d8f55fb826f28e6360714e3f6fcb229083df77f8..92deabc3dd3b022724ba90a7d5e0bcfecb8125d6 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.services.jenkinsSlave; diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index b16a8f50a3d840ebc9aa358c6e009520631606c2..4168140b287a69e8bcc855f36f7f47e9b784faa0 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -15,7 +15,7 @@ let ${cfg.extraConfig} ''; - bindingCfg = { config, ... }: { + bindingCfg = { ... }: { options = { keys = mkOption { diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index eb1713baa140ef6bb98523bac422fe874d90103e..d53175052c74af0cff3dd38a62fd4889d1b0284d 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let kernel = config.boot.kernelPackages; in diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 1923addeb3ac2409ba4ee684c2fc3d19796fc599..f6ed4e25e9cb9a9645ccc667fa9eacbdf99cda15 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -9,7 +9,7 @@ let etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; }; - netDeviceOpts = { name, config, ... }: { + netDeviceOpts = { name, ... }: { options = { diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 5a898631e0903a4f2b0aa9d0d3f596248175f674..d17121ca1c5bf35b762519561b5acf294dc4839c 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -28,11 +28,14 @@ let # temperatures are read from the file. # # For example: - # sensor /proc/acpi/ibm/thermal (0, 0, 10) + # tp_thermal /proc/acpi/ibm/thermal (0, 0, 10) # will add a fixed value of 10 °C the 3rd value read from that file. Check out # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may # want to add to certain temperatures. - + + ${cfg.fan} + ${cfg.sensors} + # Syntax: # (LEVEL, LOW, HIGH) # LEVEL is the fan level to use (0-7 with thinkpad_acpi) @@ -41,8 +44,6 @@ let # All numbers are integers. # - sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3) - ${cfg.levels} ''; @@ -53,20 +54,52 @@ in { services.thinkfan = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads. ''; }; - sensor = mkOption { - default = "/proc/acpi/ibm/thermal"; + sensors = mkOption { + type = types.lines; + default = '' + tp_thermal /proc/acpi/ibm/thermal (0,0,10) + ''; + description ='' + thinkfan can read temperatures from three possible sources: + + /proc/acpi/ibm/thermal + Which is provided by the thinkpad_acpi kernel + module (keyword tp_thermal) + + /sys/class/hwmon/*/temp*_input + Which may be provided by any hwmon drivers (keyword + hwmon) + + S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag) + Which reads the temperature directly from the hard + disk using libatasmart (keyword atasmart) + + Multiple sensors may be added, in which case they will be + numbered in their order of appearance. + ''; + }; + + fan = mkOption { + type = types.str; + default = "tp_fan /proc/acpi/ibm/fan"; description ='' - Sensor used by thinkfan + Specifies the fan we want to use. + On anything other than a Thinkpad you'll probably + use some PWM control file in /sys/class/hwmon. + A sysfs fan would be specified like this: + pwm_fan /sys/class/hwmon/hwmon2/device/pwm1 ''; }; levels = mkOption { + type = types.lines; default = '' (0, 0, 55) (1, 48, 60) @@ -76,8 +109,12 @@ in { (7, 60, 85) (127, 80, 32767) ''; - description ='' - Sensor used by thinkfan + description = '' + (LEVEL, LOW, HIGH) + LEVEL is the fan level to use (0-7 with thinkpad_acpi). + LOW is the temperature at which to step down to the previous level. + HIGH is the temperature at which to step up to the next level. + All numbers are integers. ''; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 7bfc3bb6487270aec75d5a30ba21cfcf9a08023a..0266286aaacf9d174e274c10ee00de1a1f1e0a5c 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -4,8 +4,6 @@ with lib; let - inherit (pkgs) stdenv writeText procps; - udev = config.systemd.package; cfg = config.services.udev; diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index 2c9bc18c8c3cd62738db893c7148dee05587e110..d0824df38ae306ad18800b10417481b712fdf0be 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, services, ... }: +{ config, lib, pkgs, ... }: with lib; let diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index a3eb1653df5b6b87fac07263e4a2730a8e5d0fc2..e6091182b2abc0ec239a89bc2e961398058851c7 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -9,8 +9,6 @@ let baseDir = "/run/dovecot2"; stateDir = "/var/lib/dovecot"; - canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null; - dovecotConf = concatStrings [ '' base_dir = ${baseDir} @@ -112,7 +110,7 @@ let special_use = \${toString mailbox.specialUse} '' + "}"; - mailboxes = { lib, pkgs, ... }: { + mailboxes = { ... }: { options = { name = mkOption { type = types.strMatching ''[^"]+''; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index cfe1b5496a45d28a9a0f3720928526468abdee76..fed313e4738efb08e11897287a8762627727e1d9 100644 --- a/nixos/modules/services/mail/mail.nix +++ b/nixos/modules/services/mail/mail.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index b28995a09115ed45977fe84b1be2f9a903eb85d4..bb3ac1ecf07500220b3e468414dc1b336b39b7d4 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -7,16 +7,6 @@ let cfg = config.services.disnix; - dysnomia = pkgs.dysnomia.override (origArgs: { - enableApacheWebApplication = config.services.httpd.enable; - enableAxis2WebService = config.services.tomcat.axis2.enable; - enableEjabberdDump = config.services.ejabberd.enable; - enableMySQLDatabase = config.services.mysql.enable; - enablePostgreSQLDatabase = config.services.postgresql.enable; - enableSubversionRepository = config.services.svnserve.enable; - enableTomcatWebApplication = config.services.tomcat.enable; - enableMongoDatabase = config.services.mongodb.enable; - }); in { diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 9a3966ab30aa20e07752f18d0bb013f0278201ef..08031d33c1312842a69d0b9d6ce1cd2c2496d80a 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -5,43 +5,6 @@ with lib; let cfg = config.services.dockerRegistry; - blobCache = if cfg.enableRedisCache - then "redis" - else "inmemory"; - - registryConfig = { - version = "0.1"; - log.fields.service = "registry"; - storage = { - cache.blobdescriptor = blobCache; - filesystem.rootdirectory = cfg.storagePath; - delete.enabled = cfg.enableDelete; - }; - http = { - addr = ":${builtins.toString cfg.port}"; - headers.X-Content-Type-Options = ["nosniff"]; - }; - health.storagedriver = { - enabled = true; - interval = "10s"; - threshold = 3; - }; - }; - - registryConfig.redis = mkIf cfg.enableRedisCache { - addr = "${cfg.redisUrl}"; - password = "${cfg.redisPassword}"; - db = 0; - dialtimeout = "10ms"; - readtimeout = "10ms"; - writetimeout = "10ms"; - pool = { - maxidle = 16; - maxactive = 64; - idletimeout = "300s"; - }; - }; - configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig)); in { diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 9e66e0811ab7959c8a3b18d63e03bc5424a09406..ba74b18b6970e7fa8ae4c0555bf6c24bb39a6da6 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -62,9 +62,6 @@ let cd $out ${concatMapStrings (containerName: - let - components = cfg.components."${containerName}"; - in linkMutableComponents { inherit containerName; } ) (builtins.attrNames cfg.components)} ''; diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index b1968784af0f9ce1a9d66bb46071ff94d0151747..64cc9c610ac397a44f8889dcb64093fc3461847b 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -1,10 +1,9 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.emby; - emby = pkgs.emby; in { options = { diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index 685e652c0ba087fd4a8f39911c2523e6025bfd2c..a90c7f402e7f3790680c74ad34a39a7403a54fa5 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.exhibitor; - exhibitor = cfg.package; exhibitorConfig = '' zookeeper-install-directory=${cfg.baseDir}/zookeeper zookeeper-data-directory=${cfg.zkDataDir} diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index fdcfe6bc2b8ef6ca55338a251e99f79c5d4873df..0756e81612ac01babacbe49edae2af59878c4265 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -37,7 +37,7 @@ let # List of components used in config extraComponents = filter useComponent availableComponents; - package = if cfg.autoExtraComponents + package = if (cfg.autoExtraComponents && cfg.config != null) then (cfg.package.override { inherit extraComponents; }) else cfg.package; @@ -110,7 +110,9 @@ in { ''; description = '' Home Assistant package to use. - Override extraPackages in order to add additional dependencies. + Override extraPackages or extraComponents in order to add additional dependencies. + If you specify and do not set + to false, overriding extraComponents will have no effect. ''; }; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index db72d36f2ac7f64e18ca04207f42149483c97fe7..8d1b3d225a4457e4b0f16c53bf014597940573be 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix index b92cf27f58dc51cdd178f34400dab676779130f6..d4e88ecbebdba7c042b6cc4413dbda0672e3784d 100644 --- a/nixos/modules/services/misc/leaps.nix +++ b/nixos/modules/services/misc/leaps.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... } @ args: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 5c1977d28deb54fab8b52b2fcb18198d114b11e8..e8e9c0946d7f20ee847906fd729ab916df494a80 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -4,7 +4,6 @@ with lib; let - uid = config.ids.uids.mediatomb; gid = config.ids.gids.mediatomb; cfg = config.services.mediatomb; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 8b493041b2c910a7a9d2283280cd8f478fabc9f1..12bed05757ad539879cd93f23ac1338dc28c0bd9 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 295e7fb0ba031030b051855a2808c561be51ca10..6f75e4dd03ea8435c6a48eed70a45d0ac95abcb7 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 87ed7f0a61b9015d20f9bf8b4827181c372f426b..7ce3841be2f5e1728afcef905f09bc2ac422b8d7 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.nix.sshServe; diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index f79a04a1d7489d31a2a6d1397f85be34221e896d..a472b6c7157c16553c037a4f6fbbfa23f59023e2 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.nzbget; - nzbget = pkgs.nzbget; in { +in { options = { services.nzbget = { enable = mkEnableOption "NZBGet"; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 85f1d4a85562d827b5e74aaf75d071a1129302c1..8fe5879c27648b61a45ecb1af4383e7bdbc929cf 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.plex; - plex = pkgs.plex; in { options = { diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 7738eacc6ae9dbc4a7eed90b269259ecca889991..1a9fad3883c3ff1ba3dec7187653a2b77d42698a 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index edba4e6c23ebff1ecd247525b45485a34ec5012c..97b67a0b5033c051aa14031b172ae9306ff6de89 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index ba9f52f1904b18bc4cf496d65cbc1f1f7c0cff5d..5f97abf18715f002f17c6a92206f64e1be6f11d0 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -7,16 +7,6 @@ let taskd = "${pkgs.taskserver}/bin/taskd"; - mkVal = val: - if val == true then "true" - else if val == false then "false" - else if isList val then concatStringsSep ", " val - else toString val; - - mkConfLine = key: val: let - result = "${key} = ${mkVal val}"; - in optionalString (val != null && val != []) result; - mkManualPkiOption = desc: mkOption { type = types.nullOr types.path; default = null; @@ -94,7 +84,7 @@ let in flatten (mapAttrsToList mkSublist attrs); in all isNull (findPkiDefinitions [] manualPkiOptions); - orgOptions = { name, ... }: { + orgOptions = { ... }: { options.users = mkOption { type = types.uniq (types.listOf types.str); default = []; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 8d2c303a69e8a13bba97ccf065081263f9a70bec..9c58a15bcd73c8191f16a0f9c3943bf91d2799a8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -94,7 +94,7 @@ let }; }); - mkSubModule = { name, port, extraOpts, serviceOpts }: { + mkSubModule = { name, port, extraOpts, ... }: { ${name} = mkOption { type = types.submodule { options = (mkExporterOpts { diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index fecae4ca1b3620021bd131fd95a02d678926c0a7..c345ec48a018eb2aa488c072d063eaf74aaa9be2 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -64,7 +64,7 @@ let "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"} ''; - smartdDeviceOpts = { name, ... }: { + smartdDeviceOpts = { ... }: { options = { diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index 29616a085c8f3f3b53241fcc54f429943a6c1af3..b4d3a2640109a976196ce477467813fd3380797c 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional; + inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional; cfg = config.services.uptime; diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix index 182fabf6405f7569fb951bce1fd486084bd4857c..e06a80e443d96f8117cc6199e4c70e1f54cd22ab 100644 --- a/nixos/modules/services/network-filesystems/beegfs.nix +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -139,7 +139,7 @@ in description = '' BeeGFS configurations. Every mount point requires a separate configuration. ''; - type = with types; attrsOf (submodule ({ config, ... } : { + type = with types; attrsOf (submodule ({ ... } : { options = { mgmtdHost = mkOption { type = types.str; diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix index 255740ac65ef4b5c69eb30cc597cc1026e01c442..1cc9bed847ab1987120fcd2d7f4004734a088db7 100644 --- a/nixos/modules/services/network-filesystems/openafs/lib.nix +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -1,7 +1,7 @@ -{ config, lib, pkgs, ...}: +{ config, lib, ...}: let - inherit (lib) concatStringsSep getBin mkOption types; + inherit (lib) concatStringsSep mkOption types; in rec { diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index aa8640fd240e38b1fdc5b57a4342ac7e4973581c..4c80ed0839f7c85dde5daa0c010a155a434de2d5 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -4,7 +4,7 @@ with import ./lib.nix { inherit config lib pkgs; }; let - inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types; + inherit (lib) concatStringsSep mkIf mkOption optionalString types; bosConfig = pkgs.writeText "BosConfig" ('' restrictmode 1 diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 81e11db10409851dd11d0db96a2aa7438e1803ba..2ec5a10b481807cf90027c28165f50bde608c9f7 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -1,5 +1,5 @@ # Avahi daemon. -{ config, lib, utils, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index 6a89002b42deba3b054605b1159c6264f2ebc7e7..cef30661cc3370ec8ca06a7a124c78a95296c939 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -4,8 +4,6 @@ with lib; let - inherit (pkgs) chrony; - stateDir = "/var/lib/chrony"; keyFile = "/etc/chrony.keys"; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 39b62bdc7094682fde14de1d0cddf0ef45e059f2..c40962f4aa827d53de674f851de95ac1b164afdb 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -9,7 +9,7 @@ let cfg = config.services.cjdns; connectToSubmodule = - { options, ... }: + { ... }: { options = { password = mkOption { type = types.str; diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix index b3fd91d037fac8dd064d09d00f7608e671b03ca4..3d829cb69135335b3b0757a0ed3532123b3e83cd 100644 --- a/nixos/modules/services/networking/gdomap.nix +++ b/nixos/modules/services/networking/gdomap.nix @@ -2,9 +2,6 @@ with lib; -let - cfg = config.services.gdomap; -in { # # interface diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 8875309143fdd4383fd5da1f5cf280bf355f11db..3afafaf3fed58d1b2968403cb2ded9d192afc883 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -103,7 +103,7 @@ let ${flip concatMapStrings (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: let portStr = toString proto.port; in '' + (proto: '' [${proto.name}] enabled = ${boolToString proto.enable} address = ${proto.address} @@ -122,7 +122,7 @@ let # DO NOT EDIT -- this file has been generated automatically. ${flip concatMapStrings (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) - (tun: let portStr = toString tun.port; in '' + (tun: '' [${tun.name}] type = client destination = ${tun.destination} @@ -405,7 +405,7 @@ in outTunnels = mkOption { default = {}; type = with types; loaOf (submodule ( - { name, config, ... }: { + { name, ... }: { options = { destinationPort = mkOption { type = types.int; @@ -426,7 +426,7 @@ in inTunnels = mkOption { default = {}; type = with types; loaOf (submodule ( - { name, config, ... }: { + { name, ... }: { options = { inPort = mkOption { type = types.int; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index f24562f11817440232f7104ee58e5919f2388752..cc81e27e93996102de644e9c89e968fabd4a2559 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -6,8 +6,6 @@ let cfg = config.services.morty; - configFile = cfg.configFile; - in { diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix index cce65be321a888fb5dc7dc26808238d7a5b97799..51f1d081b971002da4802f6186cc8bc09b9c13c5 100644 --- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix +++ b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { options.services.nghttpx = { enable = lib.mkEnableOption "nghttpx"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index b7b59d95bf024e280c4edd8210cb1fa229400214..613b0e0fb51a55d1d898345028812121ab2469e0 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -22,7 +22,7 @@ let Deny-IP=${concatStringsSep " " cfg.deniedIPRanges} ''; - nylonOpts = { name, config, ... }: { + nylonOpts = { name, ... }: { options = { diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index a418839d22b8baf3a493a8851056bbb9236e7879..b94b4026fd9146d520157cf70ddb6cb4842b9d04 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -131,6 +131,9 @@ in Configuration of this OpenVPN instance. See openvpn8 for details. + + To import an external config file, use the following definition: + config = "config /path/to/config.ovpn" ''; }; diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 513e6174752c1fe09bee8f9662b8c27afc55f80f..56a612b9105261d7674dbc62fa17a693163949b6 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 9784f1d160f3747fcd9960a3ca804f1d4ad0850c..1ea676d0f9299a6025d348d046a8dc6df9510a8a 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, options, ... }: +{ pkgs, lib, config, ... }: with lib; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 7b2d1920f0f1b6cb5b7a37b19d7d40e37deb3d4c..c16fbe8a52fa2450c0d8b6885515612c67509faf 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -479,7 +479,7 @@ in assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] - ++ flip map cfg.listenAddresses ({ addr, port, ... }: { + ++ flip map cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; message = "addr must be specified in each listenAddresses entry"; }); diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index f5baea9222be78ffa6e64304ba8891ee168824e1..b7655f4bec62f73b08c48bf4a147d2b5aa9d3dd2 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index f495c39967e8c160c994f9a1f0ec53f4e57340c8..ccf879996631db739d97382bf9e71cea0e235a40 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -1,4 +1,4 @@ -{ config, coreutils, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index acb4778d8485fefea5af9f64d07c9a5548fc21c7..1b87b77f9768de24c7fa13853a8fa2f3fb699d95 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -10,7 +10,7 @@ let # interface options - interfaceOpts = { name, ... }: { + interfaceOpts = { ... }: { options = { diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 5e006c13f0d0638af817eea922e835bfc627252a..46111a76af808bd844befe93cb9eba2cfcd56325 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 274bbca53fa33bf40c0b0cb6e6fb0b31a35adad8..06ccd7032e6c08885c4ceccda391a640c93a2ba8 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, nodes, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.zerobin; diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 6f477e3b14605abd8f6681e4cc07e8f820fccc16..f817db2ad000b47efe834bee24c5a29c830d7fb0 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -26,7 +26,6 @@ let }; # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`. - notNull = a: ! isNull a; mkZncConf = confOpts: '' Version = 1.6.3 ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules} diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix index 2aa2c57fd22c3dcbc814e5d1ab8a48fe7c389046..a9ad5497a657aa15d7744d94e966f8ea77647563 100644 --- a/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ config, lib, ... }: with lib; let cfg = config.services.oauth2_proxy.nginx; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index dcb41d187c2b14798e78fb16dd86838dc18c7dcb..def77ba69e58bc0f44fb25f1080b55b8859747ae 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -578,7 +578,7 @@ in ]; } ''; - type = types.loaOf (types.submodule ({name, config, ...}: { + type = types.loaOf (types.submodule ({name, ...}: { options = { name = mkOption { @@ -638,7 +638,7 @@ in authorizeClient = mkOption { default = null; description = "If configured, the hidden service is accessible for authorized clients only."; - type = types.nullOr (types.submodule ({config, ...}: { + type = types.nullOr (types.submodule ({...}: { options = { diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index d85dee089827bb8e21ea38de38d9f8f1dffc1eac..d151385d2f9beee25de08afc79936a99e6cddc64 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -2,7 +2,7 @@ let - inherit (lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf; inherit (pkgs) heimdalFull; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 11a30ea81ba975fe9d561ef72e6a401a9db74ddf..fd1570d11980795451e2c5b9daa231d42af2f857 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -7,8 +7,6 @@ let nssModulesPath = config.system.nssModules.path; cfg = config.services.nscd; - inherit (lib) singleton; - in { diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix index 281716cf1860c846902f6f75bb61d3986487b81d..c8ddca9a0db63451faeccc8ba46dcdbbc5f2c724 100644 --- a/nixos/modules/services/system/saslauthd.nix +++ b/nixos/modules/services/system/saslauthd.nix @@ -4,7 +4,6 @@ with lib; let - nssModulesPath = config.system.nssModules.path; cfg = config.services.saslauthd; in diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 4b9038e3e251c5cdf7775312ec782f76937c8711..ca63f529a5dfba8d47dc85a93d81d83235b3ee65 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, timezone, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index bf4fb76d0c0c7ab1224c2ac2c1625a7066dc5c9d..96413d2dd563f0036ef41120619a858cfd82b802 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -13,12 +13,6 @@ let settingsDir = "${homeDir}/.config/transmission-daemon"; settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); - # Strings must be quoted, ints and bools must not (for settings.json). - toOption = x: - if isBool x then boolToString x - else if isInt x then toString x - else toString ''"${x}"''; - # for users in group "transmission" to have access to torrents fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 88e488425bcedeb0a9647edfec4545287e08497c..59c45fcb44ee1b0061f7f856f5b34d6af36f5a74 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption types mkIf optionalString; + inherit (lib) mkOption types mkIf; cfg = config.services.kmscon; diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix index d411727a1a54b545258c0c6654e135c6695f6d2a..fb95e024817cfea8cca8b60c65f03db0f51f4a29 100644 --- a/nixos/modules/services/web-apps/frab.nix +++ b/nixos/modules/services/web-apps/frab.nix @@ -6,7 +6,6 @@ let cfg = config.services.frab; package = pkgs.frab; - ruby = package.ruby; databaseConfig = builtins.toJSON { production = cfg.database; }; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 42affb06b51fb20bbda3e06d554edae55cb4b2ee..fbbd7715c6b3aae1377cd76e9292215fe8c8f604 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, services, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.matomo; diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index e057e3025629ac361d5f1644ab8da109273df64a..8c675c642005176e3b6b5b025cddfe4639dc3361 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, options, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index eb8ee9b5cf46ae22e29cd60008911215cc838b39..73607c6f9a3bb8fdd20c31e26d284534932977a5 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -98,11 +98,6 @@ let allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts; - # !!! should be in lib - writeTextInDir = name: text: - pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name"; - - enableSSL = any (vhost: vhost.enableSSL) allHosts; diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix index 6f1f67970f6cb3c6a5edf25f24d222f8f6e6a39c..77194f3474928270d813f60579392d0ab179763b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix +++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, serverInfo, php, ... }: +{ config, lib, pkgs, serverInfo, ... }: with lib; diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix index 6dd91be00a73f6acc29dd27b418551c23a0192c6..4b8ee2b17ea73f3d0652d499903ce0412807a87a 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix @@ -1,4 +1,4 @@ -{ config, pkgs, serverInfo, lib, ... }: +{ config, pkgs, lib, ... }: let inherit (pkgs) mercurial; diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 82b8bf3e30db5614d06cf67cd6a122a5226a824e..6345a9a569355545f9c6f9d177d25212d5783488 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -4,17 +4,6 @@ with lib; let - httpd = serverInfo.serverConfig.package; - - version24 = !versionOlder httpd.version "2.4"; - - allGranted = if version24 then '' - Require all granted - '' else '' - Order allow,deny - Allow from all - ''; - owncloudConfig = pkgs.writeText "config.php" '' processtwo != true - ]; checkExec = checkUnitConfig "Exec" [ (assertOnlyFields [ diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 6f5b15372d7516337ec3c652e5d53fc2e9b93565..ed149f4791bfd9962ad9e35c81f518acc2ea49de 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -188,14 +188,12 @@ let "timers.target" ]; - boolToString = value: if value then "yes" else "no"; - makeJobScript = name: text: let mkScriptName = s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) ); x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; }; in "${x}/bin/${mkScriptName name}"; - unitConfig = { name, config, ... }: { + unitConfig = { config, ... }: { config = { unitConfig = optionalAttrs (config.requires != []) @@ -277,7 +275,7 @@ let ]; }; - mountConfig = { name, config, ... }: { + mountConfig = { config, ... }: { config = { mountConfig = { What = config.what; @@ -290,7 +288,7 @@ let }; }; - automountConfig = { name, config, ... }: { + automountConfig = { config, ... }: { config = { automountConfig = { Where = config.where; diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 18aad58b36ccffe0e1977c175e3c683c066dfe29..8d8bfe5900a9824bee9da452537348fb6de2e929 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 3bfdf89e0cf5f9bc8a54fdf76ef8570b393304d4..8bab91c721fdcc5a97844a2912bf6b1f41555876 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index da0c9408d891938f320b6d41e3b6c00bc4b217db..11ed5d7e4d0c73ead154dfbf4d115311bba4e3cd 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -7,7 +7,6 @@ let encDevs = filter (dev: dev.encrypted.enable) fileSystems; keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; - isIn = needle: haystack: filter (p: p == needle) haystack != []; anyEncrypted = fold (j: v: v || j.encrypted.enable) false encDevs; diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 3a8999c242bdcbe58b9f0697cace66d21fef17fb..a14a3ac38549cc36ae6c9438059d8e916beab1fe 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 39f51c363673a1cfc1e0faed1b33e880b0190eae..7120856387ef3beb8ed112eb403cd315f1af51be 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -9,7 +9,6 @@ with lib; let - cfgSpl = config.boot.spl; cfgZfs = config.boot.zfs; cfgSnapshots = config.services.zfs.autoSnapshot; cfgSnapFlags = cfgSnapshots.flags; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c4a2bd1f75fd55d4217c06787369b30786b19bc7..f3f6a19318a2f1b39812903551dd2f350983dd13 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -7,7 +7,6 @@ let cfg = config.networking; interfaces = attrValues cfg.interfaces; - hasVirtuals = any (i: i.virtual) interfaces; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index c640e886fca855bc5727cb1a2fed8201cb5c260c..2318bdd1d58263ea52c8abc594eb03980f9544bb 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, utils, ... }: with utils; with lib; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 7053aa57f803882266a7192467245c2386fcf478..20a740ce1f0caabf18ba92089e2bde4c35d78c71 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, utils, stdenv, ... }: +{ config, options, lib, pkgs, utils, ... }: with lib; with utils; diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 69599bda6d32de7089bd43ae2025e590d5ddc94a..a9d987780ee1c34c60c75c65fc82aa5a970a1eed 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 1b142fb8fd3614428fa67c93bb058cce9ccd4c09..93e03c44c868bf4f64a46f54dd926c27bbda34a4 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 1f8f2891e98cc11e32f90c3a998e96ea40fe5bbe..3575a291b2b4275317c596696e2b402157747374 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index dfe8b430e04588f1ede9e177f117c8d6ee85da5f..25490d671152aab00738b129d8845b8319c21c62 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 7a7fcbecd64f9796477f643fca8734b15c99bb2c..114e0ca39fa24000c6a87ee75e28c29c27cf7e08 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -6,10 +6,6 @@ with lib; with import ../../lib/qemu-flags.nix { inherit pkgs; }; -let - kernel = config.boot.kernelPackages.kernel; -in - { # This option is a dummy that if used in conjunction with diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 9ecdcf23e5fbfd73bc77b44e2e89d120b7dbbc07..1a45c3093b78137fd44621910527e2600f50aac3 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options = { ec2 = { diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 5cd2304a29535b58248e7500c4acdca709ce2a19..03239991b95a57e19fe396218928a58c0063e96c 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; { diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix index de1b3857923f946ed0612b98208ada41683a5561..267ba50ae025a6e16675ece245f17a7367f12aa6 100644 --- a/nixos/modules/virtualisation/azure-config-user.nix +++ b/nixos/modules/virtualisation/azure-config-user.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { # To build the configuration or use nix-env, you need to run diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix index 5c9f18ef52a5e78ee3b9ba4e42f00137962d23b0..780bd1b78dce5b286b88c56e743e12a8042f0d3b 100644 --- a/nixos/modules/virtualisation/azure-config.nix +++ b/nixos/modules/virtualisation/azure-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/azure-image.nix" ]; diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix index 528ffecc0bf2528f301ffc3d3d3dc410fb35435c..0a018e4cd69541cb7fbf07be3bb25978fef4a99b 100644 --- a/nixos/modules/virtualisation/brightbox-config.nix +++ b/nixos/modules/virtualisation/brightbox-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ]; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index c3044ea124cfc588cdf5fc0676f8a8a80cbb4655..31f5f6fe780701e28f3ed6b1b31cd4df3d834b9c 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -257,7 +257,7 @@ let system = config.nixpkgs.localSystem.system; - bindMountOpts = { name, config, ... }: { + bindMountOpts = { name, ... }: { options = { mountPoint = mkOption { @@ -284,7 +284,7 @@ let }; - allowedDeviceOpts = { name, config, ... }: { + allowedDeviceOpts = { ... }: { options = { node = mkOption { example = "/dev/net/tun"; diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix index 9535e3e0d6778a51802e1d1c4deae87ab3290083..2f304094d55bb95a542f9e27414b3c5e4fe50717 100644 --- a/nixos/modules/virtualisation/docker-image.nix +++ b/nixos/modules/virtualisation/docker-image.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index f6bca1aa8579b95304837e7c805280c9884e62d1..8f20100bc1b18a8711d46f1e3689ba241f58ce51 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ]; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index dbb7b881955afffbf303c0afe7fdc9a373e0eba6..d4936484018722f588d9089d45335e5ec6c14d77 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c1d2a314daf2d25d2772fe3d2a650b656c8719fa..cecf2a3f144c1ae5ad2dca91479ed8f06c6e1f46 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 38b138e0632636ca47aa68e244599bb1d1c36ea1..bb8b9172f23f006d196274581578aeb5cc8982b9 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -51,9 +51,6 @@ in { # Where the communication sockets live runDir = "/var/run/openvswitch"; - # Where the config database live (can't be in nix-store) - stateDir = "/var/db/openvswitch"; - # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index b46002c10b541a96625d70ce3232faf476d6633a..c00b984c2ce046caf2c50e1cdc65d224ca4257db 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -1,6 +1,6 @@ # Common configuration for Xen DomU NixOS virtual machines. -{ config, pkgs, ... }: +{ ... }: { boot.loader.grub.version = 2; diff --git a/nixos/release.nix b/nixos/release.nix index f11f372335a03ba06b74512429409bd3aed5559c..dfa4ee9e1278eafeadb2b74b192421186900ba52 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -45,7 +45,7 @@ let makeIso = - { module, type, maintainers ? ["eelco"], system }: + { module, type, system, ... }: with import nixpkgs { inherit system; }; @@ -56,7 +56,7 @@ let makeSdImage = - { module, maintainers ? ["dezgeg"], system }: + { module, system, ... }: with import nixpkgs { inherit system; }; @@ -96,7 +96,7 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; modules = [ module versionModule ] ++ singleton - ({ config, lib, ... }: + ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; }); @@ -128,15 +128,15 @@ in rec { channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; - manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); - manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub)); - manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); - manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources); - options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; + manual = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manual); + manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub)); + manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages); + manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources); + options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; # Build the initial ramdisk so Hydra can keep track of its size over time. - initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); + initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk); netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { inherit system; @@ -195,7 +195,7 @@ in rec { dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { inherit system; - modules = singleton ({ config, pkgs, ... }: + modules = singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; system.nixos.stateVersion = mkDefault "18.03"; @@ -424,27 +424,27 @@ in rec { closures = { - smallContainer = makeClosure ({ pkgs, ... }: + smallContainer = makeClosure ({ ... }: { boot.isContainer = true; services.openssh.enable = true; }); - tinyContainer = makeClosure ({ pkgs, ... }: + tinyContainer = makeClosure ({ ... }: { boot.isContainer = true; imports = [ modules/profiles/minimal.nix ]; }); - ec2 = makeClosure ({ pkgs, ... }: + ec2 = makeClosure ({ ... }: { imports = [ modules/virtualisation/amazon-image.nix ]; }); - kde = makeClosure ({ pkgs, ... }: + kde = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; }); - xfce = makeClosure ({ pkgs, ... }: + xfce = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.desktopManager.xfce.enable = true; }); diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index c5898db6b32538fb9b57207e0aecc3d5440b4aad..6d728b387e145abbbc91aa17db807c219c1f8224 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -1,5 +1,5 @@ let - commonConfig = { config, lib, pkgs, nodes, ... }: { + commonConfig = { lib, nodes, ... }: { networking.nameservers = [ nodes.letsencrypt.config.networking.primaryIPAddress ]; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix index e1dee71fddf231db8c676088e202d4260f711908..fedfde233e8de3197baf09876dd349783dc905c8 100644 --- a/nixos/tests/ammonite.nix +++ b/nixos/tests/ammonite.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { amm = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.ammonite ]; }; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index ef848c2a374f20a5fd540266be1f5485fbdf54e4..9f367d4c1d2a6664689f9f41baabccc8975a4c00 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +import ./make-test.nix ({ pkgs, ... }: { name = "atd"; @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: }; machine = - { config, pkgs, ... }: + { ... }: { services.atd.enable = true; users.users.alice = { isNormalUser = true; }; }; diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 976a770e887c272c2475b255de4a0d8c35412020..dfb60998941b14575b38cca8733a99f685039ea9 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = let - cfg = { config, pkgs, ... }: { + cfg = { ... }: { services.avahi = { enable = true; nssmdns = true; diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix index 433910feafe306475cc68702ecd9b5177680bd26..9c241fd2301a44e5c451219a2339a0983b13f81c 100644 --- a/nixos/tests/beegfs.nix +++ b/nixos/tests/beegfs.nix @@ -1,9 +1,9 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test.nix ({ ... } : let connAuthFile="beegfs/auth-def.key"; - client = { config, pkgs, lib, ... } : { + client = { pkgs, ... } : { networking.firewall.enable = false; services.beegfsEnable = true; services.beegfs.default = { @@ -31,7 +31,7 @@ let }; - server = service : { config, pkgs, lib, ... } : { + server = service : { pkgs, ... } : { networking.firewall.enable = false; boot.initrd.postDeviceCommands = '' ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 50c98664660a9676d02aeb717cbc38b43bd5a7f0..609b1ff7a83a2966d5078efb9ef3aaf6f47a9966 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -30,7 +30,7 @@ in nodes = { tracker = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ]; # We need Apache on the tracker to serve the torrents. @@ -42,7 +42,7 @@ in }; router = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.miniupnpd ]; virtualisation.vlans = [ 1 2 ]; networking.nat.enable = true; @@ -52,7 +52,7 @@ in }; client1 = - { config, pkgs, nodes, ... }: + { pkgs, nodes, ... }: { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = @@ -61,7 +61,7 @@ in }; client2 = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.transmission ]; networking.firewall.enable = false; }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index 36731773de27e3fc8b822200cbce6952bbb28ece..9b39abdfa8edf25259b2b8f8b838203868ddf097 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -41,7 +41,7 @@ in { }; nodes = { - client = { config, pkgs, ... }: { + client = { ... }: { services.borgbackup.jobs = { local = rec { @@ -84,7 +84,7 @@ in { }; }; - server = { config, pkgs, ... }: { + server = { ... }: { services.openssh = { enable = true; passwordAuthentication = false; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 828846f17c899beaea168fcd731eecfcdccf4a49..cf408dc7fec923cd535abed0453d3791afd39ecb 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : { name = "buildbot"; nodes = { - bbmaster = { config, pkgs, ... }: { + bbmaster = { pkgs, ... }: { services.buildbot-master = { enable = true; package = pkgs.buildbot-full; @@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ... } : { environment.systemPackages = with pkgs; [ git buildbot-full ]; }; - bbworker = { config, pkgs, ... }: { + bbworker = { pkgs, ... }: { services.buildbot-worker = { enable = true; masterUrl = "bbmaster:9989"; @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... } : { environment.systemPackages = with pkgs; [ git buildbot-worker ]; }; - gitrepo = { config, pkgs, ... }: { + gitrepo = { pkgs, ... }: { services.openssh.enable = true; networking.firewall.allowedTCPPorts = [ 22 9418 ]; environment.systemPackages = with pkgs; [ git ]; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index f0083ab18e45e2155bb6925e9c592217503cdc04..e60bae4b7003382fc6d63d81c4cc7256d2b79839 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -5,11 +5,11 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { ... }: { services.cadvisor.enable = true; }; - influxdb = { config, pkgs, lib, ... }: with lib; { + influxdb = { lib, ... }: with lib; { services.cadvisor.enable = true; services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix index b729e6b158bcbfd2ddf4a18bdc55326cd25c9766..ca8f35ef3bff3b4a02518e1ec339c64dfb4ff5d8 100644 --- a/nixos/tests/cassandra.nix +++ b/nixos/tests/cassandra.nix @@ -24,9 +24,9 @@ in name = "cassandra-ci"; nodes = { - cass0 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.1" {}; - cass1 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.2" {}; - cass2 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.3" { + cass0 = { nodes, ... }: nodeCfg nodes "192.168.1.1" {}; + cass1 = { nodes, ... }: nodeCfg nodes "192.168.1.2" {}; + cass2 = { nodes, ... }: nodeCfg nodes "192.168.1.3" { extraParams = [ ''JVM_OPTS="$JVM_OPTS -Dcassandra.replace_address=192.168.1.2"'' ]; diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix index b9993062c079adcd4e7e303e851a86f30b78ccca..dd45f0157b01a93e766ec41e77ca37fc0ecf7d75 100644 --- a/nixos/tests/ceph.nix +++ b/nixos/tests/ceph.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; nodes = { - aio = { config, pkgs, ... }: { + aio = { pkgs, ... }: { virtualisation = { emptyDiskImages = [ 20480 20480 ]; vlans = [ 1 ]; @@ -55,7 +55,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $aio->waitForUnit("network.target"); diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 4d3b58abc6e557992fc9094c845cdfbe0ace02d1..ab5f8e0bcf3e542583167ab9a159956cf8911c4c 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -2,10 +2,9 @@ let carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2"; carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k"; carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52"; - carolIp4 = "192.168.0.9"; basicConfig = - { config, pkgs, ... }: + { ... }: { services.cjdns.enable = true; # Turning off DHCP isn't very realistic but makes @@ -30,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = rec { # Alice finds peers over over ETHInterface. alice = - { config, ... }: + { ... }: { imports = [ basicConfig ]; services.cjdns.ETHInterface.bind = "eth1"; @@ -42,11 +41,9 @@ import ./make-test.nix ({ pkgs, ...} : { # Bob explicitly connects to Carol over UDPInterface. bob = - { config, lib, nodes, ... }: + { ... }: - let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in - - { imports = [ basicConfig ]; + { imports = [ basicConfig ]; networking.interfaces.eth1.ipv4.addresses = [ { address = "192.168.0.2"; prefixLength = 24; } @@ -66,11 +63,8 @@ import ./make-test.nix ({ pkgs, ...} : { # Carol listens on ETHInterface and UDPInterface, # but knows neither Alice or Bob. carol = - { config, lib, nodes, ... }: - let - carolIp4 = (lib.mkForce nodes.carol.config.networking.interfaces.eth1); - in - { imports = [ basicConfig ]; + { ... }: + { imports = [ basicConfig ]; environment.etc."cjdns.keys".text = '' CJDNS_PRIVATE_KEY=${carolKey} diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index 2a258e4bff542bb65b9a5c9ad29fa8e29f77dde0..303e74086460f0a3dc2ea11efb56c29d153f47b8 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -31,7 +31,7 @@ in makeTest { maintainers = [ lewo ]; }; machine = - { config, pkgs, ... }: + { ... }: { virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; services.cloud-init.enable = true; diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index dc50e14750b011947b60b8f1a551d214fb85a5e1..9cd531a1f96c8db94b686bedd6ce5c660bfbe315 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { users.users.alice = { isNormalUser = true; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index dfef46a2ada495fc4ba814881b80e5f69949c9ce..bd8bd5dee9c88050067f7816235b4afbf817f397 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index df3f3354b2d994f6f9733b13b5b333dd8b6aa7ff..8f874b3585dc4113e1c70a532fa1b617e3f3dc45 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index df1ef6d149364bd8a2b0b8941e944a75c2ca6262..8cf298c6225837befd3c3ff85390ad531a3647c6 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = []; diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 821ce1cd07d2b37c4c47cdfb8ead5603d8d88b15..c4d954592ef029408cc974a4921c5e5abd8ff765 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index f676ed122bb3a6e55b6dea41bf1df7efbaeaeaec..7db389a18e72695444e6524c52db42ac900b568c 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 390dc4ad2c29c9e6eb199a4ab9b63eeac28db7da..2bdb926a8e2b7fe5870005198765915561b243e9 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { machine1 = - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -55,7 +55,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine2 = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index bde8e175f9532121ed8e3f59016596d9601bb585..1e312f59f437ea4adaccff77687f92b7bf34c168 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { config, pkgs, ... }: + server = { ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -23,7 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; }; - bridged = { config, pkgs, ... }: { + bridged = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - bonded = { config, pkgs, ... }: { + bonded = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; @@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - bridgedbond = { config, pkgs, ... }: { + bridgedbond = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index 78cc445c2dd069b762ec528c6fc59b2069171cce..be83f82445edc8338731f14ef4363f8be8d4fc54 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 5fb42f2272b357ef67e6440bce3a49a76c60a0b0..9726ca0cb0e7663d36d509d82bcbea1eb5240421 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -21,11 +21,11 @@ in { }; nodes = { - client = { lib, pkgs, ... }: { + client = { ... }: { imports = [ client_base ]; }; - client_c1 = { lib, pkgs, ... }: { + client_c1 = { lib, ... }: { imports = [ client_base ]; containers.test1.config = { @@ -34,7 +34,7 @@ in { services.httpd.adminAddr = "nixos@example.com"; }; }; - client_c2 = { lib, pkgs, ... }: { + client_c2 = { lib, ... }: { imports = [ client_base ]; containers.test1.config = { @@ -45,7 +45,6 @@ in { }; testScript = {nodes, ...}: let - originalSystem = nodes.client.config.system.build.toplevel; c1System = nodes.client_c1.config.system.build.toplevel; c2System = nodes.client_c2.config.system.build.toplevel; in '' diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index f68c9b07759b2185ea2085289b37336653bed06d..aeb0a6e68e216063c5d8743f0854e52123cdbd04 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -17,7 +17,7 @@ let }; }; }; -in import ./make-test.nix ({ pkgs, lib, ...} : +in import ./make-test.nix ({ pkgs, ...} : { name = "containers-restart_networking"; meta = with pkgs.stdenv.lib.maintainers; { @@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : }; nodes = { - client = { lib, pkgs, ... }: client_base // { + client = { lib, ... }: client_base // { virtualisation.vlans = [ 1 ]; networking.bridges.br0 = { @@ -38,7 +38,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : }; }; - client_eth1 = { lib, pkgs, ... }: client_base // { + client_eth1 = { lib, ... }: client_base // { networking.bridges.br0 = { interfaces = [ "eth1" ]; rstp = false; @@ -48,7 +48,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; }; - client_eth1_rstp = { lib, pkgs, ... }: client_base // { + client_eth1_rstp = { lib, ... }: client_base // { networking.bridges.br0 = { interfaces = [ "eth1" ]; rstp = true; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 873dd364369fb27a55dde8241df5c7ccd93e4c13..05c21f4907bf5d7dcc0bbce75023b5a7ae82e4e1 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix index a3f675236bc6fc2cc3d7c3255d7aaf47459fbb87..48ea48eebbb31cc777b1662c9b72fef0914f160d 100644 --- a/nixos/tests/couchdb.nix +++ b/nixos/tests/couchdb.nix @@ -10,14 +10,14 @@ with lib; nodes = { couchdb1 = - { pkgs, config, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq ]; services.couchdb.enable = true; }; couchdb2 = - { pkgs, config, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq ]; services.couchdb.enable = true; diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 6119fd58447c122b8e315a0d0b48fb1e0813c9b0..b4be5e465cc03a2383691c9c1356e2a9784d08b3 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { pkgs, config, ... }: + { ... }: { services.deluge = { enable = true; diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 1fcf3903b13e9f0c68ad3c08bbe98b98b879b66d..13bc9d3d9168d26cf7c6e7ffd95a76c6119b3b92 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: { # A client running the recommended setup: DNSCrypt proxy as a forwarder # for a caching DNS client. client = - { config, pkgs, ... }: + { ... }: let localProxyPort = 43; in { security.apparmor.enable = true; diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix index 38d25daff194c34104c9c0d5420740f54575734a..b306c149be91a48b09291e7d07ef215ebbc09b57 100644 --- a/nixos/tests/docker-edge.nix +++ b/nixos/tests/docker-edge.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { docker = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.package = pkgs.docker-edge; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 1fbd199c7bc4f1aa9479047284f8be4f1cdb12e3..8936421072a992ff0079cb9ee42f2dbcc0d1318d 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - registry = { config, pkgs, ... }: { + registry = { ... }: { services.dockerRegistry.enable = true; services.dockerRegistry.enableDelete = true; services.dockerRegistry.port = 8080; @@ -16,12 +16,12 @@ import ./make-test.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 8080 ]; }; - client1 = { config, pkgs, ...}: { + client1 = { ... }: { virtualisation.docker.enable = true; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; - client2 = { config, pkgs, ...}: { + client2 = { ... }: { virtualisation.docker.enable = true; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index 9d7fa3e7a8c528d0707688a8cde967e7407a5d2e..637957bd3e8b3082a29bf110e4ef47c40a27ee29 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { docker = - { config, pkgs, ... }: + { ... }: { virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e2bcfbbd1f96249eb7c2fc6297a0d8da5d5bd9cf..db4eacc37287f6079d9476ece5d0e86d16074e98 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { docker = - { config, pkgs, ... }: { + { ... }: { virtualisation = { diskSize = 2048; docker.enable = true; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index c6c8f4cdb5fb9c4590cabe87b6104b300a3a112f..d67b2f8743d80644e38bcbd661da77bb0f7d9715 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { docker = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.package = pkgs.docker; diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix index 041be0f5a62460f2007a1fb2f23bc19ea6150209..3f02cecb8662d9508157f48154b48320852494e3 100644 --- a/nixos/tests/ecryptfs.nix +++ b/nixos/tests/ecryptfs.nix @@ -1,8 +1,8 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: { name = "ecryptfs"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; boot.kernelModules = [ "ecryptfs" ]; security.pam.enableEcryptfs = true; diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index ed656b3628b9edc8f96a73484ecdae5c01a80861..8dba7a905fa63fdfd89298bda55dc5613ac8cd0c 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -11,7 +11,7 @@ let }; nodes = { one = - { config, pkgs, ... }: { + { pkgs, ... }: { # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: # # OpenJDK 64-Bit Server VM warning: diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index 466e772a881f3240ce86b47a55ca83d9d89ac7e9..3594e35e343c5f0261093206e75bb704c939cdf5 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.emacs = { diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix index c6b0424e97b93870802fddfd0c0587545c7086d7..064c498204aecec3b8e21e8f6f8afdb51f30f68e 100644 --- a/nixos/tests/env.nix +++ b/nixos/tests/env.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; environment.etc."plainFile".text = '' diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 3971997a9bf794c1c0caca7e2f49147433a5510b..3c4de5950a79f9f69077bb131ab32403c0bc2c3a 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -102,7 +102,7 @@ in { }; nodes = { - node1 = { config, pkgs, nodes, ... }: { + node1 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; @@ -110,7 +110,7 @@ in { }; }; - node2 = { config, pkgs, ... }: { + node2 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; @@ -118,7 +118,7 @@ in { }; }; - node3 = { config, pkgs, ... }: { + node3 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"]; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index f8a6791a834f7f79f81dc1ceb8f4c3712ddd2e1c..6c23b31779bc5accb95a57cdc77b94129a77e552 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - node = { config, pkgs, nodes, ... }: { + node = { ... }: { services.etcd.enable = true; }; }; diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index bb7daae118c0845864ce9415b0a49e7fb659d80b..24b74df85ad1d6f7c6b1804d968558722ab2fb67 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { client = - { config, pkgs, ... }: + { pkgs, ... }: with pkgs.lib; { networking = { @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; server = - { config, pkgs, ... }: + { pkgs, ... }: with pkgs.lib; { networking = { diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index e1b628c91445625cec04d701bdcf045c31566f58..58a80243ea9c729a445c64bcbb62bbdec0e77ff7 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.firefox pkgs.xdotool ]; diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 1119a5312eb5b54efb1f350a83fdfcd839ec1bd5..7207a880d8e2f4ec7c9a1c8ef33eff801e27a744 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -8,7 +8,7 @@ import ./make-test.nix ( { pkgs, ... } : { nodes = { walled = - { config, pkgs, nodes, ... }: + { ... }: { networking.firewall.enable = true; networking.firewall.logRefusedPackets = true; services.httpd.enable = true; @@ -20,13 +20,13 @@ import ./make-test.nix ( { pkgs, ... } : { # original walled configuration so that there is a change in the service # file. walled2 = - { config, pkgs, nodes, ... }: + { ... }: { networking.firewall.enable = true; networking.firewall.rejectPackets = true; }; attacker = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.enable = false; diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix index 7f27903a3026c2a72743c7409bd50af69add966f..fb66fe282090e1fd97a75a42b1b82c79c2819a61 100644 --- a/nixos/tests/flannel.nix +++ b/nixos/tests/flannel.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { networking.firewall.allowedUDPPorts = [ 8472 ]; }; in { - etcd = { config, pkgs, ... }: { + etcd = { ... }: { services = { etcd = { enable = true; @@ -31,11 +31,11 @@ import ./make-test.nix ({ pkgs, ...} : rec { networking.firewall.allowedTCPPorts = [ 2379 ]; }; - node1 = { config, ... }: { + node1 = { ... }: { require = [flannelConfig]; }; - node2 = { config, ... }: { + node2 = { ... }: { require = [flannelConfig]; }; }; diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix index 9a5bdf07021737ac0941c871ac1811a43b004a26..096b37e6e2cb723c7b31ec12c420a1b0a2951495 100644 --- a/nixos/tests/flatpak.nix +++ b/nixos/tests/flatpak.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: maintainers = pkgs.flatpak.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages; diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix index bf4ef25130b3da722e088c1b602ddfc024720736..2e64149b2db3aab89efc569d11b30dd31cccb952 100644 --- a/nixos/tests/fwupd.nix +++ b/nixos/tests/fwupd.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { maintainers = pkgs.fwupd.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.fwupd.enable = true; environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ]; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 7268636b62ad0c7dd0bd818097ec4312b8b0e768..3af2cbcd098850b5799c85b2f76432fe45728b67 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - gitlab = { config, pkgs, ... }: { + gitlab = { ... }: { virtualisation.memorySize = 768; services.nginx = { diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index d4028efad1d891f442b8cf28377511b67604a401..690e456ed7c86e561312a79dee65038b19410a62 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -58,7 +58,7 @@ in nodes = { server = - { config, pkgs, lib, ... }: + { ... }: { services.gitolite = { enable = true; @@ -68,7 +68,7 @@ in }; client = - { config, pkgs, lib, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; programs.ssh.extraConfig = '' diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 71ae1709d526433eb00544a283b442bf69d67894..1f590f337fd9034e92d1d803cbb70c3bc3f99f80 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 591ed8600685ff286fea8e83ee6fc39900e8d21a..3f51d04163a4f2a89442c668c603ad59b6098fd9 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix index 5cadff0899504397e20244926b8d83264b2b2b14..50470379576b1039c79bbb7b9a36530cd7890fba 100644 --- a/nixos/tests/gocd-agent.nix +++ b/nixos/tests/gocd-agent.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { gocd_agent = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2046; services.gocd-agent = { diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix index b473d4ad61c79f3d39a08d80f24936869dc0425a..80cf04ed64049339968226d60d7e7a1051db8a1d 100644 --- a/nixos/tests/gocd-server.nix +++ b/nixos/tests/gocd-server.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { gocd_server = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2046; services.gocd-server.enable = true; diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index d45776c3ee29333b898ab1fa3c29e178df99900b..9dc765a879bcf99d71745b9f6a61d99c48e1c979 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ lib, ... }: maintainers = [ willibutz ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { services.grafana = { enable = true; addr = "localhost"; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 5a1f50bd29b181181a8283f12ef82b86840ce072..1fe4357191e3ff643be9f4c543622d27bccaa9ad 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,9 +1,9 @@ -import ./make-test.nix ({ pkgs, ...} : +import ./make-test.nix ({ ... } : { name = "graphite"; nodes = { one = - { config, pkgs, ... }: { + { ... }: { virtualisation.memorySize = 1024; time.timeZone = "UTC"; services.graphite = { diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix index 4206c940c1afac97c9b7581728804767b91ea218..e7d72a56e1e7bf3e22928f22e8b7e018e9a2e4d9 100644 --- a/nixos/tests/hadoop/hdfs.nix +++ b/nixos/tests/hadoop/hdfs.nix @@ -1,6 +1,6 @@ -import ../make-test.nix ({pkgs, ...}: { +import ../make-test.nix ({...}: { nodes = { - namenode = {pkgs, config, ...}: { + namenode = {pkgs, ...}: { services.hadoop = { package = pkgs.hadoop_3_1; hdfs.namenode.enabled = true; @@ -18,7 +18,7 @@ import ../make-test.nix ({pkgs, ...}: { 8020 # namenode.rpc-address ]; }; - datanode = {pkgs, config, ...}: { + datanode = {pkgs, ...}: { services.hadoop = { package = pkgs.hadoop_3_1; hdfs.datanode.enabled = true; diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix index e97cc1acc902e65fbb5534df67efbb84b61f60d5..031592301f172f2b10dcad00d62967823de58549 100644 --- a/nixos/tests/hadoop/yarn.nix +++ b/nixos/tests/hadoop/yarn.nix @@ -1,6 +1,6 @@ -import ../make-test.nix ({pkgs, ...}: { +import ../make-test.nix ({...}: { nodes = { - resourcemanager = {pkgs, config, ...}: { + resourcemanager = {pkgs, ...}: { services.hadoop.package = pkgs.hadoop_3_1; services.hadoop.yarn.resourcemanager.enabled = true; services.hadoop.yarnSite = { @@ -11,7 +11,7 @@ import ../make-test.nix ({pkgs, ...}: { 8031 # resourcemanager.resource-tracker.address ]; }; - nodemanager = {pkgs, config, ...}: { + nodemanager = {pkgs, ...}: { services.hadoop.package = pkgs.hadoop_3_1; services.hadoop.yarn.nodemanager.enabled = true; services.hadoop.yarnSite = { diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix index 40548f34690f6b220a0f0f779d7f80cc7d96a477..6277ebb4933fdedfff8595de1048e6a0eb471433 100644 --- a/nixos/tests/haka.nix +++ b/nixos/tests/haka.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { haka = - { config, pkgs, ... }: + { ... }: { services.haka.enable = true; }; diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index ce4094237db232a5462687b182ef84e0508e8a18..22a83e9d1eabf113b5f18bd3205d7a4c1ebc3ef9 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...}: { name = "haproxy"; nodes = { - machine = { config, ...}: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.haproxy = { enable = true; diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 0a0639d62796dbfafe312e24b6d0a69b73c771b3..2700b8e5935a97da99386c3e45ad2700ed240474 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, lib, pkgs, ... }: + { lib, pkgs, ... }: with lib; { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 3ae2bdffed90aa6d9288cef03a0889c4ae6afc19..1f98bb739f210226038906a930ca5dcdb075c6a7 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -16,7 +16,7 @@ import ./make-test.nix (pkgs: { systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k"; }; - probe = { config, lib, pkgs, ...}: { + probe = { pkgs, ...}: { environment.systemPackages = [ pkgs.netcat ]; }; }; diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix index b024306cde56be8bfca4a9a5b1417df647acf850..cb24c4dcffc246a76d0ead143c4b541c95e18483 100644 --- a/nixos/tests/hitch/default.nix +++ b/nixos/tests/hitch/default.nix @@ -4,7 +4,7 @@ import ../make-test.nix ({ pkgs, ... }: meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ jflanglois ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.curl ]; services.hitch = { enable = true; diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix index 12c58a01224322add8698a305eda5cbf8d5c09d0..78343f0e02f0f95a072631c025986779c8995f1b 100644 --- a/nixos/tests/hocker-fetchdocker/machine.nix +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { nixpkgs.config.packageOverrides = pkgs': { hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 797706a062cae38578983be3f0cfbfb2d3150777..0c027eaca619080db974b26636cbb6afe098bcf6 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -12,7 +12,7 @@ in { nodes = { hass = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index 82fd44e8e36fb19f6fe7d048558256f27a6ae0f5..f21c0ad58a85048e996c6d2b601c84daea292868 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : { meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ grahamc ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.hound = { enable = true; config = '' diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 74919444c16d61966ce957eedd896a7dcd975cf4..98d99811f3c011fe3ac7ffb2bbeb71d9870abb84 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -31,7 +31,7 @@ in { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.memorySize = 1024; diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index 4685992d7a0537ad3dd3b27792d720d4a92d2f3e..245c17eedf7e2c385751420a0ed7dca96fdce7b0 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -4,14 +4,14 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { lib, pkgs, ... }: { + machine = { lib, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "alice"; services.xserver.windowManager.default = lib.mkForce "i3"; services.xserver.windowManager.i3.enable = true; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index ee126091667a92c292afc86dd39fbdb4954b787c..440049d9511174bd8412ced0423dc289ea1424a4 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.influxdb.enable = true; }; }; diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix index b1f3d147e86264317b110a3c717d5ee6be3ee43f..b2209f297a4f80b00ce2fd6701398ce554422af6 100644 --- a/nixos/tests/initrd-network-ssh/default.nix +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, lib, ... }: +import ../make-test.nix ({ lib, ... }: { name = "initrd-network-ssh"; @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, lib, ... }: nodes = with lib; rec { server = - { config, pkgs, ... }: + { config, ... }: { boot.kernelParams = [ "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none" @@ -33,7 +33,7 @@ import ../make-test.nix ({ pkgs, lib, ... }: }; client = - { config, pkgs, ... }: + { config, ... }: { environment.etc.knownHosts = { text = concatStrings [ diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix index db9f572d3c2f6b0dbb4a9cd24dba41dea113aa50..ed9b82e2da773df8e53a3939a72aff6bf091063c 100644 --- a/nixos/tests/initrd-network.nix +++ b/nixos/tests/initrd-network.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; boot.initrd.network.enable = true; boot.initrd.network.postCommands = diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 875b6c486582dc7cde3959e8e5a9636402716700..2455b9152bd9e8493aaa8d7bbd51355fe0d0522a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -58,9 +58,6 @@ let ''; - channelContents = [ pkgs.rlwrap ]; - - # The test script boots a NixOS VM, installs NixOS on an empty hard # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create @@ -206,7 +203,7 @@ let # The configuration of the machine used to run "nixos-install". machine = - { config, lib, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/profiles/installation-device.nix diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index c6bc61545245c20d9f7afbf20c37baac0188ffe9..3cff7e99ff88796eb50fe4ad221065c69df89980 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { adder = - { config, pkgs, ... }: + { ... }: { services.ipfs = { enable = true; @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 4001 ]; }; getter = - { config, pkgs, ... }: + { ... }: { services.ipfs = { enable = true; diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 7a98fd85cfda9db8057c49985ffa4425b3e4ab22..97f348a9beebe0b7f0efad935f6a64c7aae8b19b 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -8,17 +8,17 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = - { client = { config, pkgs, ... }: { }; + { client = { ... }: { }; server = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; }; router = - { config, pkgs, ... }: + { ... }: { services.radvd.enable = true; services.radvd.config = '' diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 25629efbfa490aa94e25da767779a5dc491347a7..4f2d2085cd1a99108bfa8b9ad0c55154a54f4496 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { config, pkgs, ... }: + { ... }: { services.jenkins.enable = true; # should have no effect @@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; slave = - { config, pkgs, ... }: + { ... }: { services.jenkinsSlave.enable = true; users.users.jenkins.extraGroups = [ "users" ]; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index e48b25d67df39c23571a364728c586cc54db61d8..c9fd74620efb1329deea892e6aeffc4b6d708239 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -10,7 +10,7 @@ let }; nodes = { - zookeeper1 = { config, ... }: { + zookeeper1 = { ... }: { services.zookeeper = { enable = true; }; @@ -18,7 +18,7 @@ let networking.firewall.allowedTCPPorts = [ 2181 ]; virtualisation.memorySize = 1024; }; - kafka = { config, ... }: { + kafka = { ... }: { services.apache-kafka = { enable = true; extraProperties = '' diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index aa133c9b0aa7ae01062744351e1d52a73ee8cc0d..652fbf055373ee5e111bed4719e0df3cc6edd807 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_copperhead_lts; }; diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix index 1350426654d70ac78f787881cc5339b959427659..f30bd2e2e76052a6b54174339f983d2f7233e8ff 100644 --- a/nixos/tests/kernel-latest.nix +++ b/nixos/tests/kernel-latest.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }; diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix index 2aab4ce0b49e1b348226ae2a3880b78e818f3af4..28717fa6a844810d31531c8fc01b917d3562fe77 100644 --- a/nixos/tests/kernel-lts.nix +++ b/nixos/tests/kernel-lts.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; }; diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 0f5ddef7b1aae16e9cc608e0289ad1141f4d316e..db596189d46d0cca52741faa144c5cf463545c70 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco chaoflow ]; }; - machine = { config, pkgs, ... }: + machine = { ... }: { virtualisation.vlans = [ ]; }; testScript = diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix index 980b3e762dc6c44104a355f9426305bec854643f..7d7926309c95bdded33635cc6a2f990003c297de 100644 --- a/nixos/tests/krb5/deprecated-config.nix +++ b/nixos/tests/krb5/deprecated-config.nix @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: { + { ... }: { krb5 = { enable = true; defaultRealm = "ATHENA.MIT.EDU"; diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index d5328720931e8b9d6a0c94278a93b8e5d7b3a5d9..f01cf6988eef773330136305f1538b2b0f054777 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: { + { pkgs, ... }: { krb5 = { enable = true; kerberos = pkgs.krb5Full; diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix index 520c728b65ee288756f483e9bf3f7f57b1e1e847..85e92f6330c90fdcd8704fdd81995c59e7d87ab8 100644 --- a/nixos/tests/kubernetes/certs.nix +++ b/nixos/tests/kubernetes/certs.nix @@ -1,9 +1,9 @@ { pkgs ? import {}, - internalDomain ? "cloud.yourdomain.net", externalDomain ? "myawesomecluster.cluster.yourdomain.net", serviceClusterIp ? "10.0.0.1", - kubelets + kubelets, + ... }: let runWithCFSSL = name: cmd: diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 8c488d271bcd2934fcb80341397b1c4da6baab4c..30e1acd255a0873997f8d00512b6f54c5a0d7615 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -60,7 +60,7 @@ let config.Entrypoint = "/bin/tail"; }; - extraConfiguration = { config, pkgs, lib, nodes, ... }: { + extraConfiguration = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.bind.host ]; # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}"; services.dnsmasq.enable = true; diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix index b39f4124c958a373d5ece54fed00a20f24baa268..035a819241748cceb2b8eded728b6f844ee91e49 100644 --- a/nixos/tests/ldap.nix +++ b/nixos/tests/ldap.nix @@ -37,7 +37,7 @@ let memberUid: ${ldapUser} ''; mkClient = useDaemon: - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -61,7 +61,7 @@ in nodes = { server = - { config, pkgs, lib, ... }: + { pkgs, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index d2b561fa67b4c132d860b7c71ea177042f586e92..8a9a7408d292950bcadfe26488e955d57fb0b59e 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.lightdm.enable = true; diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index a6a460fb0a7d734a533c9636dcca997f6d243308..3dbb494b6895720a811d587fe0e03029446ccb30 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: }; machine = - { config, pkgs, lib, ... }: + { pkgs, lib, ... }: { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest; }; diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix index 310b751b4d84420f0878059f565bfe85fdc2f476..fcbeeb18a7271f04d6ef0212e13d6347f5f8a5c4 100644 --- a/nixos/tests/mathics.nix +++ b/nixos/tests/mathics.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { ... }: { services.mathics.enable = true; services.mathics.port = 8888; }; diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix index f9ef3647bd1a3b251fcf09c24b12a9ca2480630d..b120599c51dd806e4bc342b2232339824cdaf42a 100644 --- a/nixos/tests/memcached.nix +++ b/nixos/tests/memcached.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { machine = - { config, pkgs, ... }: + { ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.memcached.enable = true; diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 007d7ac216039da8312bcb0f36741d78224af876..3ceb1d8125b2014b50a2c6c5bab07519b83d7147 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { }; nodes = { - master = { config, pkgs, ... }: { + master = { ... }: { networking.firewall.enable = false; services.zookeeper.enable = true; services.mesos.master = { @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { }; }; - slave = { config, pkgs, ... }: { + slave = { ... }: { networking.firewall.enable = false; networking.nat.enable = true; virtualisation.docker.enable = true; diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 07a292a9baa57b275a7c268e8d21c83d71028436..40a599546650ac0edf0bd2bc2680fd6a2c6403ca 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.minio = { enable = true; accessKey = "BKIKJAA5BMMU2RHO6IBB"; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 179c95e764366304428d7d1424b144f015c7f054..b0bc1d083b16d0e6bc026cbdac81d81dcc1c1e00 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { foo = pkgs.writeText "foo" "Hello World"; machine = - { config, lib, pkgs, ... }: + { lib, ... }: with lib; { swapDevices = mkOverride 0 [ { device = "/root/swapfile"; size = 128; } ]; diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 18535f51af9b39e66660f32eff12e75c14878fec..2f380ff543e979f8facc87b120cf5fac90b7cea5 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -13,7 +13,7 @@ in { nodes = { one = - { config, pkgs, ... }: + { ... }: { services = { mongodb.enable = true; diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index 0a5324259ada9c9de8cdf10a5aba3d35156bdd05..eab123bd50f8697a8f0ccfb53f805847a66dd71e 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { mortyProxyWithKey = - { config, pkgs, ... }: + { ... }: { services.morty = { enable = true; key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; @@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes , ... }: + { ... }: '' $mortyProxyWithKey->waitForUnit("default.target"); diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 2950a8d809d6e58d7441db6c8c440b232b6eefe9..ac2b810defe36b06c788ea479e7b6a6654159352 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -47,10 +47,10 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, ... }: { }; + { ... }: { }; serverALSA = - { config, pkgs, ... }: (mkServer { + { ... }: (mkServer { mpd = defaultMpdCfg // { network.listenAddress = "any"; extraConfig = '' @@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ... }: }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; }; serverPulseAudio = - { config, pkgs, ... }: (mkServer { + { ... }: (mkServer { mpd = defaultMpdCfg // { extraConfig = '' audio_output { diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 7959b85a0cf009d68c7cb34fcd2552ef099eb681..8146453bfd55149310230148389993b10675063e 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : let - client = { config, pkgs, ... }: { + client = { pkgs, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.mumble ]; }; @@ -13,7 +13,7 @@ in }; nodes = { - server = { config, pkgs, ... }: { + server = { config, ... }: { services.murmur.enable = true; services.murmur.registerName = "NixOS tests"; networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 40fafc625146a064798ed3ad3d312f53b428b231..eb91d4d630bc8594bd1692c4e4d36d152492ebd9 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { one = - { config, pkgs, ... }: + { config, ... }: { services = { munin-node.enable = true; diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix index 4f11a4b8366908930858919e027f07246d0dd127..e590703ab2f48f5644605244cf3d7e615f78a5ac 100644 --- a/nixos/tests/mutable-users.nix +++ b/nixos/tests/mutable-users.nix @@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, lib, pkgs, ... }: { + machine = { ... }: { users.mutableUsers = false; }; - mutable = { config, lib, pkgs, ... }: { + mutable = { ... }: { users.mutableUsers = true; }; }; diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix index ff3650988836d79a5c9c1adf13e9ad6b2079b601..81482dfef7e5625f624883fab17bf33275cb13a6 100644 --- a/nixos/tests/mysql-backup.nix +++ b/nixos/tests/mysql-backup.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - master = { config, pkgs, ... }: { + master = { pkgs, ... }: { services.mysql = { enable = true; initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index ed09ac10b75d4f8c1b9ad48d8e484a51df256095..84d70cf3524646f5a762b9b9250069095138f886 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -13,7 +13,7 @@ in nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.mysql.enable = true; @@ -27,7 +27,7 @@ in }; slave1 = - { pkgs, config, nodes, ... }: + { pkgs, nodes, ... }: { services.mysql.enable = true; @@ -40,7 +40,7 @@ in }; slave2 = - { pkgs, config, nodes, ... }: + { pkgs, nodes, ... }: { services.mysql.enable = true; diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index c18fee6c7495984ac1f2576cdbeb57a5fa72c083..7251c4a86499fde7e534bbad38f2f083c278f3e2 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.mysql.enable = true; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 7057158a829bbbe290a2de48ef521b63282fef4c..9c280fe8b5b6671049010713df628186240c2ab9 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, nodes = { client = - { config, pkgs, nodes, ... }: + { pkgs, nodes, ... }: lib.mkMerge [ { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; @@ -44,19 +44,19 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ]; router = - { config, pkgs, ... }: lib.mkMerge [ + { ... }: lib.mkMerge [ routerBase { networking.nat.enable = true; } ]; routerDummyNoNat = - { config, pkgs, ... }: lib.mkMerge [ + { ... }: lib.mkMerge [ routerBase { networking.nat.enable = false; } ]; server = - { config, pkgs, ... }: + { ... }: { virtualisation.vlans = [ 2 ]; networking.firewall.enable = false; services.httpd.enable = true; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 58733c1b3379b6b305cd425539e42acfd9905ee0..c56506ba28744acd881697523eda5a048a43c71e 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { netdata = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ curl jq ]; services.netdata.enable = true; diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index 4c572573140443f934f4ea27f6da374546aaad37..ab908c96e5eea233650261cfb3fd48ecd81b19e9 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -19,13 +19,13 @@ in import ./make-test.nix ({ pkgs, ...} : { nodes = { # no proxy machine = - { config, pkgs, ... }: + { ... }: default-config; # proxy default machine2 = - { config, pkgs, ... }: + { ... }: default-config // { networking.proxy.default = "http://user:pass@host:port"; @@ -33,7 +33,7 @@ in import ./make-test.nix ({ pkgs, ...} : { # specific proxy options machine3 = - { config, pkgs, ... }: + { ... }: default-config // { @@ -51,7 +51,7 @@ in import ./make-test.nix ({ pkgs, ...} : { # mix default + proxy options machine4 = - { config, pkgs, ... }: + { ... }: default-config // { networking.proxy = { diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 5cb40af5799e4033de8957eb8d879839a3430fd3..cd5d537a3be74eb7735a284fa1b2caeec21b2593 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -81,7 +81,7 @@ let static = { name = "Static"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -98,7 +98,7 @@ let ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -134,7 +134,7 @@ let dhcpSimple = { name = "SimpleDHCP"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -150,7 +150,7 @@ let }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -189,7 +189,7 @@ let dhcpOneIf = { name = "OneInterfaceDHCP"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -202,7 +202,7 @@ let interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -229,7 +229,7 @@ let ''; }; bond = let - node = address: { config, pkgs, ... }: with pkgs.lib; { + node = address: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -249,7 +249,7 @@ let name = "Bond"; nodes.client1 = node "192.168.1.1"; nodes.client2 = node "192.168.1.2"; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -266,7 +266,7 @@ let ''; }; bridge = let - node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; { + node = { address, vlan }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; @@ -280,7 +280,7 @@ let name = "Bridge"; nodes.client1 = node { address = "192.168.1.2"; vlan = 1; }; nodes.client2 = node { address = "192.168.1.3"; vlan = 2; }; - nodes.router = { config, pkgs, ... }: with pkgs.lib; { + nodes.router = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -293,7 +293,7 @@ let [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -319,7 +319,7 @@ let macvlan = { name = "MACVLAN"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -329,7 +329,7 @@ let interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -356,7 +356,7 @@ let ''; }; sit = let - node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; { + node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -377,7 +377,7 @@ let name = "Sit"; nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; }; nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -398,7 +398,7 @@ let ''; }; vlan = let - node = address: { config, pkgs, ... }: with pkgs.lib; { + node = address: { pkgs, ... }: with pkgs.lib; { #virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -418,7 +418,7 @@ let name = "vlan"; nodes.client1 = node "192.168.1.1"; nodes.client2 = node "192.168.1.2"; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -476,7 +476,7 @@ let }; privacy = { name = "Privacy"; - nodes.router = { config, pkgs, ... }: { + nodes.router = { ... }: { virtualisation.vlans = [ 1 ]; boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { @@ -502,7 +502,7 @@ let ''; }; }; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -514,7 +514,7 @@ let }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix index be8862018777bc229cedf728d28e9bc3f95132a8..bf49d2247bd869fd0e0b438868dbb04029b6ef2c 100644 --- a/nixos/tests/nexus.nix +++ b/nixos/tests/nexus.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit virtualisation.diskSize = 2048; diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 6ed1995f262a2c12e45fea6198acf46c8ea4c379..1992f240e7b00fbde800d48752530ee686c3ea0f 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, version ? 4, ... }: let client = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/data"; device = "server:/data"; @@ -27,7 +27,7 @@ in client2 = client; server = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 7f7bc0f0b4fe1f81d674f57fdcc842fe2b24b4d1..32b113649237a860fa7da4b5fca4cc24cdef23f4 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { webserver = - { config, pkgs, ... }: + { ... }: { services.nginx.enable = true; services.nginx.commonHttpConfig = '' log_format ceeformat '@cee: {"status":"$status",' diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 21b86f6dae279b676df47e26cf4211b23941f5fc..2b56aee0a2e7a3c001aa79ca1a98a86373dbc91c 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ dtzWill ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { services.novacomd.enable = true; }; diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 230b452068472686cc6e4bac76a05dc843b70f53..c66b90b802d53cc04ae94789e35eb9c4d93f22de 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -11,7 +11,7 @@ in { nodes = { server = - { config, pkgs, ... }: + { ... }: { services.openssh.enable = true; @@ -23,7 +23,7 @@ in { }; server_lazy = - { config, pkgs, ... }: + { ... }: { services.openssh = { enable = true; startWhenNeeded = true; }; @@ -35,7 +35,7 @@ in { }; client = - { config, pkgs, ... }: { }; + { ... }: { }; }; diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix index 0dcdea40b0646e4a2f180e485f0c2758a147276f..c968569f2008cc0ebb54e04ea7b24478c22cfca0 100644 --- a/nixos/tests/owncloud.nix +++ b/nixos/tests/owncloud.nix @@ -1,10 +1,10 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: { name = "owncloud"; nodes = { web = - { config, pkgs, ... }: + { ... }: { services.postgresql.enable = true; services.httpd = { diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index eb5966d92139bdbb964ed51851e2433365e306ea..b9d489950e7220b68e0ea0e4e6ed598ff46ce31e 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: +import ./make-test.nix ({ ... }: let oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3"; @@ -12,8 +12,6 @@ let # and picking a the first 4: oathSnakeOilPassword1 = "143349"; oathSnakeOilPassword2 = "801753"; - oathSnakeOilPassword3 = "019933"; - oathSnakeOilPassword4 = "403895"; alicePassword = "foobar"; # Generated via: mkpasswd -m sha-512 and passing in "foobar" @@ -24,7 +22,7 @@ in name = "pam-oath-login"; machine = - { config, pkgs, lib, ... }: + { ... }: { security.pam.oath = { enable = true; diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix index 291d9b278d3b11d7643eaf7cc1545519bab8b157..01a08995950f68528bf37c833d925c0aca365b00 100644 --- a/nixos/tests/partition.nix +++ b/nixos/tests/partition.nix @@ -65,7 +65,7 @@ let in { name = "partitiion"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.pythonPackages.nixpart0 pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2 diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index eb729f22f913e03fd993cb3d7c4c6fbc76ed9bc9..fae37fedaac78f2be2ee9ffbb3c1b11eb382d542 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { peerflix = - { config, pkgs, ... }: + { ... }: { services.peerflix.enable = true; }; diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index d186c42a2a98e2824984e828842a60e1e484f645..a2d81288c812207e102d0be75f2301b40162d25a 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -14,7 +14,7 @@ with pkgs; { }; nodes = { - master = { pkgs, config, ... }: + master = { ... }: { services.postgresql = { enable = true; diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index fdc39393faeafa5bea64f53073aa539139ff0c52..20b3b838aba83cd33c8ae2aee69ac94c4bf1d1b7 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { storage = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' /repos 192.168.1.0/255.255.255.0(rw,no_root_squash) @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; webserver = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; @@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; client = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.plasma5.enable = true; }; diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix index f618a39a22931b044479f1c9a748412984d1d01a..19bde9babad5df8d4ff7aa24264f9fd60077eb33 100644 --- a/nixos/tests/php-pcre.nix +++ b/nixos/tests/php-pcre.nix @@ -1,9 +1,9 @@ let testString = "can-use-subgroups"; in -import ./make-test.nix ({ pkgs, ...}: { +import ./make-test.nix ({ ...}: { name = "php-httpd-pcre-jit-test"; - machine = { config, lib, pkgs, ... }: { + machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { enable = true; @@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...}: { }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' $machine->waitForUnit('httpd.service'); # Ensure php evaluation by matching on the var_dump syntax diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index e479d3f1cb8f0c0a636b25af97fdc70334520c20..eb705536827e7740afb71afb0f8f1e8916df35af 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : maintainers = [ ttuegel ]; }; - machine = { lib, ... }: + machine = { ... }: let sddm_theme = pkgs.stdenv.mkDerivation { name = "breeze-ocr-theme"; diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 9058c59c92deecb67c95e70a4bb4203ecfb8bd4c..609afe7b2145f47c2e04438289ae4defb40568fd 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 7fe905eb4254f7d18c521843a2a45b7ac6dcfaa8..f8b63c5b6a27bf3203e6e981040f20d24e577e10 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.postgresql = let mypg = pkgs.postgresql100; in { diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 2381939552e232e267d7c1ba798a0a6438c7f073..f1f09277f342a5a693fa2f1fa96e4292d2617004 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -22,7 +22,7 @@ let maintainers = [ zagy ]; }; - machine = {pkgs, config, ...}: + machine = {...}: { services.postgresql.package=postgresql-package; services.postgresql.enable = true; diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index 0d5b0f715f52b0e4fc4b4df407c3a9471d2f3062..8addcc784012d0fc75267d20d9b239944fb7c546 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "powerdns"; - nodes.server = { config, pkgs, ... }: { + nodes.server = { ... }: { services.powerdns.enable = true; }; diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 0b431034a7a928ef6c8b23771877979779491ec5..0d73436c1c3f5544816b4e3a8a502c789f2d4acb 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -9,7 +9,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; meta = {}; - machine = { config, lib, ... }: { + machine = { lib, ... }: { networking.usePredictableInterfaceNames = lib.mkForce predictable; networking.useNetworkd = withNetworkd; networking.dhcpcd.enable = !withNetworkd; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 9890088306136e2c00e69936cef6dda1a70fcbb4..d85abf3c105cc566ba97e803ecdb81f5035d221a 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({pkgs, ... }: { nodes = { server = - { config, pkgs, ... }: + { ... }: { services.printing.enable = true; services.printing.listenAddresses = [ "*:631" ]; services.printing.defaultShared = true; @@ -24,7 +24,7 @@ import ./make-test.nix ({pkgs, ... }: { }; client = - { config, pkgs, nodes, ... }: + { ... }: { services.printing.enable = true; }; diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 374fb2d634b4b36d6d118b7f229ebb909971606b..87a6510f40fd8e6c66709fa433328234ff4fa205 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -2,7 +2,7 @@ import ./make-test.nix { name = "prometheus"; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.prometheus = { enable = true; scrapeConfigs = [{ diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix index fcebfaf74e12642b3e2f856d6af76fc9ddf217c1..5d33aaf8d65decccfdb2944f7443e1c1be3aeff0 100644 --- a/nixos/tests/prosody.nix +++ b/nixos/tests/prosody.nix @@ -1,7 +1,7 @@ import ./make-test.nix { name = "prosody"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.prosody = { enable = true; # TODO: use a self-signed certificate diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 3fee1d325384958e52d97a53a1522ba9c7810f32..18195312028229adab63fdc8cc792e80753528fb 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : let backend = - { config, pkgs, ... }: + { pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; @@ -21,7 +21,7 @@ in nodes = { proxy = - { config, pkgs, nodes, ... }: + { nodes, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "bar@example.org"; @@ -57,7 +57,7 @@ in backend1 = backend; backend2 = backend; - client = { config, pkgs, ... }: { }; + client = { ... }: { }; }; testScript = diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index 613180942c41567076113d2bd9c0084a0cc47d37..0ff14a21584a443c0534f59dd9fa491c38f0a224 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -30,14 +30,14 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, nodes, ... }: + { nodes, ... }: { virtualisation.vlans = [ 1 ]; networking.defaultGateway = ifAddr nodes.router1 "eth1"; }; router1 = - { config, pkgs, nodes, ... }: + { ... }: { virtualisation.vlans = [ 1 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; @@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }: }; router2 = - { config, pkgs, nodes, ... }: + { ... }: { virtualisation.vlans = [ 3 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; @@ -61,7 +61,7 @@ import ./make-test.nix ({ pkgs, ... }: }; server = - { config, pkgs, nodes, ... }: + { nodes, ... }: { virtualisation.vlans = [ 3 ]; networking.defaultGateway = ifAddr nodes.router2 "eth1"; @@ -73,7 +73,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes, ... }: + { ... }: '' startAll; diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 22d71595cb488edd6474339a227b3ec86bf375ec..75c82cca63f5f15233ecc3e6e7cdfc36ac849faf 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -29,7 +29,7 @@ rec { #makeCoverageReport = true; client = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; hardware.opengl.driSupport = true; @@ -40,7 +40,7 @@ rec { nodes = { server = - { config, pkgs, ... }: + { pkgs, ... }: { systemd.services."quake3-server" = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 23a7e2ed538f20d17da1e9d477f372318c5e018b..34ab05787867ab0708c11c3721c1a14a928fad5f 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.rabbitmq.enable = true; }; }; diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index e3843038541593a17b36a92a3911bc32cadbc93d..0a9c2d394a7a5db3b7d93a4a89ea3ed20032107b 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -28,7 +28,7 @@ let in - import ./make-test.nix ({ pkgs, lib, ... }@args: { + import ./make-test.nix ({ lib, ... }@args: { name = "radicale"; meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index 18d028232ac24e32bb6025d1c7c030d745bcc6d0..68a9b7315b3501ef6b49c309fb8bf6e742f3c5ce 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -3,7 +3,7 @@ import ./make-test.nix { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.riak.enable = true; diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index a6dfece44a92e0b14bb015070377c54a955871e2..bd90dc3080bd9b8e16c2632395d223fc3ab3f1e9 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -5,7 +5,7 @@ with import ../lib/testing.nix { inherit system; }; let output = runInMachine { drv = pkgs.hello; - machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; + machine = { ... }: { /* services.sshd.enable = true; */ }; }; in pkgs.runCommand "verify-output" { inherit output; } '' if [ ! -e "$output/bin/hello" ]; then diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix index cfe64a75a63523a3dc001b48316237645c0400a9..d0b53db8eeb6180bc966c39087f46d41d18479d2 100644 --- a/nixos/tests/rxe.nix +++ b/nixos/tests/rxe.nix @@ -1,7 +1,7 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test.nix ({ ... } : let - node = { config, pkgs, lib, ... } : { + node = { pkgs, ... } : { networking = { firewall = { allowedUDPPorts = [ 4791 ]; # open RoCE port diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index e446284fc0efdcb093e57f3d594e9cfceb64ee25..2802e00a5b1a2cc5c293c0e206a0d33b78a6cc67 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride { "/public" = { fsType = "cifs"; @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }: }; server = - { config, pkgs, ... }: + { ... }: { services.samba.enable = true; services.samba.shares.public = { path = "/public"; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index ac91a89f6695815a3d529aea9fc5973da5a77946..7b9fdc0b3441555515f3e8849d617fd13d08cac2 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -9,7 +9,7 @@ let default = { name = "sddm"; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; @@ -39,7 +39,7 @@ let maintainers = [ ttuegel ]; }; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm = { @@ -54,7 +54,7 @@ let services.xserver.desktopManager.default = "none"; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 04d624adcfe978394151145c0880f0dfe6c6d17b..84c5621d962fbf5b1e9829049565bb01e8a38d6d 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; }; diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix index 5c76c58cf3f32335d12cf752cd972fed692af508..42c87dfa039d240b10bb68fccc5374573ab35075 100644 --- a/nixos/tests/slim.nix +++ b/nixos/tests/slim.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { pkgs, lib, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.windowManager.default = "icewm"; diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index ec67ea092874b4303bf0ccc4a8665cd6b9ca18d6..60f44c3c8459c3b8f4f309f36d1fd6874a3984db 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: let mungekey = "mungeverryweakkeybuteasytointegratoinatest"; slurmconfig = { controlMachine = "control"; @@ -14,7 +14,7 @@ in { nodes = let computeNode = - { config, pkgs, ...}: + { ...}: { # TODO slrumd port and slurmctld port should be configurations and # automatically allowed by the firewall. @@ -26,7 +26,7 @@ in { in { control = - { config, pkgs, ...}: + { ...}: { networking.firewall.enable = false; services.slurm = { @@ -35,7 +35,7 @@ in { }; submit = - { config, pkgs, ...}: + { ...}: { networking.firewall.enable = false; services.slurm = { diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 4c77e4b786130ca536e225e94516ac76ed172fb6..07d22805112787f0cd2275db0520b2da1db3d51a 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { sm = - { pkgs, config, ... }: + { ... }: { services.smokeping = { enable = true; diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix index 021743021b404c37b21c78ca561bfbb5a8246e14..8bbebd4230032137fdf1f408702d0eee2affbc6c 100644 --- a/nixos/tests/strongswan-swanctl.nix +++ b/nixos/tests/strongswan-swanctl.nix @@ -34,7 +34,7 @@ in { meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ]; nodes = { - alice = { nodes, ... } : { + alice = { ... } : { virtualisation.vlans = [ 0 ]; networking = { dhcpcd.enable = false; @@ -42,7 +42,7 @@ in { }; }; - moon = {pkgs, config, nodes, ...} : + moon = { config, ...} : let strongswan = config.services.strongswan-swanctl.package; in { virtualisation.vlans = [ 0 1 ]; @@ -94,7 +94,7 @@ in { }; }; - carol = {pkgs, config, nodes, ...} : + carol = { config, ...} : let strongswan = config.services.strongswan-swanctl.package; in { virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index a8e33a6f7e59c7ec724144c7dd38d576a1b26d4e..6175155cdfc9cc502cd967960d0a1a4ed7cd0807 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -39,7 +39,7 @@ in nodes = { webserver = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; @@ -55,7 +55,7 @@ in }; client = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.subversion ]; diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 5d6c8691230aa7dc795acda8cbd13e5ab7ede68d..fc16b99cc19ca08c0e8612b7323daaac6c6239d6 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -11,7 +11,7 @@ in }; machine = - { config, lib, pkgs, ... }: + { lib, ... }: with lib; { users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 46f2563af8d996cbb1814cc1fc9f690a88c1dc84..32010838e67b40df294ece86104944012d17591b 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, lib, pkgs, ... }: { + machine = { ... }: { users.mutableUsers = false; }; - other = { config, lib, pkgs, ... }: { + other = { ... }: { users.mutableUsers = true; }; }; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 475c947e72d98d16e030fdaec2ca96685d843db5..af63c7ee8e029904094875b25a978beb60640e37 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { pkgs, config, ... }: + { ... }: { services.tomcat.enable = true; services.httpd.enable = true; diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index 24d46a03897e5c51cb49dac7b70813bc83847db1..0cb44ddff248591af99e32591912b73cf3355f6d 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -5,14 +5,14 @@ rec { meta.maintainers = with maintainers; [ joachifm ]; common = - { config, ... }: + { ... }: { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; networking.firewall.enable = false; networking.useDHCP = false; }; nodes.client = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ common ]; environment.systemPackages = with pkgs; [ netcat ]; services.tor.enable = true; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 5da5717d7f865673e0a545e76c1530b789c946f7..4599885acde69a21a8872e880463f06ebeec35a6 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { storage = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' /repos 192.168.1.0/255.255.255.0(rw,no_root_squash) @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; postgresql = - { config, pkgs, ... }: + { pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql; services.postgresql.enableTCPIP = true; @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; webserver = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; @@ -43,7 +43,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; client = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.plasma5.enable = true; }; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix index 34c49bd7f15b8ade06dc529884e35966e067b955..f1c238730ebb81aa8041d6ac7369c7136c77588e 100644 --- a/nixos/tests/transmission.nix +++ b/nixos/tests/transmission.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ coconnor ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; networking.firewall.allowedTCPPorts = [ 9091 ]; diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 70a999267a54c237ee80e1327df1b34c9790c139..8bbbe286efcf8f5548044e5f4d6761cb23aeee01 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -16,7 +16,7 @@ in }; machine = - { config, pkgs, ... }: + { ... }: { services.udisks2.enable = true; imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index 515d5c8bac251382069bf4b632de75ccb74c79da..caf0cbb2abfe0bc3faaac8a5e7c94f0c4d299436 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... }: meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ lnl7 ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.vault ]; environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; services.vault.enable = true; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index c51306a8c7a04d4921a9bbd8455b94e4fbb8240b..2c0bbbfd71613e04cf33916dc99a45a0745f1cc8 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { web = - { config, pkgs, ... }: + { pkgs, ... }: { services.mysql = { enable = true; @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes, ... }: + { ... }: '' startAll; diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix index d954b07f73d6fc9c4d76a6dce15b82249d32bec9..79ebb83c49a59860d11e17d69f55bc09684c9481 100644 --- a/nixos/tests/xdg-desktop-portal.nix +++ b/nixos/tests/xdg-desktop-portal.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: maintainers = pkgs.xdg-desktop-portal.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; }; diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index c8b18f1226580a24ae54130f58748536354129e0..47717e8cf7d917bcf044e20250ef2bb3bc315427 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 3ea455c393c40ae400d36ec91751d3c075f40498..61fa7c1a67d34c6c8d9fe1d6474e13cc6b956b28 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix index c997e36cc442c822e1c4b8f97fbdf5f72d83b9f0..0106aefe8318d50d783f27ff873f3185d3b2c5bd 100644 --- a/nixos/tests/xrdp.nix +++ b/nixos/tests/xrdp.nix @@ -5,14 +5,14 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { lib, pkgs, ... }: { + server = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; services.xrdp.enable = true; services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm"; networking.firewall.allowedTCPPorts = [ 3389 ]; }; - client = { lib, pkgs, ... }: { + client = { pkgs, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "alice"; environment.systemPackages = [ pkgs.freerdp ]; @@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $client->waitForX; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index a6908024de9bbaff2a8e446c89e812b6fa2fb760..1434038e90c197083de69d8592fe18f1f21a1ca2 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -17,7 +17,7 @@ let maintainers = [ adisbladis ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix index d247654adadeff7c6bb968fe2da3c526bd4cdaa1..f343ebd39e4423ef6e6319574fe0a395d7b04ba7 100644 --- a/nixos/tests/zookeeper.nix +++ b/nixos/tests/zookeeper.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { pkgs, config, ... }: { + server = { ... }: { services.zookeeper = { enable = true; }; diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 73cdd3664ea579b649645cfb7f2e30aa901ac4a8..d7e4ee233a86220eea35c92f7445abbb897559e1 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake, - autogen, git, sqlite, gmp, zlib, fetchFromGitHub }: +{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake, + autogen, sqlite, gmp, zlib, fetchFromGitHub }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 385e9e53522d22541ef00b34e9627fee606fbf9f..9f1763087de2c331e3f862e42beece447012fc63 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -88,5 +88,5 @@ rec { parity = callPackage ./parity { }; parity-ui = callPackage ./parity-ui { }; - particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; }; + particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; } diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix index dff7bc0b0dc415f7ea529c19511a3d5b20a1ff91..8405ea8f842b97f4ea6031bacfab539278d6c01e 100644 --- a/pkgs/applications/altcoins/dero.nix +++ b/pkgs/applications/altcoins/dero.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost -, libunwind, lmdb, miniupnpc, readline }: +, lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { name = "dero-${version}"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 33c2e598fca920413a466a5e4c7f2eeb06cc09a3..0452f40133458df36a9c35756c17bf72b9cf2164 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc -, glib, protobuf, utillinux, qt4, qrencode +, protobuf, utillinux, qt4, qrencode , withGui }: with stdenv.lib; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix index 0659c4fa258505901c3a32c140d71cf44c6efec4..35fd4bc718c8962b65985ce7347a82716ffeb779 100644 --- a/pkgs/applications/altcoins/ethsign/default.nix +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "ethsign-${version}"; diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index b753e2d48c977c2844bedff219acb070ecb3de41..1e9192bc6e4006bb012b15acd4c15ebbf2237129 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: +{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }: stdenv.mkDerivation rec { version = "0.8.6-2"; diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index 679312d9a8e9b01bf2a6b5e2a2101f7bb2ce9058..7461e4c376ab672939f27e5443ff9439f76e913c 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-ethereum-classic-${version}"; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 79c8e0dfde8ac4bbef70e8637ebb65d847777afb..73aa4452c0f0bfd98cc103a380fc692810920b64 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: buildGoPackage rec { name = "go-ethereum-${version}"; diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 1aa598f32545d81611943dc348e25398e47fd972..e7f47d0f220050973f487d60e9a579dedf38ae00 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -5,12 +5,12 @@ , lens-aeson, memory, monad-par, mtl, optparse-generic, process , QuickCheck, quickcheck-text, readline, rosezipper, scientific , stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text -, text-format, time, unordered-containers, vector, vty +, text-format, unordered-containers, vector, vty , restless-git , fetchFromGitHub, lib, makeWrapper -, ncurses, zlib, bzip2, solc, coreutils +, zlib, bzip2, solc, coreutils , bash }: diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index c38e613fdd4abc020a8cf44abb6d016600253f69..f809b30189f473621031c38c59a452685115f1f9 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: +{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: let version = "0.10.0"; @@ -26,7 +26,7 @@ let }; mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { - inherit name version; + inherit name version meta; src = { i686-linux = fetchurl { @@ -56,7 +56,7 @@ let }); in buildFHSUserEnv { - inherit name; + inherit name meta; targetPkgs = pkgs: with pkgs; [ mist diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index f734958116953632cc5e0255f2f9fb528cc09193..9af37ff0bca673de38c0b34945a7f75ce894950f 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode , withGui }: with stdenv.lib; diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index a14a40e9cc7590d6442785fc05b7b6c333392b81..76ee914bd3d7834a2427a72af8a79b71c5d97aff 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -1,4 +1,4 @@ -{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: +{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: stdenv.mkDerivation rec { diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix index b22302d0d39af0abae973324cc474177e3eba779..8566e6037d6f286dc45c0e923c36859fca7a5c4e 100644 --- a/pkgs/applications/altcoins/parity-ui/default.nix +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }: +{ stdenv, pkgs, fetchurl, makeWrapper, nodePackages }: let diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index 4068d4fb93004db4280eeaa2192d12eaf0d9388f..3f9b0939b62a8b5cc9bdcfc5b0572a2f3406d3f5 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: let packages = [ diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 5be2bec6c72495c862f1a75c900c2be2a0e4d162..331e169cf3f352e4e3b030786bc9b5b5957c5798 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -4,14 +4,11 @@ , db48 , fetchurl , libevent -, libtool , miniupnpc , openssl , pkgconfig -, utillinux , zeromq , zlib -, withGui , unixtools }: diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 4a4665291d6e8864cda85478177b9ddb11165fca..4c3f9fe0760bb1f4688495368940300e014caffd 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git , bison, flex, postgresql }: let diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index e672e6f3bae18e715add7691307b208d7675324a..04ee72edc36e13dd25d3372373451de0d05413ef 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 -, lame, flac, eject, mkcue, glyr +{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 +, lame, flac, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index c37963c77f3eff5030b608fd7d363d79b68979eb..737e73421c9bd490be998cef7d144210e03d561d 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,5 @@ { stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper -, overrideCC, qt5, requireFile, unzip, wine +, qt5, requireFile, unzip, wine }: let diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b0c47972e3856c40177a70f57c9a8b7104f15adc..1989fd1400d43f60f89fcc3f66e4dc0f72856fb6 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, +{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, + libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ autoconf, automake, libtool }: diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index a3ac2b097e95c00188b5178dab344075c8f74ec8..2479360b88e942fec0c7d3a2eb566d229cd32c1d 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base +{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 6379975e951c40449576026160b8a066702c8892..611828753e46646fe2703c398dedf83039a578cc 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf -, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: +, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: let - withSpotify = config.clementine.spotify or false; withIpod = config.clementine.ipod or false; withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; @@ -12,8 +11,6 @@ let version = "1.3.1"; - exeName = "clementine"; - src = fetchurl { url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz; sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 4dced0cfafae57250cc7ab1d74ca342225df1ee3..e2fcc3c4626a5ab604abc80331506548c3b2bdfe 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson +{ stdenv, fetchurl, intltool, pkgconfig, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix index 5b14302204e7f7d77371352b2162b7376d161432..cd45ef5926b07621cb0ca94c4162e94cea153889 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/applications/audio/deadbeef/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }: +{ symlinkJoin, deadbeef, makeWrapper, plugins }: symlinkJoin { name = "deadbeef-with-plugins-${deadbeef.version}"; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 5c9211e7f3bbbe8fd768f9051aed20c5319ae629..3aa8aa371e65aac6c19fe31bd6f44f4330f6c414 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: +, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { name = "distrho-ports-unstable-2018-01-01"; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 961ef713569712775f309249a2ed7d8495199dce..cfb37e5761a770cb58383550184f5da1f8633ee5 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , makeWrapper , pkgconfig -, clang , llvm , emscripten , openssl diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index f1bdcd8c5242528e9ddfb51c3aef772ff91888c7..a61f7dc0a9051942af1dc3f7c04749bdaf8d4d45 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake +{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index d111502651ed2a14abaa1e56ed9de798213c7826..ed34c3118c68ddf0dc2823685be7d1216825ac99 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, pkgconfig -, gcc , python3 , gsettings-desktop-schemas , desktop-file-utils diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index e0e620bd05f941b9bb6f348b77b5f2d552d645d0..6546fd7866ea96ee82f21d0e88dbc71ffb1be193 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, - libvorbis, hicolor-icon-theme, gdk_pixbuf }: + gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag, + libvorbis, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index cacbf428caa099a095d23443911763516962ba99..2410106cff035f4948aa70e5cffd3ac2c2659aef 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 2cb90081c68beee4743482863405b0ea34a3d3aa..e22bca29bc974b847f8ffcbf6f98fc34a4fe2c36 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "lastfmsubmitd"; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index d7cc88905c535df5422431ed69a9b1456d28ff0b..740763889ffd2dce2aea967734dae3bddc1f5690 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { name = "VoiceOfFaust-${version}"; version = "1.1.4"; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index f077afec8b209548c627ce377c89a9adf2f1578f..343ec8679feb2f08439c2b89fe0610784e677652 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }: +{ stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { name = "mikmod-3.2.8"; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index d55e711cf330259ac0d7d499bb5e375042231b50..b657f69e26eec318844b9d04eab8251dbf878591 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 8e591487111b9b81a226ab30a0e81f9650dcddc0..e21815574d1e28c8cbea7bd4f63b65ce60f9defa 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }: +{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, libav, curl }: stdenv.mkDerivation rec { name = "pianobar-2016.06.02"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 26f35f258651aba871b90c1fe4757a5d6bf036d4..d7e6173da9ad169fb47a1496f37651ac6f22e3eb 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python2Packages, fetchurl, gettext, chromaprint }: +{ stdenv, python2Packages, fetchurl, gettext }: let pythonPackages = python2Packages; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index e96b6f1909a5339878c8c489a9d44dac92423594..915d7fcbd98b80bba3c2e358c5f39defbc559bfc 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: +{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: python2Packages.buildPythonApplication rec { pname = "puddletag"; diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix index 9c0a48db51cc0b43478aa9ddde49dfa88fb4da8f..80968e2700b497a854dc82ca789a81f8e6d16497 100644 --- a/pkgs/applications/audio/puredata/wrapper.nix +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }: +{ symlinkJoin, puredata, makeWrapper, plugins }: let puredataFlags = map (x: "-path ${x}/") plugins; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 28a69d5a3b76d51d4971e4716b3174c6d52e69dd..0ff23102e75528e916e2388762a3c96e769081a5 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, +{ stdenv, fetchFromGitHub, automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index a3d418cd4fe43d9774ffc657240419b886b0dda0..0affe5dc89d4e7fef9859d056da75dc56df6dabe 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook +{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook , python3Packages, gnome3, gtk3, gobjectIntrospection}: let - inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2; + inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; in buildPythonApplication rec { pname = "sonata"; version = "1.7b1"; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 2e335e6b10e94a97a1c8fba43fe618d31c9c60c1..134e5bfb42a0aedb565a4f029a6fdde380b0bd00 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, pkgconfig, mpd_clientlib, openssl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: stdenv.mkDerivation rec { name = "ympd-${version}"; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index e840c6eeda0a0bf110bdb18e734455fd450953de..2c76891b3f9edff7ec561beac002563baf14cade 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: +{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }: stdenv.mkDerivation rec { version = "4.8.3"; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 6ba053499f90afdece6d3adb1a585d88d627bffc..8d3d9c9bfcfd4a0cbe7749a2c2e92d725fecaf5d 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils +, intltool, libxklavier, libgcrypt, audit, coreutils , qt4 ? null , withQt5 ? false, qtbase }: diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 27b23bb571fc20778d2b61915af903769ac261b2..5e583049190c2fae96dbbffd037f1b2543143e39 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir +{ mkDerivation, lib, fetchFromGitHub +, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b7a23b589db1be8606a906db805e7a5d449b3e7c..bd0c412efa536db2cfaa20e7360578f923cd85b3 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }: +{ stdenv, callPackage, makeFontsConf, gnome2 }: let mkStudio = opts: callPackage (import ./common.nix opts) { diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8139640457e3666c11b1e16062ddcb7f4b7c3d3d..4078efa6783bb3d441623a8a643a18e695d1acea 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: let common = pname: {version, sha256}: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index f93d4042a62268b865abfb55bac1a4fe2017f36c..da78c39324a5e8c2aeadcd8b1948b42c96a04298 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,5 +1,5 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 23cb16c0733ffad0d747248226eac9521338b37a..1065564f7b4c3bbb691599577ddc2bfc111580aa 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: +{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf +, cups, libgcrypt_1_5, systemd, dbus }: with stdenv.lib; let diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index 03c3c5d5eec6c7d9c81a5e93034d1fe4c71f9386..33d80a577dbef6ae29e9122fbf4ec67a1acd9c45 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, coreutils, ncurses, lua }: +{ fetchurl, stdenv, coreutils, ncurses, lua }: stdenv.mkDerivation rec { name = "dit-${version}"; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a2d246809c9d4eb61acc0a789051056886674f3f..c719c7b2da1aa430c39c654be96c0eff0475845c 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, freetype, fontconfig, libX11, libXext, libXrender, zlib +{ stdenv, fetchurl, makeDesktopItem, makeWrapper +, freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, libXtst, jdk, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser -, buildEnv, writeText, runCommand +, buildEnv, runCommand , callPackage }: 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 index 9585f3278211d1f9a260e4bf6f571965f53a6e83..66ac9a3d77e688a6d011725f34819b7e1537d8e8 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvmPackages, clang }: +{ clangStdenv, fetchgit, llvmPackages }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix index f09a71ec9df09cda98e98d556b94373b17782a81..ad22faf3dff72de577007254317d9c80d98501db 100644 --- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, melpaBuild }: melpaBuild { pname = "filesets-plus"; diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix index 5362451e06bf7db3b92005663b654b37326dc5db..b4ee54f3bd31d212200bca5e6ab90e78b4aa8bc6 100644 --- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix index 7da40425185bc440aa9a39f3a846b26e8442d7e8..171d8c6b16aec1c2529a381cbf396436b6e863b4 100644 --- a/pkgs/applications/editors/emacs-modes/header2/default.nix +++ b/pkgs/applications/editors/emacs-modes/header2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix index 3144eea702df62120209d148731dbcaa70d8db58..8b9ebcd60262765454c0c831d4390e60f52b3979 100644 --- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix +++ b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexrgb"; diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix index 8e5d5ee1929ffde88cf4ae32ea93d49a1b4375c3..84dae10127e9ea9f287d1c294df0e7bdfcb50d0a 100644 --- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix +++ b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index bf0d503689729629b296f3ff3e271c62504a80e0..c0febd803cc0292bc7cf6284e25857d56f718877 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -13,7 +13,7 @@ To update the list of packages from MELPA, */ -{ lib, external }: +{ external }: self: diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 7ed6355f9815a344228f75a706870426506b20b9..9f8d408dd5a2dabd1c7289e4fefb38618bbce653 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs, ocaml }: +{ stdenv, emacs, ocaml }: # this package installs the emacs-mode which # resides in the ocaml compiler sources. diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index b8543841a7ff32b9b7a583dfea05ed6050d652b6..46b90a52a0913ec3c08e2624f2b3524a36386749 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -11,7 +11,7 @@ To update the list of packages from ELPA, */ -{ fetchurl, lib, stdenv, texinfo }: +{ }: self: @@ -23,12 +23,6 @@ self: super = imported; - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; - overrides = { }; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 1189fd1d6d15020c4070ee3f368cddcebdc9f94a..99ecddcb26481972076032c2f60d9e5e80bb3c6d 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, texinfo, which, texlive }: +{ fetchurl, stdenv, emacs, texinfo, texlive }: stdenv.mkDerivation rec { name = "org-8.3.3"; diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix index d68feaec2939da6e0d1b1d53526e2ca63ff3aaa8..820919b5321f9ae548cf1b4b36a830fbe2bfb8be 100644 --- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index b659e060e3b4aade7c6cf43f6492eb8cde080a35..ee21bbbd9bd9a94b6d1fc12438f1d21ebbb90ee3 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 67afdb24cd4729d62de789fd0f1165428b76825c..01eaac7be5d1bbf6465dfe99933b20e144ecbaeb 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 7715de153981d9ad241fa0fec77e8f6151ebcc3d..04de4f564c3382e2f784c234863d1c4bb96aa263 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip, libsecret +{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip +, coreutils, gnugrep, which, git, unzip, libsecret }: -{ name, product, version, src, wmClass, jdk, meta } @ attrs: +{ name, product, version, src, wmClass, jdk, meta }: with stdenv.lib; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 060d1de5e045e144717a22343591f085045ed115..2d7ea931dd2a8643f65ebbed21e30470a046cf4a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf -, coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses +{ lib, stdenv, callPackage, fetchurl +, python +, jdk, cmake, libxml2, zlib, python3, ncurses }: with stdenv.lib; @@ -10,7 +10,7 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass, update-channel }: + buildClion = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; @@ -66,7 +66,7 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass, update-channel }: + buildDataGrip = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; @@ -83,7 +83,7 @@ let }; }); - buildGoland = { name, version, src, license, description, wmClass, update-channel }: + buildGoland = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; @@ -108,7 +108,7 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, update-channel }: + buildIdea = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; @@ -125,7 +125,7 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }: + buildPhpStorm = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; @@ -142,7 +142,7 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass, update-channel }: + buildPycharm = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; @@ -169,7 +169,7 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildRider = { name, version, src, license, description, wmClass, update-channel }: + buildRider = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "Rider"; @@ -195,7 +195,7 @@ let ''; }); - buildRubyMine = { name, version, src, license, description, wmClass, update-channel }: + buildRubyMine = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "RubyMine"; @@ -208,7 +208,7 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: + buildWebStorm = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 6f5f416f4f5f40d7601433038c3f52553e9e405c..08918beb8d5921cf3c26edd5bf9797fae56f50e3 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, +{ stdenv, fetchgit, gnome3, at-spi2-core, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 8ef1e549906ef0cd08f364ac8c870c66ec6187eb..83598bd7eb172a13b36037c5f6e5336032b11f11 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: with stdenv.lib; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index b03abc2146aaab2c8bc36637e12d1bd0d4c2f1aa..4e22e032e357ffe8e2bd65e6e1dadeecae8cd85c 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined , openssl, xorg, zlib diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 66112b3498dd560714e44291a9b01e1808d7e4e0..69e102f207750f03ecf421543e34fa97a3807404 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchNuGet +{ stdenv, fetchurl , autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index fb0ce43a60e6e75ef078d7dbd03f813a30e99e41..96a9cea09c762be82eac3a7b05caee9ebe7753ba 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, fetchFromGitHub +{ stdenv, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index f47688b8280201a61fc99193110b1be6964bf775..af454d357e95ed96405a14164ac32bb2238c31ce 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv -, libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, vimUtils, xsel, gperf, callPackage +, libuv, luaPackages, ncurses, pkgconfig +, unibilium, xsel, gperf , libvterm-neovim , withJemalloc ? true, jemalloc }: diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index f1ec03cb42ee7fbb4904032d79040f3fdf4290d3..fa0603255599418cfd5ec3bba1147ff428cbf5f7 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper +{ stdenv, lib, makeWrapper , vimUtils , bundlerEnv, ruby , pythonPackages @@ -10,8 +10,7 @@ neovim: let wrapper = { - name ? "neovim" - , withPython ? true, extraPythonPackages ? [] + withPython ? true, extraPythonPackages ? [] , withPython3 ? true, extraPython3Packages ? [] , withRuby ? true , withPyGUI ? false diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index e806e63cdbf626e3c98d0dd94c1749d2ee25054f..567f47520352799555ee8ceb544613dca076bb2e 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, tk, python2Packages }: +{ pkgs, fetchurl, python2Packages }: let pythonPackages = python2Packages; diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index e319ccf39b1b1639c1627ef5168b71ff61795fb5..dfb2e49e0c8d02ccbc18514bd8225c4bd5de1bb0 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeWrapper, +{ stdenv, callPackage, fetchurl, guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, tex ? null, aspell ? null, diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 4f1a29278be927f334ffcb946adcbbf301d25f20..818183b9852b979bce79070a4deac2ff494f3da9 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -56,7 +56,6 @@ let gtdialog_zip = "gtdialog_1.3.zip"; cdk_tgz = "cdk-5.0-20150928.tgz"; termkey_tgz = "libtermkey-0.17.tar.gz"; - bombay_zip = "bombay.zip"; scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b23db38e0f45930c28eb411ae43c059e2d481193..5f9fa850fe66b57e37c6c4bc619c44921420a291 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake -, python, qtbase, qttools, zlib }: +, python, qtbase, qttools }: stdenv.mkDerivation rec { name = "tiled-${version}"; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index b6c03a57b561cdc6b886ec2816fcb955141eb62c..c97b17bd9af1f1ac217543f300ef216c36b671e0 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ncurses, gettext -, pkgconfig, cscope, python, ruby, tcl, perl, luajit +, pkgconfig, python, ruby, tcl, perl, luajit , darwin }: diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index d79a50855f3908b35f32230d107340ca9bbb6dcd..3e815642c178abf4bb94af090ba8c12bb70845c8 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, +{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem, gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.25.0"; + version = "1.25.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1dgn9swqax54pn5ykk97zdkkzyj46jambmnkb67cn44p29bw9s9m"; - "x86_64-linux" = "0w2lzif7iilibvwhvg13gxarwz41qsb72s8hvj87mk5iqfdms1px"; - "x86_64-darwin" = "08xhwvggflzh9lfc5s3jgrqb49yz4jdfii8sfq6v8w3c6yy8cdly"; + "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg"; + "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq"; + "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 9b0d69ae65aacc11786558565fe02d8afc031da6..5535d9ab11282e835395c0f0c99c1a5bca543801 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript +{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript , vscodeExtensions ? [] }: /* diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 5597bf0d0b3cb1e73048352d1c3433d29ed7bfd3..c345e8a95d55b6a1e8976877cf13eeea6f52d6d1 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }: +{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 02e874739efe09ca9d578e7fce4a5f2065dbe5c4..c2ead5a19141e7e8d114832b8671d0f651e30e12 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl, darwin, pkgconfig , withGrass ? true, grass, IOKit, ApplicationServices diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 63cf950f02a4e91d283a869177bdb73b8fff4868..86aafa9697df825b3bbfd9be30b6a4adda934093 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b767f11da00b7ddab68a1bb651cb6d22908b8b7c..94a4aeaa9337e7b6a419b5e19c6d0df65093bb33 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -2,7 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 5fb7e0078065d9d8937799e3258052952ca5d714..5326458038087b3101d0afcb9934c10c99f38e6e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, +{ stdenv, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper, useUnrar ? false, unrar diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fbf6443b91f852206f47afd349a6e99e1c8a6af6..521f957ec1e9c72e53b289f28dc31fdc79777580 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, makeDesktopItem, fetchurl, unzip +{ stdenv, makeDesktopItem, fetchurl, unzip , gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 , xorg, mozjpeg }: stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1qvyc08i3b4rr43ssz78xndm4bx8lz2vigh6w9gd7w367xjf4f5b"; + sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f7a813f360612979f9a5deb00ccadde382b05ab4..df742645e86b1d241476bf3cbcd8b573b8514a89 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: +{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: let diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5c6a4bab93066ceff03ef6cf0a9280df9fbb77ae..a31bbe8caeb6f780691a5e63164b8b213cd0eac8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -35,7 +35,6 @@ , libusb1 , marble , libGLU_combined -, mysql , opencv3 , pcre , threadweaver diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 7667b674fcec60d459f2bd97856478309c2c2001..69d09cd429c1278ffad46e5a583bd9c9ac2da5b9 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 02528a43e31b6216ff9e7037978c80e4ad4c805d..ef694dec6527fad6b703af72b4b7cf8dcb30b0be 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake , libjpeg, libexif }: diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index 355acf7681a09c302c215b31dbbe6321f0d2d3c1..b1437508a5094814f73d337abb15fa5495c64936 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}: +{stdenv, fetchFromGitHub, qtbase, mesa_glu}: stdenv.mkDerivation rec { name = "fstl-${version}"; version = "0.9.3"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 2d4fa882dd61b55a704a9fe38b91ae9564075228..b4715902df1f17b97cc6d579a916c2f84c150b33 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig, which +, intltool, itstool, makeWrapper, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 3d49452cbe62dd29e5488ba5961122b3a9510cbb..99230eb23e32d6fe876c8ec1c632083d23313fdd 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 2c322128c38695d6cec44b07d0be4bdcfdc75d67..ee58e9831e9af57086c9a04e5043ecbf731b2922 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript +{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 639f1928f8a4b113be955c2867b237758c760d7f..a82f13ee409ab1d40aa6361574591bc7b8b19cb3 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 996d495d87c1a3f8f9b7c06fb0f10649b3608284..3555c2b477ffccc3ed4641d542aaa93da67cff56 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc +{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 8f043816ba06d6087ae93ab34a230a3a96702aa1..0d898df14b3f9ee5d9246ca289661f3009681f08 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook -, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons +, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz }: diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 1fd19162a4f7612142db0ac2f829de1235c92071..836a78ce058bd08762675a398db3f98c1c1a3413 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq"; + sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 1103c9ff40a95a3d7a92323dfb74a8be6b785320..05d047f7227505c3a71fa57e0114eded0e0f0f55 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , cmake -, makeWrapper , pkgconfig , wrapGAppsHook , gsettings-desktop-schemas @@ -18,12 +17,12 @@ }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv"; + sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh"; }; name = "nomacs-${version}"; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9ab5288700cce31ba73ac8b9b2fc2a86ea161492..44855d5c8b49c0c4f06e9f054bac229b6141704d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +{ stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index e5385c7528040cb379ec60adabbf5e0affcbc02b..1d9956245a63e3fc8c50c820ef05cbe9b5bc4ce6 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.4.1"; + version = "5.5.2"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; + sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; fetchSubmodules = true; }; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { "-DPARAVIEW_ENABLE_PYTHON=ON" "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + "-DOpenGL_GL_PREFERENCE=GLVND" ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by # default. preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 803257d9392915381945a10a0775605f93f06249..6916ef4ad7aad59cec345a4fbc53e83813219a1a 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 2ca1fead84c8988fa5599671f7e268cf40ebdc4f..0f47c82f0325324c5871c31b5b570750fe4838e9 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 29e53683d1c24cbbcc7253c03414476b07198eee..d55441e39fa55fad5aa14127987d49d77dca251e 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, fetchFromGitHub , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index cffe485711f639640e925d83bdf37accd9b87cb1..292ae9c8faa875de4929bec6e859f0148c11d570 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }: +{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 3bc814e1e758d88428b06f93d9921d7f54380cae..1f41253b69946427d71e2b35ee6773e7ddae8511 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg , hicolor-icon-theme }: diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 930a7e686f8f1c5164029cb36fae565573494c9f..63d35cc545316f2c91677c77403aa3cf641497c0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig , imagemagick, intltool, autoreconfHook, which, defaultIconTheme }: diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index a1c39fadb59d787e1e51739a9b32778f3a2d905c..231a9799b59f832cfe7a50c79c839424d80c4c75 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, qtbase, qtsvg, makeWrapper, fetchurl, makeDesktopItem }: +{ stdenv, lib, qtbase, qtsvg, fetchurl, makeDesktopItem }: stdenv.mkDerivation rec { name = "write_stylus-${version}"; version = "209"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a8b4038b11f3cdf7cabd78ca4dd4b851bea3c376..aa2435c43de686e2ff1e6e64cbb8d7554fa4da14 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: +{ stdenv, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { name = "yEd-${version}"; diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 3f3c2a32e68edb165923bfe24684449dc9033c2e..de9be76b6e45ca8f5926d83fd598fa1110425abe 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }: +{ fetchhg, stdenv, xorg, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index fb631414838cd36005c2e72df63b48131825e4a1..598857f2e70d3d46e7f772cc3f4ebe3550e00c40 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, config, makeWrapper, + mkDerivation, lib, makeWrapper, extra-cmake-modules, kdoctools, diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8f64c88493116b53e2701886f3d66dd35a62f09a..d839a7141e3b2be8264983103f8a4db36701aeb4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -26,8 +26,7 @@ still shows most of the available features is in `./gwenview.nix`. */ { - stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, - plasma5, attica, phonon, + lib, libsForQt5, fetchurl, okteta }: diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 2570e37bf2c9a50b9cc21e7621a2790f305f4d7a..6a4635c26fb341c6e742d36e8cf000347844dc67 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, + baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, - konsole, kparts, ktexteditor, kwindowsystem, phonon, solid + kparts, ktexteditor, kwindowsystem, phonon, solid }: mkDerivation { diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 65080ba7f066b201390d149dff9d0211af61dde1..9da12b248c5681c886a952002a4d71471f10d725 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -2,18 +2,13 @@ , lib , extra-cmake-modules , kdoctools -, kactivities , kconfig , kcrash , kguiaddons , kiconthemes , ki18n , kinit -, kio -, kio-extras -, kwindowsystem , kdbusaddons -, plasma-framework , knotifications , knewstuff , karchive diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index 52aa2b10e2414ca79ffe2bab0b1733aec0067183..cae2aec5668d3bd8783e86d002b69f3fba3b7963 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: +{ mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: mkDerivation { name = "libkomparediff2"; diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index 10123944e3a6929a040203803c67b997eb81263b..d17ffb3c044460dced77372295bed4d7d114cccb 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -4,7 +4,7 @@ akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, - karchive, mailcommon, messagelib, pim-data-exporter + karchive, mailcommon, messagelib }: mkDerivation { diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 02e9a47274b4e3656288371034920b66ecf73c05..bbbcca13d9804fd855b8d97e437c78b2ce2999a1 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, - kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin, + kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, kwallet, kwindowsystem, libkdepim, qtwebengine }: diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix index 319764ae81a5d5d1f51276b93671fcee94929177..c1b8a7eb866308ac55dedf7017d2494da14a1772 100644 --- a/pkgs/applications/misc/acbuild/default.nix +++ b/pkgs/applications/misc/acbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "acbuild-${version}"; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 698485fb086f3d9743507cf99cc363106ae012fc..09da61f346410683b0e7648aa15ff8be28b96b61 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -9,7 +9,6 @@ freetype, fontconfig, libX11, - gperf, libXcursor, libXxf86vm, libXi, diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index acd5ae7dd73d4f55d45122d5f542f22d817d8ca7..fc5fa4d030062251cbf6e4f1bed92c6102e699e8 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, netcat, python, bind, iproute, bc, gitMinimal }: +, curl, python, bind, iproute, bc, gitMinimal }: let version = "1.17.3"; deps = lib.makeBinPath [ diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index a9d32d4b2522d15650b28ba215c11fa9ce4a67bb..3245a56e9de3b45c0881c1438822500eb477b8b0 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -6,7 +6,6 @@ let version = "0.96.1"; - sitePackages = pythonPackages.python.sitePackages; inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted; in buildPythonApplication { diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1aabbb587eb561fd1c78bba836625cf37478afd1..0fa859ac84bbc2edbbbbb5c51d9b104d213d431d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp +, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp , xdg_utils, makeDesktopItem, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "3.27.1"; + version = "3.28.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh"; + sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"; }; patches = [ diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix index 83292a76c5dd658d0c4098b151fd89a74d4c2174..3a9f20289227bf3cd87f498d842519e3be46340f 100644 --- a/pkgs/applications/misc/cataract/default.nix +++ b/pkgs/applications/misc/cataract/default.nix @@ -1,13 +1,4 @@ -{ callPackage -, stdenv -, fetchgit -, autoconf -, automake -, glib -, pkgconfig -, libxml2 -, exiv2 -, imagemagick }: +{ callPackage }: callPackage ./build.nix { version = "1.1.0"; diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix index 8d8b063e48b375c42ea4707423935194576c209c..397aed355a952483eb84e54aa3ff9ea0a15542b2 100644 --- a/pkgs/applications/misc/cataract/unstable.nix +++ b/pkgs/applications/misc/cataract/unstable.nix @@ -1,13 +1,4 @@ -{ callPackage -, stdenv -, fetchgit -, autoconf -, automake -, glib -, pkgconfig -, libxml2 -, exiv2 -, imagemagick }: +{ callPackage }: callPackage ./build.nix { version = "unstable-2016-10-18"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 03709c30373d8af8a3254ea07aa25f1344697a8c..6bd1cef7c1b26a3f6fbca0fb771427d5021aa228 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, gettext, sqlite }: +{ stdenv, fetchurl, pythonPackages, gettext }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 6e0152c71ed098101d0770a85681bc7405d69ca0..8c57ebead6ae2c1c290b63ee501effaef675bd18 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper -, python, pyserial, pygtk }: +, pyserial, pygtk }: stdenv.mkDerivation rec { name = "chirp-daily-${version}"; diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index 7aa19ffb30179f615fa97da9e4bc4502b227bc0b..fbeb965df3805d99eab21639f4915e4bd72cb4f1 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, coreutils, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation { name = "dbvisualizer-9.5.7"; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 53344595f7831827cf7d171132df7da6b9963b09..6cbdc8ece0ca47ccfa1a912663992f6bfab9aba7 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }: +{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: let version = "git-2016-01-10"; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 76b61de56088cc60dbfed3eabf207a52c0c59f2f..891222a0f10e36b295cb54f30a09df69623b594c 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, qtbase }: +{ stdenv, fetchurl, python3Packages }: let diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 383f73b62994b300b005b79aec824089735a389e..ed2f0626e5d27e3926dae2e82bea162ba942a091 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }: +{ stdenv, fetchurl, python3, python3Packages, zbar }: python3Packages.buildPythonApplication rec { name = "electrum-${version}"; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 73911bab6f66bccc2058b24471ba5dfc3a51dc72..3d715a1d16bd30054637f30b415c392a3aac97bb 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: stdenv.mkDerivation rec { name = "evtest-1.33"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 9ddd39981cc2902fa2a40f5d2f8df8fe3e9f8285..d8a0c53d9e1a7d502dec8393265dd24a1e770055 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 93e5d297ffb3012d42f803ae61eecb47e4878d95..2c024b9fe0edb527dd3065c1cedfdcd00635c4c0 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc , keybinder3, clutter-gtk, libnotify , libxkbcommon, xorg, udev diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index f3f7fe2aacbae8702f8bef0d88fe51004508bc4d..a3aebf227339db2715a90695c05053ed0240e66e 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "gcal-${version}"; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index efd3bfe73dd9265131333ad4520ab34dd26290b6..f62eb92ac04a59676c9fc80a8d73a2b7ad10ca06 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity -, yacc, flex, zlib, config, qmake, makeWrapper +, yacc, flex, zlib, qmake, makeWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index c77f8658220b24df387905897e02114968245372..9c1b457c299da0087faa730ca9f1276c9fa1625e 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv -, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 +, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 , zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: let diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 586807b2dd5ce131e4917ced10eb1e2a8736a91c..6689a3cae102696db1c0a0b8a7287b16373b5103 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d87ac459d0210cfe5b31ec14ffa4145a2b58fedb..ed0dd3ba5be33b58c87834275e7cc581192aeba4 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: +{ stdenv, fetchFromGitHub, qmake, qttools }: stdenv.mkDerivation rec { name = "gpxsee-${version}"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 50f575d15cecf3d4fa492d597891b44cc2273aec..b4b98909447e569e46004ea8117937f243e39786 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, - pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook, + pango, gobjectIntrospection, wrapGAppsHook, # Optional packages: enableOSM ? true, osm-gps-map }: diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 57dc68263ac4ebe72905d83dddb06df9e209e332..8bf779185b36bff8c2507b902dc8113fe2e241f9 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.3.0"; + version = "3.3.2"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788"; + sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 5fdb8985bbbbd39916c355fb783c356e8e76677f..6c84f3cbd326522de46bccf8b81d64da4f54bf12 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs, makeWrapper +{ stdenv, pkgs, makeWrapper , glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler , pkgconfig, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 105f7beb98fe3dc73014e06a6300f519a421e824..2abdce45c95f246630bfdea4860c1cd95466cc81 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils -, intltool, dbus-glib, gnome_python, dbus +, intltool, dbus-glib, gnome_python , hicolor-icon-theme }: diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 624c15e118a2e0dd5ec557dc27cf01594e867f22..1fa016627d4e0badb47c274551d41937cbcdfb4f 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, python }: with python.pkgs; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 0b679617243dd3bb372e9bd366bec0a978f5fafa..607dff2931895b5c5deea1e181d356306ef27803 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: +{ callPackage, buildFHSUserEnv, undaemonize }: let houdini-runtime = callPackage ./runtime.nix { }; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 2295e15cc3d3c18916be72eded0709fdd1ee7e9d..49b1741fd5af564427698b47137a4852b77f80ff 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: +{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: let lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index c4f10a1c35bb9bfeb11a3ce26df7222f47bfb222..9872ff23f3479c30b43aa22d943722e1324171b2 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }: stdenv.mkDerivation rec { name = "josm-${version}"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 075640f702cb4b6f937a2704ad304f4d178689b2..3c5184d54632b50840d49328a765f948f0609e57 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3 }: +{ stdenv, fetchurl, glibcLocales, python3 }: let python = python3.override { diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 38c2494c9f7d3dc135328084f136f96e5f0de094..0c894fb0b6129986782abe319626ff19101668fa 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, - fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, +{ stdenv, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz, + fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, which diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 699cb2fd09863897d9479676671ded985122a8ec..c37d26f3dbcce97ae4c45bf06cd540d85fe8c466 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib +, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index bb55fc2d4a8b7d38bb7602a23c3174a17ee99db5..3072963c43e85580df7248387f39c69e7ef4575c 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -1,11 +1,9 @@ { stdenv -, makeWrapper , fetchurl , intltool , python3Packages , gobjectIntrospection , gtk3 -, dbus , libwnck3 , keybinder3 , hicolor-icon-theme diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 959ed6b11babf63bc434244b0b43c4d839b00631..372adef4375c4e284b49f7d3e2370f92712e87dc 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf -, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; -let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llpp-${version}"; version = "2018-03-02"; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 787ce7231f30f0d693f29f06afb255fb0541853e..f2dacb7890f051c7f9e14b6abd470217b112283e 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "madonctl-${version}"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index fb17aadfa4904817d1fec48a1a05576c7c7125c9..23f14d7ac9afba1fd276cb22178b0b93a2f11c47 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }: +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }: let version = "4.3.89"; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 336b136c56d61b320e25b1ff8835cf42eadb0d8f..8c6bd92d5362e9c0a2f84c481c9cdeef181e853d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "mop-${version}"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b3a32d30c39cb66a8ebb511bea0b2e047a6f7c8f..99d23b0eb7cf2d146cbcf999cdad4480bac1849b 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, fetchurl }: +{ stdenv, fetchFromGitHub, python2 }: let diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 0a1d26012a8020afbe901c1d666116060507b813..bd65acf5e5e9ad8c12ec1bb3f8924389fa1c615b 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: let buildPlugin = args: pythonPackages.buildPythonApplication (args // { diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index ca06b5fa6df6fab0c4f93c0499f6567fbdf98524..199fa3e9bfe9edc559f13e7e14d376f0de2f04f9 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication +{ lib, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook, gobjectIntrospection , intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg -, xkbcomp, gsettings-desktop-schemas, liblouis +, xkbcomp, gsettings-desktop-schemas , speechd, brltty, setproctitle, gst_all_1, gst-python }: diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 746a319c2e1e11a7d3a325ab9b55f1ea9d47efca..9ecf0da58067e4cdeb1b4bdc543f4673b9924fe3 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: +{ stdenv, go, fetchzip, git, fetchFromGitHub, fetchgit }: # When perkeep is updated all deps in the let block should be removed let diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 23ab0f8d34ad815b8fff80f0c2eaaffd37bcdfb6..a548c149665a1ab1bf81ba75bb9b5427bd46ce45 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : +{ stdenv, fetchFromGitHub, postgresql, openssl } : stdenv.mkDerivation rec { name = "pgmanage-${version}"; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 05ad3e2a9066d9a493e6e4541f7d8c9692948578..3ac719d18d253d7f7132e89436e53f1ca8a52028 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,6 +1,6 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper +, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index a400bb04da430e9dd1064ea824f0bb0af47fbbb6..dbda7664bde077a613fd3bb6ba841d3793ce8375 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "pt-0.7.3"; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 7a4348260fd38135d0847867f3c0e67a088e097c..bf4559e911780e2c699976aacdf88c51492f4074 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2 +{ stdenv, lib, fetchgit, pkgconfig, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1, qtcharts , qmake diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index dcc8300550f4169653694d659da5740320668a1e..c6d3d6e1a9d52b186536e3d452a2acfacbe8dbbe 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection , gtk3, python, pygobject3, hicolor-icon-theme, pyxdg diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 7da721e9f3740c373c9dbdc13e88c49f51016636..2d22d87c49a8d37a30a8a67c4584777318f8bafe 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git -, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification +, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 17bbf1583c466585d867b6f44d7a44b999f69990..c2384f56faa1a775636f915bd99dc9da85de4f18 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }: +{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }: if theme == null then rofi-unwrapped else stdenv.mkDerivation { diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 3ef5a6c4e3453ec8e9ca175b7c4bd302c3db30e8..11a75e4064f40d5649714f13ca8bbf0f00d5aaf6 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext -, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme -, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper +{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat +, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme +, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index d2027696824433955cce940fef7be79b3a1dcb3c..5c16a02ddb8cf908c92bec57225119ff048834b8 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: with pythonPackages; buildPythonApplication rec { diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 98d7e12a8ed889cf76319cf05f9821cb52fe8b09..909c267def828eca3a50425a03f375db04c4b14e 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }: +{ symlinkJoin, rxvt_unicode, makeWrapper, plugins }: let rxvt_name = builtins.parseDrvName rxvt_unicode.name; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 436d3ee4233e2a3316150f3a7dbe62b7b8797875..719b8d32b33036ee468b28e4ecfe58e526d6a470 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }: - stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "simplenote-${pkgver}"; pkgver = "1.1.3"; diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 11a5baa288ddc751c56005e7dffaf054d7dad3d7..9f4036c3f967545cdae54f91be1e433fa647d772 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, glew, eigen, curl }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 6fa594dec046f403e8d16b18ece237f15c850801..9f20b20f7f3a3ffbc40e96bcf8f5e977fe4f558d 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }: +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { name = "spacefm-${version}"; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 6c4b32ca9aa6a62f69575963fbba31a2c051b0e5..14285a52e27c7e13be2969c097e038891fbf2242 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: +{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +, gtk3, gsettings-desktop-schemas, sweethome3dApp }: let diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ee3cb9cd8ed4d5efb76abeaa2d126bb07f8d822b..5f12bdb4dfcdbd00ff236ab7219f2c3d8f548c04 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr -, xinput, curl, openssl, unzip }: - -with stdenv.lib; +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { name = "synergy-${version}"; @@ -14,17 +13,33 @@ stdenv.mkDerivation rec { sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; - patches = [ ./openssl-1.1.patch ]; + patches = [./openssl-1.1.patch ./update_gtest_gmock.patch + ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch; patch_gcc6 = fetchpatch { url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch; sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d"; }; + # Due to the included gtest and gmock not supporting clang + # we replace it with 1.7.0 for synergy-1.8.8. This should + # become unnecessary when we update to a newer version of Synergy. + gmock_zip = fetchurl { + url = https://github.com/google/googlemock/archive/release-1.7.0.zip; + sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0"; + }; + + gtest_zip = fetchurl { + url = https://github.com/google/googletest/archive/release-1.7.0.zip; + sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m"; + }; + postPatch = '' - ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip - ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip - patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6} + ${unzip}/bin/unzip -d ext/ ${gmock_zip} + ${unzip}/bin/unzip -d ext/ ${gtest_zip} + mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0 + mv ext/googletest-release-1.7.0 ext/gtest-1.7.0 + patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6} '' # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt # it's not able to find it (it's trying to search the store path of libX11 @@ -38,15 +53,19 @@ stdenv.mkDerivation rec { # Looking for XRRNotifyEvent - not found # # So let's force it: - + optionalString stdenv.isLinux '' + + lib.optionalString stdenv.isLinux '' sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ set(HAVE_X11_EXTENSIONS_XRANDR_H true) ' CMakeLists.txt ''; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ]; + buildInputs = [ - cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl - ]; + cmake curl openssl + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' mkdir -p $out/bin @@ -58,12 +77,11 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "../bin/unittests"; - meta = { + meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; homepage = http://synergy-project.org/; license = licenses.gpl2; - maintainers = [ maintainers.aszlig ]; + maintainers = with maintainers; [ aszlig enzime ]; platforms = platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch new file mode 100644 index 0000000000000000000000000000000000000000..003d7d22421a1c359fa8042bf1322691b5f49d10 --- /dev/null +++ b/pkgs/applications/misc/synergy/respect_macos_arch.patch @@ -0,0 +1,61 @@ +From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Sat, 14 Jul 2018 21:56:59 +1000 +Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS + +Only set the macOS architecture if not defined by the user. Use the +OpenSSL libraries and headers from Nix on macOS to prevent architecture +mismatches. +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 14 +------------- + 2 files changed, 2 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2f37424d..c7217e28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if (UNIX) + # <= 10.5: 32-bit Intel and PowerPC + set(CMAKE_OSX_ARCHITECTURES "ppc;i386" + CACHE STRING "" FORCE) +- else() ++ elseif (NOT CMAKE_OSX_ARCHITECTURES) + # >= 10.6: Intel only + set(CMAKE_OSX_ARCHITECTURES "i386" + CACHE STRING "" FORCE) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 237ba484..04428636 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,11 +23,6 @@ if (WIN32) + set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32) + endif() + +-if (APPLE) +- set(OPENSSL_PLAT_DIR openssl-osx) +- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include) +-endif() +- + if (WIN32) + set(OPENSSL_LIBS + ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib +@@ -36,14 +31,7 @@ if (WIN32) + endif() + + if (UNIX) +- if (APPLE) +- set(OPENSSL_LIBS +- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a +- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a +- ) +- else() +- set(OPENSSL_LIBS ssl crypto) +- endif() ++ set(OPENSSL_LIBS ssl crypto) + endif() + + add_subdirectory(lib) +-- +2.17.1 + diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch new file mode 100644 index 0000000000000000000000000000000000000000..87b53e78585b98416a830c57050025142bfb9580 --- /dev/null +++ b/pkgs/applications/misc/synergy/update_gtest_gmock.patch @@ -0,0 +1,158 @@ +From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Sat, 14 Jul 2018 22:07:39 +1000 +Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0 + +Fixes compilation under clang on macOS as is now found under +. +--- + CMakeLists.txt | 2 +- + ext/toolchain/commands1.py | 4 ++-- + src/lib/platform/CMakeLists.txt | 2 +- + src/lib/server/CMakeLists.txt | 2 +- + src/lib/shared/CMakeLists.txt | 2 +- + src/lib/synergy/CMakeLists.txt | 2 +- + src/test/CMakeLists.txt | 12 ++++++------ + src/test/integtests/CMakeLists.txt | 4 ++-- + src/test/unittests/CMakeLists.txt | 4 ++-- + 9 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94c474e8..2f37424d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -178,7 +178,7 @@ if (UNIX) + CACHE STRING "" FORCE) + endif() + +- set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") ++ set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}") + + find_library(lib_ScreenSaver ScreenSaver) + find_library(lib_IOKit IOKit) +diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py +index f32ec483..bf997cf6 100644 +--- a/ext/toolchain/commands1.py ++++ b/ext/toolchain/commands1.py +@@ -251,10 +251,10 @@ class InternalCommands: + macIdentity = None + + # gtest dir with version number +- gtestDir = 'gtest-1.6.0' ++ gtestDir = 'gtest-1.7.0' + + # gmock dir with version number +- gmockDir = 'gmock-1.6.0' ++ gmockDir = 'gmock-1.7.0' + + win32_generators = { + 1 : VisualStudioGenerator('10'), +diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt +index 481d8ef9..1ce67eca 100644 +--- a/src/lib/platform/CMakeLists.txt ++++ b/src/lib/platform/CMakeLists.txt +@@ -31,7 +31,7 @@ endif() + + include_directories( + ../ +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt +index 3cb582ec..0525d627 100644 +--- a/src/lib/server/CMakeLists.txt ++++ b/src/lib/server/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt +index 891f4aa7..16c8b04a 100644 +--- a/src/lib/shared/CMakeLists.txt ++++ b/src/lib/shared/CMakeLists.txt +@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources}) + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + target_link_libraries(shared arch base) +diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt +index 0972be8c..e19fcce5 100644 +--- a/src/lib/synergy/CMakeLists.txt ++++ b/src/lib/synergy/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 8812150a..04cdfc50 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -15,13 +15,13 @@ + # along with this program. If not, see . + + include_directories( +- ../../ext/gtest-1.6.0 +- ../../ext/gtest-1.6.0/include +- ../../ext/gmock-1.6.0 +- ../../ext/gmock-1.6.0/include) ++ ../../ext/gtest-1.7.0 ++ ../../ext/gtest-1.7.0/include ++ ../../ext/gmock-1.7.0 ++ ../../ext/gmock-1.7.0/include) + +-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) ++add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc) ++add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc) + + if (UNIX) + # ignore warnings in gtest and gmock +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index 2f1ca7f3..6ddbd29a 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -56,8 +56,8 @@ endif() + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ ../../../ext/gtest-1.7.0/include ++ ../../../ext/gmock-1.7.0/include + ) + + if (UNIX) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 3e49dc3c..5f6c4fac 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ ../../../ext/gtest-1.7.0/include ++ ../../../ext/gmock-1.7.0/include + ../../../ext + ) + +-- +2.17.1 + diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 1e51ba22ddc3d9a12efcd2a049d26b4261e0d418..dac447edd7d2f9f8fff5a7c5ade615d3a5466af5 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }: +{ stdenv, fetchurl, cmake, readline }: stdenv.mkDerivation rec { name = "tasksh-${version}"; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 1cc03b4cd42614950a4e34c6b770c5030245ff2a..f30c6a63948979ebb2fdcdb8ad935cea2ac9add8 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd +, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 9aca45264af370c63c65efb21b25df76a446f51e..ff3caec29644918ffcd1ca6f0bf12fb585365c1a 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "timewarrior-${version}"; diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix index b41f5c9a0a70552d67275ccfc49b93bca60cc83d..f001cbcaab92dac87edea1199e616caa18308873 100644 --- a/pkgs/applications/misc/tqsl/default.nix +++ b/pkgs/applications/misc/tqsl/default.nix @@ -1,12 +1,5 @@ { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: -let - lib_suffix = - if stdenv.system == "x86_64-linux" then - "64" - else - ""; -in stdenv.mkDerivation rec { name = "tqsl-${version}"; version = "2.3.1"; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 297f3d0b5991c7549f2c1df2387dff4757daabd6..020aa963541e999fe173e9b943c487485f20a612 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: stdenv.mkDerivation rec { name = "twmn-git-2014-09-23"; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index e59a3e989432c5582ff08eb213631be3450d9c24..b61566af6b2c1351e2b927485c1a2a8e96da43bf 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "wego-${version}"; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index 27376f4db81cfd0936d91cb57ded7420f8be4524..410346bce9adfb7e790e2981a5a85db3e4193392 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 , faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix index 23be3a5dc4facf0a96553a80c4326204d58b0b66..fd6be8f59201b60f982a0f71a3d65522f97f0721 100644 --- a/pkgs/applications/misc/wsjtx/default.nix +++ b/pkgs/applications/misc/wsjtx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase, + docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase, qtmultimedia, qtserialport, texinfo, libusb1 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 05530af12547f2f94e9ea502b87e02660dd76f48..b98d10efdee10c1dedd0b7feccf060b681ea3241 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ { stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +, fetchFromGitHub, cmake, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.4.5"; + version = "2.4.7"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "0ix4vqhcm4x9j5p6pwdfwkm2ml6wmwsyn3ppzvxllhp4dj8blzwf"; + sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index cadf5ccb6a48b6ac94179d74dc08ac9fe4d6bf48..2c569b7d6816d708998a69dd962f4cf7237bc867 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, lib, -autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs, +makeWrapper, pkgs, perl, perlPackages, gnome2 }: diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 06fa8d2bd0dd3218230cd8535c89558a41c93423..8843c821ffb41906ccae67ae2fdffd5bdd219318 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }: +{ stdenv, fetchurl, python27Packages, pcsclite, yubikey-personalization }: python27Packages.buildPythonApplication rec { namePrefix = ""; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 415995a828d626ebd7ab0d4d0909f62dcbb81ad2..001d70775d6d1548bea2b294b888a71bd2229782 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig , appstream-glib, desktop-file-utils, python3 -, gtk, girara, ncurses, gettext, libxml2 +, gtk, girara, gettext, libxml2 , file, sqlite, glib, texlive, libintl, libseccomp , gtk-mac-integration, synctexSupport ? true }: diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 86fe453465a5156c2cec54bb7862716414113e2b..9d86dfe4a445d9c7f0c7056836db1d142f4e81c7 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, -gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec, -openjpeg, fetchpatch }: +gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { version = "0.3.3"; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 92d173807f90b405de1b1685483dd5dce4274fda..18876cf355b86e73c46c1b2daf949680d294f104 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, python3Packages, fetchFromGitHub }: +{ stdenv, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index eb988471c8c737efa817ef25238a2cb08e302cfb..dae540ba4260f27a972f414c999b9175ca5e7b6d 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, version, sha256s, ... } @ args: +{ stdenv, fetchurl, version, sha256s, ... }: let arch = { diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 021c048669f537cdc4e87797823f614698330d4f..c2471d8a0eaa7288dfbb2f7db760531d98f2a74b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib, libvpx +, libusb1, pciutils, nss, re2, zlib , python2Packages, perl, pkgconfig , nspr, systemd, kerberos @@ -14,11 +14,10 @@ , glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups -, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 +, ffmpeg, libxslt, libxml2 # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libexif ? null # only needed for Chromium before version 51 # package customization , enableNaCl ? false @@ -43,10 +42,6 @@ let # source tree. extraAttrs = buildFun base; - gentooPatch = name: sha256: fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; - inherit sha256; - }; githubPatch = commit: sha256: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; inherit sha256; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d2bb04251705f9a728e85aabe62322eebcce4712..51618a479d423344a86b5c5a1a62c953c8d16358 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -64,8 +64,6 @@ let version = chromium.browser.version; - inherit (stdenv.lib) versionAtLeast; - in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 9dad2df7fd0a984fa56b849b6b192d6dc9a7da05..21631ef191c487a15d12b30b94414070927b42c3 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake -, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: +{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }: stdenv.mkDerivation rec { name = "falkon-${version}"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 50eb396d6442ccd48672039ceb3608ae61d7d284..336cd255661110ec5a4191de8e8fdd72f00ca092 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, icu, libpng, jemalloc, glib +, icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bdb9dab4f9d26175c7fd35c34447f1ea938a3180..f1d7b216120df8a81b28d0bb6995bf11cdd2e9d7 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: let diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 2df2043517ae33e4ba47ba144b491dea3d404dff..52a2ccb292bb40a0c3c8219837dd4331120baf46 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, makeWrapper +{ stdenv, patchelf, makeWrapper # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9cdd32d2aaed4d1eef0e1cc1fad60adcce8838f4..6097c0e95f0d94d204431eb73c87fb98ef4d187f 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPackages , fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null -, buildPlatform, hostPlatform , nukeReferences }: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index dbf0bbbd4d5490bb25123d25bcecb39f58692f7d..8420dbdaaa8e08a846639f6b52fdf282498a5646 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -47,12 +47,6 @@ , debug ? false }: -let - arch = - if stdenv.system == "x86_64-linux" then - "x86_64" - else throw "Flash Player is not supported on this platform"; -in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; version = "30.0.0.134"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index a320321ea171a1957bb6b1fb2d6df280dca8d891..a172e0e8d5d9cb234d3ff4ac6c872c7723728bec 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo +{ stdenv, fetchurl, libGL, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus-glib, alsaLib, libpulseaudio, systemd, pango }: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index fb6e85ccdbba3b0af3510f4984c318f0d3b14e2e..3d4e0fc002257fb2ba651d22fd30cc1f676d6d1d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, zlib }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation { name = "TREZOR-bridge-1.0.5"; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 0a8efb3aace963a7a0f46ebe4639c54a50a6b4c2..d1f50627d905d5bdb93c6d2f7db9035d7a2f7d17 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub +{ stdenv, cmake, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine , version ? "0.9.96" , sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 54abc7dedff4daee5c539da7edfde2d9caa17698..9de7518677deb95d003ee33b42969fe8e9122143 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, +{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl, pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index c9486d9a7271097a68b296bb9032aef1420fbbad..e6902aadd906fa2a7823e0465999debec03552ae 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg, systemd -, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp -, libuuid, xz +, freetype, fontconfig, libXft, libXrender, libxcb, expat +, libuuid , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2 , nss, nspr diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 11aa0ce706d665acf35d7cafcfb86a5b8782afe6..ab2c24727d7c29f7822a249cf5cd8e7ba43cf9af 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 1656e5a09a6b69d549df256179a704beb33a4400..0c210dcc535b7ad7bfbcd3bbc338d5e70c77f5c0 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, pkgconfig , libsodium, libarchive, openssl }: with rustPlatform; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index ff0f664154aa87bcabfe3f017c4d864793c3d41e..d6e703f79d052136035cd64d7a0935c59659af4c 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "kompose-${version}"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a1e17f60810d615dabf679f1db7c82da943a1b7d..5f7a2e8e28435f339e6259445426e8803f96f012 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }: buildGoPackage rec { name = "kops-${version}"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 6bd7ba3eac2cd955520f8af2e744ac5cabe593a8..01bf3467af957f5a518fca50b986dafe5872df76 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync -, iptables, coreutils +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync , components ? [ "cmd/kubeadm" "cmd/kubectl" diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 961c0afc5c50dcb611df74f81b8011a910e46945..6e2089f99352ae8db012dafed2e605712b1230f1 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh , unzip, gnutar, jdk, python, wrapPython -, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd +, setuptools, boto, pythonProtobuf, apr, subversion, gzip , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 7301e45a41f8fd44d375665b4fb4b1250df13380..b674f1f645808d766b544c6e0c47adac5a40c34e 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu -, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig +{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu +, gpgme, makeWrapper, hostPlatform, vmnet, python , docker-machine-kvm, docker-machine-kvm2 , extraDrivers ? [] }: @@ -14,7 +14,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.28.0"; + version = "0.28.1"; goPackagePath = "k8s.io/minikube"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1gm61w0f33mdax6im42wckfmjgdr5pziiaw2n7yj6jfjrxjnmzmf"; + sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 6b6a2dc8986ba3857f494457bf6819ca5c511a67..6f836d27357aaa3dde6b11f13731661e04d2f4a4 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux -, iptables, coreutils, kerberos, clang +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux +, coreutils, kerberos, clang , components ? [ "cmd/oc" "cmd/openshift" diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 1510dc575cc9ecbc7271c86e75b7ab3498404efb..c61896d892182d2bd089eab33baea05efedd2b34 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl , openssh}: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "3.7.7"; diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index ad4edec6b4eaa1bb2b6b4e93287f7a161bad1845..fddf13795f3eab11d69ebd9aa776632dedfeb9d8 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: # # USAGE: diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix index 135e5402929a70982a513a93ab0063ab9e2ac5e5..f4ad171c267ee46322fd8e3f97c463d358963d36 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "terraform-provider-nixos-${version}"; version = "0.0.1"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 4f45de76d1618c88d303d954ff144c28321211d3..358a1f23147aa8ff7249562894879cdcd9379592 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }: +{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -60,7 +60,7 @@ let # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. if actualPlugins == [] then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) - else lib.appendToName "with-plugins "(stdenv.mkDerivation { + else lib.appendToName "with-plugins"(stdenv.mkDerivation { inherit (terraform) name; buildInputs = [ makeWrapper ]; @@ -75,7 +75,7 @@ let }); in withPlugins (_: []); - plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; + plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; }; in rec { terraform_0_8_5 = generic { version = "0.8.5"; diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 40117b4585506c2c47a3d008a3f4ee98f8a8181b..cf1649f7bb39ab9f9de7e480305043a894a20091 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: let list = import ./data.nix; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 749b94f7b7ec5740acd856af7c2d8c85bbc00a1d..d2b1a8eba36719fa2871118b21d8f809c1efa832 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,4 +1,4 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { name = "compactor-${version}"; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 826452016e73648960f82025ef2a4f2e6ef5cc80..113d6a2e5f4650207cd4080771ad4135cfd3b8f3 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "drive-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 9793fd234a18de96fe58dbf514ae0cb1a0f114c1..aa7895ce14883f788656a55d9988094d6ccb968b 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 1477d0674642971f7701aab88d87479cf0464c9a..a034827c4ed47b12e811de2c9d8633c0e44d0f06 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 0b2a97b53786a162590fae4ebfac16a837ac22a1..2ed7fbcee3b53ff43cbb18a2acc04d8a6d464ef3 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python, +{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python, enableLibPurple ? false, pidgin ? null }: with stdenv.lib; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 003ffbfc7d1eb1af37d7045be934bb72c4981d9b..f831ac0847ce7cd30a1fd51a396fd25ee4dfef7c 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool , perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook , libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index e0aecd2c810286cf58edbadac552980eab16da7d..1b257ea61dce9a94ac86e1ab7f49c4573a503c92 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp +{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 6b17eb0a8975947d079db1af431337bf3205c6cc..3c267e612a685f1f635ac9eb774ea7987876b251 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, bundlerEnv, ruby, pkgconfig +, bundlerEnv, ruby , alsaUtils, libnotify, which, wrapGAppsHook, gtk2 }: diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 914b3480a95d96f6d4cc4b5660eaa4c7cecef849..095f838fe981e458286e9f5ec879c09a2337249d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, pidgin, makeWrapper, plugins }: +{ symlinkJoin, pidgin, makeWrapper, plugins }: let extraArgs = map (x: x.wrapArgs or "") plugins; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 5d463648bd8bc2bcf1a82b4397440979d2ab98ae..e7527bafcc65d2180524ea66c90290b84ec68b88 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, - fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, + fetchgit }: let gui = true; # Might be implemented with nixpkgs config. diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 7fabfa5f7722519d07c9cdf61340c9fd484aa29e..37d9de8794e554e147f277814ac1d6bca72d8b70 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, callPackage, which, glib +, libICE, qca2, pkgconfig, which, glib , libXScrnSaver, scrnsaverproto }: diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index c99130f28a391c35f00a47bd669d33f7e93eea77..a6aef5e6a2fb21866923d9439346dae7cbed957a 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip +{ stdenv, fetchurl, pkgconfig, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 024902a9c486faae0b02c5437ae73dd5c293a014..f858bb38dd19b30dbb48c69a5ffbbdfbe5338c46 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -30,7 +30,6 @@ , openssl , perl , python3 -, bash , libupnp , speexdsp , fetchFromGitHub diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index dbf17d9cbdb1dccdee9e03838c7a9757610b4b24..37ce34f09df80b7e1fbbfb73e89789e8600907e8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, conf ? null }: let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a8e1618222b8dc66bba5a003ea225e4e178adfb9..87ee10d0db7ba748617a6ff137fa534e98f01581 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.2"; + version = "1.14.4"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0szc7ynl26hqvvwk3sx02ym4abyz78akx0sp6cvif3bb4m8brz1c"; + sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 7fedde2ad3ecf257b6c10dda028f11a8ad86feb0..bcf887808750907a801b3abce580b53df7fe32cb 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango -, systemd, wget, xorg }: +, systemd, xorg }: let diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 9354ae7282186e63183a5e6296dd2ff3fc60f805..39d664805fa90b4d65391b876be0353cf6d5abac 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ qt5, stdenv }: +{ qt5 }: let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index e139904fee53bb0551b76e94bf9baa436b366ccb..5955ecb60bd9ca07f08a879bd39e09531ae598aa 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }: +, libXrender, fontconfig, libXext, libXft, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 9ed954cc7ec2ccf996dfb0865aaf54724b9220b0..9d5d5c1b80fc8031cfdec333e7d21d669c06853d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , qt4, qmake4Hook, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto , xz, zlib diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 196cbb70b4e1958ad295286ab684714dd56d9d0e..72812563b099b44bf60c197a1a042ce41f91984e 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -11,8 +11,7 @@ assert pulseaudioSupport -> libpulseaudio != null; let - inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath - makeSearchPath optional optionalString; + inherit (stdenv.lib) concatStringsSep makeBinPath optional; version = "2.2.128200.0702"; srcs = { diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 8d7bf677983c7df1324d5ff81c817f100fd166b8..add4fa632c91bda464b0831064e54b4ad12048a3 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index dec933489af9f936e8475b71a45b8f6beed05c2f..16162435e09ab1a8887ee51cf8843a5a0a187ff5 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls , zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv -, writeScriptBin, symlinkJoin # for withPlugins +, writeScriptBin # for withPlugins , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 @@ -15,7 +15,7 @@ , runCommand }: let - inherit (pythonPackages) python pycrypto pync; + inherit (pythonPackages) python; plugins = [ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } @@ -123,6 +123,7 @@ in if configure == null then weechat else ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/weechat "$@" '') // { + name = weechat.name; unwrapped = weechat; meta = weechat.meta; } diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 3b45c2fd44569826cf8096600b515b4a573903f0..bb62014c77a447d00c948dda151ece6e7ed486bb 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 75f34952394eb1462b75de46900cc7420a50963f..2b62db069bc9d5742dafd8fabea23febd31128da 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome-keyring3, networkmanager +, libgnome-keyring3 , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 36dc94951d5c883499d9b5c489b7f460ccb53156..0f11d9a6df05a9d138a4f190744d73488c16c16d 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }: +{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 487b2799b980c6140b68bb3683b17ad26f1124b1..6e2e8d58c6760bc83af7a30783be9342a679a1eb 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre }: let version = "1.9"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 81cf4541222f8dcf25c1d76883b17c543c8e9136..f2c097a43752a993bd063a81abc0bcb5e77ad9f1 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582"; + sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 33ccec355117dcf737138817221b9215ee66f9ea..f082c241a64c1bbdff1fdc5b92c374601d9eebbd 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180622"; + version = "20180716"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i"; + sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180622 so we disable them for now. + # that has tests (20180223) as well as 20180716 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 766aab39ce307080f7f86275a49ec2ff632fbc53..e7e199155d731022c32ff54fc3e09c8b1bbd82e2 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -1,4 +1,4 @@ -{ dpkg, fetchurl, lib, pkgs, stdenv, config +{ dpkg, fetchurl, lib, pkgs, stdenv , alsaLib , atk , cairo @@ -13,7 +13,6 @@ , gdk_pixbuf , glib , gnome2 -, libgcrypt , libgnome-keyring , libnotify , makeWrapper diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix index 728287f8c75ab20f0a930226ed595d71b2f3fd95..713f585d283c9b7bdfe297490c77a62542025594 100644 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: # NOTE: Please check if any changes here are applicable to ../alpine/ as well diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index b7ac621eb6db8ef5739ee27a2f07b3ff86f07803..06777916b92af0ca906bc4e5eae1db2d85dcaa0c 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian -, pkgconfig, which }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "sup-0.22.1"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 921611644858249afe3e877496f46223c7668da4..85c98742af38306276866cc3e1642808b62b3f2d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification -, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc +, icu, libpng, jemalloc , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 916bd36ba54cbf0ab0d901c84ef7042c5caa8d18..4a1940ae654546353c351bfec565cf2768ba44e6 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,6 +1,6 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null -, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls +, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls , makeWrapper, gnupg , gnomeSupport ? true, libgnome-keyring3 }: diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 293c67164835ea382126280d95c01b084d592297..9ed532acfe1a138b661d2c58b483972c94bd4da6 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub +{stdenv, fetchFromGitHub , autoconf, automake, mandoc }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 8cb5f768f9563dbc47cb4698b99b63b6d612249d..7b854fce6c5552a702ab9ea399e29b82d209fa25 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let version = "6.6.7-build-529"; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 53485e95b9a6b3fff0ac438ae974b7ceeebeeedc..c66c3ca05a4ec2998ec9944c6eb7c6cbeb90cd14 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, qtbase, qtscript , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig , kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, boost, taglib, libgcrypt, kplotting +, libktorrent, taglib, libgcrypt, kplotting }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 950187ed9c60beee0f0db8fa0169b8df8c058639..34b4780633b838e0bd94e7b3ea153a84a2c297f0 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg , qtmultimedia, qtx11extras, qttools }: diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 315106ea85255bf9f1bb6e982c8e025dd578e07a..e525c564c509203c0faf5883cc127ea8e98dcab4 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchurl , dbus -, expat, zlib, fontconfig -, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd +, zlib, fontconfig +, libX11, libxcb, libXau, libXdmcp, freetype, libbsd }: with stdenv.lib; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d8fc1d840d2be8def0221428f821040821780153..d9ddf04592168653390bee1aeec1501285adbd97 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index aa42af5ccbdd7b7b638ae76bb91f8161ae2f05c2..1169dba188cdd302c9eaf380c2696627343270dc 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index c331c4f287e62e4a88439701b6e7ef69992ce728..6a89731ff10413ec1964e24851fb432a41bd4f82 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey -, pkgs }: +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 19e85a9711d156df560e38df16468c7a536493c0..0f107936be6fcdaa6ce3cc162ef929fa0c940f1f 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, makeDesktopItem -, atk, cairo, freetype, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg +{ stdenv, fetchurl, makeWrapper, makeDesktopItem +, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg , lsb-release }: let diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix index d3746fa6c7ad83ccdcbfb5f53e811044ca6d1f01..9830b84652597e4501da2546ec623dadf7961758 100644 --- a/pkgs/applications/networking/remote/freerdp/legacy.nix +++ b/pkgs/applications/networking/remote/freerdp/legacy.nix @@ -14,10 +14,9 @@ , ffmpeg , libxkbfile #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXfixes , libXinerama , libXv -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? true }: assert printerSupport -> cups != null; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 1d1d6f4e1e3f6150fdf6c8a27f24875b74fc4e03..f20bb740615c537a4c1291d0121fa204f199a452 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu -, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }: +, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }: stdenv.mkDerivation rec { name = "ssvnc-${version}"; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 5365228ae65723ff2f14826d5a4700480100554f..e4715cce8e18f6ee24d2796efaf9a6a989ec23bb 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: +{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 3061467c82bd9a299c386e81ecc1b1c1fb28ab8a..a778042c2ea2c93b340cb5e3bb8b8b022d2280be 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index ea0a756e76d104f44d22e546e01d4ea294b91bc3..a1f1d50e5beefdbc8d76aa6078adc62f207e3ed2 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, makeWrapper , withShibboleth ? true, qtwebengine }: diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ef1dade4dddd50cd6b2d5457349125d1e00cdfa4..5232704cd361d353ec7c8309011d491eac87df91 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares -, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib +{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 80210d898b39d343cfc162befad48422b8fee3bc..59872afaad938a62c062cc3c64aa85e492726a39 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango -, systemd, wget, xorg, xprintidle-ng }: +, systemd, xorg, xprintidle-ng }: let @@ -97,7 +97,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "To Do List / Time Tracker with Jira Integration."; - homepage = http://super-productivity.com; + homepage = https://super-productivity.com; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index b8f388c63eb53e25e56acb5b67ccbae6a4d4dcd6..26288f9f6e65033a9bbc417e26b1d253130b0d3d 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: +{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: stdenv.mkDerivation rec { inherit (backintime-common) version src installFlags; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 82dd3a506dee8d0dfbfc55e2be272e135fbc3252..bea6a0780ed92d7f7c672990654ee356c46a37ad 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , meson, ninja, pkgconfig, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index abc1f27e4f60aa81512a53cbd10c61e94ef62181..fc4bc6c0671e44c156a57894c95e5f0a0e6e98f5 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: rec { version = "3.1.3"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index f1e3f6b7301cd5feaf85b24e076a32f49c3d06da..0b4d580cd2099684629265d9fa2439d3c5d5fa3e 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt +{ stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -6,7 +6,7 @@ assert enableACLs -> acl != null; let - base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; + base = import ./base.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index bc2a6eb9c3cb658c49e0b314f06d558648357203..e5c04798aab8c4776829faef4d6d05c77f318dcb 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, perl, rsync }: let - base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; + base = import ./base.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index b78c0ad09c3dabdd7b763700307edaee4df60bb6..80b1e9caeaa98cc7bcd3ae7ad3a58154cd1b3e8b 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0"; + sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 4b68285c3f1a5735c7bb6e8a998e458b0e739bd2..a799df2d1ed0ac9a64bab28385f3fa0762cab423 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, znc }: +{ stdenv, fetchFromGitHub, znc }: let zncDerivation = a@{ diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index fdff39e27f90f76c714276229f61fc64d5a57a9f..0a6268f8452f0656cb6afa8bf211bd81bf0d5f59 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection -, gtksourceview, gnome3, libappindicator-gtk3, libnotify }: +, gnome3, libappindicator-gtk3, libnotify }: python3Packages.buildPythonApplication rec { name = "autokey-${version}"; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 80046ecb2cd516443aa7878c9d6483cf3fa4dc93..a7c6165bdd2b8309dcce92676dd02a8f7264afeb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 92feb6618c9e9c103c08c4f65c538f9601d2c5dc..8946bbab93164d83be2e2f4323b0995191bf5af4 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, python2, makeWrapper, lib -, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: +, SDL, ghostscript, pdftk, dejavu_fonts }: let version = "0.12.0"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e3ff0b594b4efafa6138169c24c059b70ba90057..43258282ac06c0fac13e4054c34b245ea749d590 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext -, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, CompressZlib, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito +, fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index dbfeb0f2fe867630eea8d963c4e21eed05675004..7a2538e4bcd667d317b0c942242b88c0b58e9fb5 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd +, CompressZlib, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, carlito @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, bluez5, libtool , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index cf40392c6dd936139739eac870c1b23206cb1486..693fa63661b57f693041df7e4efe0cead42a46f5 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -36,7 +36,6 @@ let arch32 = "i686-linux"; - arch64 = "x86_64-linux"; arch = if stdenv.system == arch32 then "i386" diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 31de4db76f1aa6e29175036ade117a36bd151462..47d2ecc81ea371d2d73dc7d3f47abd91583dd08c 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, libredirect, coreutils, pcsclite +{ stdenv, fetchurl, patchelf, coreutils, pcsclite , zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }: let diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 3564454a67414b0a50f870ea23c393761d6e4298..20dd27fa28737c60307ca6477fe86aba31758265 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { name = "timetrap-${version}"; diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index d1b3cb1b1a1718d39a2876e1118040baee5b84e8..59c58a3af13a0fc5a9d363ed649b618d65a7bb4a 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages +{ stdenv, python2Packages , withPostgresql ? true }: with stdenv.lib; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index a55a98b1f5eb548e0dd441c650d1ac31d452662c..46faf9ba651e9e504a4fbfda624a1443f57c6e9b 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, fetchurl , libX11, glib, xorg, fontconfig, freetype , zlib, libpng12, libICE, libXrender, cups }: diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 9f7048f36462ba781bce0b6c46def9951bca2264..26a141dc5067071ec62b9c8ef19ffc88b336ca7e 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages }: # # TODO: Declare configuration options for the following optional dependencies: diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 589625cc18f98ccc75ddb59933682b5c5acc4128..e3ceffd34c199e413f1e3e997a9916c68c917d27 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo -, pango, gdk_pixbuf, atk +, lua, libGLU_combined, pkgconfig, perl, autoreconfHook }: let diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 111608126718b2af5cca77c8233cb47b32cf6a6b..24d6246e90cdc329276cecbaf3fc9c3f8f31cec8 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv +, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation, makeWrapper, qtbase }: diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index a45e5df2f52843ea225e48d6d51a5264cdff8dcf..854e91b2fcbb67d74c6b0d0ce0cba8f71b88da53 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gcc, zlib }: +{ stdenv, fetchurl, cmake, zlib }: stdenv.mkDerivation rec { name = "diamond-0.8.36"; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 99d2dfa55ddd36e7ab7c15daa79e343c7a24469b..1a15dcf6197d01c96a0ad0505370318c2fdb8147 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gcc, zlib, bzip2, lzma }: +{ stdenv, fetchFromGitHub, zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "freebayes-${version}"; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 05cd7992aa900e7f7308aacf5d86094b779fa9cf..4b4920a6ca3a05e8f2ee1a3873b1e73312fbe6b1 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nim, htslib, patchelf, pcre}: +{stdenv, fetchFromGitHub, nim, htslib, pcre}: let hts-nim = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index efe19a4e2b6e8ce477424f3873849a5f7c787634..140f7032319406258770d87398a6f03ff991af73 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, zlib , pkgs , mpi ? false }: diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index ab3050955df790e9975f573f41f2cbfe1059974d..394973692dca70d8b5fc020546f2945bf54f7100 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, htslib, zlib, autoreconfHook, pkgconfig, perl }: +{ stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 99b7ef79594f0921771abd98944159db76a60f3e..236225959f7a479a704d08ee8665a87b19712b95 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoreconfHook, flex, bison, gperf, +{ stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf, libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index e1db7131a65b0f61982e0604a853541188dce5db..64777b5a0ac8ee0d2e1bb5602b90c6e1b3c1ca2d 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -2,14 +2,12 @@ , buildFHSUserEnv , cairo , dpkg -, fetchurl , gdk_pixbuf , glib , gtk2-x11 , makeWrapper , pango , stdenv -, writeTextFile , xorg }: @@ -60,10 +58,6 @@ let ${(wrapBinary libs) attrs.toolName} ''; }); - fhs = target: buildFHSUserEnv { - inherit (pkg) name; - runScript = target; - }; in buildFHSUserEnv { name = "${attrs.toolName}-${attrs.version}"; runScript = "${pkg.outPath}/bin/${attrs.toolName}"; diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix index c10e9de851a4cb46701376e9a82cc170a190c3b9..58e01f4f9f4986e22a19592d8533c88c5e204a79 100644 --- a/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -1,15 +1,8 @@ -{ buildFHSUserEnv -, callPackage +{ callPackage , fetchurl -, makeWrapper -, stdenv }: let - wrapBinary = libPaths: binaryName: '' - wrapProgram "$out/bin/${binaryName}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" - ''; mkBitscope = callPackage (import ./common.nix) { }; in { chart = let diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 8e98bad55c3dfb20ffa950603c60539869cea646..e3244ec339ea6bb06110064c9e95f235148c01c0 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: +{ stdenv, fetchurl, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { name = "kicad-${version}"; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 48afb5bf9dc0cabf2bb57719617ec3f5acb5674e..33eb52c18ee7ebc2206a2110fd5231a7eda19834 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }: +{ stdenv, fetchFromGitHub, qtbase, qttools, qmake }: stdenv.mkDerivation rec { name = "librepcb-${version}"; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 9e6243c54980a68833b3d2b38cb659fb778d0e2f..b787a4e7a01ce6749c8d37a5c6877e34cade6b75 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -4,8 +4,7 @@ installExamples ? true, installEmacsMode ? true }: -let inherit (stdenv.lib) versionAtLeast - optionals optionalString; in +let inherit (stdenv.lib) versionAtLeast optionalString; in let inherit (ocamlPackages) ocaml camlp4; in diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 5e1a448a7cf99b14cf020b3ec447570e786beef4..d7a5e7b4c83fb8ddde1ebc71c98eadf5e3071eee 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }: +{ stdenv, fetchurl, fetchFromGitHub, zlib, boost }: let glucose' = fetchurl { diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index 9687ac66ead16efaeb4aac86fef02279f48f7f04..a987bf1ba57ee5f04686c3c5a9e6c112aea81033 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, make, fetchgit, ocaml }: +{ stdenv, make, fetchgit, ocaml }: let version = "20170720"; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index ff737de0cc4f8f29e5932cb7f431106ae64506cb..2b7cb9c30faef2086145fe9065d10fca1613b3b7 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "elan-${version}"; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 8d7c11ee91b7d3f98f34bc07bf3c44234f3c9c2e..a1779baf5f82b4cffe3acb86991b1f997f8a8c95 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, camlp5 }: let start_script = '' diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 2b861b6d06d9bb64cd372f3e45c1d97c902f5f6b..4e1415d3961db52700a0428c1045a1f8b0f3a0b0 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 6d9549b526f9b2438174884f018e202c9ff68d22..dc32e84279a80829dc7efd1d1de6cb917f00bb49 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost, - python27, python27Packages}: +{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}: stdenv.mkDerivation rec { version = "201707"; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 949b34420b79e2be81c1eb4b6fae2c3d878df7f3..65d2b4d91c3052e8f8b6546c5a3e4c7e73e280dd 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp4, ncurses, zlib, makeWrapper, clang_35 }: +{ stdenv, fetchurl, gmp4, ncurses, zlib, clang_35 }: let libPath = stdenv.lib.makeLibraryPath diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index fb37554b65fe7afcf31436fcb38fb79a00761e2a..4efc384ed227973f61ed48581f83ed6f1ac6c562 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,4 +1,4 @@ -{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib +{ haskellPackages, mkDerivation, fetchFromGitHub, lib # the following are non-haskell dependencies , makeWrapper, which, maude, graphviz, sapic }: diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 9a78c1df8b17c2691cdf722f073d527370d841c6..7d35f5f91df3f4421ec43286f6346672c2eac0dd 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -1,8 +1,6 @@ -{ lib -, fetchurl -, makeWrapper +{ fetchurl , stdenv -, ocaml, gawk, isabelle, cvc3, perl, wget, which +, ocaml, isabelle, cvc3, perl, wget, which }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index b677927a8eff78054d834fe32ccb53a68560de11..313fe5a9f1dd68c71331b6dcb50941b9cf1accd9 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "workcraft-${version}"; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 85a4aa02e4410a1d6561356286eca09715925b5a..9c4f24021430f2a3d4d024a4463492b1e97ac061 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,6 +1,6 @@ -{ luarocks, lib , stdenv, writeText , readline, makeWrapper, - less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, lua, src, libjpeg, libpng +{ luarocks, lib , stdenv, readline, makeWrapper, + less, ncurses, cmake, coreutils, fetchgit, libuuid, czmq, openssl, + gnuplot, lua, src, libjpeg, libpng } : let diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 25ebee96a103dd6fc2f061a07e7ed7e6cae60668..913fac6ac1286df351885ab8268a4d60057fa1d2 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch +, curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false }: diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 07740f4c8aeac2b33479d0d7199a2b3913927c40..fe5c77be8b22b70140a116a151ce1ca9e3690d38 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false , cudaSupport ? false, cudatoolkit, nvidia_x11 diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 29785363b0482ff149ef2b4c27aeb23d864c9ac6..e62df7f11cc7e6f77dba605438b3fbd2ef7e1294 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 6a49976c86b8d0fb6f13da976a0716cece83bee0..4884ee1f93abd5f10d8037339cc0bbb7258e67b6 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -7,13 +7,11 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl , unixODBC , xorg -, zlib , libxml2 , libuuid }: diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c4fd0c384c1481600a4b6f1559ca46977626794d..d60feb54695d7765e8afe2b4eed26c9d5bba0d2f 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -7,13 +7,11 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl , unixODBC , xorg -, zlib }: let diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 97781a69ce644c94b7fe083497a2a3f0bf2b9ba9..fa4ff8b00687508944df31f2431461a8a719e469 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -8,7 +8,6 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl @@ -24,12 +23,6 @@ }: let - platform = - if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then - "Linux" - else - throw "Mathematica requires i686-linux or x86_64 linux"; - l10n = with stdenv.lib; with callPackage ./l10ns.nix {}; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 1f540cc2b287a3d3c49c7b5554dfaa355eb5dbe1..63b751b814ee1b7a0486f23fb1af36ff2d68a978 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -3,7 +3,7 @@ }: let - inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x; + inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x; # https://trac.sagemath.org/ticket/15980 for tracking of python3 support python = nixpkgs.python2.override { diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 2ed079ab32bc886ed367cc58a74c100f80fd0bbf..288ffd6e0e1a1421b293b5eaabe6696607388a4b 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -1,5 +1,4 @@ -{ stdenv -, writeTextFile +{ writeTextFile , pari_data , pari , singular diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix index ba46850bbc617fa01c6ace1f75861bd4999e6b37..f4669a6557e94ffe29c2b9cd06482a5018de03be 100644 --- a/pkgs/applications/science/math/sage/openblas-pc.nix +++ b/pkgs/applications/science/math/sage/openblas-pc.nix @@ -1,5 +1,4 @@ -{ stdenv -, openblasCompat +{ openblasCompat , writeTextFile , name }: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 3d1ebe87c6b7117d71195598e2921273e976c893..63b9772b8231f7615268eaf3808b6bbc6ae8ce1d 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -3,8 +3,6 @@ , makeWrapper , sage-env , sage-src -, sagelib -, sagedoc , openblasCompat , openblas-blas-pc , openblas-cblas-pc @@ -14,7 +12,6 @@ , singular , libgap , gap-libgap-compatible -, gcc , giac , maxima-ecl , pari diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 7b280e9e0280678c3508450c55e7bd064009cef4..a594428a389ae14979d02f5a915de26a7d075c99 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,7 +1,5 @@ -{ pkgs -, stdenv +{ stdenv , sage-src -, env-locations , sage-with-env , sagelib , python2 diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index a053d997bf9a6adb36fd07677d4e3a49591826c8..abcefba5e260f18cf5cf56d4288c897643c22e1e 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -1,5 +1,4 @@ -{ stdenv -, sage-src +{ sage-src , perl , buildPythonPackage , arb diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index fcdbb6b985d69e5575a3b5f79f415643d17ae6c8..6063a45a3efb569668f85d765d1cf8a2995c0697 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, lib, gfortran , ncurses -, Xaw3d, withXaw3d ? false +, withXaw3d ? false #, withPVMlib ? false , tcl, tk, withTk ? false , gtk2, withGtk ? false # working ? diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index cec1a831c9128860887d3db7d9decbafe87160e8..8be302f41e5e5d729126cbcfad2f2e4dfb1f0309 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig +{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig , autoreconfHook , file , flint diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 3a0bcb66813e2329e9d90fa3de2fdf3f431c350a..b81f188a91bfb769a5677fb8821c036c7cbf0cd1 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }: +{ stdenv, fetchFromGitHub, jdk, maven, javaPackages }: let version = "0.9.2"; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 5b210fa4bf6bf4ab5c74c68987d3c645dde2a0a5..dc768725d4fbec3c5dafce349835c3d404b74a26 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,16 +1,8 @@ -{stdenv, fetchurl, fetchgit +{stdenv, fetchgit , wxGTK, perl, python2, zlib, libGLU_combined, libX11 , automake, autoconf }: -let - s = # Generated upstream information - rec { - baseName="golly"; - version="2.8"; - name="${baseName}-${version}"; - hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; - }; -in + stdenv.mkDerivation rec { name = "golly-${version}"; version = "2.8.99.2.20161122"; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 0f0c6aaf74da6a53a316c61b85fd0a5e9f6b52e2..c3e1cd60bf0bbf8402664750526fe8207aa988b1 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, cmake +{ stdenv, fetchgit, pkgconfig, cmake , libjpeg ? null , zlib ? null , libpng ? null diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 4e5b986a428e5ab39ca55f4d34540795f059b905..b665d5f4f6878cf367c326f57f70362fcb9c4119 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ stdenv, fetchFromGitHub, pkgconfig, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 00ca1d2c7abe88504e15bcccca81eb172dbd918c..e966e798ae6dd9062e1611cc9a5eb6cc09094ac6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index babd87eb2b1d14d498058f69d43592a61b94ef4e..98ccd92c4ee58fff9269cb96ef9ef5305f336c2b 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ruby, ignition + , libtar, glxinfo, libusb, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 95462c02eb5b784b58f1ac57363522d089eac7df..ce3317da9f8fd067fd854adc77c6e92140e0670c 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchgit, git, espeak, SDL2, udev, doxygen, cmake +{ stdenv, fetchgit, git, SDL2, udev, doxygen , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech -, makeWrapper, lndir -, gst_all_1, qt-gstreamer1, pkgconfig, glibc +, makeWrapper +, gst_all_1, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 98576cfd09175f8ddfbe4c341d0b7ddae3b68e47..507481cddab28aa9860522ce8a30b6a8a8f6fc93 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ace +{ stdenv, fetchFromGitHub, cmake, ace }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 4411d78cec215c1d5a8a1e7d40fcce547b39d67e..0564f3de1b7829b5f8073dd523baad56a39813b8 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem +{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem # mandatory , numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle +, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle # optional , numpy ? null, scipy ? null, matplotlib ? null # optional diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index d6c65548c1f708717d8a82b4efd3e027a77b4bfb..0ad3c6079acdb88f65529fc6054669bfffa4ac48 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python2Packages, bazaar }: +{ stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { name = "bzr-tools-${version}"; diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 06cfc90e65f138b7c5d0a3fa8194006e1c6c7c9a..26397380d57f591ad783135fc3fdd20aead8646e 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, gperf, bison, groff -, pkgconfig, libXft, fontconfig, pcre -, libtomcrypt, libtommath, lz4, zlib }: +, pkgconfig, libXft, pcre +, libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { name = "bitkeeper-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 474faa30467b69589a1f26312ef4f10865197fcd..88d1f07ee74bee8e460d0a71b614c995f34bcc3d 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}: +{stdenv, fetchgit, mercurial, makeWrapper, subversion}: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 9f1d8e9d7171c43560d1871afd7c61f83e5a23b1..4d0f33730e45bd0a8afe3687d1835487e4df7f0a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "git-annex-remote-b2-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 391ca26de257fbb49e55af500a9d426653e6eff2..63894cc3dcdb5bd81c9f7503d533ead502cdb9a5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }: let - inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock; + inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; in buildPythonApplication rec { name = "git-cola-${version}"; version = "3.1"; 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 654576a29e8055484f0ac336a801abb3ba5f35c9..9c362276383c20f8e439b71a26e52f0cf761c42e 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 @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , openssl -, gcc , zlib , libssh , cmake 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 8b77efd1be23d75b3fc8d1edce08b9c0cd2236bc..9ca7a67a53e76c243e95c7e2c16b74e44ded2750 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,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }: +{ stdenv, bundlerEnv, ruby }: bundlerEnv rec { inherit ruby; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 94143e652f9559c78fda03e919067389d3392778..ba126bb476c12dc1abdff2d1642a59e743ff8893 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }: +{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }: stdenv.mkDerivation rec { name = "git-hub-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 645b12220bdc16e26e4732b739b5abb9bd469167..12b7b8965efadd1e4160bbccbddf0bc9f3c6dd88 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux }: buildGoPackage rec { name = "hub-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index e3ceccdcf3bd0a5783163b6670979e4483828c72..17fb74945dc44ea4396de0ba17c388a0780b179d 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let version = "1.0.12"; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 24c22d423d5dedac7b369ae24609f37c4c068bcf..3cde046a2adff62e591cac036bb748a31aa4d6e6 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "git-lfs-${version}"; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 21ceccf9f351f9059df3a1068b99a863dae317e6..7b81c28c37556676bdfdfa9129140acedceade06 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, python} : +{ stdenv, fetchurl, pythonPackages} : pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index a0d7382de3419b07f8a3750065b45c5512bc66a4..9c5ab20d364fdccf3d3cb83feb97d65913067be2 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-sizer"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 917deac6daa32cd9b7c5a40b8f90dc744074d4f4..5f8619b4a7f8619b0a268621e4b33964a2c23e56 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, coreutils, bash, gzip, openssh +, git, bash, gzip, openssh , sqliteSupport ? true }: diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index db2fdf0199e39643cfaea706e141c111aff3192b..9a7609684b582bc416b030c2e2e43bbfafd7e261 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.4"; + version = "3.6.6"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x"; + sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 87e4aff28c378f09e0ba3dd6b05691c55a78caeb..71c62b758682a2c199aeb26fc5031403b3de7ffc 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv +{ stdenv, lib, fetchurl, fetchFromGitHub, bundlerEnv , ruby, tzdata, git, procps, nettools }: diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 508c8b3fb6de9a5215bec615c1cb2b2a0a326d27..d3c248b44752d16e7a632e382a91e10fe2a90065 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, coreutils, bash, gzip, openssh +, git, bash, gzip, openssh , sqliteSupport ? true }: diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index ded0d5e398634d8f8b69588a36adaa5dc3826c78..88074a0862c148296f247437640c18f2d6c15e05 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a00393abf270bdf5bdf25e3ecf00b876acdd0c10..a4cb1f5b63bbfb1a59fb0ef6515321e9145cf788 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip +{ stdenv, fetchurl, python2Packages, makeWrapper, unzip , guiSupport ? false, tk ? null -, ApplicationServices, cf-private }: +, ApplicationServices }: let # if you bump version, update pkgs.tortoisehg too or ping maintainer @@ -56,8 +56,8 @@ in python2Packages.buildPythonApplication { meta = { inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = http://mercurial.selenic.com/; - downloadPage = "http://mercurial.selenic.com/release/"; + homepage = https://www.mercurial-scm.org; + downloadPage = https://www.mercurial-scm.org/release/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; updateWalker = true; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 7b3c7aafa44e5ccc866bc2a3c17525dba19d6682..e799d5fac43b92587749d38cc00ba880f792e10b 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }: +{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { name = "rapidsvn-${version}"; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 1535d88026a3d16553b8b84cd111e6f472948b65..5a23c38a886383dcd6578f755334da870c77cbd5 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }: +{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 84b6633b8835de063fcbe7d3eca7f44475d32f89..3fd66572315974bde1a274a71310cea5e1574958 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto , bazaar ? null, cvs ? null, darcs ? null, fossil ? null -, mercurial ? null, monotone ? null, rcs ? null, src ? null +, mercurial ? null, monotone ? null, rcs ? null , subversion ? null, cvs_fast_export ? null }: with stdenv; with lib; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index a34afbab55e6c09b78438876a244b45076d22658..519f339a5083f369248d4f90c8d7f474e4118c97 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -2,7 +2,6 @@ , jre , gtk2, glib , libXtst -, git, mercurial, subversion , which }: diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8cbfe1ec16173c6626935e2b46d10ec60f7341b1..fc98b398213cc79f51e79e9df4983802bdaca924 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -117,8 +117,8 @@ in { }; subversion_1_10 = common { - version = "1.10.0"; - sha256 = "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic"; + version = "1.10.2"; + sha256 = "127dysfc31q4dhbbxaznh9kqixy9jd44kgwji2gdwj6rb2lf6dav"; extraBuildInputs = [ lz4 utf8proc ]; }; } diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index dc202e9e7b490af5c2c4277daad69da543adcf14..c68cc928848dd3cd48c71340e370b1fee21e3b11 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { name = "tailor-${version}"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 8b2d6fcc8c3859166f2d0e80ba55eb44c7be9d2e..0553b60fde71c75c733117ab3ae50f16c3e94c71 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub }: +{ stdenv, fetchFromGitHub }: let version = "1.12.0"; in stdenv.mkDerivation { diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index b36147009a6613508d860c6ba32c087c6cc54260..0637e813b48cb260c403cd0212c957de1fc118cb 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, cmake, pkgconfig , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 4adbdbdadb2a87dde1a4a59d9101acb06fa9e662..090afde819949d0793ef6d375c81ffbe515f09a8 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool +{ stdenv, fetchgit, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -7,23 +7,10 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-git"; - - # # REGION AUTO UPDATE: { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; } - # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz" - # (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; }); - # # END + name = "cinelerra-unstable-2016-01-12"; src = fetchgit { url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; - # 2.3 - #rev = "58ef118e63bf2fac8c99add372c584e93b008bae"; - #sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph"; - # master 22 nov 2016 - #rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa"; - #sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5"; - - # j6t/cinelerra.git rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; }; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 157e4903e52ebb19e4d52557ea430cfa00a2629e..48c5032f2da2c7ca0daf0b1fae8b1090c3a2a39f 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor +{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk_pixbuf }: let diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 0d0ac0a2e947e7cecfd5a2ac5f811ded6349722d..32dd3e6ff75840c5cf9f5a56f8bb40448c00e44e 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -4,13 +4,13 @@ # { stdenv, lib, fetchurl, - python2, pkgconfig, yasm, harfbuzz, zlib, + python2, pkgconfig, yasm, zlib, autoconf, automake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, lame, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor-icon-theme, + fontconfig, freetype, glib, gtk3, intltool, libnotify, gst_all_1, dbus-glib, udev, libgudev, libvpx, useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 48c7624cfa6a90fe1a458c21f443e9e2f6e93037..1e8883eae7ffabc4e8ed6779db4f688782ec6b51 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, cmake, automoc4 +, cmake , dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools , phonon, qtx11extras , extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix index 734229eac938bc3f270f66344d042506e5204dbc..eff9b7871069b35900f68aad9dc97b799548b23c 100644 --- a/pkgs/applications/video/kodi/commons.nix +++ b/pkgs/applications/video/kodi/commons.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib -, unzip, cmake, kodiPlain, steam, libcec_platform, tinyxml -, libusb, pcre-cpp, jsoncpp, libhdhomerun }: +{ stdenv, fetchFromGitHub +, cmake, kodiPlain, libcec_platform, tinyxml }: rec { diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 776d2732327f6f8aa641e35574f81decea5bd9e8..5ca678a2e175f74222c9bb0346fbb15a58795a8c 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper , pkgconfig, cmake, gnumake, yasm, python2 , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 4d6b18854549b4095892d32283c60b6a05c7b9d8..5a0583202e6d3ab1d458eae2f90c1a062d6eea11 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip +{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: with (callPackage ./commons.nix {}); diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index e3b94b69179c66170ad76b57a9df4e6401b4d34b..64a967001b57f593b85e60cb71934c88e1644c06 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv -, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU +{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv +, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 6569caad6c527e3240d394f3a8cf448cafdfbbe8..c44bd25b91a7556ad27aab3e4eaccf3529a95d13 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , qttools -, qtbase , qtmultimedia , liblo , gst_all_1 diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f2d40c2ac8084334bb3e6c5bcf68308352b1f238..02a0c2c0ec490bbb3c554516e8ed05bb7b649ab4 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm, ffmpeg +{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index cefd5b66aed14c4348c85e4e434f809a0b71e9e6..e3954598cbe00ca72d148e2e41f28b88bf77ef87 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 1eb725d10bbc88d1a2254a521ba7f8ac21ac59c3..090b4ec9ffe212b5056ae542f7344522177cd193 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio, openimageio, qmake4Hook, libpng, libGL, lndir }: let diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 9e5e278ba8941018163d3514354f763cca8fca58..422b50a85854880efa8a117f39674f7ee6e0851d 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg , swig, python3 diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 6c92b9aeed6b458fcd7057f5343448dac9501b17..cea85f553b5f74cec9a0ecd1cd4fe46dc5f59426 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook -, python3Packages, gst, gtk3, hicolor-icon-theme +, python3Packages, gst, gtk3 , gobjectIntrospection, librsvg, gnome3, libnotify , meson, ninja }: diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index a689697e0a0fed0bda843d63d845c1ac5c5bccca..1fce30edbdf4e751899dd3e7d5fc2fc21ecd0ed2 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4 +{ stdenv, fetchurl, qt5, ffmpeg, guvcview , cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils , libv4l, pcre }: diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix index 2beb3ca94f2453bbd30538c46d50f566ddef2640..984b623cee7ef26c7179d378ce3bbd53e96b899d 100644 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/pkgs/applications/video/recordmydesktop/gtk.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig, glib +{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig , pythonPackages, jack2, xwininfo }: let diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix index d85e4df7434d69a924ccf994c40226c24582d1e5..a875daf065e99977e3c4b2bd57093cddc0fb61af 100644 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, fetchurl, jre }: with stdenv; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 46d03ad3d622bb340e5f3f32e67cd50593db3e2c..6c739b32c5fbf487abb40c9a2fb983fbd4fd2e8e 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, removeReferencesTo -, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }: +, go, btrfs-progs }: with lib; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6e40f9ba07622c95767056777c9988ebb674e003..d52b5365b5efe7024e45821ec3020ae19a7eb89a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, bridge-utils, lvm2, systemd +, sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps, libseccomp }: diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index b0fd42f4efb13bb1760d27b12253ac10e78f9337..7172b172ef2faabcfc0d4289be0f5a1290c93ec5 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index f0ee4b5b26ede39726e9140c533ce595320568ab..8222fb50a8f934bc3620c17fa7d7bec1dcd7392b 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }: +{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }: with stdenv.lib; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e7ab3aa251cf63c78621068fc3d9b0f43a4a9ab1..f9770435aaf0baaeaaae34bcd1afe367461bde47 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 , libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap -, zlib, libpng, glib, lvm2, libXrandr, libXinerama +, libpng, glib, lvm2, libXrandr, libXinerama , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, gawk, nettools, dbus +, alsaLib, curl, libvpx, nettools, dbus , xorriso, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null -, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null +, enableExtensionPack ? false, requireFile ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index af344eb82cf515a6aa0bcb870dddaff372b2b48e..65435e19366be33a7b2dd1893d654e94bee7d20c 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, glibc, buildPlatform }: +{ stdenv, fetchurl, glibc, buildPlatform }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index dab90a1ed781bcb0397d08ff557d02fbfa720af7..5e21f7ee6081e6ef4134d96496ee4f5b9dcc5915 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -22,11 +22,6 @@ with stdenv.lib; # and try applying all the ones we don't have yet. let - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; qemuMemfdBuildFix = fetchpatch { diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 79be1be11908eaf93da1f9d1dc8be8dce5da1c08..f99cdb69d2a8e0d75f01e91ca12dd5f014a09bed 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -22,11 +22,6 @@ with stdenv.lib; # and try applying all the ones we don't have yet. let - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; xenlockprofpatch = (fetchpatch { diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 0538228d4b4e26302078abff8d2402f4c0abbe82..dc57ad13d414b12771d2f4fa325a7e9b7d3e2dca 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libxcb, libXinerama -, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm +, xcbutil, xcbutilkeysyms, xcbutilwm }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index 7b31c63128a74dd12c1c14be0c7554f2991d8bed..09c7c8e0e088b2f649be39a8db13e29538566853 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }: +{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }: stdenv.mkDerivation rec { 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 97e399a133ef16f513467e0416154b39f67c3d61..cc00f1e4b6e949be037ee4ddcfbb3442ae60e4eb 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -1,6 +1,5 @@ -{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 -, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop -, extraModulePaths ? [] }: +{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +, makeWrapper }: stdenv.mkDerivation rec { name = "clfswm"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 986639c947b07ef549df01e6073bddeff5fd9290..74c3c71dbf7c66f92e5b303f129739fe33d8a0cf 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev -, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon +, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index ebe58e921dddec8bed63b44a8d9d1d42580ae3ca..eaeb9979c10c90e603df198a127e79189a9d2fae 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,6 +1,6 @@ { enableXft ? true, libXft ? null, patches ? [], stdenv, lua, gettext, pkgconfig, xlibsWrapper, libXinerama, libXrandr, libX11, - xterm, xmessage, makeWrapper, lib, fetchFromGitHub, mandoc, which + xterm, xmessage, makeWrapper, fetchFromGitHub, mandoc, which }: assert enableXft -> libXft != null; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 1a3c976f77dea6d5c1bfd304009d19853dc2d5bf..81901be0e60b9348342d42cad9dc5a87a4fee386 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,5 +1,4 @@ { fetchurl -, coreutils , libX11 , libXrandr , libXcursor diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 117d4fe1d6a8f7cc930a94e107202986dd8f5276..3ed7f4325f24364948aa3a723104c8dffaffd5ce 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop , extraModulePaths ? [] , version }: diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 3181914c40ffa1236b16def639ed0e5cb4bed946..dfb2eec5dc553707da247e5a9b746873d565ec89 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,9 +1,9 @@ -{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); in stdenv.mkDerivation { - name = "taffybar-with-packages"; + name = "taffybar-with-packages-${taffybarEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix index 9ba6db36772023d97bdfa29ab178939386aa099d..8a740b15500da74abf6d444dc46e16af357cdfb5 100644 --- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix +++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix index d1c0993982ab02b50c97cc057c1b2873306bf4c0..c63123db7ccbca53bb28cd2fdd15b0fd0e5ab077 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix index 253281b6a9a20d2f3ba21bf869742712768caa24..947a9653e56dfbe0cd7a897fcf491bcccb454167 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix index 80775112abc103049e649b598371b76a685909b9..008df5479ce1b3b0716fc4fe744453148e7c3eb6 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -1,13 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index c68562d82b39ac19cca3daaa056ab8c70eed4a20..8a680e1f763342fd9579e3d79ef084f36208dcc9 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, pkgconfig }: +{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }: rustPlatform.buildRustPackage rec { name = "wtftw-0.0pre20170921"; diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index 6f3d463adb280fa8fcc7f2ad1101debcd139e69f..bc7a5174e26b6b74a5e315468ad46df760b31548 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -3,7 +3,7 @@ let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); in stdenv.mkDerivation { - name = "xmonad-with-packages"; + name = "xmonad-with-packages-${xmonadEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 219530a67bd8c9b05aeec76a9680ec5a55d77c3a..c733556de45c80eff9d2b206073141d7ef2c51a0 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }: +{ callPackage, runCommand, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index ba85428ba8c49adcb7a4c180337153bb0074f28e..30df3e8e7336d1953481a123b24fee3a37ecd09d 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -17,7 +17,7 @@ infoFile: let ${lib.concatStrings (map (dep: let inherit (dep) url sha1 groupId artifactId version - authenticated metadata extension repository-id; + authenticated metadata repository-id; versionDir = dep.unresolved-version or version; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ff45cf81d7e5fd85c9e3f046c8110218816d5021..950c0c86a6e4479c55ef3506d836cdcec4ec7176 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,5 +1,4 @@ { - callPackage, coreutils, docker, e2fsprogs, diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index b1853bf73641acbab47103fef3a582509012d836..62370d361cd023b39a1bde9b69c4e99fceb2e29c 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -14,9 +14,6 @@ assert modifyPublicMain -> mainClassFile != null; -let - wrapperCS = ./Wrapper.cs.in; -in stdenv.mkDerivation { inherit name src; diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 79a26abcb831b7a5e01ca2fce528540c94c9a7a3..e6f6c23e449ffba0e1c408508ab8fd12f3c5a331 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, fetchurl, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo }: with lib; diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index f55c91f82c7db475b92bc46fec7c369fd27f6420..5fa45b154a371a2c9934ee4f4441e6b71bb981e4 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchurl, fetchFromGitHub, emacs, texinfo }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: with lib; diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 3b965b06662c3fdc117cd753176fb5280c67764d..02777c9900dcc8d3dc84c31f0e287c1e3bd78eca 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, darcs, nix, cacert}: +{stdenvNoCC, darcs, cacert}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index c01288dbf53a0a394db6c9d404a350a300709c29..001693501ccb0d071590bbccd1751d8ed69600b8 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -32,7 +32,7 @@ let pathParts = (builtins.filter - ({path, prefix}: "DOCKER_CREDENTIALS" == prefix) + ({prefix}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index ae3ae4185e0537e9740a0503a0602367cc357a12..3556df32d926d0ddef3cf664f551372679be4b1a 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }: +{ stdenv, lib, coreutils, bash, gnutar, writeText }: let stripScheme = builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix index e051cee08432e1e1b2631a500deddb792ea13e1b..3b0c33770467e7d3eadd979f8b6f1046dba062f8 100644 --- a/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -2,8 +2,6 @@ let awk = "${gawk}/bin/awk"; dockerCredentialsFile = import ./credentials.nix; - stripScheme = - builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; in { fetcher , name diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index 4dcf6d06718afd03f86c85e577233b9b480c6300..59376f3b0424f5609a2c9d3a7d6fd79438e3774c 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -1,4 +1,4 @@ -{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { +{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // { SSH_AUTH_SOCK = if (builtins.tryEval ).success then builtins.toString else null; diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 7a25966e9fb520a78796165087cbdd4f74995612..fa1945775537467898653a90fb40e20c2153d3c4 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,4 +1,4 @@ -{ runCommand, git, nix }: src: +{ runCommand, git }: src: let srcStr = toString src; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 36a48ce9f17001529e1b9a08fe6214cce2eadf45..40ead021cdbf882ff7e45efe86f25359d2c1d1b8 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +{stdenvNoCC, mercurial}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: if md5 != null then throw "fetchhg does not support md5 anymore, please use sha256" diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 40ba79ec4353f240f3c9233dc65d235f78deef00..960bc3c1ffb2e6e2130b252e220a0fbc89b1ff07 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, buildDotnetPackage, unzip }: +{ fetchurl, buildDotnetPackage, unzip }: attrs @ { baseName diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 14dac9997d94d343897a058be9b591766c8c2779..3dbde203374d886df75903eb2c2f2ef54639c865 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -5,7 +5,6 @@ , sha256 , region ? "us-east-1" , credentials ? null # Default to looking at local EC2 metadata service -, executable ? false , recursiveHash ? false , postFetch ? null }: diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index be76c283babc557075731e373ab8a61293b0b9a5..6c7dd67c40025e0611661a3d946afb21edfccbfc 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -53,7 +53,7 @@ let makeDeps = dependencies: ''; configureCrate = - { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }: + { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); @@ -181,26 +181,18 @@ let makeDeps = dependencies: runHook postConfigure ''; - buildCrate = { crateName, crateVersion, crateAuthors, - dependencies, completeDeps, completeBuildDeps, - crateFeatures, libName, build, release, libPath, + buildCrate = { crateName, + dependencies, + crateFeatures, libName, release, libPath, crateType, metadata, crateBin, finalBins, extraRustcOpts, verbose, colors }: - let depsDir = lib.concatStringsSep " " dependencies; - completeDepsDir = lib.concatStringsSep " " completeDeps; - completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; - deps = makeDeps dependencies; - optLevel = if release then 3 else 0; + let deps = makeDeps dependencies; rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; - version_ = lib.splitString "-" crateVersion; - versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; - version = lib.splitString "." (lib.head version_); - authors = lib.concatStringsSep ":" crateAuthors; in '' runHook preBuild norm="" @@ -348,7 +340,6 @@ crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, cr preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); - release_ = release; dependencies_ = dependencies; buildDependencies_ = buildDependencies; processedAttrs = [ @@ -431,16 +422,16 @@ stdenv.mkDerivation (rec { colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); configurePhase = configureCrate { - inherit crateName dependencies buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateFeatures libName build workspace_member release libPath crateVersion extraLinkFlags crateAuthors verbose colors; }; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; buildPhase = buildCrate { - inherit crateName dependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateType - crateVersion crateAuthors metadata crateBin finalBins verbose colors + inherit crateName dependencies + crateFeatures libName release libPath crateType + metadata crateBin finalBins verbose colors extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix index ac6bb6ab1bd449cdbbdc7cfdb192539fc5bfa24b..486f365f78acfb4ae59c5a233d031ae6b3ace684 100644 --- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix +++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix @@ -1,5 +1,5 @@ # Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix -{ lib, buildPlatform, buildRustCrate, fetchgit }: +{ lib, buildPlatform, buildRustCrate }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; hasFeature = feature: diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 5b79d607f9d5d38e65cdf5d9c8c2a79a6447b0b1..22d3fcd0c1fa663ac36e59821acc2b91ecfa0a66 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -2,12 +2,6 @@ { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index d7d03aae33ee07817fcc27d093c1d4efd54eb635..fb1d6e390ae1647fc83d647ac1268af1f48359ed 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }: +{ stdenv, cacert, git, rust, cargo-vendor }: let fetchcargo = import ./fetchcargo.nix { inherit stdenv cacert git rust cargo-vendor; @@ -20,8 +20,6 @@ in assert cargoVendorDir == null -> cargoSha256 != "unset"; let - lib = stdenv.lib; - cargoDeps = if cargoVendorDir == null then fetchcargo { inherit name src srcs sourceRoot cargoUpdateHook; diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index db2bef367e9ee4e4646f91049254719ee8f85c9c..5179f47eaa5ee3a0656819894047b0ab5093aa28 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -8,8 +8,7 @@ , vmTools , gawk , utillinux -, e2fsprogs -, squashfsTools }: +, e2fsprogs }: rec { shellScript = name: text: diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index f1575219982225c54da4f29f8975c90d65bc6cac..e5ff13f0da9d12445ab29dd92f1965dda08fc889 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -21,11 +21,6 @@ let in { runInWindowsVM = drv: let - newDrv = drv.override { - stdenv = drv.stdenv.override { - shell = "/bin/sh"; - }; - }; in pkgs.lib.overrideDerivation drv (attrs: let bootstrap = bootstrapper attrs.windowsImage; in { diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index c2e64cb63dd1440602cb9471a757139694c5bc5c..909985d945bca47dbab6072423143ccca0d3261e 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: let version = "2.04"; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index de281c278e6276a82ade836cc199b49a1ea7bb18..0be58d06fa4dd1124179f4a7479202d0362fa6c4 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "google-fonts-${version}"; - version = "2017-06-28"; + version = "2018-07-13"; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc"; - sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg"; + rev = "3ca591dae7372a26e254ec6d22e7b453813b9530"; + sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr"; }; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22"; + outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83"; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 4fc47793661b6519c528c8eaea8774dd7d19dde1..f7fce315e8c1391bf66d32aa8e0364abc76aee04 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, - runCommand, writeText, nodejs, ttfautohint-nox, otfcc, # Custom font set options. diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 33435c98267a08c997ec5b712e59e0d8c2539d86..0a086453244ac1e026bce1dabbc1f478e157f043 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: +{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, pythonPackages, pkgconfig, pngquant, which, imagemagick }: let mkNoto = { name, weights, sha256, }: diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 1cbf7168ea961828a57b775ac8363caaff52fa40..a801886350df10b4b69df83ed702758d8bc0f867 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { + mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { name = "tex-gyre-${variant}-${version}"; inherit version; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index e867d0fbb4beb19d181467ea9085f0f6e016647a..aa6a42badb7c3994a18943d175151d11d1908cf5 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, nss, python +{ stdenv, fetchurl, nss, python , blacklist ? [] , includeEmail ? false }: diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 8d9ba54c950050ee5d60a0f5725642d5bd8afd47..a8af8f791a9266de87de6f9e7212bfe110db14f9 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz"; - sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz"; + sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673"; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 2eebe61b142ee16a07b7956e8688692da8494380..3a65a9626d141270c82f6630e70f453ea114f18f 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - mkNixBackground = { name, src, description } @ attrs: + mkNixBackground = { name, src, description }: stdenv.mkDerivation { inherit name src; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index bc51ceeca43190b424a6a3cc3d07aa227da98384..3d8e16443dbf3cb1aba1875089af0d748c55eebe 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl}: stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index d4cb7bc889d37370cbf8a048db2bf6a445e9a3aa..35e69641f1169af01d5b71c90e4bbcfb73138499 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index d2cc69559b869169194df8e77d930f762cacf235..f8c827e826d0f3f8244aae4d60ef99c3384a2d42 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index e1f9337df9416953fd35559136dfdf3b16dd03ab..2c253a1029d6150bdcea9aa06dce32ec8af912b7 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 1a9d622affc603a1e5a0e0f5b7b2093daa1b32dc..d051d205808b5816e7e284a00635be2ce9c4fcbb 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 301b400ac7e1fa973cd5b650ca73d129352b0d83..156ee653bbe369c6ff610cdc99b225118f69eaba 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip findXMLCatalogs; + inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 10b76f7b2b55ae88da0c781dbb97b2b1cfde91c4..41c4b73d3f629cfb74915345776154f52965ac9c 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: +{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: stdenv.mkDerivation { inherit src name postInstall; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index dc538625bf09c8135c384cde3d84e125c6ec1722..9119d5e93d81fe8b638207c4a0c1c61a837b4f38 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu, xkeyboard_config, pcre }: diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 276bc7e79c1a68f9883c16b31635d72503a7cb50..c4f6ad8207c2f1f896b9e2863b4e188fe50f665b 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python , shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 -, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 , libSM, docbook_xml_dtd_412 }: stdenv.mkDerivation { diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index d85b5494da47a49b03d0a8b78c0b7629e6e136e5..3bef218740cbece4e8d60dc3de8c688717c543e6 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra-gtk2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python +, gtk, libXau, libcanberra-gtk2 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop -, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: +, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index d4935c498f136dde81d2c2f67239f8762fd9366f..c14ee25981c77527cabcc048f7e5301a3f8306e1 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index a9b692aadf51157cb4802fde1cff75112c255701..0233f6340f554df53a33868c0668b5573d0b3755 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk , gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: stdenv.mkDerivation { diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix index 029d751e719078993d8146af15c15696860bcb82..5ae126df331c295760672dd9098feea58389d0c4 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}: +{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}: stdenv.mkDerivation { name = "gnome-vfs-monikers-2.15.3"; diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index ee0bf5f82a098bb9a8ece3508fab84088a3293d6..bf0cec8dfbe6039691fa52ef36de4bdfd277ee9c 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 2dcb85235ee4c075c46c68f94e31c3880c4846d7..42f47bc5a83fe4c518d85b8ba84123642fb1253c 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 -, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg +, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index b07417ecc35aa81f3cf2ea8d87128ccffaf24ef0..b5525957d468de4ac961a847ba818230212351de 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook -, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }: +, gobjectIntrospection, gjs, libunistring }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 7db21d9e74830551983f623ca1ede3362017ac8d..a7d4288c9eb5483b4255a2f7cfec66c35553fa27 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,10 +1,10 @@ { stdenv, meson, ninja, gettext, fetchurl, evince, gjs , pkgconfig, gtk3, glib, tracker, tracker-miners -, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts +, itstool, libxslt, webkitgtk, libgdata , gnome-desktop, libzapojit, libgepub -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json-glib, inkscape, poppler_utils -, gmp, desktop-file-utils, wrapGAppsHook }: +, gnome3, gdk_pixbuf, libsoup, docbook_xsl +, gobjectIntrospection, inkscape, poppler_utils +, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 560d8446f088426f73d88f255b4d125d771abf18..eef91ec0fbb8a510eb30d471a74f5c896c234c70 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker , libxml2, python3, libnotify, wrapGAppsHook, libmediaart , gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins -, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib +, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib , itstool, gnome3, gst_all_1 }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 4ae67f9b41d688de2988858a06debb2430608f54..d3bb75d1f97d92ef03c797843978af8e7e138cd1 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,4 +1,4 @@ -{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme +{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell }: diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 60e8822135ced34c3bad0d705cf85dfc9fbdef10..1bcf778390074582c1b82e174f278b1e4ea59684 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, vala , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme +, gnome3, gpgme , libsecret, avahi, p11-kit, openssh }: let diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 400b3ea9a9b09c12e8924a541b77d5e1687b151c..71779c17280772098f32025d3497fb251b9844c0 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 -, libxml2, docbook_xsl, makeWrapper }: +, libxml2, docbook_xsl }: let pname = "dconf"; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 98cfc686e9780eb21e65fa1ad1395cab1755bbe1..089c32d602ea0242d00ca242cd704f4a2f2a5d11 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,12 +1,12 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus-glib, telepathy-glib, telepathy-farstream +, telepathy-glib, telepathy-farstream , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control , telepathy-logger, libnotify, clutter, libsoup, gnutls , evolution-data-server, yelp-xsl , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info -, bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee +, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 2f7452dbc572a3a9e7b5fa728d0c2a5eb146d888..5ceba1a77194e2ad89d957b14cfa433fc1527ac7 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus +{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth , librsvg, coreutils, xwayland }: diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 772df5d24417d93939c27e432bc7f1e292310da9..c3b2f97f9b2f4fa38d283cb0cc762880ee75e35e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook +, libpulseaudio, libical, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , sassc, systemd, gst_all_1 }: diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 6cb827bc504f310ccb61ea1336aa9927f5d9ad72..1938c90a8254a03ba6209f96010d8d96abde127c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: +{ stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 509c10d75648ae322add4525b35d67385c48d777..da117a536911a629704365c5d712e7f9d7747692 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, gnused, systemd -, bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd +, pkgconfig, gtk3, glib, libxml2, systemd +, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index c6000352ab06c4b64d2431b59260ac0cc1440666..35e2012c531389f3d5637fb88dca15dd2215d109 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite +{ stdenv, fetchurl, pkgconfig, intltool, sqlite , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av , gmime, json-glib, avahi, tracker, dleyna-server, itstool }: diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index e5ca314c69afc767895a62f7245fd2b5e5c232a0..5dc6137c9fcabeaf8163c0edc96d5f099793905e 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection # just for passthru -, gnome3, gtk3, gsettings-desktop-schemas }: +, gnome3 }: stdenv.mkDerivation rec { name = "gsettings-desktop-schemas-${version}"; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 1562c42b374a34b7ca1daa17c26e58a339b94e41..861702a3986e4729f7f7bf072ab1dcf9ba8fd379 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool +, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 2daaf2d43261c09f26a0ad273f6c63438cd3343c..5beabd08fa3a23b33a86f68936ebcf184f73c1a0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook -, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif +, gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: let diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 114c0d8ac960d6bf6f620a7eeaf9bd13507460dc..100a2727fc3c7cfdf6efb60d358b5162c3e6adec 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, clutter-gtk, clutter-gst, gnome3, gtksourceview , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 7cf1872da5a903281f57574021c116f770fa9c45..1a7e257f92971775421077d7eb360d998d5c55ba 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter +{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg +, wrapGAppsHook, itstool, libxml2, vala, gnome3 , gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index ed313221e56afb14b4289cdfc7df6bc2891ca17f..17385ab7202958b68fe4f0803955faf03acf4432 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2 +, gperf, pcre2 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index f904a90454f3f77dc6f801fef56563131ea73cef..6abaff8e32be70ad2eec9e5d8d047fe544a4046f 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash +{ stdenv, intltool, fetchurl, pkgconfig , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index b9788106342738f53357c5326c20aeccd2dbc85a..7f9996d17d99759b71652e926d22acb6f754f1a1 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 47a0238a7fd55b71a121771e3641be461941ed78..395e90d263efc3bd2c07e6723b450d01ab13a491 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }: +{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 84a9d26c2d761c881978508b81c4321569ed06ac..f9c45f45ea4a734ff4e71cf5e1cafd0c6e93cd78 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext, bash }: +{ stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { name = "gnome-shell-extension-topicons-plus-${version}"; diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 8194e3f1699d7c54a1fe83a0736770ee9cefbd5a..f8d2961222351f9db58844c9feaf5dbce8a7ad56 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib +{ stdenv, fetchurl, pkgconfig, glib , gnome3, libsoup, json-glib, gobjectIntrospection }: let diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 32da3a9a4b81583253a313b77ccb542a7ffbad3e..d2dce9d6f1b85fe7e9099f86acdfd6a82b3c5d40 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret -, libsoup }: +, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret + }: let pname = "gitg"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a7c69de44eb64a471d3533dc871959c28e35c6c4..41206b71d42a6a991345ea6d2960fec5981e416a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,7 +1,7 @@ -{ stdenv, meson, ninja, gettext, fetchurl, atk +{ stdenv, meson, ninja, gettext, fetchurl , pkgconfig, gtk3, glib, libsoup -, bash, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: +, itstool, libxml2, python3Packages +, gnome3, gdk_pixbuf, libnotify, gobjectIntrospection, wrapGAppsHook }: let pname = "gnome-tweaks"; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index ce7bb6f75b5cd71926671a8bd2a7b30836b2f7ef..a10675ab80335b66ae9ca255a77ff3d70be54f2b 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null }: diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix index 210b72292fd66129ca19cb05b052b588a67d737f..d5018a4350f829cb81b8e44e687937da0ea392c6 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/desktops/gnustep/gworkspace/default.nix @@ -1,6 +1,5 @@ { back, base, gui, gsmakeDerivation , fetchurl -, sqlite , system_preferences }: let diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 00b96cd2fac1bb473dba5138d324f4145ecde280..7bb287c3fa5985b8524edb639970bca29b021fcc 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, make, makeWrapper, which }: +{ stdenv, make, makeWrapper, which }: { buildInputs ? [], ...} @ args: stdenv.mkDerivation (args // { buildInputs = [ makeWrapper make which ] ++ buildInputs; diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 191fe0796e887ecd8371681c8f8710f98d888785..ba4937a7227fb48163af6611e1ad049b955fff86 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 40c25b3302ca4b8272ec96a93f1d68c13472250e..675368c9a69e6714114f050bae3d8c814342a958 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeScope, libsForQt5, fetchFromGitHub }: +{ pkgs, makeScope, libsForQt5 }: let packages = self: with self; { diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index eda4e9b05bcd48c90dedea160dcb96415202b355..59316039b36b85989781d696ed96fcc711730fc3 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index c0c3cd48376e0063b65d6e647ff80dcfc3287e51..92da012ca7dab0b03c4a2031bb54d93946f76a3a 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-panel-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0"; + sha256 = "0093pimqkx5db2nciksgrmq02hldg08p7hghafky3njl0kzv8l5z"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 6a24e67d2c7056d83af4cd36421b216bf249cf0e..4138a042856b0d773d793591b52236545b827a6d 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 8d6d470727dd7dee55f79fddc44933b42d370a44..bdf5ac29ca61e78ae3ab43d3dd70f49590d512ca 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines, +{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk_engines, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0b1668038f59640ea903819d1e3ac1847e32632c..2c99713bcd4a32a6a22f8a8802a0bee4b009f61f 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,8 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, gsettings-desktop-schemas, - debug ? false, + gconf, gsettings-desktop-schemas }: let diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index e23ffd3644a04a57c6000d14609e4475cf95449f..398fc356fc9393f7f34afbc2e6527ec674e70606 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio, + kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays }: diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 2c9d824999e2cc5923c26307440a7adc05e9ecfa..a0b09e30338f50fb423f23962de29431e6cd9f4a 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, fetchpatch, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 28c586382b46ce5ef26caad29f10efe2ce86e9ec..8e5bffd9dd6f2813db8eb0307708175e23def82c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup -, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: +, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 2d5a169a215d223ca7912a8dc2b7b43fd74267fd..3f6237d6de17baac8b98b45ad7ea633031726dd6 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit +{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit , libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg , hicolor-icon-theme }: diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 4db9e03ae721676777a6b4bcb070c4d8b505bf9c..7134d29c9ffbe6f994910320c3eea3c7915983d5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }: +{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { name = "vala-panel-appmenu-xfce-${version}"; version = "0.6.94"; diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix index 451322bcaf97e4cbc893df73e48c99d9f284c0ce..6db207a79c56dd6a08881d9f16c2c5612e83ac13 100644 --- a/pkgs/desktops/xfce4-13/default.nix +++ b/pkgs/desktops/xfce4-13/default.nix @@ -19,9 +19,7 @@ makeScope newScope (self: with self; { libxfce4ui = callPackage ./libxfce4ui { }; - mousepad = callPackage ./mousepad { - inherit (gnome3) gtksourceview; - }; + mousepad = callPackage ./mousepad { }; orage = callPackage ./orage { }; diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix index 84206f763f3e2ee666d03a37679d6b7e292ec5e1..b5fd3a19d0609160ffea4d6fd062c4e32c1c44d3 100644 --- a/pkgs/desktops/xfce4-13/mousepad/default.nix +++ b/pkgs/desktops/xfce4-13/mousepad/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }: +{ mkXfceDerivation, exo, wrapGAppsHook, dbus-glib, gtk3, gtksourceview3 }: mkXfceDerivation rec { category = "apps"; pname = "mousepad"; - version = "0.4.0"; + version = "0.4.1"; - sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw"; + sha256 = "0pr1w9n0qq2raxhy78982i9g17x0ya02q7vdrn0wb2bpk74hlki5"; nativeBuildInputs = [ exo wrapGAppsHook ]; - buildInputs = [ dbus_glib gtk3 gtksourceview ]; + buildInputs = [ dbus-glib gtk3 gtksourceview3 ]; } diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index dfdd8141aaaa844a342fb85215b36b3d92f018e6..45186914604dd334964f43efd298977bc41ba197 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -1,5 +1,5 @@ -{ pkgs, newScope }: +{ newScope }: let callPackage = newScope self; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 83de6f9e56975a544b86fd7797498c8887aa57e1..f10c8ec86ff90b8d3e5173b9a1bd5f7ebd55135f 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, erlang }: let - inherit (stdenv.lib) getVersion versionAtLeast makeExtensible; + inherit (stdenv.lib) makeExtensible; lib = pkgs.callPackage ./lib.nix {}; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index d6b83cb1af04ead6e059ad2f3329612ce91ff80d..db40c47794fa34af7d8f7298e329c9f8f03c55f0 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -49,7 +49,6 @@ rec { */ callElixir = drv: args: let - inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/elixir/generic-builder.nix args; in callPackage drv { @@ -71,7 +70,6 @@ rec { */ callLFE = drv: args: let - inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/lfe/generic-builder.nix args; in callPackage drv { diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 968c845a011969729f02964c10734d9837ae6c96..ec5e08ffda402d30db14f8887fd666ba3ce7d314 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared-mime-info, gtksourceview, gtk2 -, targetVersion ? "4.5" }: +{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant +, shared-mime-info, gtksourceview, gtk2 }: let release = "alpha"; diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix index 58247e5aeb533ce1bcec01d5300e0d9ef47eaba7..2a14a997e57daf3a582d5ed6866b735eadd0415d 100644 --- a/pkgs/development/compilers/chicken/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/eggDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchegg, chicken, makeWrapper }: +{ stdenv, chicken, makeWrapper }: { name, src , buildInputs ? [] , chickenInstallFlags ? [] @@ -8,7 +8,6 @@ let libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; overrides = import ./overrides.nix; - lib = stdenv.lib; baseName = (builtins.parseDrvName name).name; override = if builtins.hasAttr baseName overrides then diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 6bfb71a9627d9bd305a47368489267f62b6ac69d..6ff2028e3c16e28a01655c614de7864112b59f83 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub , llvmPackages , cmake, boehmgc, gmp, zlib, ncurses, boost - , waf, python, git, sbcl + , python, git, sbcl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index b7c310cf01d2aad3302419d1fc051f7c08cc17e3..e44c21abe94602bfbc28c84425e84cf4dced1084 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib +{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib , gcc48, gcc49, gcc5, gcc6 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index e7cb7495c90e0298e175bafcad99a5d7998996e6..f16be1b28225f946452135ef36be3f8595c9c607 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -6,7 +6,6 @@ , libuuid , zlib , curl -, patchelf }: let diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 8ed34cf9d1e04c4f2e374230560f717effcbaf22..6a8d5f11b75c0cc2bef5d977eb5135a843d44300 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }: +{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }: # To update: # 1) Update versions in ./update-elm.rb and run it. diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 8e268aa7eb7446de99d1b99e74fa672ad68cf6ee..e03039cb5e14eaab55ded357783a056c92641347 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,5 +1,5 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs -, jre, binaryen, enableWasm ? true , python2Packages, cmake +{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler +, jre, binaryen, enableWasm ? true , cmake }: let diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 5317cf25d41baed100dd62d5e687845b19daf884..06acebd2ba4a8d6ed30b8d7e6f829bf612ca8453 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -1,4 +1,4 @@ -{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }: +{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, ... }: let rev = emscriptenVersion; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ce1987866007ecd49d1b69a34b717b9224ded1ee..4dab2e06f48e88611ef5d09477db53c80bd2aa24 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, +{ stdenv, fetchurl, fetchFromGitHub, glib, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, libGLU, libXmu, libXt, libICE, libSM }: diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 202e552542223863ab0037ec5a6b34514b514f5d..72530f99cdbcc16e5b790d8b9b85eaf143b66c1c 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,4 +1,4 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }: +{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }: stdenv.mkDerivation rec { name = "gambit-${version}"; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 93f1d9184b4d8c6812c76212536f3ed8048ac7ce..77e8fb51602cbaa83381bcc49b0a77c259effbce 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -2,7 +2,6 @@ callPackage ./build.nix { version = "4.8.9"; - git-version = "4.8.9"; SRC = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 545bece12c4886590f2969ea5a49a2bda23eafea..169ddb5a6a310fdb2cfe4922d5688fa438312b34 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -2,7 +2,6 @@ callPackage ./build.nix { version = "unstable-2018-05-30"; - git-version = "4.8.9-54-gffe8841b"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 75259ed39834488a5d4d3171cc04133165fdb162..943391611de1953b26aca702be3781ea4e27a78a 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -28,7 +28,6 @@ , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -54,9 +53,6 @@ with builtins; let version = "4.8.5"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = [ ] diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 27164176b532df4a87a58818063036f5eb9adf0b..bf3b192e1bbda684130a593f806cbea72d8c04d6 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -28,7 +28,6 @@ , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -54,9 +53,6 @@ with builtins; let version = "4.9.4"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index eeeabe301d135aae03ddb59ba778b3ee7613ed4f..0564329967e56c1b2eabdab04fdcfcf7468af99c 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -29,7 +29,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -53,9 +52,6 @@ with builtins; let version = "5.5.0"; sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index e5c77568a0ede172a2e65ce3390645a9b91a2e0d..50d55aef23423c7d55ebe23a67031873ace736ab 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -29,7 +29,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -52,9 +51,6 @@ with builtins; let version = "6.4.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d671743ee629e61aeb43e08a702c3c958aaf6190..0c51868aef8dae46b802ccff32c25c7341d6a4a4 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -41,9 +40,6 @@ with builtins; let version = "7.3.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index e8c03c382308b227c67be525b9fd6a2b1a614f32..38d8bcd83cf59c4dd3d5e5e637acb8409a580bc6 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ stdenv, targetPackages, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -41,9 +40,6 @@ with builtins; let version = "8.1.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 4e69d7e0408c67861b22a83f12620a9d9559caa1..124fdbcdf9d44cfa8233aa74fa4f14df30be08f9 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages @@ -42,9 +41,6 @@ with builtins; let version = "7-20170409"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 2a80eccfb40369d6f0dc1fe93160bb8fb484973a..71a6eaa8db8de791382ac362745f5068c9884b0a 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mpfr, m4, binutils, fetchcvs, emacs, zlib, which +{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace , libXext, xextproto, libXt, libXaw, libXmu } : diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 0e4d5bed0514cd543eaa45b87d1e790019e502cf..f503427b326eba8d3ea04b6e87245d6ab7e2a9ee 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which +{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xproto, inputproto, libXi, gmp , libXext, xextproto, libXt, libXaw, libXmu } : diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 5609de15d4cb0738d67ef5b3e2843dacbeb5772c..0ce9fbb00e2e886ea735333109ebe45cf2f466a6 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeStaticLibraries, +{ stdenv, makeStaticLibraries, coreutils, rsync, bash, openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, version, git-version, GAMBIT, SRC }: diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 2a906d918aa35950b29bd3f539a9464eddb2f23a..0cf3a4cb12b48f88106c38f714a8d65ee7ba0a8c 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -3,10 +3,10 @@ # build-tools , bootPkgs, hscolour -, coreutils, fetchurl, fetchpatch, perl +, coreutils, fetchurl, perl , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 8062e93df549dfd76d621766d3ba3f2d7b19e46a..7671fcdb0252e74a1399d0e518df38e7933b7587 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -5,7 +5,7 @@ , bootPkgs, hscolour , coreutils, fetchpatch, fetchurl, perl, sphinx -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index d740a7ee673b8cf3d921c6d8adc6be48fb932f45..c24cdeb43bfd203292ae2ff2b4edc096741d3b96 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -6,7 +6,7 @@ , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx , runCommand -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 182afa6b3496ef166a0bb5094dc547c55c9c577b..c93fb1fd9b2277738757e630c667be5eae365cbc 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -5,7 +5,7 @@ , bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 522ad32e69f4f981dc45dd6bc4273be38c0ab549..ae22e1f1e4062e6fa1a8f67235d5afbbe4677e90 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -3,9 +3,9 @@ # build-tools , bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4c1e5d986dcf7437d2495cc90f82b2115bb2c983..2824ce669ee62b64c694b6931acf57bfccee7a68 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,7 +5,7 @@ , bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchgit, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix index 57d9fccd266b924b9407473e4407043cf031a905..df1394e4a24b85994edbfe85d78e39cd363c1d63 100644 --- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix +++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix @@ -4,7 +4,6 @@ , python3 , gcc , cabal-install -, gmp , runCommand , lib , stdenv diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index f09a577110b76c58e093e9cf6d0ca1a4a12c4c52..46e9d8d72bed2eb0eebf6c57261ee243db35ee0c 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -3,7 +3,6 @@ , broken ? false , test-framework , test-framework-hunit -, test-framework-quickcheck2 , data-default , ghc-paths , haskell-src-exts @@ -20,10 +19,8 @@ , transformers-compat , haddock-api , regex-posix -, callPackage , bootPkgs, gmp -, jailbreak-cabal , runCommand , nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm @@ -32,11 +29,11 @@ , lens , parallel, safe, shelly, split, stringsearch, syb , tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal +, vector, yaml, fetchgit, fetchFromGitHub , alex, happy, git, gnumake, autoconf, patch , automake, libtool , cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs +, haddock, hspec, xhtml, pkgs , coreutils , libiconv diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index b4fa005c3de851135a43bcbc043c6302de639685..513d0307f6bf44572afbd6d5d23055c2e8bf9eec 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps , pcre, cacert, llvm -, Security, Foundation, bash +, Security, Foundation , makeWrapper, git, subversion, mercurial, bazaar }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8ef528e2c92ae27bc47cbfe3c672acd307d989f9..d46e40f460b17f8be8949633390df6d6ba18884a 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps , pcre, cacert, llvm -, Security, Foundation, bash +, Security, Foundation , makeWrapper, git, subversion, mercurial, bazaar }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 79446744371517ce2f9b4f58178ed95c05749d9f..52a49c519b3991a2d785a40ec3df3cb598b79cd1 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: let # pre-download some cache entries ('mx' will not be able to download under nixbld1) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index afeef2b3637cbd63d211d009deb4e159e12b1692..0a974fccc888bcbb8a77d014ae1a693f60059e4d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }: +{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }: let generic = { version, sha256, prePatch }: diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 7f1830430c45b2b99c63c7f92ac09344fc0fcfc9..a6955c030519f392acec7e8ee0e5cdfe30684260 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }: +{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }: let version = "6M62"; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 9c4b38f87dedc14afafe8bfee5643f93776607b3..e64c0c912d947a8da2b86986b9c2a3a856b9c41a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -1,6 +1,6 @@ { stdenv, git, clang, fetchFromGitHub, requireFile, - openssl, xz, gnutar, gcc, + openssl, xz, gnutar, automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 7aedf191abee0a35ec92a5e913fe6c43c8362183..a5d6247ffdc7e35cdc1f683028142b64de124f3d 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index cff6c1c446f1403602a2217e9a310a924dd1506b..e503b7a92ce48d2fa7e32b281db2cfc4e2fd98fa 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchgit, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, runCommand , paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib -, llvm, libffi, ncurses +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 49bbaf0e8df117ca5ffc7ea5695c2714be3e2cf8..fcf486b3b41a31358fd4283b3e469f4b176a9aac 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchgit, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, runCommand , paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib -, llvm, libffi, ncurses +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index b5a3a8c6be2d2464d08435ad505d7df723be5160..a504dc2ea463d071c70aa3dce0e218a6e14547eb 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl +{ stdenv, fetchurl # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl # libjulia dependencies diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 48301a8f28740a1bf92deec20b2d4f4740da5b90..dc6a933a93459e678b018ff2b2d8dbb046d71604 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata +{ stdenv, fetchurl, cmake, llvm, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 0b29b04825a10ff80324a380ce57879950a3c487..25bb082841424ff21073e3ec2b37384c60ed3e93 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index 96d4f9f558c8c8c1779e4ca7a7cc6489186022c5..d54ffd96382d19f15935860243ef491f98db421c 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,4 +1,4 @@ -{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: +{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { name = "dragonegg-${version}"; diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 1bd4b88c72d4823b96af21a4838de9c81d8d1a0a..f176894dedb9f84c1dbbd815fbd875514290e867 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,5 +1,5 @@ -{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl -, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl +, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 1654914ff8c4ca52a29bc20dafac1bd9a3e280bd..98b6f4adbbf6810d7af8f78055a0075d5bf1e0e0 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 28f908ee829f0df06a55a3c74d4e0019cc61f7df..99869e6e80a74cae305b3d74753eb28d99afa09e 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a6fb6119817608cab8f72f2a61f89a921eb56eb5..8cfcb1af43d4e9e9ddb7a98b640ec7077490f506 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index ea3ea36eb6d365e28c89823798cd066aac690c6b..01c08f4bd2091dd269b62677b23ca521112ef6e1 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 458ad7db8efde4e6605480388a11ef56c67ee852..c974eb6f6d39542e484ddb60d14aa95dd2dcf03b 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -8,14 +8,12 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib , compiler-rt_src , debugVersion ? false , enableSharedLibraries ? (buildPlatform == hostPlatform) -, darwin , buildPackages , buildPlatform , hostPlatform diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index ae674d1fa8e8dba37dcc7892be590cf6f9310756..75037f6a07db1a9d287ce1c61ce708732c30b76b 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6ce9c0d4792b4febf46e336e60e0a19ea8d383c9..2b543b9d793ab49fbbfbcc0761be420863e57a81 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index 776109ee74d18dea502356bc852ff1b8bd31a0e7..21b0c1c3601c1d5e30d276193c00530280cf5a35 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -1,9 +1,7 @@ { stdenv , fetch , cmake -, zlib , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index e9140d3fcc6aa6ee4e94f0b51ab58c70dab23a48..514c3a006e38a00d0c165549f1e0e6eee5dd09a2 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -6,7 +6,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index 0bdf5c71e1f3a8fb6cd66685efffb58065cb0c0e..a8a6b3dfea874dc4044b7356439903a553b033d0 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 07738048f8e259eab7abce47d7772bca971b8587..5fd0271f0261d0fe7ef692d66c7b48c1f3a01f4c 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index ef2e1c29088fd0deaf19546ba13dda4a6a445645..00b0083108b5a3f6ef65098d44f7c8f2bbb2581e 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 5492e12da98c0c84ed29c7ca74c6d141045b5653..c7b4615e374a2a890a9eae44e09ebab6a013019a 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 05801f2f08f07c705b879ca80e470991e9495008..9a47435cf140dac82d12fc4dadedbe681ccde2e3 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -1,9 +1,7 @@ { stdenv , fetch , cmake -, zlib , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 31750e2d0da82843ffc2406979795804d93d1d49..68eebc33c6b90cfa97c25a62241b645f01561e55 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +13,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 5c2b7501f9798ea245ea06052cb5fb49e8c32a0d..901015bf2ff4a2ba1ab9f28ca97302ceb26c09c1 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 8821441840647b4075a33da02642c159ef155dbf..840567496785f90d0974dfe398310002f0600539 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 66f0facc952cbdf9c449f9074a3a257998ffc10d..141daa88dcffd291573a589995a762e7924473e3 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index c1f0b9f61294b23141bd62e1fc90485e9920dc5f..1f87cb83ab01dc0efc46cc29baf3711e04fd112d 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 818ad47a335afb9d99f6d433f4986064bdf643ac..1e68276945ecc9b63b8e76594d21b63586caae25 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -3,7 +3,6 @@ , cmake , libxml2 , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 6fc448574f43da2b395c225489d851951c979de3..a86f5b5039e75d37f868254c67704e7aec923b7a 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +13,6 @@ , enableManpages ? false , enableSharedLibraries ? true , enableWasm ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 16093758e8264433f352474d2cc9b5f6a0714a44..908a5f1218f7679118d2a22b0a00d68871905484 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index 58fb0ca22d7c5b57a728e2b186c53289d63bc703..63e5b50c3d472186fe80f5979d73496ddf774868 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "matter_compiler-0.5.1"; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index cdf201cec7ad0d1e7ed2924e6095e934be0bd8e4..9ce7c9166bca76d2c5c0d1ef222ab4b3946b4e26 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mcpp }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mcpp-2.7.2"; diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix index f13883db74ff94c172b7b7580b90891409f6e789..892ae99abaf53fdfba36ad7b65b3002cfa7f769c 100644 --- a/pkgs/development/compilers/mono/4.0.nix +++ b/pkgs/development/compilers/mono/4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.0.4.1"; diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix index f80cffe220ea91b255ff1c25f0c9c85902e0eabb..9a3ccd1fd861c12d96b04b832811422a86fe3eb6 100644 --- a/pkgs/development/compilers/mono/4.4.nix +++ b/pkgs/development/compilers/mono/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 7c9918cdd397496b9012223f79e49d800344682e..2bba660b69cd69e9b18ded92bc28af5a1cdccca0 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix index c3ba316cd13bb0b7a62ce90c5717bf9181ae5b5f..f445127c0da8575401a0a3ee24435e1254e99a72 100644 --- a/pkgs/development/compilers/mono/4.8.nix +++ b/pkgs/development/compilers/mono/4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index d10d6e3e60532fa89a5b12a3bf8fac7b1ec149fb..53820c97b1b03f9345251dd8ce0ed083a9d3bb3a 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix index 31e86f94c0a262916d9a9cd69705dd34c5fbd448..acebb4beef6a3004cb4b567bab51201e361b7288 100644 --- a/pkgs/development/compilers/mono/5.4.nix +++ b/pkgs/development/compilers/mono/5.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix index 6db9e19807bbcfa27512821079f3228cd7bfb7c7..7b5008fd04c2e9da6add9552026c5a092d556c52 100644 --- a/pkgs/development/compilers/mono/5.8.nix +++ b/pkgs/development/compilers/mono/5.8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 9eec23f1ba88fbc4185f8879f249288cde32fe26..21ccf77e4a24ac832be5ab1abe1ef8f05db7fda6 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf }: +{ lib, stdenv, fetchurl }: assert stdenv ? glibc; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 774cefb794041fbc07730f1a4fc03dab951088a5..f5bd3430ae707ea9f38c5d4b722cffcadcc46be8 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: +{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; version = "0.0pre20170827"; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index 16d7e2580b38ec4a96f43034f1ae018b9980fd09..e6c68894036858b4ab4db2e2d1e05496e77007c1 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -2,8 +2,7 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; - useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 7ed493fe92e96683eba644f1243a572540e0ba3f..6e8d9003bf431810571bcedbe400c49cd6c0b027 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 3c29df7ec78e8c9471522da098b33568fe71f3bc..612f0db058215b27b91ad0cb787ad2aec989df41 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv -, runCommand, fetchurl, file, zlib +, runCommand, fetchurl, zlib , version }: diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index b93a13abc9cac1fdd0cbfc5b6a0ca4e37877aa72..de063500b709672c043ff8ff23ee65851c7aec32 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -2,11 +2,9 @@ , stdenv , requireFile , makeWrapper -, unzip , file , xorg ? null , packageType ? "JDK" # JDK, JRE, or ServerJRE -, pluginSupport ? true , glib , libxml2 , ffmpeg_2 @@ -28,7 +26,7 @@ assert swingSupport -> xorg != null; let - version = "10.0.1"; + version = "10.0.2"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -51,19 +49,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; - sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; + sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre10-downloads-4417026.html"; - sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; + sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; - sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; + sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c"; } else abort "unknown package Type ${packageType}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index bdd367ef35238516e9b5fd4973c060e7388b880f..55faf277b159543f19c18077a38228df25cd2e87 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "171"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; - sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; - sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; - sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 901eea0f8f1575ddadcb7056b618bb7bcc8381be..55faf277b159543f19c18077a38228df25cd2e87 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "172"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; - sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; - sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; - sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 94b89cf3a952ab97eea6804847991c6f52d1f4ab..603882653480332e815c25f9b549869d941a673b 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { curryBase = haskellPackages.callPackage ( { mkDerivation, base, Cabal, containers, directory, either - , filepath, mtl, pretty, stdenv, syb, time + , filepath, mtl, pretty, syb, time }: mkDerivation { pname = "curry-base"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { curryFront = haskellPackages.callPackage ( { mkDerivation, base, Cabal, containers, directory - , filepath, mtl, network-uri, process, stdenv, syb, transformers + , filepath, mtl, network-uri, process, syb, transformers }: mkDerivation { pname = "curry-frontend"; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 4c3c5d008f0616d3cc67e630dcafe8b229dda3b8..488d43a6fea4f8c2df3184b0ff40d94d62c8a973 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bash, cacert, zlib, buildRustPackage, curl, darwin +{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin , version , src , platform @@ -6,8 +6,7 @@ }: let - inherit (stdenv.lib) getLib optionalString; - inherit (darwin) libiconv; + inherit (stdenv.lib) optionalString; inherit (darwin.apple_sdk.frameworks) Security; bootstrapping = versionType == "bootstrap"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 46caabf33917c515f3b1191ac94b8ad2a5118da2..2ff3257c7fb73192fb3706a6416f094bc2a92115 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib +{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin , version , patches ? [] diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b0dae9d2042aadb0f515081e2bc61bea5d250d9d..f3f9e2f57b728cf2337a1235da0c14149299ba27 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -13,7 +13,7 @@ , doCheck ? true , broken ? false , buildPlatform, hostPlatform -} @ args: +}: let inherit (stdenv.lib) optional optionalString; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 099a591b407decbe8b6712d8f4f9cd7c3516628a..0523e099e497383540d3f8adc454455b6307b63c 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , boost, bison, flex, openjdk, doxygen -, perl, graphviz, libtool, ncurses, zlib, sqlite +, perl, graphviz, ncurses, zlib, sqlite , autoreconfHook }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index abbfdd2abb72e4e26944f716a3f0ba99724b3929..9c1a36585907bfe4d8032b7886b672b3ae674543 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -27,7 +27,6 @@ , git , libgit2 , fetchFromGitHub -, fetchpatch , paxctl , findutils , makeWrapper diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index f2b6016ceb70e09e480c69d38e3ace6290e447db..8426635ce962b2882155acf1459c54bcba993a4c 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, file, openssl, mlton +{ stdenv, fetchurl, file, openssl, mlton , mysql, postgresql, sqlite, gcc }: diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 1cc5dc368da3ec2bd3c6adb9b3bbd161f9ee6b8d..22721ca98bc2f5901bbabb0caba2cdffc084cc09 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, withDoc ? false , src, name }: diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index a44e81d3c19cac2c86f52474506ac0745ac3967d..d09e47a7f8456f3738e06f6a53f36c3d6ff4f47b 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, withDoc ? false , src, name, patches ? [] }: diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c7e7cd4f4c3ff07ff3cad95e972e6d1b1c5806c2..0d9fb43be25ea51137f97fca080e820d3892df7f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb"; + sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -244,19 +244,21 @@ self: super: { # base bound digit = doJailbreak super.digit; - # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat - hnix = (overrideCabal super.hnix (old: { + # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably) + # This is due to GenList having been removed from generic-random in 1.2.0.0 + # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) + # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though + hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: { patches = old.patches or [] ++ [ # should land in hnix-5.2 (pkgs.fetchpatch { url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch"; sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh"; name = "disable-hpack-test-by-default.patch"; - }) + }) ]; testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - broken = true; # can't cope with deriving-compat 0.5.x. - })); + }))); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -1100,4 +1102,10 @@ self: super: { unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; # dontCheck: printf double rounding behavior prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter; + + # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73 + hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch { + url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch"; + sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index f73172e02d38e04803eb59012351bcf890323b3c..825b4f349f0e80e46c6b114b23ed3056219249ab 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -96,4 +96,83 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); +} // # All the following is needed to build tensorflow. +( +let + tensorflow-haskell = pkgs.fetchFromGitHub { + owner = "tensorflow"; + repo = "haskell"; + rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7"; + sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8"; + fetchSubmodules = true; + }; +in +{ + proto-lens-descriptors = super.proto-lens-descriptors.override { + proto-lens = self.proto-lens_0_2_2_0; + lens-labels = self.lens-labels_0_1_0_2; + }; + proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override { + haskell-src-exts = self.haskell-src-exts_1_19_1; + }; + proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override { + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + }; + tensorflow-proto = (super.callPackage ( + { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types + , proto-lens-protoc, stdenv + }: + mkDerivation { + pname = "tensorflow-proto"; + version = "0.1.0.0"; + src = tensorflow-haskell; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base proto-lens proto-lens-protobuf-types proto-lens-protoc + ]; + libraryToolDepends = [ pkgs.protobuf ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow protocol buffers"; + license = stdenv.lib.licenses.asl20; + } + ) { + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; + }).overrideAttrs (_oldAttrs: { + sourceRoot = "source/tensorflow-proto"; + }); + tensorflow = (super.callPackage ( + { mkDerivation, async, attoparsec, base, bytestring, c2hs + , containers, data-default, exceptions, fgl, HUnit, lens-family + , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv + , temporary, libtensorflow, tensorflow-proto, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "tensorflow"; + version = "0.1.0.2"; + src = tensorflow-haskell; + libraryHaskellDepends = [ + async attoparsec base bytestring containers data-default exceptions + fgl lens-family mainland-pretty mtl proto-lens semigroups split + temporary tensorflow-proto text transformers vector + ]; + librarySystemDepends = [ libtensorflow ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit lens-family proto-lens + tensorflow-proto test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow bindings"; + license = stdenv.lib.licenses.asl20; + } + ) {}).overrideAttrs (_oldAttrs: { + sourceRoot = "source/tensorflow"; + }); } +) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f50b02a7a9562fe65bbb8129777411bfac33ace3..06508c2b7b8fcd6de30c2fa38c74dddcf75c365f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2392,6 +2392,7 @@ extra-packages: - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x + - lens-labels == 0.1.* # required for proto-lens-descriptors - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2399,6 +2400,9 @@ extra-packages: - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 + - proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - QuickCheck < 2 # required by test-framework-quickcheck and its users - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -2581,6 +2585,7 @@ dont-distribute-packages: passman-core: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-fragment-shader-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7b512e46da80498663fbcd7064cee26f80410c0f..b8943a55394ab5161d9358d202ce27eb12ec3d5c 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -11,7 +11,7 @@ let inherit (lib) extends makeExtensible; - inherit (haskellLib) overrideCabal makePackageSet; + inherit (haskellLib) makePackageSet; haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5816f295e0d674e023ba149d709d6c3d8faa88aa..85355782171313777311c127b42eafb2adc7be16 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -758,6 +758,50 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_4_1" = callPackage + ({ mkDerivation, alex, array, async, base, binary, blaze-html + , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq + , directory, EdisonCore, edit-distance, emacs, equivalence + , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable + , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process + , regex-tdfa, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.4.1"; + sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filemanip filepath process ]; + libraryHaskellDepends = [ + array async base binary blaze-html boxes bytestring containers + data-hash deepseq directory EdisonCore edit-distance equivalence + filepath geniplate-mirror gitrev hashable hashtables haskeline + ieee754 mtl murmur-hash pretty process regex-tdfa stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex cpphs happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -10626,6 +10670,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_4_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.4.0"; + sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -18744,12 +18806,15 @@ self: { }) {}; "Win32-errors" = callPackage - ({ mkDerivation, base, template-haskell, text, Win32 }: + ({ mkDerivation, base, hspec, QuickCheck, template-haskell, text + , Win32 + }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.1"; - sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; + version = "0.2.2.3"; + sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6"; libraryHaskellDepends = [ base template-haskell text Win32 ]; + testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22025,6 +22090,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-typescript_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.1.0"; + sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -29613,8 +29701,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.0.0.2"; - sha256 = "0sv7xgmipb9cqyiry5mp0fr6abr7r45167ifq7sa518gz7a2a7ax"; + version = "3.0.0.4"; + sha256 = "0ynh8f0fn7fhpvslb5y5hl6kwcdycm15b3qfcr4x98yz71hk373s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35060,16 +35148,16 @@ self: { }) {}; "bindings-sane" = callPackage - ({ mkDerivation, base, bindings-DSL, saneBackends }: + ({ mkDerivation, base, bindings-DSL, sane-backends }: mkDerivation { pname = "bindings-sane"; version = "0.0.1"; sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2"; libraryHaskellDepends = [ base bindings-DSL ]; - libraryPkgconfigDepends = [ saneBackends ]; + libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.lgpl3; - }) {inherit (pkgs) saneBackends;}; + }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: @@ -40604,10 +40692,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.3.0.0"; - sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls"; - revision = "1"; - editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq"; + version = "0.4.0.0"; + sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -40616,7 +40702,7 @@ self: { containers directory filepath text vector ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers mtl + ansi-terminal base base-compat bytestring containers directory mtl optparse-applicative parsec text vector ]; doHaddock = false; @@ -40983,14 +41069,14 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "cabal2spec_2_2_0" = callPackage + "cabal2spec_2_2_1" = callPackage ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty , tasty-golden, time }: mkDerivation { pname = "cabal2spec"; - version = "2.2.0"; - sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp"; + version = "2.2.1"; + sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -43076,6 +43162,8 @@ self: { pname = "cborg"; version = "0.2.0.0"; sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340"; + revision = "2"; + editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l"; libraryHaskellDepends = [ array base bytestring containers ghc-prim half integer-gmp primitive text @@ -47342,15 +47430,16 @@ self: { "codeworld-api" = callPackage ({ mkDerivation, base, blank-canvas, cereal, cereal-text - , containers, hashable, mtl, random, random-shuffle, text, time + , containers, ghc-prim, hashable, mtl, random, random-shuffle, text + , time }: mkDerivation { pname = "codeworld-api"; - version = "0.2.4"; - sha256 = "17rpm9414fbwzxnpdvp67zlv6sl7ymkflgbbb50nhq7vv9z69dbc"; + version = "0.2.5"; + sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m"; libraryHaskellDepends = [ - base blank-canvas cereal cereal-text containers hashable mtl random - random-shuffle text time + base blank-canvas cereal cereal-text containers ghc-prim hashable + mtl random random-shuffle text time ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -50048,6 +50137,8 @@ self: { pname = "conduit-parse"; version = "0.2.1.0"; sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm"; + revision = "1"; + editedCabalFile = "1bgxjn9lbx67584xpwl2k9jrwvlgyqf4vkv0s7vs1nnc1h6qk7qw"; libraryHaskellDepends = [ base conduit dlist mtl parsers safe safe-exceptions text transformers @@ -50163,10 +50254,8 @@ self: { }: mkDerivation { pname = "conf-json"; - version = "1.1"; - sha256 = "0jgyl56fgs506x4s28g14s08lcfnn6k4wh39j73cl576mlghr1rx"; - revision = "6"; - editedCabalFile = "1dyvz8jczzhr62s5cqr7gc4qd826nwgxkij0k41pfipw6jz0sc4f"; + version = "1.2"; + sha256 = "1j0m0zl1a7rkwczz58322kwsd9dzgwz2ia2q8l9h42ln239q0fbs"; libraryHaskellDepends = [ aeson base bytestring directory ]; testHaskellDepends = [ aeson base binary bytestring directory hspec QuickCheck @@ -52714,8 +52803,8 @@ self: { ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: mkDerivation { pname = "crackNum"; - version = "2.0"; - sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp"; + version = "2.1"; + sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56829,6 +56918,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack_0_0_12" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack"; + version = "0.0.12"; + sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 data-msgpack-types text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers data-msgpack-types hashable hspec + QuickCheck text unordered-containers vector void + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-msgpack-types" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , QuickCheck, text, unordered-containers, vector, void @@ -56845,6 +56961,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack-types_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack-types"; + version = "0.0.2"; + sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector void + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-named" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, text }: mkDerivation { @@ -58926,8 +59060,8 @@ self: { ({ mkDerivation, base, containers, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.6"; - sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir"; + version = "0.6.3"; + sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq"; libraryHaskellDepends = [ base containers foldl ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; @@ -62830,8 +62964,8 @@ self: { }: mkDerivation { pname = "distribution-opensuse"; - version = "1.0.0"; - sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr"; + version = "1.1.0"; + sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62839,6 +62973,7 @@ self: { hashable hsemail mtl parsec-class pretty text time turtle ]; executableHaskellDepends = [ base containers text turtle ]; + testHaskellDepends = [ base ]; description = "Types, functions, and tools to manipulate the openSUSE distribution"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64344,18 +64479,12 @@ self: { }) {}; "drinkery" = callPackage - ({ mkDerivation, base, conduit, conduit-combinators, exceptions - , gauge, list-t, ListT, machines, mtl, pipes, transformers - }: + ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { pname = "drinkery"; - version = "0.3"; - sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4"; + version = "0.4"; + sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q"; libraryHaskellDepends = [ base exceptions mtl transformers ]; - benchmarkHaskellDepends = [ - base conduit conduit-combinators exceptions gauge list-t ListT - machines mtl pipes transformers - ]; description = "Boozy streaming library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64724,6 +64853,8 @@ self: { pname = "dublincore-xml-conduit"; version = "0.1.0.2"; sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl"; + revision = "1"; + editedCabalFile = "1rljgmi4jb6yhigfy394jb64q5f5qx7i1g68pw6zgq9ziz91p321"; libraryHaskellDepends = [ base conduit conduit-combinators safe-exceptions text time timerep uri-bytestring xml-conduit xml-types @@ -65893,9 +66024,11 @@ self: { }: mkDerivation { pname = "edit"; - version = "0.0.1.1"; - sha256 = "0smxb6v4n83b09dyaj388hhi7kx1ca6axg60q3adnixy13a284lz"; - libraryHaskellDepends = [ base deepseq transformers ]; + version = "1.0.0.0"; + sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd"; + libraryHaskellDepends = [ + base comonad deepseq QuickCheck transformers + ]; testHaskellDepends = [ base comonad doctest QuickCheck tasty tasty-discover tasty-quickcheck uniplate @@ -67194,8 +67327,8 @@ self: { }: mkDerivation { pname = "email-header"; - version = "0.4.0"; - sha256 = "0lmdb8s29w5wbrwsfcn43z354ms3xblffprgvg22rb16ny1410hn"; + version = "0.4.1"; + sha256 = "14xs001ab0p2y6f9hl9lw8bwd4fcg23y5ia3wfcafn6893pbb5f6"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive containers exceptions text text-icu time @@ -69120,6 +69253,8 @@ self: { pname = "euler-tour-tree"; version = "0.1.0.1"; sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4"; + revision = "1"; + editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -71856,6 +71991,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcm-client" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , conduit, conduit-extra, containers, data-default-class + , http-client, http-conduit, http-types, HUnit, lens + , optparse-applicative, QuickCheck, resourcet, retry, scientific + , stm-conduit, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, utf8-string + }: + mkDerivation { + pname = "fcm-client"; + version = "0.1.0.0"; + sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl"; + revision = "1"; + editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers data-default-class + http-client http-conduit http-types lens scientific text time + ]; + executableHaskellDepends = [ + aeson async base bytestring conduit conduit-extra + data-default-class http-client http-types lens optparse-applicative + resourcet retry stm-conduit text utf8-string + ]; + testHaskellDepends = [ + aeson base containers data-default-class HUnit lens QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + description = "Admin API for Firebase Cloud Messaging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fdo-notify" = callPackage ({ mkDerivation, base, containers, dbus }: mkDerivation { @@ -75943,20 +76111,19 @@ self: { "fraxl" = callPackage ({ mkDerivation, async, base, dependent-map, dependent-sum - , exceptions, free, mtl, time, transformers, type-aligned - , vinyl-plus + , exceptions, free, mtl, time, transformers, type-aligned, vinyl }: mkDerivation { pname = "fraxl"; - version = "0.1.0.0"; - sha256 = "0q21g7ggdfrl7afkx9g2apx2nzh7fs7fpy63zhjylav16xhycc56"; - revision = "1"; - editedCabalFile = "1fjwfiydrw1dga0dy6cwwji4kjzichr6nx7hazkx11r08lqncxzi"; + version = "0.2.0.1"; + sha256 = "1k5fcl6d9yxc2773x0vv7z8q1pq3mf6l29icr4yc4wxsxw4l3r7k"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base dependent-map dependent-sum exceptions free mtl - transformers type-aligned vinyl-plus + transformers type-aligned vinyl ]; - testHaskellDepends = [ base mtl time transformers ]; + benchmarkHaskellDepends = [ base time ]; description = "Cached and parallel data fetching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -76639,8 +76806,8 @@ self: { ({ mkDerivation, base, bytestring, process, text }: mkDerivation { pname = "fromhtml"; - version = "0.1.0.3"; - sha256 = "1zj811728g1hwpagq7jl1qxppn164vn4b27pxn20151iljipq1va"; + version = "0.1.0.4"; + sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process text ]; @@ -81428,7 +81595,7 @@ self: { "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , libdbusmenu-glib, text, transformers + , libdbusmenu, text, transformers }: mkDerivation { pname = "gi-dbusmenu"; @@ -81439,11 +81606,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libdbusmenu-glib ]; + libraryPkgconfigDepends = [ libdbusmenu ]; doHaddock = false; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) libdbusmenu-glib;}; + }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -82124,7 +82291,8 @@ self: { "gi-xlib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers, x11 + , haskell-gi-base, haskell-gi-overloading, text, transformers + , xlibsWrapper }: mkDerivation { pname = "gi-xlib"; @@ -82135,11 +82303,11 @@ self: { base bytestring containers haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; doHaddock = false; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) x11;}; + }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -82374,8 +82542,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180626"; - sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q"; + version = "6.20180719"; + sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -82386,7 +82554,7 @@ self: { isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix-compat utf8-string + hslogger IfElse process split transformers unix-compat utf8-string ]; executableHaskellDepends = [ aeson async base bloomfilter byteable bytestring case-insensitive @@ -83445,6 +83613,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_4_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.4.0"; + sha256 = "0qja5mdnbgrsdiwqjfwrzzynbybwg5yksvnwgazak0wv2p86i5yh"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -87491,23 +87680,26 @@ self: { }) {}; "greenclip" = callPackage - ({ mkDerivation, base, binary, classy-prelude, directory, microlens - , microlens-mtl, text, unix, utf8-string, vector, X11 + ({ mkDerivation, base, binary, bytestring, directory, exceptions + , hashable, libXau, microlens, microlens-mtl, protolude, text, unix + , vector, wordexp, X11, xcb, xdmcp, xlibsWrapper }: mkDerivation { pname = "greenclip"; - version = "2.0.1"; - sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y"; + version = "3.0.2"; + sha256 = "1b1nx2jnwal1fhwh7cq0hv1nrwc2hzzh96yab6cpv0r8bm34qxs7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary classy-prelude directory microlens microlens-mtl text - unix utf8-string vector X11 + base binary bytestring directory exceptions hashable microlens + microlens-mtl protolude text unix vector wordexp X11 ]; + executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; + inherit (pkgs) xlibsWrapper;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network @@ -88474,16 +88666,16 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk3, x11 }: + ({ mkDerivation, base, glib, gtk3, xlibsWrapper }: mkDerivation { pname = "gtk-traymanager"; version = "1.0.1"; sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; libraryHaskellDepends = [ base glib gtk3 ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) x11;}; + }) {inherit (pkgs) xlibsWrapper;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory @@ -90640,8 +90832,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.10.3"; - sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj"; + version = "1.10.4"; + sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96656,8 +96848,8 @@ self: { }: mkDerivation { pname = "haskus-binary"; - version = "0.6.0.0"; - sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0"; + version = "1.0"; + sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2"; libraryHaskellDepends = [ base bytestring cereal haskus-utils mtl ]; @@ -96671,19 +96863,19 @@ self: { }) {}; "haskus-system-build" = callPackage - ({ mkDerivation, base, directory, filepath, hashable, haskus-utils - , optparse-applicative, optparse-simple, process, simple-download - , temporary, text, yaml + ({ mkDerivation, base, conduit, directory, filepath, hashable + , haskus-utils, http-conduit, optparse-applicative, optparse-simple + , process, temporary, text, yaml }: mkDerivation { pname = "haskus-system-build"; - version = "0.7.0.0"; - sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g"; + version = "1.0"; + sha256 = "1xzl5f8wilmdq9bg37zzdcv59cqp8kxnhbm6fd8pzqnj8w1pkwdk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath hashable haskus-utils optparse-applicative - optparse-simple process simple-download temporary text yaml + base conduit directory filepath hashable haskus-utils http-conduit + optparse-applicative optparse-simple process temporary text yaml ]; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; @@ -96691,17 +96883,20 @@ self: { }) {}; "haskus-utils" = callPackage - ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl - , stm, stm-containers, tasty, tasty-quickcheck, template-haskell - , transformers, vector + ({ mkDerivation, base, containers, extra, file-embed + , haskus-utils-data, haskus-utils-types, haskus-utils-variant + , list-t, mtl, recursion-schemes, stm, stm-containers, tasty + , tasty-quickcheck, template-haskell, transformers, vector }: mkDerivation { pname = "haskus-utils"; - version = "0.8.0.0"; - sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3"; + version = "1.0"; + sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd"; libraryHaskellDepends = [ - base containers extra file-embed list-t mtl stm stm-containers - template-haskell transformers vector + base containers extra file-embed haskus-utils-data + haskus-utils-types haskus-utils-variant list-t mtl + recursion-schemes stm stm-containers template-haskell transformers + vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; @@ -96709,6 +96904,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-utils-data" = callPackage + ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl + , recursion-schemes, transformers + }: + mkDerivation { + pname = "haskus-utils-data"; + version = "1.0"; + sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4"; + libraryHaskellDepends = [ + base containers extra haskus-utils-types mtl recursion-schemes + transformers + ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils-types" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haskus-utils-types"; + version = "1.0"; + sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf"; + libraryHaskellDepends = [ base ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils-variant" = callPackage + ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }: + mkDerivation { + pname = "haskus-utils-variant"; + version = "1.0"; + sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn"; + libraryHaskellDepends = [ + base haskus-utils-data haskus-utils-types + ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskyapi" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , directory, http-conduit, markdown, mtl, network, parsec @@ -97917,6 +98152,8 @@ self: { pname = "hbro"; version = "1.7.0.0"; sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh"; + revision = "1"; + editedCabalFile = "0slsd0f0qvlh4l6777b8iaskd4ij04193mcjwnq8p7szslxx40q1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97946,6 +98183,8 @@ self: { pname = "hbro-contrib"; version = "1.7.0.0"; sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam"; + revision = "1"; + editedCabalFile = "1vfkwzd5rsv0065bldkd90fprp1qspfqg44ip5i4ihnbj4vawv9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100605,34 +100844,40 @@ self: { }) {}; "hgeometry" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, containers - , contravariant, criterion, data-clist, deepseq, deepseq-generics - , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens - , linear, mtl, optparse-applicative, parsec, QuickCheck, random - , semigroupoids, semigroups, singletons, template-haskell, text - , time, vector, vinyl + ({ mkDerivation, aeson, approximate-equality, array, base + , bifunctors, bytestring, colour, containers, contravariant + , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest + , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens + , linear, mtl, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, random, reflection, semigroupoids + , semigroups, singletons, template-haskell, text, vector, vinyl + , yaml }: mkDerivation { pname = "hgeometry"; - version = "0.6.0.0"; - sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij"; + version = "0.7.0.0"; + sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz"; revision = "1"; - editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg"; + editedCabalFile = "1wjwpfiic3jbhg77qm2nzgvybnpk0h3wwpywkpfxz8sv1yhb8pa2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant data-clist - deepseq directory fixed-vector Frames hexpat lens linear mtl - optparse-applicative parsec random semigroupoids semigroups - singletons template-haskell text time vector vinyl + aeson base bifunctors bytestring colour containers contravariant + data-clist deepseq dlist fingertree fixed-vector hexpat lens linear + mtl parsec QuickCheck quickcheck-instances random reflection + semigroupoids semigroups singletons template-haskell text vector + vinyl yaml ]; testHaskellDepends = [ - array base bytestring containers data-clist doctest Frames hspec - lens linear QuickCheck random semigroups vector vinyl + approximate-equality array base bytestring colour containers + data-clist doctest hspec lens linear QuickCheck + quickcheck-instances random semigroups singletons vector vinyl ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics Frames lens QuickCheck - semigroups + base bytestring containers criterion deepseq deepseq-generics + fixed-vector lens linear optparse-applicative QuickCheck semigroups ]; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; @@ -103500,21 +103745,19 @@ self: { , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff , directory, exceptions, filepath, generic-random, Glob, hashable - , hashing, haskeline, http-client, http-client-tls, http-types - , interpolate, lens-family, lens-family-core, lens-family-th - , logict, megaparsec, monadlist, mtl, optparse-applicative - , pretty-show, process, QuickCheck, quickcheck-instances - , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups - , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck + , hashing, haskeline, hedgehog, hspec-discover, http-client + , http-client-tls, http-types, interpolate, lens-family + , lens-family-core, lens-family-th, logict, megaparsec, monadlist + , mtl, optparse-applicative, pretty-show, process, regex-tdfa + , regex-tdfa-text, repline, scientific, semigroups, serialise + , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck , tasty-th, template-haskell, text, these, time, transformers, unix , unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.5.1"; - sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al"; - revision = "1"; - editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr"; + version = "0.5.2"; + sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103522,7 +103765,7 @@ self: { containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq deriving-compat directory exceptions filepath hashable hashing haskeline http-client - http-client-tls http-types lens-family lens-family-core + http-client-tls http-types interpolate lens-family lens-family-core lens-family-th logict megaparsec monadlist mtl optparse-applicative pretty-show process regex-tdfa regex-tdfa-text scientific semigroups serialise split syb template-haskell text these time @@ -103539,11 +103782,12 @@ self: { ansi-wl-pprint base base16-bytestring bytestring containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq Diff directory exceptions filepath generic-random - Glob hashing interpolate megaparsec mtl optparse-applicative - pretty-show process QuickCheck quickcheck-instances serialise split - tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text - time transformers unix unordered-containers + Glob hashing hedgehog interpolate megaparsec mtl + optparse-applicative pretty-show process serialise split tasty + tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell text time transformers unix unordered-containers ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring containers criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256 @@ -109124,6 +109368,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "hspec-need-env" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-expectations + , setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.0"; + sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + description = "Read environment variables for hspec tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -110531,8 +110789,8 @@ self: { }: mkDerivation { pname = "html-parse"; - version = "0.2.0.1"; - sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw"; + version = "0.2.0.2"; + sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -112548,6 +112806,8 @@ self: { pname = "hw-dsv"; version = "0.2.1"; sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv"; + revision = "1"; + editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112652,12 +112912,27 @@ self: { pname = "hw-hedgehog"; version = "0.1.0.1"; sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6"; + revision = "1"; + editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.2"; + sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hspec-hedgehog" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit , transformers @@ -112666,6 +112941,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.5"; sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk"; + revision = "1"; + editedCabalFile = "05fg0d89652yhsji35ckh9qiiy4y7c04i6zya9hrkgwl2jaq55fv"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -115150,6 +115427,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_9_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, filepath, ghc, ghc-boot + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, text, transformers, unix + , unordered-containers, utf8-string, uuid, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.9.1.0"; + sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline + haskell-src-exts hlint http-client http-client-tls ipython-kernel + mtl parsec process random shelly split stm strict system-argv0 text + transformers unix unordered-containers utf8-string uuid vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv + shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -115727,6 +116040,8 @@ self: { pname = "imm"; version = "1.3.0.0"; sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; + revision = "1"; + editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118178,6 +118493,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_4_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.4.0"; + sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -118385,6 +118726,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_9_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , cryptonite, directory, filepath, memory, mtl, process, temporary + , text, transformers, unordered-containers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.9.1.0"; + sha256 = "0944riw00i3m8n3cab0g9c14b24xryf9w8ddlddnmxgys4sn8qak"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring cereal containers cryptonite directory + filepath memory mtl process temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -119344,10 +119707,8 @@ self: { }: mkDerivation { pname = "ivory-opts"; - version = "0.1.0.5"; - sha256 = "0h4k2fy8w2hcyglfgl1jzxr6as04lc4ks8wk4id8h4gpn6bgdfrn"; - revision = "1"; - editedCabalFile = "1mn1jrpwzm1pcmw942i0kg0na56zagxsqcqs9y32j1xnlkgljkpn"; + version = "0.1.0.6"; + sha256 = "014dnfflf09gfn6c47jjg25lq95bx9sl6nkj18zylyzy0f1qszrq"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -122658,15 +123019,15 @@ self: { ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text + , text, vector }: mkDerivation { pname = "keccak"; - version = "0.1.2"; - sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g"; + version = "0.2.0"; + sha256 = "1hkp6zn86bvn817vvxd2yqjgfh76n0ynvyqq2942frl1i0v19ymw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; + libraryHaskellDepends = [ base bytestring vector ]; executableHaskellDepends = [ base base16-bytestring bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring cryptonite HUnit memory parsec @@ -122676,7 +123037,7 @@ self: { benchmarkHaskellDepends = [ base bytestring cryptonite gauge memory ]; - description = "haskell keccak functions"; + description = "cryptographic functions based on the sponge construction"; license = stdenv.lib.licenses.mit; }) {}; @@ -124795,8 +125156,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.14"; - sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18"; + version = "1.2.0.15"; + sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -124819,8 +125180,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.7.0"; - sha256 = "0w7r5ngpz3ifahjfccz6ma9m2jdmn5nqimk5154hk35skcjwrswx"; + version = "0.7.1"; + sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -127125,6 +127486,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_1_0_2" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.2"; + sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-labels" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { @@ -145137,10 +145510,8 @@ self: { }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.4"; - sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; - revision = "2"; - editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; + version = "0.0.5"; + sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -146649,6 +147020,8 @@ self: { pname = "non-empty"; version = "0.3"; sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p"; + revision = "1"; + editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -146656,6 +147029,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: + mkDerivation { + pname = "non-empty"; + version = "0.3.0.1"; + sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + description = "List-like structures with static restrictions on the number of elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-containers" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -149804,6 +150192,8 @@ self: { pname = "opml-conduit"; version = "0.6.0.4"; sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; + revision = "1"; + editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers @@ -151204,7 +151594,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_2" = callPackage + "pandoc_2_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -151219,8 +151609,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.2"; - sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc"; + version = "2.2.2.1"; + sha256 = "19d6cd8ry735ziazfkk6xhrjbvx5ywpbqmhxr3wbmp8kyp6c7x7m"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -161477,8 +161867,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.3"; - sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz"; + version = "0.3.0.1"; + sha256 = "0qipddb5065z6c7klbaz75d8jbx39k8qppv8d7xb6hnj28v62ab7"; libraryHaskellDepends = [ base cereal deferred-folds foldl primitive profunctors vector ]; @@ -162889,6 +163279,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libpulseaudio;}; + "proto-lens_0_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, lens-family, parsec, pretty, text + , transformers, void + }: + mkDerivation { + pname = "proto-lens"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class + lens-family parsec pretty text transformers void + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, deepseq, lens-family, lens-labels, parsec @@ -162974,9 +163382,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage + ({ mkDerivation, base, Cabal, lens-family, proto-lens + , proto-lens-protoc, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.2.0"; + sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-protoc text + ]; + libraryToolDepends = [ protobuf ]; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, text + , proto-lens-protoc, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; @@ -162986,16 +163412,44 @@ self: { libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text ]; + libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) protobuf;}; + + "proto-lens-protoc_0_2_2_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, directory, filepath, haskell-src-exts + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.2.2.3"; + sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class directory + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text + ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers data-default-class filepath + haskell-src-exts lens-family proto-lens proto-lens-descriptors text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, deepseq, directory, filepath , haskell-src-exts, lens-family, lens-labels, pretty, process - , proto-lens, text + , proto-lens, protobuf, text }: mkDerivation { pname = "proto-lens-protoc"; @@ -163008,13 +163462,14 @@ self: { directory filepath haskell-src-exts lens-family lens-labels pretty process proto-lens text ]; + libraryToolDepends = [ protobuf ]; executableHaskellDepends = [ base bytestring containers data-default-class deepseq filepath haskell-src-exts lens-family proto-lens text ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) protobuf;}; "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers @@ -164319,30 +164774,30 @@ self: { "puzzle-draw" = callPackage ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers - , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec - , linear, mtl, optparse-applicative, parsec, process, SVGFonts - , tasty, tasty-golden, tasty-hspec, tasty-hunit, text - , unordered-containers, vector-space, yaml + , deepseq, diagrams-lib, diagrams-rasterific, filepath, hashable + , hspec, linear, mtl, optparse-applicative, parsec, SVGFonts, tasty + , tasty-hspec, tasty-hunit, text, unordered-containers + , vector-space, yaml }: mkDerivation { pname = "puzzle-draw"; - version = "0.2.0.0"; - sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02"; + version = "0.3.0.0"; + sha256 = "0vnmq65khi1lcrf3rz4ym7lnv3178rvnb884rln0jspil6bs4cs7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers diagrams-lib diagrams-svg filepath hashable - linear mtl optparse-applicative parsec SVGFonts text + aeson base containers diagrams-lib diagrams-rasterific filepath + hashable linear mtl optparse-applicative parsec SVGFonts text unordered-containers vector-space yaml ]; executableHaskellDepends = [ - aeson base diagrams-lib diagrams-svg filepath optparse-applicative - process tasty tasty-golden yaml + aeson base containers diagrams-lib diagrams-rasterific filepath + optparse-applicative yaml ]; testHaskellDepends = [ - base blaze-svg bytestring containers deepseq diagrams-lib - diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml + base blaze-svg bytestring containers deepseq diagrams-lib hspec + tasty tasty-hspec tasty-hunit text yaml ]; description = "Creating graphics for pencil puzzles"; license = stdenv.lib.licenses.mit; @@ -165328,14 +165783,15 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.12"; - sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7"; + version = "0.4.13"; + sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers ]; testHaskellDepends = [ - aeson base primitive QuickCheck tagged transformers vector + aeson base containers primitive QuickCheck semigroupoids tagged + transformers vector ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -165589,8 +166045,8 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.0.1"; - sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r"; + version = "0.1.1.0"; + sha256 = "1dxazyn5h2njhjs41x2cb5nwydf87a29yxgy7wv40s6fq6ajj084"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -168758,7 +169214,7 @@ self: { libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; license = stdenv.lib.licenses.bsd3; - }) {raptor2 = null; inherit (pkgs) redland;}; + }) {raptor2 = null; redland = null;}; "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath @@ -169163,6 +169619,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-fragment-shader-canvas" = callPackage + ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens + , reflex-dom, text, transformers + }: + mkDerivation { + pname = "reflex-dom-fragment-shader-canvas"; + version = "0.1"; + sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl"; + revision = "1"; + editedCabalFile = "1s08vdpwyyfrfw7hfbn2i2m9b3dszcdd7dmfyd0z1pbxy6wj1xmz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghcjs-dom jsaddle lens reflex-dom text transformers + ]; + executableHaskellDepends = [ base reflex-dom text ]; + description = "A reflex-dom widget to draw on a canvas with a fragment shader program"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflex-dom-helpers" = callPackage ({ mkDerivation, base, reflex, reflex-dom, template-haskell }: mkDerivation { @@ -170515,6 +170992,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "relude" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty + , tasty-hedgehog, text, transformers, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "relude"; + version = "0.1.0"; + sha256 = "16q9mh35c989pmy4xz602svfz57x2kbl8v82mjsapigmnxa41r8x"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -171363,8 +171865,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.1.0.1"; - sha256 = "1ywh83ydy48mlix7mglnkhsjj3b13jqs2gs52by6q1g438nb31in"; + version = "0.1.1.0"; + sha256 = "15qpd11ijbip88pf7sn1cmms369cv963l2xdp3wxg7qvlf362ns8"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -174100,6 +174602,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "rss-conduit_0_4_2_2" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.4.2.2"; + sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; + revision = "1"; + editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d"; + libraryHaskellDepends = [ + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types + ]; + testHaskellDepends = [ + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS standard"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq , feed, http-client, http-conduit, http-types, io-storage, irc @@ -175657,8 +176190,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.9"; - sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m"; + version = "7.10"; + sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -177591,8 +178124,8 @@ self: { }: mkDerivation { pname = "self-extract"; - version = "0.3.2"; - sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q"; + version = "0.3.3"; + sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178363,6 +178896,8 @@ self: { pname = "serialise"; version = "0.2.0.0"; sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0"; + revision = "2"; + editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -180436,7 +180971,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_7_0" = callPackage + "serverless-haskell_0_7_1" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq @@ -180444,8 +180979,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.7.0"; - sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj"; + version = "0.7.1"; + sha256 = "1vjiv56w591vparjw3372fz2vsa5hcm5j3p90j00x882gm23wf22"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -183490,6 +184025,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-vec3_0_4_0_8" = callPackage + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen + , QuickCheck, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "simple-vec3"; + version = "0.4.0.8"; + sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a"; + libraryHaskellDepends = [ base QuickCheck vector ]; + testHaskellDepends = [ + base doctest doctest-driver-gen tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Three-dimensional vectors of doubles with basic operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-zipper" = callPackage ({ mkDerivation, base, hspec, lens }: mkDerivation { @@ -183950,8 +184503,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.0"; - sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz"; + version = "0.3.0.1"; + sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -184568,8 +185121,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "0.1.0.0"; - sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds"; + version = "0.1.0.2"; + sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm"; libraryHaskellDepends = [ aeson base binary bytestring containers lens lens-aeson mustache pandoc shake text time @@ -185583,6 +186136,8 @@ self: { pname = "snap-templates"; version = "1.0.0.1"; sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; + revision = "1"; + editedCabalFile = "0m54p36hvwn3zaixalb5jiy9siq1ksf5da5d0407rys87wfy711b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185774,8 +186329,8 @@ self: { }: mkDerivation { pname = "snaplet-customauth"; - version = "0.1.0"; - sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3"; + version = "0.1.1"; + sha256 = "0alh5jaygcxnjpm5r3qx2c6al1x73shzwqi67820rzqxix2np8pc"; libraryHaskellDepends = [ aeson base base64-bytestring binary binary-orphans bytestring configurator containers errors heist hoauth2 http-client @@ -189470,6 +190025,8 @@ self: { pname = "stack-prism"; version = "0.1.7"; sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz"; + revision = "1"; + editedCabalFile = "1xd0hcp003ijakpcjgcmllsa65i0924has9wllvsj8i0mnapcni3"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -191676,6 +192233,8 @@ self: { pname = "streaming-base64"; version = "0.1.0.0"; sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; + revision = "1"; + editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r"; libraryHaskellDepends = [ base safe-exceptions streaming streaming-bytestring transformers ]; @@ -192482,16 +193041,19 @@ self: { "string-random" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , pcre-heavy, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + , optparse-applicative, pcre-heavy, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "string-random"; - version = "0.1.0.0"; - sha256 = "090lin4b0y7xccwpnw8q33kfdljjw6annbl2d1jldird7db086ah"; + version = "0.1.1.0"; + sha256 = "0gypx0lg9kz8s2aksj2qg238m41cnl49k4bxwz7sgf94h12nhil2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers random text transformers ]; + executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base bytestring pcre-heavy QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -193859,24 +194421,22 @@ self: { }) {}; "sv" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors - , bytestring, charset, containers, contravariant, deepseq, hedgehog - , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids - , semigroups, tasty, tasty-hedgehog, tasty-hunit, text - , transformers, trifecta, utf8-string, validation, vector, void + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava + , contravariant, hedgehog, hw-dsv, lens, Only, parsers + , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog + , tasty-hunit, text, transformers, trifecta, utf8-string + , validation, vector }: mkDerivation { pname = "sv"; - version = "0.1"; - sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s"; + version = "1.0"; + sha256 = "1sgyly9b6nrij5hpj3ffvwj6m3ygm43wbi8xkd2gxs2jh5zjzvw3"; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bifunctors bytestring charset - containers contravariant deepseq lens mtl parsec parsers - profunctors readable semigroupoids semigroups text transformers - trifecta utf8-string validation vector void + attoparsec base bifunctors bytestring contravariant hw-dsv + semigroupoids sv-core transformers utf8-string validation ]; testHaskellDepends = [ - ansi-wl-pprint base bytestring contravariant hedgehog lens parsers + base bytestring cassava contravariant hedgehog lens Only parsers semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text trifecta utf8-string validation vector ]; @@ -193886,24 +194446,88 @@ self: { }) {}; "sv-cassava" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv - , text, utf8-string, validation, vector + ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit + , sv-core, text, utf8-string, validation, vector }: mkDerivation { pname = "sv-cassava"; - version = "0.1"; - sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15"; + version = "0.2"; + sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin"; libraryHaskellDepends = [ - attoparsec base bytestring cassava sv utf8-string vector + attoparsec base bytestring cassava sv-core utf8-string validation + vector ]; testHaskellDepends = [ - base bytestring cassava HUnit sv text validation vector + base bytestring cassava HUnit sv-core text validation vector ]; description = "Integration to use sv with cassava's parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sv-core" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, lens, mtl, parsec + , profunctors, QuickCheck, readable, semigroupoids, semigroups + , tasty, tasty-quickcheck, text, transformers, trifecta + , utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv-core"; + version = "0.1"; + sha256 = "0zqzj6i4xbw7bjzn40mimn4rw1g88jndrdxzdmrbdigfdncxhyl3"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq lens mtl parsec profunctors readable semigroupoids + semigroups text transformers trifecta utf8-string validation vector + void + ]; + testHaskellDepends = [ + base bytestring profunctors QuickCheck semigroupoids semigroups + tasty tasty-quickcheck text validation vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "sv-svfactor" = callPackage + ({ mkDerivation, base, bytestring, lens, profunctors, sv-core + , svfactor, validation + }: + mkDerivation { + pname = "sv-svfactor"; + version = "0.1"; + sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0"; + libraryHaskellDepends = [ + base bytestring lens profunctors sv-core svfactor validation + ]; + description = "sv-core + svfactor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "svfactor" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, charset + , deepseq, hedgehog, lens, parsec, parsers, semigroupoids + , semigroups, tasty, tasty-hedgehog, tasty-hunit, text + , transformers, trifecta, utf8-string, vector + }: + mkDerivation { + pname = "svfactor"; + version = "0.1"; + sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring charset deepseq lens parsec + parsers semigroupoids semigroups text transformers trifecta + utf8-string vector + ]; + testHaskellDepends = [ + base bytestring hedgehog lens parsers semigroups tasty + tasty-hedgehog tasty-hunit text trifecta utf8-string vector + ]; + description = "Syntax-preserving CSV manipulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "svg-builder" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hashable, text , unordered-containers @@ -198125,17 +198749,20 @@ self: { }) {}; "tensorflow-proto" = callPackage - ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }: + ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc + , protobuf + }: mkDerivation { pname = "tensorflow-proto"; version = "0.1.0.0"; sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage ({ mkDerivation, base, bytestring, cereal, snappy-framing @@ -198200,6 +198827,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "termbox" = callPackage + ({ mkDerivation, array, base, c2hs }: + mkDerivation { + pname = "termbox"; + version = "0.1.0"; + sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + description = "termbox bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "termbox-bindings" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -202049,6 +202691,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "timer-wheel" = callPackage + ({ mkDerivation, atomic-primops, base, ghc-prim, primitive + , psqueues + }: + mkDerivation { + pname = "timer-wheel"; + version = "0.1.0"; + sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j"; + libraryHaskellDepends = [ + atomic-primops base ghc-prim primitive psqueues + ]; + description = "A timer wheel"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -209149,6 +209806,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uploadtest" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uploadtest"; + version = "0.0.0"; + sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz"; + libraryHaskellDepends = [ base ]; + description = "Upload test"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "upskirt" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -214798,8 +215466,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2"; - sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd"; + version = "0.1.2.1"; + sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -216257,35 +216925,35 @@ self: { "winery" = callPackage ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu - , deepseq, fingertree, gauge, hashable, mtl, prettyprinter - , prettyprinter-ansi-terminal, serialise, text, transformers - , unordered-containers, vector + , deepseq, gauge, hashable, megaparsec, mtl, prettyprinter + , prettyprinter-ansi-terminal, scientific, serialise, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "0.1.1"; - sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar"; + version = "0.1.2"; + sha256 = "0g18xgby2k5cgb1ymyv92ii9rqj07ng12v2qfsp8yk15fcrx0ky9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; benchmarkHaskellDepends = [ - base binary bytestring cassava containers cpu deepseq fingertree - gauge hashable mtl prettyprinter prettyprinter-ansi-terminal - serialise text transformers unordered-containers vector + base binary bytestring cassava containers cpu deepseq gauge + hashable megaparsec mtl prettyprinter prettyprinter-ansi-terminal + scientific serialise text transformers unordered-containers vector ]; description = "Sustainable serialisation library"; license = stdenv.lib.licenses.bsd3; @@ -218774,6 +219442,8 @@ self: { pname = "xml-conduit-parse"; version = "0.3.1.2"; sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1"; + revision = "1"; + editedCabalFile = "0jnnr4z3c6rq2dz0ldiic5zwkrp36igf6gip11qrm9ss2pk9khbl"; libraryHaskellDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -225120,8 +225790,8 @@ self: { }: mkDerivation { pname = "ztar"; - version = "0.1.3"; - sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1"; + version = "0.2.0"; + sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i"; libraryHaskellDepends = [ base bytestring deepseq directory filepath path process text unix-compat zip zlib diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 38e8dfd24c4e75694d7fb3c479f1405e4f702414..c7fbab6ab88c0c6e1c037b07cfcc83321e69a2d2 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -28,7 +28,6 @@ }: let - inherit (stdenv.lib) optional; wrapper = ./hoogle-local-wrapper.sh; isGhcjs = ghc.isGhcjs or false; opts = lib.optionalString; @@ -36,10 +35,6 @@ let if !isGhcjs then "haddock" else "haddock-ghcjs"; - ghcName = - if !isGhcjs - then "ghc" - else "ghcjs"; ghcDocLibDir = if !isGhcjs then ghc.doc + ''/share/doc/ghc*/html/libraries'' diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 1cd687058b3a4c746b3944090c435e2387f35396..ff19e52135c806397ccb1a872f86030d89894ec7 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,7 +1,7 @@ # Build one of the packages that comes with idris # name: The name of the package # deps: The dependencies of the package -{ idris, build-idris-package, lib }: name: deps: +{ idris, build-idris-package }: name: deps: let inherit (builtins.parseDrvName idris.name) version; in diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index c2ae87582df63587ac6152cb1f382572055959ac..2ad0bc0285e5a3de4fa521aff2ae3ee0871a35d3 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.7.3"; + version = "0.8"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x"; + sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index d0ba1912e9a4c3ae749b09abf2f3a9b1a8dea22f..d94d4a5a14d09e41d25961801c6ab5aaa46762e6 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, fetchpatch }: +{ mkDerivation, fetchpatch }: mkDerivation rec { version = "19.3.6.6"; diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 5cea1fd533f2de9b003d59cfa02583fdea890e9c..19ac6d3559265bd219288e122aa058239e316645 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation }: mkDerivation rec { version = "20.3.8"; diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index de00ebdf2cb064246535100c8b1af7cbbe76dbcf..e9aa2a3dc426b09c054853cbee9be4d077b00e3e 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation }: mkDerivation rec { version = "21.0"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 6ea3ac73a4b11a5add71d13f5a8ec3681b5f4dea..ba0a00b30376afd50c176ea254fd65a2d7470879 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index b0eeb89ce431fd762c73078bb6161b06c03c2951..848b8666f27de6f96fd29dc8550592bfe4e43145 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring -, coverageAnalysis ? null, gnu ? null +, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 196c899fcea99098f58a5b4d370f2e28aa86a6e0..8110598e17304b99c2a43c3a184ce3afe9fbbe5e 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform , fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring -, coverageAnalysis ? null, gnu ? null +, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 271490c995745a4778734e4de1310ea77fc42faf..09af492490cf20555e30cdeb2712669a10a3216f 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, readline }: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 6221bf3fb8433aa928edbb47b7480b899377fb84..6d8de7bae27eebd26529313cdd1eed9bbb197178 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 5a4893db0637552bd50ab4c060c3e0ce2f9b7cff..2c4f3657aac2dd040bbc48b0784ec8a38d56c1e5 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: stdenv.mkDerivation rec { name = "lua-${version}"; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 73b979e9ca4fa5cc85e3a1677cc85ebf6fc1513b..9ee628f498ee6a9f0695c3ab5ab14452b14e238a 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, hostPlatform }: +{ stdenv, lib, fetchurl }: rec { luajit = luajit_2_1; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4deadefcc4bc0a266e06a960a9d43d9734cda39e..40a70623dcb7e2c49b7ea0e4ee319032792e516c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurlBoot, buildPackages -, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper +, enableThreading ? stdenv ? glibc, makeWrapper }: with lib; @@ -156,26 +156,17 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.1.8"; + crossVersion = "1.2"; perl-cross-src = fetchurlBoot { url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; - }; - - # https://github.com/arsv/perl-cross/issues/60 - perl-cross-gcc7-patch = fetchpatch { - url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; - sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cd perl-cross-* - patch -Np1 -i ${perl-cross-gcc7-patch} - cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3032b5e4c2a122cb65ef2e3f57eaf6d72b143123..52a3c64f81caf1e229fd7d6a5a9b01c016b42277 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,6 +1,6 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix -{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison +{ lib, stdenv, fetchurl, composableDerivation, flex, bison , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 18bc875fb334d0fcd8d4ade158c026c663a75cb8..be11b38a0b83a24eed162b363a3c16dd215be5b7 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: let version = "0.9.5.1.1"; in diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 2feb15b647dad75d96ddbcc8ca1c911de51ce62a..2a18dbff9e6eb523b21b75afe9ab21654231ca22 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: let version = "0.9.6.4"; in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index cd1a0fc6e18f49a5d9d14172887fc1120bba12b6..fd84d924d7b80efc7c377376c66fa430d4596a32 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,7 +10,6 @@ , zlib , callPackage , self -, gettext , db , expat , libffi @@ -19,7 +18,7 @@ # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -33,7 +32,6 @@ let majorVersion = "2.7"; minorVersion = "15"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; @@ -161,10 +159,6 @@ let # don't rely on detecting glibc-isms. ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no"; - postConfigure = if hostPlatform.isCygwin then '' - sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' - '' else null; - buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 7da2cfdd152761b0253d30ca89da0c7e2d9cd809..7e583087c083f3e1665f0fe8af1fc1f55bfd0c27 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -15,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +29,6 @@ let majorVersion = "3.4"; minorVersion = "8"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 434c233827092b84c6ac03c1264b5d16e46b650e..588880c1e82e52d9c2f0f340cc5299410ae0f4d6 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -15,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +29,6 @@ let majorVersion = "3.5"; minorVersion = "5"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 9ea0876b1ce6b695b72c1f604b459d5cfa1d027d..6b9e26e99fcd803d2e71ebe2d4b48abd87b0fc19 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, fetchpatch, buildPackages -, glibc , bzip2 , expat , libffi @@ -16,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +28,6 @@ let majorVersion = "3.6"; minorVersion = "6"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index ad88895fa67d5a11417670202974eb81c74702a3..adee8d594f18be579a08c35dd44ce8592c47971e 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, fetchpatch -, glibc , bzip2 , expat , libffi @@ -16,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +28,6 @@ let majorVersion = "3.7"; minorVersion = "0"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index e68cfc3148ffdf279474f0e885f7d2e99cebbfaf..95a893a209c12382e96d5a4bf99fae06b9384cc2 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -4,7 +4,7 @@ , makeWrapper, callPackage, self, gdbm, db , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert zlibSupport -> zlib != null; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 8a13c4efce611bb587ae6cc4ec2f3a247c8f86b6..4d98f18eee4a7e108965ab821d7f365e6fbd07d5 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, patchelf, glibc, libX11, libXt, perl }: +{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: stdenv.mkDerivation rec { name = "rebol-nightly-${version}"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 89d394c875699275b1502a2ac52410ed3b43641d..bb6f2758f4cf6e3ede0024b392686847eedc8ef9 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -32,8 +32,6 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby20 = ver.majMin == "2.0"; - isRuby21 = ver.majMin == "2.1"; isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 31ef51802ed61dc0e67e0263648d290bde787350..594bbc05b7ceb632823875cc018785332be2cd11 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: +{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 3bf4ba2dc2f0191ff88f07650258f92fff023cfe..a472ccaafbf2dc404fd254148cdfe1dfb8e2ed73 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv # Version specific stuff , release, version, src diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index a6dfec49b2a258275b239d9a381d707f53cccbb7..77154b54fd8feb515ce78f96bde935c8ceb91db0 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, gdbm, libX11, libXt }: +{ stdenv, fetchurl, unzip, libX11, libXt }: stdenv.mkDerivation rec { name = "unicon-lang-${version}"; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index cceec44e6ae60252a5cab0f115533aa1cd311b48..a3c3b2bf96f68acdc6b570c8bc110f1d83270f19 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: let # workaround https://github.com/NixOS/nixpkgs/issues/37364 diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index df87f51768df5d53c80366a2565c1d79c2d6309b..ca7cc7027be7110a542d9e7fb87bd013df060b4e 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -6,7 +6,7 @@ with pkgs.javaPackages; let collections = import ./collections.nix { inherit pkgs; }; fetchMaven = pkgs.callPackage ./m2install.nix { }; - plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; }; + plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; in rec { # Maven needs all of these to function diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index e9ce5b1ce8cf8edce2451fd69240ac221d106af0..8cc79dc1d228aa6f3b869e9f439135d3e6013047 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, maven }: +{ pkgs }: with pkgs; with pkgs.javaPackages; diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index 912ea53c3d3ac8e321bd6eb7b0f6ed42ed372270..60fafd60ad0b65ccfc2cb6a995523b089ccf9f51 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arguments"; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 219c8df803b762d7679e67571c424c29155f8b80..24e06b0d65a9a0cd652bbe38de36581b1aae8750 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: +{ stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { name = "assimp-${version}"; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 703679ba3a55a5d361d888c5cb5696f2fb10992b..ec93e2f64671f42dfa7befd1df98b2ca175fe5d0 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, fetchurl, writeText }: +{ stdenv, unzip, fetchurl }: let version = "24"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 8b787855c4deee18be700508a95ad94552253c07..580cd1bd73f5bc884424532a7c6d56b717dd74c1 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }: +{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: let version = "1.8.2"; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 8805dc74a26c30accff751400d84a74d2777bbd5..093bb811489fcd4fe0ad94fe566bb045ae6b6248 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }: stdenv.mkDerivation rec { baseName = "belcard"; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 003fce0ea8c31d7397986873e9fe6fcb8047fedc..09ca4908d7891d6e74d44311815ed41e5045a9ca 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub +{ stdenv, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub , cmake, zlib, bctoolbox }: diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 214abb21f2cda16d44e4e0a055b6be67c6f55067..736c9a2f9e0cef2393b04b012d0ef71201566130 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { baseName = "belr"; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 5ae9ead9ced41026e386f94b6d61c37237c7592c..503e4b0fa43b2d242201c2fae1a4767a32024269 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -19,7 +19,7 @@ assert enableSerialization -> boost != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index cdc660ca3f3261855ab6c557db070a4acb812f9a..11b94a0181a19a4f2074d8b67fc72b20edb513d9 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }: stdenv.mkDerivation rec { baseName = "bzrtp"; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 1e764aff4cc1f10caaec15ab05e9e35593ec64b0..397e80961e064b6bd4b9bd64a050219f7505076a 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "actor-framework-${version}"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 4486149cfcef3a2abcc87d56e5000afd04199923..db46412ceb554006b6e5f7227cb218c97e655d6e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv +{ stdenv, fetchurl, pkgconfig, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 47250f2b3da281620fd77a268fe86bee3dda82d5..a4e4968f562f7bd322a85856147d93c85ce10b58 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; ver_min = "2"; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 64e3690eb3e64d38b797046c53d5f24b81676ae7..0fc0dfb07066f234df3a71cfc58160a2879f2b98 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pkgconfig }: +{ stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { name = "capstone-${version}"; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7c44c2e0ab0cf017e46002dedb8cc63beb11ea4f..7cb75d8de0f39fd3d63ea573298b1876706c9861 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.3"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index eba94288e8fe079b39a25f34a9654fb899711205..705aa7252d1f720e03d746c9bd48b3da67c6c095 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes +{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, gobjectIntrospection, gtk3, gnome3 }: diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index c1bf789c59bd728053305664140355f431f3ed59..ba5b2aa43718a1db7ece74c2f48a3e1d36822247 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv }: +{ fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { name = "crypto++-${version}"; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index fb12921817566545a40deb51bc1196ac41167d5e..c3ca9aa442bd2689247700d5f6d169828fca52c0 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -5,7 +5,7 @@ # Options from inherited versions , version, sha256 -, patchSrc ? "src", extraPatches ? [ ] +, extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat , drvArgs ? {} }: diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index c17a140b9c570c757987be103b7c9a375c2c7329..013913e52972560181a4da6531ccb0bedd2ac973 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index ea7d920dc82833878c77b899c924df082f1eecbd..40c633dda523cd8f48dca4d73239dcbbff104c90 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index e4d1fa2073fab1fc66f92ce4485e3d100f586ad1..62014489f30c03cd2e8001b7139d410622e15f31 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -2,8 +2,6 @@ , fetchFromGitHub , fetchpatch , autoreconfHook -, libtool -, gettext , pari , ntl , gmp diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index e341ce842eb66f2f44e8cc3ca32e2d87814a72c3..79b29a90463eef341990f8c24e13cff64c9b91d0 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "expat-2.2.5"; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 5169688614820ccb47217539954209fd3f088572..04d085bde73c9a54cfa81421e1da3d7746808e7a 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook +{ stdenv, fetchurl, autoreconfHook , mp4v2Support ? true, mp4v2 ? null , drmSupport ? false # Digital Radio Mondiale }: diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index c5ce5e252fac60145a48bd9ecf22d14078062e7e..34c649022cf5b099304c699bfabbe27bf0285502 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) @@ -80,7 +80,6 @@ #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora , libopus ? null # Opus de/encoder -, libsndio ? null # sndio playback/record support , libssh ? null # SFTP protocol , libtheora ? null # Theora encoder , libv4l ? null # Video 4 Linux support diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index a3ce9ea9c2bf8b4aff72df13e7be7c12d14e5a35..4607d3e2f197508c0f5a73390dbe713304ae319e 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, perl, libsixel, yasm +{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 3d9027db1602eb47bcd678e1f7359aa363cb2acf..e763e5c1159ca6775ffea30d9561f8b27c7ab166 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -42,7 +42,7 @@ */ let - inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32; + inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; inherit (stdenv.lib) optional optionals enableFeature; cmpVer = builtins.compareVersions; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 9e76c1e6400171e8a6a13211e186e208a82427f9..a1cc11fb8c1e71273a3ea36d4eda27e9bebc0565 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index ccf2d6d0585598450d82a8ee8756e60c78af3431..2b6a949c23269988189afa4eb00c88955173ab55 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent , double-conversion, glog, google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c2d99446d81b79fe8732015757f74e534b8d7cff..01c4140f3b5ca1cb07315e438539cf062f844762 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchurl, fetchpatch +{ stdenv, substituteAll, fetchurl , pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 8b534edd2498ace4364f175eda1c8e0bb2c16f14..76e89b97617e27c176f3fc6407f0a3c32c23e5e4 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,4 +1,4 @@ -{ runCommand, lib, writeText, fontconfig, fontDirectories }: +{ runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" rec { diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 2f5374851d82032cdfedb25f5c8e2cc3218e6a15..e15626a160e27689900b3ebd0ad65cdd6ccefa3e 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "frame-${version}"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 23aa86af377c52a63e528cd1270e1425ba86072e..fce052aeb223aef43d90de52be90c3bd5d55214a 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, copyPathsToStore -, hostPlatform +{ stdenv, fetchurl , pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib @@ -10,7 +9,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { name = "freetype-${version}"; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 6745bc1ecf5fae5b926261c500a82bcce3384326..d700c3d3c16045d595146a78f72f19cfe6cedf81 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "gbenchmark-${version}"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index d2987be6a3d50a2a68599109366f96f2ba1ef572..ccfa7e536111d76286d3592b3ff6ae9a791e44b5 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg +{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg , librsvg, pango, gtk2, bzip2, intltool, libintl , OpenGL ? null }: diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index b92f6e61f56a5c1d666f0670581052f2ea55128a..83030a7a014228ade182369ec9f1f85545fad250 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python }: +{ stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "geos-3.6.2"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index fd6e0a65abcef22a524c1d3b53669a6acff251b4..8a07a9f9f2276dff87fde6816dc9439a8cb4892c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python +{ stdenv, fetchurl, gettext, pkgconfig, perl, python , libiconv, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5c504d0d8e25fc3e3014f57578dfb834b5ca9d8f..8b4a213aae0517887559514afdb7431b2e58b1af 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -20,7 +20,7 @@ { stdenv, lib , buildPlatform, hostPlatform , buildPackages -, fetchurl, fetchpatch ? null +, fetchurl ? null , linuxHeaders ? null , gd ? null, libpng ? null , bison diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 472ec83fb02c404d43f4cca272bcb10a5ab854fc..a81cd91fdc76c05bbadfafe4ec9ad392ca26d6da 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv -, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake +, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake , yacc, texinfo # Version dependent args diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 984603827c8d36adcca10c22fef6b0641a05fad6..081d896a6e0b8ef4d5ebe793df36abbbd5823e37 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 6cdd19f307dfd895cd522a62ad1bddcf33f65a61..6155b8b18bd0f1c8e631cbecbcc507c06dbac918 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg }: stdenv.mkDerivation rec { name = "goffice-0.10.39"; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 94c09b716832e1cee4c9e57fb449ff38db3452d3..e7da60a9d1a228241dc2c18d3b2bacc382b42951 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which , autoreconfHook , git diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 720ff06ceaa5023fe483c0885537de37996791ad..9c19bdbdc29a0e3b4d17cbc05c9ec7c02e7a94f8 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn, kerberos }: +{ fetchurl, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 4f952359f711106d6d2a93e3cc2770f1c814155d..37d4843db8d45f09970d52320e039355999f2340 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "gsl-2.5"; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dfd3383cdbad073f3c7f6969c4469014672c8e2a..49216b70fe12fb4c2b316c665ee45c465924ec37 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, meson, ninja, gettext, gobjectIntrospection -, python, gstreamer, orc, pango, libtheora, libvisual +, python, gstreamer, orc, pango, libtheora , libintl, libopus , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 11e0894df3c35042536eb423e5ed2765f29eb6fd..ad7309be0445368b0c7a68486a3892974c95067f 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -12,7 +12,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "gst-plugins-good-1.14.0"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 8371b2780409214dfc66ec8cb199cde3d3f64565..db75705c825abc4b16f81fc66236a7cb4972dd9e 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintl , ApplicationServices diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 75583624f5457e4a2e6c7355c74f60c674cc7492..9c47ef0260b4e7c9deef8cbb379bf4c536733609 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo -, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx -, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc +, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx +, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index ac680f8432ab062684699a9d2f3ea5df099779e9..2f46016adac814e7e7eb78cd0f1eb937340a99c6 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }: +, libmad, libdvdread, a52dec, x264, orc, lame, libintl }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 11b451e76fdfce3957e30817c65138e51f31152f..7255894f3b1fe9b78cbd46ed8e28921895343c29 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm +, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm , libvpx, python }: diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index f206a169b93ded32ffd8e772a4c1abcf4c9b90ff..c0dc0753cd01317968eb2d423142c694fa35b381 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, substituteAll, which }: +, pango, pkgconfig, which }: stdenv.mkDerivation rec { name = "gtkd-${version}"; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 4f3bc64b5d4011a14a5eadb17100ad950a1aa3b4..4c858242bb540d9d20daee26f2e479239f54ed1f 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3 +{ stdenv, fetchurl, pkgconfig, gettext, gnome3 , glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index ee8a5107b341f8254bf538e50ae314a3024f3cd0..9f0a6c34512ff38ad3db51b4682550d705188367 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -163,6 +163,7 @@ let name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { + description = "Hunspell dictionary for ${shortDescription}"; homepage = https://sourceforge.net/projects/linguistico/; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index ee868d371ce5e18c271a9499fb71363ee9bf8993..705fb816b2e5e4f28bacd01f59828540ff812904 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,5 +1,5 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames +{ stdenv, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform }: diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 3568edb7890ce3c3a3449465383d2c1a5a2bd4b2..8abff4c5f0592170a2bd3e27bb3a372792d20c8e 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, utillinux, +{ stdenv, cmake, pkgconfig, utillinux, protobuf, zeromq, cppzmq, version, src # parametrize version and src so we can easily have pkgs # for different versions diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index ed500ca518fd37b659d6eb97d9a634b5b33cb021..a5b226ee9c744da9e8819ff5934db708cc7714a2 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }: +{ stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { name = "ijs-${ghostscript.version}"; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 4dfe190124b175eab520c451277d784f32f298f9..d78c59e9c25a02475dcb3368539293de05252397 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, python3, xz}: +{stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { name = "iso-codes-${version}"; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 5280a95afb4012aabbdde0d4f92d71a1f35c6989..5f6a6f51a52202f12f7f751e4b7bea41a80c59ba 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { name = "itk-4.13.0"; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index eff57d6f2fd9eaf89d73470bc37d2dd67df19ca8..cf9c554d57f4a53c0907defdf38aef72f6d5059b 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.17"; name = "commons-compress-${version}"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; - sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37"; + sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0"; }; installPhase = '' diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 8731bd8e73664440f774047e3f636950ae5291ec..b9dcc927172f692db29907fd8044d2540813bba3 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jbig2dec-0.14"; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index a9b5d596b395cacf6786b6619b7516bd78291702..be83dbc52f4550c8c9ac129217109f880c7a35dc 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext -, gobjectIntrospection, dbus, fixDarwinDylibNames, gnome3 +, gobjectIntrospection, fixDarwinDylibNames, gnome3 }: let diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index cd5f2163dd955984833946c0f7113fb1f7cea6b1..d5a407ee16f269070071b1519fe0c6599b718bd1 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, writeScript, + mkDerivation, lib, extra-cmake-modules, qtbase, qttools, shared-mime-info }: diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 7aabeb021545e9692e88c8095b924c0817bbd980..34e01b4c1b623ece5ca39735cf95eb244235166a 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, - kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative + kwidgetsaddons, kwindowsystem, qtdeclarative }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index ae945ab73384e9efa2406597731de5f1474e4497..ca015151e0f1c0541bc673d3485d4803f04201b6 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, qtbase, qttools, qtx11extras, diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index c0b4b63128610eddae8e8fba448cf26cca938fc5..6779faa50cdcfa7356eb1ae5b6d29188f1bf10f1 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchurl, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 3efd4cf4e2a8b87e00e4b0b87fd5b9e230b8a34e..c633aee30a1beb4fe5ef6c4a6129f529a065387a 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, fetchpatch, + mkDerivation, lib, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cf4b85043bb27d5464bd059e996f2284fc40d1c1..194b57c0534263b92b95d21972092a83f4e1d4b3 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index c6c3ba53d2c38e53a2895904f73b9d55dc2a39fd..5c53f5e6ad5da955ac4a8d9e7dcdc07348e6b162 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig +{ stdenv, lib, fetchurl, extra-cmake-modules , qtbase, kdeFrameworks , libatasmart, parted , utillinux }: diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 3f44dbb9c1389205d32b34bcb4ef2753d4f7e460..256989992c5a0c0e248bd58219bb8a696fb1c386 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 + qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 }: mkDerivation rec { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 853d23c974586a6d5f98408e1c39a37eeaaafa86..dcff8c2757e1f311a508bf371318d1adc791216f 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { name = "frog-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; - name = "frog-${release.version}.tar.gz"; }; + name = "frog-v${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 61b4559ebab0c4377359127f1314caf9cfa327c9..2c418c1bc5f57782d641c4a40d1422c060708fe8 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu -, languageMachines }: let diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json index 1147322be6da8c1e36de643a523b55560bc0cc49..6ea449387172ba3c16db076242ccbdbb07017ae9 100644 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json @@ -1,5 +1,5 @@ { - "version": "v0.13", + "version": "0.13", "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" } diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 7defa71fc0ee1822a2ec5447f5c501dd5cae77d0..01a78b5b4be641d4c8076f529810b3d074cddbe8 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu -, languageMachines }: + }: let release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json); diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 5791b0808b4a327d34ce929ec404681b33846774..e9ba4ae5ac2125fdabb484b22006df27cf1409d7 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }: stdenv.mkDerivation rec { version = "0.3.2"; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index fde8a06eb4162ad374b1aad56c06e1b8ce62d7f5..0c0fc3861c9ea23d90141d3aefa4a8be7f2d2615 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, hostPlatform }: +{ stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b726d9c2b42aab71535670ea193c7a6883985d85..5eb90aaf05c910c64739aa6f6fdb3282d02de87b 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -18,10 +18,10 @@ assert faacSupport -> enableUnfree; -let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in +let inherit (stdenv.lib) optional hasPrefix enableFeature; in /* ToDo: - - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools + - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools - maybe do some more splitting into outputs */ diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 8b2f0b0da92db80d9db5ad70378afdc31da9e7e6..3a1b77525143da98ba42cdc0e7c43256efa480be 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }: +{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: # library that allows libbluray to play BDplus protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 3f244d399f7e776d7c33617fb3f9ac00cd84ac0e..c02e2108f2376194488e1ea8d7d06ff713971d42 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPackages -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped +{ stdenv +, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped , libiberty, zlib }: diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 418e9cf0b57332124b5ad3aa68db57c9b4438243..e4864aded279fe6bd827abae9bdb85b1bd305da1 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3 +{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: let diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 4f0ba439417f220664065652a6147709a877a036..4f4007649d04c63559ba8aa6d2ac85443dda643d 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, collectd }: +{ stdenv, collectd }: with stdenv.lib; collectd.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 7f4eaa5fd14b4c77d77defba8908ac162ec28e87..295028abc97d8c91964f126f9f31c8af6913dc46 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 +{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 34ba39d799ed518e35001c740e848f29379529fa..1342ee6773f71fe832ea490d2673a961186c0b68 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -3,7 +3,7 @@ let baseName = "libdbusmenu-qt"; v = "0.9.2"; - homepage = "http://launchpad.net/${baseName}"; + homepage = "https://launchpad.net/${baseName}"; name = "${baseName}-${v}"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; - + meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index bc4cea1b4702239fda172b51b8e1b0c1efe2c2bb..c68e171084b93796423d43b47b270a0e5f3eb31f 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, groff }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "libedit-20180525-3.1"; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index b1a6238a3780168cd0e6d95a22a2d1efc137e4e7..d150d4a0033097f8300e1ae2f92e00df4edeff69 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }: +{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: stdenv.mkDerivation rec { version = "20171104"; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 05c320c42aecc9ae0bfaec84d8186d448b2abdb8..5e94d00dcdb7dfa04c537db51402a723e0f517fd 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig -, libtiff, giflib, libjpeg, libpng, monoDLLFixer +, libtiff, giflib, libjpeg, libpng , libXrender, libexif }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 652848d8a955c357d058f48de21611d849cc4784..29f346e9acfbbd57d077cf8bca7d458921c9d0b3 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, docbook_xsl, xauth, sudo + autoreconfHook, intltool, docbook_xsl, xauth }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 96b42ac068ccb1b850db864b3cc455f4c2dba217..8616a0146755a82679b7e372f5f77d0768e9a523 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index fbe421e9974e548b8f5a170fab59b32e1f923d47..c6056ee49fbf38f5a43733de793f3f88ba818db1 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,5 +1,5 @@ {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, - libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, + libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib, libimobiledevice, pythonPackages, mutagen, monoSupport ? true, mono, gtk-sharp-2_0 }: diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index b0013d0f94912e8cb5af6b421bb0a08c24af5ca6..90daf2ddf7434b57c50142d6390f62070d69f1fe 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,8 +1,6 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 , python, perl, gdk_pixbuf, libiconv, libintl }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "libgsf-1.14.42"; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 6498014aee8d056a70cb8accb78068a031011b7d..d0be9e25b87e758dabb8baacff18617120e8084a 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }: +{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }: let pname = "libgtop"; version = "2.38.0"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 516e6bbbe88c8cf45715b30d737181232c37b8a3..bcc85abbd3efc1404d367fbf22df894723df7a2b 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, staticBuild ? false }: +{ stdenv, buildPackages, staticBuild ? false }: let inherit (buildPackages.buildPackages) gcc; in diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index a153001a9600c40596ce4f5d52cec4394345b758..0289a5331f8937775a6035397644472cb2358bc7 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, writeText, zlib, gperf}: +{stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { name = "libid3tag-${version}"; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index a100b0cc59323d547d4c4696aab6601cfb46d8ae..dd8e3c4a4f87811f9e3d35add523ed154556d10f 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }: +{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }: with stdenv.lib; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index fef5e7278b818dafd88f857daa3c1cffe7e39c25..612de78b741dc5bc2f9fdc2a53e95640023207d7 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 87cae224685287e1ad6381c5fbaa93bd0a08de85..f352c8e9ed198fa2f4935f7e097df08370eacf53 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkgconfig, git +, doxygen, catch, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 4b547fde3ab0c37707080c0af1d86e24d523a6a7..79439f822696d5849d020cd7eabbeadc64ba9bda 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux }: let diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index c918c61abf0d64a8d9023ae4b86f4fb7f7319c6a..2c59fa03ea06a48edfe7459c57c2b7eb9331f6a7 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, autoreconfHook264, bison, binutils-unwrapped +, autoreconfHook264, bison, binutils-unwrapped , libiberty, libbfd }: diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 66c7e7e882e810a9c46c1bd5a9fd2ce474b8f530..135f1caf97e2f5324ebe0c0c19f044db98a42957 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , fixedPoint ? false, withCustomModes ? true }: let diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 8da097c3d386c1501aebf3b64ece1e42d402d156..8dc64f2c2b57c31e4933d2ebf912277ee6a916af 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }: +{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }: let inherit (python2Packages) python cython; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 5ad9cf1e7b771a867c8310471766b9d432bca893..4173588ac522ad20ccf7f93f42c95a611f7cddf9 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true -, buildPlatform, hostPlatform -}: +{ stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 02e634b22a3444746f4076846b41014682e5ef9e..0e0499251eb9147df5dd0f07298ac497015c35f6 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib , dbus, networkmanager, spidermonkey_38, pcre, python2, python3 , SystemConfiguration, CoreFoundation, JavaScriptCore }: diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index b7a78cb3daf6683e069321c45f3b3baf3fca3785..3f43667712357999878ca83d207de9be4f2e664d 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, libxslt, curl }: +{ stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { name = "raptor2-2.0.15"; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 8168ff0edae438711ab438266026406d40e9740b..38ba93d4f7c59dde0d362fe66a2f3997b1fd4750 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { name = "libsass-${version}"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz"; }; - patchPhase = '' + patches = [ + # CVE-2018-11693, is in master but no release yet + (fetchpatch { + url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch"; + sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl"; + }) + ]; + + preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index b77ba49822fdbfbeee2f9113f8c911039c354f16..f311d1a03353380c9eaa612594f908521bac7f43 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl , libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: let pname = "libsecret"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index f6bfff78fa2698b9adf93978ae9924d0a60452c4..def5ee0e19a21a3ffd68b231e1a436382df75903 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: +{ stdenv, fetchurl, pkgconfig, gnum4 }: let ver_maj = "2.10"; # odd major numbers are unstable ver_min = "0"; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 8152c1ea8524625616a6ae273472a77135c31e1d..306c73a9b551c422be6e4736c7b42fc53e37275d 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl -, buildPlatform, hostPlatform , enableSigbusFix ? false # required by kernels < 3.18.6 }: diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 48b0ed6d711c43c13c49eed51b9fd2fc56d1990f..b64c3e51778258e5d6accb33437f843ba8da73d6 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, +{ stdenv, fetchFromGitHub, libtool, gettext, pkgconfig, vala, gnome-common, gobjectIntrospection, libgee, json-glib, skk-dicts }: diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 578053bbb42738c56a408b06ad3052d7f393517b..4ea2209160f82ee10fa18cfbbb6f6a26a7b974e4 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index aab0da90d394e8489bd8bd2fff6ad37cc022871d..6eb8b6b1a8e9d09714df2d31698660ef41cfb94d 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsvm-${version}"; - version = "3.22"; + version = "3.23"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd"; + sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5"; }; buildPhase = '' diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fce15b121b426ed0b7ec2f23afa8b07dd8772cfc --- /dev/null +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, patchelf }: +stdenv.mkDerivation rec { + pname = "libtensorflow"; + version = "1.8.0"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz"; + sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha"; + }; + + # Patch library to use our libc, libstdc++ and others + buildCommand = '' + . $stdenv/setup + mkdir -pv $out + tar -C $out -xzf $src + chmod +w $out/lib/libtensorflow.so + chmod +w $out/lib/libtensorflow_framework.so + ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so + ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so + chmod -w $out/lib/libtensorflow.so + chmod -w $out/lib/libtensorflow_framework.so + ''; + + meta = with stdenv.lib; { + inherit version; + description = "C API for TensorFlow"; + license = licenses.asl20; + maintainers = [maintainers.basvandijk]; + platforms = platforms.linux; + homepage = https://www.tensorflow.org/versions/master/install/install_c; + }; +} diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index fd58f4f44e78d8d296e3dd01f04dbb8b4227d9f1..b5ab9d310da338fed35bb3774bd221bdbeef153a 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: +{stdenv, fetchurl, libogg, libvorbis, pkgconfig}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c492a15bfa4e05868ba4a079082830248efc9e78..c5a12432280b9f70ec5fcac67cdc044d4121a86a 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }: let version = "4.0.9"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index dbf1d7a3756fdf9eece2c3c974daf3e94fb9c278..6a32ccf5c1b14876d35b744e05e0d03ae481890c 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }: +{ stdenv, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { name = "libunwind-${version}"; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index 95d4be08548ac48f819045e7789921262cf44d02..6868e5c8cfa9c1632c5c8b375fd14a4881ac4ff0 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libdrm, libva }: diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 731892d33b4d8aa4357e744a1f32f5cd29c83c36..515aa25374434a72fbecc754109c38b2922ac635 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -33,7 +33,6 @@ , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -, experimentalSupport ? false # experimental features # Experimental features , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false @@ -41,7 +40,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; + inherit (stdenv) is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 7d4b75d6cdf8112209c6193757d0263d9a37fec9..fb7f828f61f05f13e0c9ee74b78a82710aec701d 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -35,7 +35,6 @@ , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -, experimentalSupport ? false # experimental features # Experimental features , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8a3d7abdfa576a9eee9903c42cca4a13fd369d52..51c142a81119de793f08da32384c50e2822f9955 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl , zlib, xz, python2, findXMLCatalogs, libiconv , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1bb90ee195dad070ec4ac1dcda892975b61a5e7e..5b6fdb462c2c474d0bbfa69bb322e0375da9b455 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2 , buildPlatform, hostPlatform , cryptoSupport ? false , pythonSupport ? buildPlatform == hostPlatform diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index ff09aeab2c6fb7362924e8a3cc6dece9e6e63d46..af665c6d9a4a87254d2119f7ae38073b7b9565f5 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "libyaml-cpp-${version}"; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 7178e64b6b6a0dbc071287a3ad30c4eb1965093d..7bd0d1970f4e43c6b18ab8462b34fac95d71d6f5 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: let version = "0.1.7"; in diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 3f008744c1b483c24073c1eb4444ebd70d6c1001..5fa1035868d1b453603f9bcc9b2f86606750ba68 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "linenoise-ng-${version}"; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 7f4d8cc19c8e437a88299b278fc71e9806e0e698..ad6d2df1d8bdf8c1b05796248502fcbed5daeee6 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3 +{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3 , libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 93c8a0474d9611c6dd2316e730ea434b02fdf53e..c45fa6bc61aab503f6b56dce5e7014601104caea 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }: +{ stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { name = "lucene++-${version}"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 8b756e338e483747484e66a66bd04080bb5b65cf..4b69d5d0aafe437f5a784c4f0858ab0b8dfa26af 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm +{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , python, libXext, libmatroska, openssl, fetchpatch diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index f49b7ba2c4b4d920f97526ba87762bf4a8e5bee2..b8a8c64011ca0967282569b0ecdb839d0b70d85d 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 +{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264 , fetchgit, cmake }: diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index 0ae17b4d3f6193acdb182a0d7695b3e51ab89f01..f18c1e693cbcc1c572e6fa8a88674612e21451dd 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -1,7 +1,5 @@ -{ stdenv, stdenvAdapters, fetchurl, pkgconfig, intltool, flex, bison -, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau -, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableExtraFeatures ? false # not maintained +{ stdenv, fetchurl, pkgconfig, intltool, flex, bison +, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau , OpenGL, apple_sdk, Xplugin }: diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9c0bf29d49089cc00c86d75412599c084398c896..028930ba066d84c1f83110191fd6e7b08a424485 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, lib -, pkgconfig, intltool, autoreconfHook, substituteAll +{ stdenv, fetchurl, lib +, pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2d4de33904226ed2e0014819962016be5c9e92ee..d8075c41a7036cda3f86e43c9948673b3807a305 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, movit, pkgconfig, sox , gtk2 diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index 444ec9dac2bef1f9f87e9bd85cd542ad94ffc2b6..d96f90b4bfd673a0f3f7ae95121461a1ca194fe0 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }: +{ stdenv, fetchurl, which, pkgconfig, mono }: stdenv.mkDerivation rec { name = "mono-zeroconf-${version}"; diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 6c5a0e5279ce949c172954e1f40c70bce12dea13..b5a36c184ff742882257dab2378fb92a11f7be50 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, perl, gfortran +{ stdenv, fetchurl, perl, gfortran , slurm, openssh, hwloc } : diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index b9b25e7f43b3bf0ad85234687b1579e2664a7af1..2ecae98387e1880280c3abfef07d44931261fe05 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, m4, which, yasm }: +{ stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { name = "mpir-${version}"; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index e0adb312677c5b2a1ca4167b60e1b3776ecd7573..65679c7e282517715148de330264e926ebc0bd6f 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: stdenv.mkDerivation rec { name = "neardal-0.7-post-git-20150930"; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 3483d4bed778d9e605ae4d349852abfad59f91f4..fb36839fe233789fc8baad5290dd9cf830ba821d 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }: +{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }: let version = "016"; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 94aba672887d0c45980e4a7f037de4a799a2621d..2715ff4dfaffc9a6f8ce51329c8f7ad6b2b3d936 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }: +{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }: stdenv.mkDerivation rec { name = "odpic-${version}"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 1d3a9629fd0ce1d64d45a99a5802b827dcc36e19..264c05e1af9dfe80695a9f45b675b346489c0853 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 20a62ef67f981ed940fba8fbf6bc5d729363558f..a073a29b507deabb188384d2aff445851b1db21c 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, readline, mysql, postgresql, sqlite }: -let - inherit (stdenv.lib) getDev getLib; -in stdenv.mkDerivation rec { name = "opendbx-1.4.6"; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 60ee30177c02068c4af360e0768562658130cd9b..293274a57767c7b334e35e0c6b97b94fa613e904 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { name = "openexr-${lib.getVersion ilmbase}"; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 187f861337568ad56da3f5199f0f36dc4ed12f38..7d84392d204aed7d88bc4cb47a8bb47d789e8ecc 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, lib }: +{ stdenv, fetchurl, lib }: stdenv.mkDerivation rec { name = "openpam-${version}"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0251de77d03ebaae9f3ca0fea5cb25d1f4b66cbb..b4b932f8d0589bf95717f54eac90e9e190709c33 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, buildPackages, perl , buildPlatform, hostPlatform -, fetchpatch , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false }: diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 62c093f310fb11264966ba76844f594e97fd2000..51270427397d1652bf3248d1a07f18a2eff33b6b 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit , darwin @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1"; + sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 5dc5df8e95b95acae0f56020e5cd1ecea7459d35..e58e347c7f3e5cc91affb05261e43d64aecf5fa7 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { baseName = "ortp"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index c23e7c9617eb07c069bb37f0f5ec3fef36447ade..a9a8c5c2563e899f41cd2aa8b157cbc40f4b9c72 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz, fribidi -, libintl, gobjectIntrospection, darwin +{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz +, libintl, gobjectIntrospection, darwin, fribidi }: with stdenv.lib; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 73e7fd42cdba8800f71648ecc04aa6c67f824965..e0819cde679b6650be11974ae20a16dad665c0de 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pcre2-${version}"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 9993060eb728b4ec87616bff0a8e0404b09d11f3..a8655c2dcbe3b58204b2c66953a5b9cfe82c01c2 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: +{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "herwig-${version}"; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index 32a05d10d3a67f19cc95cffeb878042ad1bd11cf..b287e52b24313a01636ca54b9d5edcb9db27773b 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }: +{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }: stdenv.mkDerivation rec { name = "mcgrid-${version}"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 0c9d879fbd096a79f7fce8dc592e668c343b57ff..2f79a2b76ab9c93fb3647ab4d6bab27752c1ae03 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "nlojet++-${version}"; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index eb34b94118a97ca0af5824711fc19efe446a3596..1dacdba1b1ce3f807949961a9eed462a8a255c8d 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: +{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index aa9a3f9fdc0a7a989314376674fcafd33486765e..a577d318523dbdc881972de87580d479e99ec169 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,12 +1,10 @@ { fetchurl -, fetchpatch , stdenv , perl , libxml2 , postgresql , geos , proj -, flex , gdal , json_c , pkgconfig diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 06154e0008ba54893989a1364604cd533aae448b..1a20d806b968b2ebfcc5f3eb707152cad82f9528 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, version, src +{ stdenv, version, src , autoreconfHook, zlib, gtest , ... }: diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 4e74e31e3ec824a7c67e5f4073ff2b19fb5e3841..51253676341ff2355c6eb40e47da00b7ef6913b4 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, cmake, qt4}: +{stdenv, fetchurl, cmake, qt4}: let pn = "qimageblitz"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 4227575acb091fb2bb9a0a668f18ef088c857ab4..01d0fc510aaaebffa1895608e3d35e566a716d0d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, substituteAll , hostPlatform -, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext +, libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 5407a79cd77505d00e8fc72869f1eac505e93f78..2a706fc7b6e8de18101f594c53a6fe920710f140 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper, + stdenv, fetchurl, fetchFromGitHub, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index b9ed5eddd5cf6531bd42f023019540d975b41857..8732b1061342f539e71b2211b30085f85614611b 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, + stdenv, fetchurl, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index e109fe447aa235f5600a8e45dafda6c9564b99f9..755e6a9487e76acffc2b7bd9d3f4c4968f119c5b 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, + stdenv, fetchurl, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 15e19c77567a01746ac2a166535f0b1e58db4569..0d9cb81afda93fc560e4311b6b3cf3025b225d51 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,14 +3,14 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, which, + which, # darwin support - darwin, libiconv, libcxx, + darwin, libiconv, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, - xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg, + xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, zlib, # optional dependencies diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 1b7a7c1fceaaeb761bc4076e59948e9abbf28bfe..d0bab88b2f21442866d4eb5a852da3f8909cf74c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,6 +1,5 @@ { qtModule, stdenv, qtbase, qtdeclarative, pkgconfig , alsaLib, gstreamer, gst-plugins-base, libpulseaudio -, darwin }: with stdenv.lib; diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 2f8c142323d224a825be3ca0d778a2f674703171..516d38340dc5364e1da4b1eec2d4f0419808b939 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -1,4 +1,4 @@ -{ qtModule, stdenv, lib, qtbase, substituteAll, systemd }: +{ qtModule, stdenv, lib, qtbase, systemd }: let inherit (lib) getLib optional; in diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 8691e20ec45217eb911324be801a6bda8429e6a5..62da679157f017f991c395a88d5a56b2825e0b3e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -4,7 +4,6 @@ , sqlite, systemd, glib, gst_all_1, cmake , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin -, substituteAll , flashplayerFix ? false , src ? null , version ? null diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index 49585f601d146d6859531d0192e0c8daf445e0f0..da56c07779b9cfe6c35aa4e841e3c659a2f8334e 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,4 +1,4 @@ -{ lib, buildEnv, qtbase }: name: paths: +{ buildEnv, qtbase }: name: paths: buildEnv { inherit name; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index a8611b3124053472a81317c9e33a802f88667bfb..b94cdd22f7f05e9976ac7c5e33594e354fc7a05e 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "qtstyleplugins-2017-03-11"; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 8d096e18f08fc364b863b9ecfa9bc87abd434b97..ae858738ec1665eef2f3c0e1025192618d01b37b 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qtbase, qmake }: +{ fetchurl, stdenv, zlib, qtbase, qmake }: stdenv.mkDerivation rec { name = "quazip-0.7.3"; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 77e76ad638abf981d794b87b70241179b706d5c8..35d16ee5e19b60e6aa23b2b49b117922989152f6 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python2Packages, hexio +{ stdenv, fetchFromGitHub, python2Packages, hexio , which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 90389055a415af4fc920e031b163fbbb3525e8db..786fce0fb6381c96ebbbc90c8cdfb4e63feff347 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -5,7 +5,6 @@ # Optional Arguments , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null -, numactl ? null # Malloc implementation , jemalloc ? null, gperftools ? null diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 77cb7cf1f2b6f875056e78627fa3e8bb6814a7bb..55c1a641fc3d2dea7670be67df2e9229aba4e435 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool +{ stdenv, fetchurl, autoconf, automake, gettext, libtool , gfortran, openblas }: with stdenv.lib; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 916bf122b3c244f87c30920db6e9bfcc46301bb5..c1994533b78d8ec8d164384c6149e05d748f3546 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, config, fetchFromGitHub, fetchpatch +{ stdenv, lib, config, fetchFromGitHub , cmake , glog, google-gflags, gtest , protobuf, snappy diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c68454fbe4a1d6021eb2f3eea53a96f297b91a6a..e6af2251b1f1880c6d54ff3ad1712169b0fa4b92 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,8 +11,7 @@ let atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } else null; usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals concatStringsSep; - inherit (builtins) hasAttr attrNames; + inherit (stdenv.lib) optional optionals; version = "3.8.0"; in diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix index 3601066cb22f28d0a4b85dd8c53947d9938b7f7a..632380328db168dc2a049eab4e84546fd70f28f8 100644 --- a/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub, fetchurl +, fetchFromGitHub , python # for binding generation diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index dfaf1c679dd79c14c319e9e28de15a5b72e35ad2..f794c3841b93278ac518a75c90e6aebe5fdd34fd 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos -, pkgconfig, gnused, expat, openldap, libiconv }: +, pkgconfig, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 3207bdb3a7f2775608edbf80b024186c07779bf7..9004378647173d7f29d2800148c3fe8304d6f8f5 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: +{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }: stdenv.mkDerivation rec { name = "smpeg2-svn${version}"; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 22d66b7e71d1f7d323973ef3f95ba2ff825dda65..771ad033ed915a99183b6dcc8a2f43ecc61b9b72 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk, alsaLib, ncurses }: +{ stdenv, fetchurl, alsaLib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 0b815f9095f9cb44053bd6523a06d462807d17c3..ba3791a8a8bdb48401feb5fdf73a34c53cfc245f 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib +{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 0185bd2733b40dc98f7afec639d8baef6aadf663..4f711a639f7311de8d6ae56240f20b68dbd99b3f 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , Carbon ? null , libjpeg ? null , libpng ? null diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 99f0bb65441c2e71296e83fee867b6cc2e3846ce..24251cf0cc1d2039a285697315b0b206321e9813 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { name = "libtirpc-1.0.3"; diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index 9f9d8e62de5061b4850fd29e87929d81f5f97075..aa4a7890b23ef27b7aa6161828b46770b525b0fe 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { name = "unicorn-emulator-${version}"; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 9112079a90eaa6c46159e6b64896717c30b61419..ce666becc85535951517c62d1d5b8eed3ebff4de 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -1,5 +1,5 @@ # This old version of V8 is still needed for the R V8 module -{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }: +{ stdenv, fetchFromGitHub, gyp, readline, python, which, icu, ... }: assert readline != null; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 438b4eda454bf92b7b9039e63239dc0feca4cafc..14211ea65e9aba7b5dd7e041d5a361e49b8c38bf 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase +{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase , libjpeg, libpng, libtiff, openexr, python2Packages }: let diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 984a106236ce07b135ec3c22ddce79fef5e67e2b..bdfe3d1c5c60af1b2ce2031d167aa58c02c27308 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 797c64729ecf8e10f4900665ecb0db042fd117e0..e154403697fec96cfbcca97521a835b72bd7865a 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vulkan Header files and API registry"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 29a27e53f22558b00a52e5568bfb0350b78e60a3..9eb3254001d59664ab698705f32a0c88ac59c20b 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "wavpack-${version}"; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index d832becbed88f1f7454822618362fb00b967a6d0..3555a92322855ba50c536caa3b03ea66bd3833ca 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index bbc33f33e701475e4d61578214fce7f9cf201f1b..fce0dae6c7313ed98a77f2af589e5bb1f67e71d2 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c905c40cf96035accb875f95e3ae00f2c3fd6e1e..c4d94af850dd567dbc6fa3de754596e68965d246 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -13,7 +13,6 @@ let + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 2b9244ff1b184d198bade434d543484e8ddb2f40..572adfeb0bb698f08455f8b35c3030158f464271 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL , libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 17f8646b51770357501906f582ebf24d5911267f..e343c301127fa2fcdf12799648c2d513f8ad0cdc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig -, git, xorg, gnum4, libxcb, gperf }: +, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 7865724efa4073d54c05c38d24df6c200720bce3..ad1cc2efc8797835fd5443f7c8d159283bbef6b3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchgit, cmake -, avxSupport ? false , cudaSupport ? false, cudatoolkit , ncclSupport ? false, nccl , llvmPackages @@ -9,13 +8,13 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.7"; + version = "0.72"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l"; + sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 274a70057bdd708f90ce770c049484b31e5a1cf0..69b5b95e7613a965d32493ba9d2a8a3c2c2e5435 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib -, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg +, libvorbis, libtheora, speex, zlib, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index f67964748dca18054cc229bbefc3f94077b6df3d..9d0065277172930bb2c18c7b82d361f249d574f7 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; + sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index c834ab7a305b16b52ca1ac54a1558020bee72cc4..019a44482b9a0b721abe300215d9185a928a51f9 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, asdf, which, bash, lisp ? null}: +{stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; 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 9b9486e9758c71dbce225bae1ab6873dbf014ce3..22aa818f8756d7979bc2b6f93a9f4ed432ff332e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''alexandria''; version = ''20170830-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 7c618a9fffb25d635ef803f40afb833a03290233..c90a9e091920e4d68c7133dcf3442e47290d1393 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''array-utils''; version = ''20180131-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 f2125676e5a2aac9a45d64d6f6e71f8eea6846a4..68c8a7e087b54733ac0a15d94446e32118dd5db5 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..4612e6175b91677809d4e036443409f8d796d5d4 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''asdf-system-connections''; version = ''20170124-git''; 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 a9808173b626c0cf164e93d8c6559c384dce4d7b..c8f34e0fa17f2ebe8ec1d3a9156bd9d7ec0529df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''chipz''; version = ''20180328-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..a420c22054f6eb7005d9bac10da248769b4fd0c5 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-aa''; version = ''cl-vectors-20180228-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..42a7bd595853f9b0cdb315e3f351e24a9e08f5a3 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-anonfun''; version = ''20111203-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..0321572e72a6db9aeff79f6fa7fc8e7f1543eb6a 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-html-parse''; version = ''20161031-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..825fea4eb90682c900d56f121acf7401c9b42704 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; 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 57c9c03ba42b9f64ab16ec41410bff6d70fb2f32..d506acf876ee935261fadba1b1cc517ba0a8a818 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-log''; version = ''cl-log.1.0.1''; 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 8967b0970c5686e18e462e9a37a7bb5c49fb5c32..67468edbb6cb650e21a715f3b040dc2f47a47c90 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-markup''; version = ''20131003-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..f546e4711acce500d67d986c420052ec0ffd9546 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-paths''; version = ''cl-vectors-20180228-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 6d284b7b012089613580432c0c4a8e01bd819428..4434e711d9ded63ac84eff71bc283fd8000c4d70 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-unification''; version = ''20171227-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..1b78d0d28983971a331e115bc5914dcbda88e0ba 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-utilities''; version = ''1.2.4''; 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 fe511ec40bdfff366b1a250280bb618b70d68d1d..a4a66ecfa64ffe7874099df548c5083f3aa36e2f 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''clack-socket''; version = ''clack-20180328-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 312d0eb10a44ef96504bfa9e68f25ccb514aa693..ec7599f2bd3fbe2ac9e00e50fbf7d833c90c08a4 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''closer-mop''; version = ''20180430-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 e1fb59658528fa5bb962f9c6873f361839b3cc1b..1ae6fa0f4ec425bdfc593fdeb70430a43d23f4d9 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''command-line-arguments''; version = ''20151218-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..bb5ab940638a814d2e7043a26ceda44e09b677a0 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''css-lite''; version = ''20120407-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 ae8ed6de87760f7451919cbe9e1d19ac08c31486..7c69878900cd46011729a0c1dac9f6f780cc59f3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''db3''; version = ''cl-20150302-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 1568533d92af1f66e7d6c8dbe77c1c9971184145..91b8db69a36b100207628b9a218ec2030357bbb4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''eos''; version = ''20150608-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 11d5ac4491ebf50afc1a127e098ac40e5034133e..76e2a55620cb86c4c4d7e4f6c99078c9a470aade 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''garbage-pools''; version = ''20130720-git''; 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..f85b128652d0cdd3fcb9cad516a0539390769875 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''iterate''; version = ''20180228-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 e5cbad3e9e8369b2909b8bcda92c7d0829f24e9d..62a3ae2bb7d114a2ba57349f726cd3fafcc37253 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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 4dfdce68bc8af914f746a6d8134f7da93375c20f..79f2d38ef10ddb80e187ce13f32370e50f3b72fe 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''lack-component''; version = ''lack-20180430-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 a3ddc2fd953ebc30e6f84ec59668f8fefc3728d5..b44c0c8a9874b3f8536288e038dfd2b88b04845f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''lift''; version = ''20151031-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 db25e6ae53478027f4a16a57c8ac6b99cea074ef..006361ed80c1204feecceacae3556122860c7c4c 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''map-set''; version = ''20160628-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..c34d79f3d13de64808cca31fa55b0573cf785089 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..c65d95d9ef7a3305c8481902ebfa27c90585c9fb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..5647b9a92707ef647724f970a78c3ffa3f8eb15e 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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 1fc10b9c8db75e9cd09e76dabf81d847751d2e00..6bbdf5f911e031b27d964a8d01763c081c7271b4 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..3c289fefa9ab52f63553060a6cbdac4e52869fd2 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''misc-extensions''; version = ''20150608-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..29460307e69833173188acc572d9814d820a2a38 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''mt19937''; version = ''1.1.1''; 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..e1d6a1477a7b0d5ae23537690fbd0f59d84d19b6 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..67636d3f6cf3ebe8d86704e70b5912365e3e4b22 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e7d638fa67bdc8a70fe6f381705277..5c1f90220eb3d8c02f9064aa392d2fd4906f6c9b 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''parse-number''; version = ''v1.7''; 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 5edceaf4ad97e13161186aa6a40881c018be9c8f..cd0db041c5b2212dfde798045c96eeb4deafda31 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''plump-lexer''; version = ''plump-20170725-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..c90b252313bf97d9793b79f9af814e42f8a9d229 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''ptester''; version = ''20160929-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 be2897d19a4a6f5c286d649c854fb8ef851fa169..41ead034791a17779c09b5e8a75a1d1068710486 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''rfc2388''; version = ''20130720-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..8ed7c1a449936d9f6ba56106e59c32a2bee769c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''rt''; version = ''20101006-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..d55f7700092c871def4da418befe9bde3c32e69d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''salza2''; version = ''2.0.9''; 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 7f5cc1e048de8bd7d9fa32edf8f0579ec7875db7..9cc6338c8b890ba7abb99984b6ae40796e9d3924 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''string-case''; version = ''20151218-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 1359e13b949ef703bee065955512fbf00176770a..6819e4b25713ee7f7c0fe3527e076862f107ec03 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''swank''; version = ''slime-v2.20''; 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 9a4afce3280f0179f32ba6a8242f64ff3e22a3bf..a772694b9830dcca10d03680638f9438faea7eb1 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-backtrace''; version = ''20160531-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 1a562c2288bb9c533da1de701d294220ff26f896..5efc576695527bf0e530dcc722f970cbbcfc4d19 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-features''; version = ''20161204-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 dd93a599d699e83135fe5851d7df5f42fe13148e..9a285fea2f18b50cb733c200974d7ad427d65961 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; version = ''20180328-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 4f4e1f812233db168e3c5862853d24af300aead2..e044f097701d3ee491d06d53e9fc3304fe45d51b 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-indent''; version = ''20180131-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 56bbb583837750625b1c5739dc80625840782d87..6946141f11213412e01785338b68b87a9f2d49d1 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-mimes''; version = ''20180131-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..1af66736f30ff366c2a08c8b2ea9610d899ccd96 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..753f21dbcb96a199b752e5543cd5d40fc32abbbd 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..0ac190993d80dbda08f60c70cb4dad73e2cc2b0f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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 39c2060af02753b6733e59517919c698df378a62..afb8b3885681d756c53377ed8d321934c1f7a4df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''uiop''; version = ''3.3.1''; 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..3a4b05e052697d771621cfb009df3400ed3191ae 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''unit-test''; version = ''20120520-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..11b9351c03ada5b3db39afdd78d5a3c20c66a2e4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''vom''; version = ''20160825-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..c70c3f2e1e126daadc51141310e3da1c95d96277 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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..733185e2b26f1ca3fe69a1177e5374ac9199b071 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''yacc''; version = ''cl-20101006-darcs''; 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..090aa670ad9ef1dd07a421f0b2a80a31481a8c57 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,4 +1,4 @@ -args @ { fetchurl, ... }: +{ 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 111d995274983d0ac08e37ea4d39a28f45465875..91493d7431e82da8eb193820315334e7191ab066 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -1,6 +1,5 @@ -{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}: +{pkgs, quicklisp-to-nix-packages}: let - addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index efa76ea00a0e2691d6c2c6f5426156528e8d5f5e..b43deeceb8679a4ea50e2c11ef587ba601369520 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 1e8ea65c73d9a2476af08eab1eb3587858df0909..fd8651e89cf5b62c191c4d5c7fb759dfde8d42fc 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -25,9 +25,6 @@ stdenv.mkDerivation rec { sed_script_1 = "'s|^PROGDIR=`dirname $0`" + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - sed_script_2 = - "'s|^MYNDKDIR=`dirname $0`" + - "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 390c5eb7a2058a7cb9e7bb0e75974cdaba30215d..20b3ff3b8f509088606686589ed8662401b47c26 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -7,10 +7,6 @@ args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux" - else if stdenv.system == "x86_64-darwin" then "macosx" - else throw "Platform: ${stdenv.system} is not supported!"; - androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; abiVersions = []; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6765a9cc5c30ad93aaf5854e0a702eca8ecbefba..b09a483290f76c89d23944a43fd9d2127ff57c05 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: +{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: rec { androidenv = pkgs.androidenv; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 5bdd0fd63c5adcaa1baae65dc03c463797893ff9..bbd94cb7882ad59ef0c0d25fcfa50912ce0e2877 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,4 +1,4 @@ -{stdenv, xcodeenv, kitchensink, bundleId}: +{xcodeenv, kitchensink, bundleId}: xcodeenv.simulateApp { name = "simulate-${kitchensink.name}"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index 53963c100c74eb79757705423d67b8ea09432b8c..26adf373826e14300ed480ba52bb453afefae2ec 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, fetchurl, unzip, makeWrapper}: stdenv.mkDerivation { name = "mobilesdk-6.3.1.GA"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix index 61c23a6d0b375dc3d8e88e843c58624922e04f29..a6de1f0ae8c6815f2359671d4144bfbbfa8da49e 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc08503cf6ff0294e4f5dc04ca2751aaa93..eee72cb9613d5ea7c1ca2419c01eb1b54b47e54b 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -56,7 +56,7 @@ let ) dependencies); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: + composePackage = { name, packageName, src, dependencies ? [], ... }: '' DIR=$(pwd) cd $TMPDIR @@ -176,7 +176,7 @@ let # dependencies in the package.json file to the versions that are actually # being used. - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }: '' if [ -d "${packageName}" ] then diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index 97c59d8581fb11ccbec05629a88b251bddd73e76..827487be69bf5fb880b3a02c037057589ad9d23b 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -buildOcaml rec { +stdenv.mkDerivation rec { version = "0.8.3"; - name = "astring"; + name = "ocaml${ocaml.version}-astring-${version}"; src = fetchurl { url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index bab2541fd74444daca3b5d387295f1b9c2d4f3ad..291dd03c8d11412fec61d7e4431a82b0f4e30e85 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}: +{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}: buildOcaml rec { name = "atdgen"; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 8882bbf66474bcff8c4b55c261901c7e2b240d1c..72c426ce0372d765198d1595a6585e35c75f12f3 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch , ocaml, findlib, ocamlbuild, ocaml_oasis, - bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, utop, which, makeWrapper, writeText }: diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index 4a2b9846271bdb868d48edfc2610fa519975eadf..1acb17a8f7a34184c7f4e48fd9426f53720ebfae 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, buildOcaml, fetchurl, type_conv}: +{stdenv, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "bin_prot"; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 24f0e9bfd7a5a57d70be1e78078eaf7e78764b2d..962525b47e42dd27baf11c36f7c21dc6f5ea5079 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder , ppx_fields_conv, ppx_sexp_conv, ppx_deriving -, base64, fieldslib, jsonm, logs, re, stringext, uri +, base64, fieldslib, jsonm, re, stringext, uri }: stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 25f84826ec18dc5b316898ee0b933f958634d448..0122ec9ff61dab0dbb2a4294770ac51cb45247c9 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools , async ? null, lwt ? null }: diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 8b304aadd9efdbb3276107b376449f12b36e70e8..f82cf33e3079454703d7f7e61d81cf4219664272 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, - js_of_ocaml, lwt_react, cryptokit, + lwt_react, cryptokit, ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix index a7290c8bb98f337ce2c3214e1d33cb9d599182ce..1a8f854185a2f0173478dd42b7436cc5bbfccbcd 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }: buildOcaml rec { version = "0.3"; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 189388efe324fbab0918591eaa0d0127e79f0c05..afeb3f1957b0e4412b76440196771aca693af5bb 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, git-http , cohttp-lwt-unix -, tls, magic-mime, cmdliner, mtime +, tls, cmdliner, mtime }: stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 6f0f0d0b120b855d7f972b83f7f4e07e94460193..0bf43174412c5bd21c176d0a7e12cd4feafd36f9 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri , alcotest, mtime, nocrypto }: diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 20d558e37c1a5b9aa3580f05ab0420d91ed0cd96..2f0aa34299509db99ca7ea48abc7328e42f166d9 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib +{ stdenv, fetchurl, ocaml, ocamlbuild, findlib , jbuilder, sexplib, ppx_sexp_conv }: -buildOcaml rec { - name = "ipaddr"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ipaddr-${version}"; version = "2.8.0"; src = fetchurl { @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw"; }; - buildInputs = [ findlib ocamlbuild jbuilder ]; + buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; inherit (jbuilder) installPhase; diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix index 4a283cc9910b34a7aeb53f15bbcd3364e3d27489..19eef7cf1825781b82b671177e3874778d9a35e5 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix, +{stdenv, buildOcamlJane, async_kernel, async_unix, bin_prot, core, ppx_custom_printf, fieldslib, herelib, pipebang, sexplib, async_rpc_kernel}: diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 4d7213a8603e35731034d953064cff7474e0a8a1..938f5ccf4474c32c2fb041ed2167f16e6577086c 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcamlJane, fetchurl, core_kernel, +{stdenv, buildOcamlJane, core_kernel, bin_prot, fieldslib, - sexplib, herelib, opam, js_build_tools, ocaml_oasis}: + sexplib, herelib}: buildOcamlJane rec { name = "async_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 5621d2ec704b5db8af43a3b331edf48047e834ad..7db7cae27096feb03c848b72ed153f5cfe62987a 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, +{stdenv, buildOcamlJane, async_kernel, bin_prot, comparelib, core, fieldslib, herelib, pipebang, sexplib}: diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix index 2e776e273be11ceb42e9d638e4dc820f8bcd83de..4cd67e1af86b7822271f2475dbe9127aaa34fcb6 100644 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, +{stdenv, buildOcamlJane, async_kernel, async_unix, async_extra}: buildOcamlJane rec { diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index bc1977ce2d6934e670b930d4e458d687004b73eb..631562159762313359e545f6106042d77aec93b9 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,5 +1,5 @@ -{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes -, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +{ stdenv, buildOcamlJane, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis }: buildOcamlJane rec { diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index dc84ea34337e944e2949e6aad54d29627f27f6e3..5410167e0a2625ef5697c7576b1c85ab75fa46e5 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -1,9 +1,8 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, core, bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - re2, textutils, - ocaml_oasis, opam, js_build_tools}: + re2, textutils}: buildOcamlJane rec { name = "core_extended"; diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index 05ea4d5d566b5869b4ed738947b122bb9baa09be..c2f97badda93d63eeb8983765256bf834dd6e279 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -1,8 +1,7 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, core_kernel, bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - ocaml_oasis, opam, js_build_tools}: + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: buildOcamlJane rec { name = "core"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index 93fcdde5bb384f8576fb7243b3aac26638ba12ce..e5bbb7800520c6c34a874a16aec406e9da24b8c8 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -1,7 +1,6 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - ocaml_oasis, opam, js_build_tools}: + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: buildOcamlJane rec { name = "core_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a4c3c15160d1a679ad27ddb084b94d3e3791569b..a05d49245b257d0694db04c52b7a8b27c7a843fd 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes, +{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, openssl , ppxlib diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 5482d7ac87cd6dbbf6ee054bb031472be57c2714..1986f7e48f69e35feb7ad80f457bcd9b7ec52b06 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 165dda1fa0271503a66710fb39fe3d4950799c9f..e1590bb0c9ae0ad6712780ea122e1b24e5d45ea6 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 165a566b1b71ac800367849c2e90d245c859c98e..38b56ac7beb1e0ff370eb7fd42ca1f7c6e26cd05 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 9d5f4f4e669df1d919f4e07a8e5e3a41ad0fc21d..45dd73d4a3211df59e17a0aad38b37ea45f582e3 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -1,15 +1,26 @@ -{ stdenv, buildOcaml, fetchurl, ppx_tools }: +{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest +, ocaml-migrate-parsetree +}: -buildOcaml rec { - name = "ppx_blob"; - version = "0.2"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_blob-${version}"; + version = "0.4.0"; src = fetchurl { - url = "https://github.com/johnwhitington/ppx_blob/archive/v${version}.tar.gz"; - sha256 = "0kvqfm47f4xbgz0cl7ayz29myyb24xskm35svqrgakjq12nkpsss"; + url = "https://github.com/johnwhitington/ppx_blob/releases/download/${version}/ppx_blob-${version}.tbz"; + sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; }; - buildInputs = [ ppx_tools ]; + unpackCmd = "tar xjf $curSrc"; + + buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ]; + + buildPhase = "dune build -p ppx_blob"; + + doCheck = true; + checkPhase = "dune runtest -p ppx_blob"; + + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = https://github.com/johnwhitington/ppx_blob; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 3afe4149fa34318380f0e7e2cc959db5b28f12b2..24cfbcf5b7af0509ce531296be7856222a1a12a6 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,7 +1,11 @@ -{ stdenv, buildOcaml, ocaml, fetchzip +{ stdenv, ocaml, findlib, ocamlbuild, fetchzip , cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree }: +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ppx_deriving is not available for OCaml ${ocaml.version}" +else + let param = if ocaml.version == "4.03.0" then { @@ -14,23 +18,21 @@ let param = extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ]; }; in -buildOcaml rec { - name = "ppx_deriving"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_deriving-${version}"; inherit (param) version; - minimumSupportedOcamlVersion = "4.02"; - src = fetchzip { - url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz"; + url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; inherit (param) sha256; }; - hasSharedObjects = true; - - buildInputs = [ cppo ounit ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; propagatedBuildInputs = param.extraPropagatedBuildInputs ++ [ ppx_tools result ]; + createFindlibDestdir = true; + installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 3948cfce0e8e0632170b6641c9079fd184a12db4..1f53b8712828388c3b11864dadd5f8dd329afbe4 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline, - cppo, ppx_tools, ounit, ppx_deriving}: +{stdenv, fetchFromGitHub, buildOcaml, opaline, + cppo, ounit, ppx_deriving}: buildOcaml rec { name = "ppx_import"; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 53d7847acee6fb5a8938aa602182044bec250e8a..2aa74d751dbfe376bc513d0f088798fb3f7a4ec3 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -17,6 +17,9 @@ let param = { "4.06" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; + "4.07" = { + version = "5.1+4.06.0"; + sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; }."${ocaml.meta.branch}"; in stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 7421e2fa0b1afc8af2f0e2bec83587f9e6550069..46453f30d3bf336cd33e277f9d8f8ddf1f015097 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -2,12 +2,7 @@ # This is the original pycaml version with patches from debian. -let debian = fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz"; - sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; - }; - -in stdenv.mkDerivation { +stdenv.mkDerivation { name = "pycaml-0.82-14"; srcs = [ diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index 9b26c4040959922a5ec6f7ace8f6057f1fa92202..2b7d9855665f7b68078675f3622cb0ba15598c3f 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test, +{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, bin_prot_p4, comparelib, sexplib_p4, rsync}: buildOcaml rec { diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 1e031b135d29ea64f8fdc9388d7654e672619079..181946802d7084080c4d47fdd254b89aa8f615c0 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit +, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index a965d6ed11630fa4b0eb6db30bbe8f6148cbda71..b34c9279c3070dca95e450819922e3eb6ee3ff68 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re +, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, camlp4 ? null }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; @@ -13,13 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; + buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ] + ++ stdenv.lib.optional withP4 camlp4; propagatedBuildInputs = [ uutf re ]; createFindlibDestdir = true; - configureFlags = "--enable-syntax"; + configureFlags = stdenv.lib.optional withP4 "--enable-syntax"; meta = with stdenv.lib; { homepage = http://ocsigen.org/tyxml/; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index 176cd06a9cc35303a52763050788f8b75c407a22..dbb167e27b32c43147bd1f46796234d918e38f72 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, stdenv, perl }: +{ fetchFromGitHub, buildPerlPackage, stdenv }: buildPerlPackage rec { name = "MNI-Perllib-2012-04-13"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 82b3da7a37c4682efe7ca83189fb96915d8a3fa8..b59be96bb6211a14892b6c08aeb328287ffc9aee 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b995e0e2540afa99dd6f8cadd2413df4acffe365..5178551df45380d88c568d8e2e0385e7508843e5 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs: +{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}: let i686 = pkgsi686Linux.callPackage ./vms.nix {}; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index e8c1a948fe929040f06df1dcd486c4a9d418fceb..22bbb4d3be41de8d3ba9ecdba0988cbcc8aea709 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, +{ stdenv, fetchurl, pkgconfig, pure, haskellPackages }: stdenv.mkDerivation rec { diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index e86f08b57ca905791f25c2613031e8b0995732e5..7b615928da9aa474cd8a4f008d8b1f5262a6ab4d 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 124e8b80ba024136e7602c84d7d925b2319806b2..fa07eee0d7e14a2f23b4772810e70ce923250a6c 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, isPy3k , python , glibcLocales , pkgconfig diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 4f0a7d4aebc26b64b48cbdeed86abcd6e48b47fd..550fa1da3edf7b559ea7087a9daa6ba599e00460 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -1,5 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted -, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +{lib, buildPythonPackage, fetchPypi , geoip, nose}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 13bddd3ffb8f6b244013800569e864eb9e056c6d..879cdb9bd095806d109181f958bb963d7eb1de05 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "JPype1"; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 29a792000e9954a162c2b43611d2b78475b5caac..48878995bb4e8584ec9387b2e0c6c95816943c45 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }: let diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 30c820ec6c19d1b87a2cd58b1683e971e2c1b526..e2b31cdda7942c9d158a26300ab91deda3120480 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -9,7 +9,6 @@ , isPy3k , nose , numpy -, pydot_ng , scipy , six , libgpuarray diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index cd81a7facc2276272f35546059c0a2488d1b6bfb..820ee2a95d81aa36f9d51765587b58a6f0706309 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage , certbot , nose , cryptography diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index f0756e1572e72790aaac9d59e2d39df3cc7a4bd9..9f307f24dfaf369d2cb013a228e4edf5a45e78af 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: buildPythonPackage rec { pname = "aiohttp-jinja2"; diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index 3065bb17c05d33ddd354ca2b73894515943cafa8..00198cd27cffaa4247d8baa86ec8ccb17d49992a 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , typing, aiohttp }: diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2ad260f5d40697b966c59550baf54495eb34a3c1..1492a15aadf384448d736d7827b35cc6ec7a0787 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp }: buildPythonPackage rec { pname = "aiohue"; diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index ba32cf7ea695d1580633bd893095862682188cc3..6db4bbdc31486f8de15929bf60ec9d4751d6dfb3 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }: +{ buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "anyjson"; diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 32314b81edca51cbe824f69d6c24099f231debad..584eb3ae2c52199e112d0d777aa89ab379343bd4 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 808ddc57096d2246eb1555b57201c3ad93921008..20013b8a1ed44ecd7133e7e7086eb80142fec522 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , boto }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 28b88d3b46a0e04f57be7d3753a751b8ed33d19a..37d97f42aa1fe8c2ec08d621aee4851bb431a701 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, lib, - coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt + dicttoxml, pexpect, prettytable, requests_toolbelt }: buildPythonPackage rec { pname = "argcomplete"; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index f46efd9f496ec5516f220164cd4f6a16a4242779..ce371076256e929a5c4ba726b2dd2b3944848cc2 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -1,5 +1,4 @@ -{ lib -, cffi +{ cffi , six , hypothesis , pytest diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index fd89457ed310b30dc348d0553d86b92700fe96b6..2fbe4932bedacd6089377556d8e8197ce26e7f0c 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six +{ buildPythonPackage, pytest, requests, requests_oauthlib, six , fetchFromGitHub, responses, stdenv }: diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index bc8e375271d6a029862bda00b265dd06b1ea3e34..ee15be954186a1e5ca04ea35e99db2396e727e02 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner , pythonOlder }: diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix index c3ed7bed7426f35b96e95f4607a90978704a6d81..489a31b3242c1297a62f9e1d54e8fdb5fe028871 100644 --- a/pkgs/development/python-modules/asyncio/default.nix +++ b/pkgs/development/python-modules/asyncio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "asyncio"; diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index 0004badd6f402c65648bbc4d52219e2e1c893bf4..187e0924ccacda52c68ead8d846399370fbf485a 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }: buildPythonPackage rec { pname = "asynctest"; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 1c3c1fdefbeabd8918b5df952fecc4e8ac226765..bf7c35fa69895a1a1a9089fcbfac480477483f9a 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index a4a7b63b8a3f0e2c2e285565acc249fc6e76453c..6fc3f16b3ad225d41766ce10afa972dcda0f3644 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi -, buildPythonApplication, isPy27, python, pythonOlder +, buildPythonApplication, python, pythonOlder , mock, nose, pathpy, pyhamcrest, pytest , glibcLocales, parse, parse-type, six , traceback2 diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 240dd5513e85c4b0e37fb1f35b354001d8057b76..2a9cb2a2cfdf9a8a5bfb70506bc27d5f99ddbe27 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }: +{ stdenv, python, fetchPypi, makeWrapper, unzip }: let wheel_source = fetchPypi { diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 791b05e81cad26f573bad4148c05191fdc65658c..c9ca8f7ec0473525797ffe17463ad516a252418f 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , nose , numpy diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index 5a9bae58bd6d4843acf48ec9ec4601e356f43bae..b5da73a32d21e66b9bb2bbdbac8953784b9eb29e 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix index 3bc9882585f6399b5b8458598f8b487d2468d62e..8efb1c083f26da9f0e7b0dbb0d185e0e7f8b9102 100644 --- a/pkgs/development/python-modules/bz2file/default.nix +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi }: diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index de15ffaabc69325ad812599e2b95c547780edf41..d4b9195c5558ec375cf51a4d10846aad04e96dbe 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachetools"; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 395122b4da9e1de350f3ad176506a5691a6e57b2..f85f80ea23991fba45b269513d1c4c4416322529 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pyserial diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 99ac6c3ec45baf86fee1964979d6a94e3c8e265e..3e07188986d07665da787e0d240b52ab297be3b4 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 08ae54e0b73bb72484052a765918cc9eb877831c..1afe23416331b5638233679bd8597be3a9c3d379 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -1,7 +1,5 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi , fetchFromGitHub , nose , can diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index 2c0b0e623ca96e0e6b92511b5e258d2cff99c2f9..0c636e1208847af2e44ee98a029e60addb2896cf 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }: +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: with stdenv.lib; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 724769422761514d2c3b9e4328979869e31cbca4..3f1456f6e948dfb021dd052e32fa5d1f736c6a1c 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 0e355723604e4a388bf68c045b1b4af40bdddb3d..425a53987caf73585efc457480f72b5477a61822 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest , coveralls diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index b07a205ba2158aaedbdae5c8ae526c6f71e927c6..cc75649119bd404db03f35d6861471e0df81de41 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python +{ stdenv, lib , buildPythonPackage, fetchPypi, isPy3k , filelock, protobuf, numpy, pytest, mock , cupy, cudaSupport ? false diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index f004e6d541c5ef4f60f9119b16569b95e81a6dfd..1c42b1283eee6bf7ae462c4a2bf949ab51de78e5 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest }: diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 7e6cc206cdc0b8e28301af199bce779048073154..0a82238b703e32f49fda47d5af3a294c7dae2d83 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , iowait, psutil, pyzmq, tornado, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index e83fd4163e4a7a6376fb0e3ff9c30c0707ee3186..967941666c8488a18af10d75a4f71955e381d62a 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama -, contextlib2 ? null, subprocess32 ? null -, pytest, mock, which, fetchFromGitHub, glibcLocales +, contextlib2 ? null +, pytest, mock, which, glibcLocales }: buildPythonPackage rec { pname = "cmd2"; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index 5ffa51def0d2799d7d02bd212e80634a0118b235..7778e73f92f756f60e05de811c0a32e5dd4c68fc 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +{ stdenv, buildPythonPackage, pythonOlder , pyperclip, six, pyparsing, vim , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index cfd6389ce5fb43071cfb7dc8028dfc40b500f4fc..bcf3271479657f67b96123b4b2cca8bb9f470af0 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }: +{ lib, buildPythonPackage, fetchPypi, requests-cache }: buildPythonPackage rec { pname = "coinmarketcap"; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 1ccb31d5120a70c3f0b5d45f8401a5c20922c5aa..14bae27592ab71db1bcbada075db8a96ff4a81e1 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python, stdenv, nose +{ buildPythonPackage, fetchPypi, stdenv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 6a52076252e86ec43576faaf45c9b4b423993e05..62e63a8e5b31bb802da376cabb8cdd604a616546 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ConfigArgParse"; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 8e770c504c3b2009e7e6c6faf5b793e781e81563..7bef3e8293515757df358352eebaad9ac4d7fe65 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "configparser"; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index afba2e17bf64b3507793f1d5f0cefc3802b4e7f5..680f6e02cd01bffd6ebeadff91158018fbdbd5e3 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }: buildPythonPackage rec { pname = "construct"; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 4d2a168f79cc0b1f32270b94c57abecfc4187d4a..0aa38aed296d7d7fec6358312a8b6094fbcc2f24 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , mock }: diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 232a4a19fd858ed0e65cbcb9cfa3d843f7466d29..f27cfc44e57bd51dd8fb21db2eca4989cc761fa2 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}: +{stdenv, lib, buildPythonPackage, fetchPypi, bash, which}: buildPythonPackage rec { version = "0.7"; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index e19850be8ceeff833fecb1db3658700c4f3e882a..db48326535dbd20f0278430082f0d2fab47741ca 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: buildPythonPackage rec { pname = "credstash"; diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index bcab5c4347595614dbdbd5ea5d15f540a34ce067..6285ac28fce1982847aecb5090b2e622d72ca69b 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchPypi -, cryptography }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 3a3aeb7b2267059eebb3667bc88ab77cfec15a60..da742b310507deaf9f44847ab82ed34b932152ce 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonPackage +{ stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages, gcc5 , fastrlock, numpy, six, wheel, pytest, mock , cudatoolkit, cudnn, nccl diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 69a5e8c11d486ffc39e6437bed59890370ff6755..67120bf0f3d00f4f2441136d4c054f1b2ba6972f 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }: +{ stdenv, buildPythonPackage, fetchPypi, ncurses }: buildPythonPackage rec { pname = "cx_Freeze"; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index d01029652a98e251a43b8a4664804a131db9a891..47c206fda5e8bfddf4087c88668abfc196844028 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub , decorator, requests, simplejson , nose, mock }: diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index fdc408e1c4c10c7600399035b0aee7fd62c8b168..f6af0855b9f54b1b00d6d379fcd29fe84a0f3f13 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib, fetchPypi, buildPythonPackage , nose , parameterized , mock diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix deleted file mode 100644 index 0808cf4f20110977c2705b52eb1dcb390ebbae4b..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/dateutil/1_5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }: - -buildPythonPackage rec { - pname = "python-dateutil"; - version = "2.7.3"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8"; - }; - - propagatedBuildInputs = [ six ]; - - meta = with stdenv.lib; { - description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; -} diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 937b6df4229272ac285d373cc7528f6cc37b4fac..e4cd21bce4a37d078ec642bf5ec5060fc14c51f3 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , chardet, six}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 6426333ed26a393c6fade1dbdff4071a132f2d4d..328195365006434ac82022fadfac265955bca609 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "defusedxml"; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index 6b048db90e308dedf314fd46d23cbaa4eb1e33b6..fa06117a64495d48f81a680e4e14c7dda14e0e97 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { pname = "django-tagging"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index dabc3244592affaf07ab79e16bdfded41f651524..7ce8877bbce01f81c166fa9cc6d9aab5cc943825 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage +{ stdenv, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 27b1a3e6122c399eadd016317184ff1f0da4492f..20f4bc7e0c33f9b96c64b27e642d692a42329792 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: +{ buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "dugong"; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 334778c93aab4d27e6b0b17fa7850ff7490d272c..97f04828300b8fe7b98f7399086fcc74360d0eab 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi -, pycrypto, pillow, protobuf, future, ecpy +, pycrypto, pillow, protobuf, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index a0a619a39c848e8c3d34863ef9a2bec0344f69ae..99859ac1517543240bbb4562274f80820398da2f 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: buildPythonPackage rec { pname = "email_validator"; diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index a05ac1ba679eb609f80eeea298ca611ccfb3cc05..c4d600ec994e2e3786e30ac3cfbfc29d48aa61ab 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "faulthandler"; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index c5ac67106a2fe9f890818e42a0d351d283ead9b9..67ff86e8f729257246ddb349d83b1ae938998b59 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }: +{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 2612cfde1f50f7b3c3115e75b892f805311ce035..eaed804245fa50a9946e7237ea8d337ce37b765b 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,5 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six, - fetchurl }: +{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }: buildPythonPackage rec { pname = "flake8-future-import"; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index f4fc3cf3fa2420c310eef75ebee47e825f8b0ef9..89cbdf0fbf82019fa82210ffaa7fa19bd519c589 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic -}: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: with stdenv.lib; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 17b9d018c397a168797bacee2f021d819369366a..d9a0682a02e00b3aa7d599e768b493b79b0c5ee1 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchurl , isPy3k , docutils , requests diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index c09d54ad555537c7d30715ca73841430cc6fbe08..a528244cb0f9b3c207b49d020eb89aad5ad51762 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fpdf"; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index ca1c9a09e4eb93a5166f19c5c6b2134e8569e894..d2e806e43b901fafa0a29c27c7ed95b882f018a1 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,8 +4,6 @@ , html5lib , wcwidth , nose -, python -, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3faa6d914d257140be45741ddd2e0aeb4f38b39a..1b3ab52c4c39624c63adc795c219b12925b46a31 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -5,9 +5,6 @@ , six , scipy , smart_open -, scikitlearn -, testfixtures -, unittest2 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 7f2c7a582290d53659a550f09f32fd8741eec77a..aa8050de088552b79df309db0234b8d7355704f3 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, -pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, +pkgconfig, boost, expat, scipy, cgal, gmp, mpfr, gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, buildPythonPackage }: diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix index 8afe6379dc7c8ae83fa301c32510d3bcd243be4c..d572b10fd625af3f7c04739d3563f50c5c22a0be 100644 --- a/pkgs/development/python-modules/gurobipy/linux.nix +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -1,10 +1,7 @@ { fetchurl, python }: assert python.pkgs.isPy27; -let utf = - if python.ucsEncoding == 2 then "16" - else if python.ucsEncoding == 4 then "32" - else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; -in python.pkgs.buildPythonPackage + +python.pkgs.buildPythonPackage { pname = "gurobipy"; version = "7.5.2"; src = fetchurl diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 144e826b675d75a8a1d144d9695b3a0e7160d6ee..2b95b1473cb21c049e16ab63f7f029ecf833d765 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage +{ stdenv, fetchPypi, isPy27, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig, unittest2 , mpi4py ? null, openssh }: diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index bbd4760bdf893ee246a1656d4c7ab8c166a22f88..5131e64a3c2b77665b28e1a678a4d1d47b018fa0 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, watchdog, mock }: diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index b72544611833bced2563c005a63255205d8cd6e4..8337fd2230ba5c52fb13a251ba625e44b17e2b7f 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , requests, six, dateutil }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index d5ee59ac2d925988cbc19d1403f8dcf0455c081a..88705962627ff533553cda7f96631018b9383b16 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python +{ lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34 -, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock +, doCheck ? true, pytest, pytest_xdist, flaky, mock }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..49d1062abc319272e2855e99bc307dad33c6a0a4 --- /dev/null +++ b/pkgs/development/python-modules/image-match/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: + +buildPythonPackage { + pname = "image-match"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "ascribe"; + repo = "image-match"; + rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950"; + sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + scikitimage + ]; + + # remove elasticsearch requirement due to version incompatibility + postPatch = '' + substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," "" + ''; + + # tests cannot work without elasticsearch + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ascribe/image-match; + description = "Quickly search over billions of images"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix index ef2444c0d2f0518e023c5df41d040266059e8fbb..c67d56b153e04495ef5b3ead8c0fce9479eece73 100644 --- a/pkgs/development/python-modules/iowait/default.nix +++ b/pkgs/development/python-modules/iowait/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "iowait"; diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index a91988bd97d06a82ba49b94a55be9fb3ff4b4d31..f2066fee2a4a21ef1959ca4e2f73c13d743d7c2d 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, pythonOlder # Build dependencies , glibcLocales # Test dependencies @@ -13,7 +12,6 @@ , mock # Runtime dependencies , backports_shutil_get_terminal_size -, jedi , decorator , pathlib2 , pickleshare diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 65d1f4f68220271e37a1e0141f14c9093e334bc9..17896a58469c437e0432139b0c5fc9bbcbe67c5a 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,11 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, nose , sphinx , numpydoc -, isPy3k -, stdenv , pytest }: diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 3a6d69cc829fb788c879a622ffe7f8060a8d82f0..f11fccb086bcd8c52eff6de64f43f574b242489a 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsmin"; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index c934d24dab7b2bcf9033a218aadd2fcb9f0df8b3..a6a955507a79274ca4c440a3d76ae58845005837 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi , ipython diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index dbd2e36b7b8400df9b21055c80d29c0b23ace20f..8598654e2060b0d8cd5912953b2d06ac66ed1be7 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi , fetchzip @@ -13,7 +12,6 @@ , traitlets , requests , pythonOlder -, nodejs-8_x , nodePackages }: diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 19169e88b125a50860408997daee511c5d484076..a1e795421b0753101a465475c36a5c2696501004 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index be59a112be746daacbcb01b79d817dbed135c85d..3b221238f3af4272f8cf9abc400b69359f4fbecc 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, pytestpep8, pytest_xdist , six, numpy, scipy, pyyaml, h5py }: diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 95672600a30ae7712b44714cb68c550cbab91055..17a6b158d3f224d8bfba1636286944396830acac 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , pyasn1, pyasn1-modules, pytest , openldap, cyrus_sasl }: diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 58ca72a3dc98432b39faeae007db8be863950b1a..02d10b832ff2cccba324a77d54472b37e9dd1666 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi , pbr, ldap, fixtures, testresources, testtools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 2fc66e810d0614369469b413d5100917af268065..fc58c6ca6a1dc448733b015bd83cdc34d330b818 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub -, python, cmake, sip, protobuf, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 14e83584678ce8f9f8db6460c14021a8c568b318..ef01fde2daa73191551d1ce94cca13390e3cd6d3 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -8,7 +8,6 @@ , six , nose , Mako -, python , cudaSupport ? false, cudatoolkit , nvidia_x11 , openclSupport ? true, ocl-icd, clblas }: diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index cf0a1a865a19f46144f184065b2b0a68d030e19a..75e55944e987dd27b57202b261d062586a69af1b 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a99d4542ba5aa8f992a6e220932d785cc987b6e7..26b42020fc340911019897e06319ba7fb0722f70 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }: +{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index ad6b938c9888c33b33a5b1908007edcbcbb3035d..4689050ba6c700cf921ffb610cc3cfb823eb83ed 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, - isPy3k, pythonOlder, lib, requests, diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index c9b9b4896139fb865d4735c657bb25ce729a8af1..bc91139728b0ef75a1f95eaf9601dd7271fb27cb 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "lmtpd"; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 4a96ce8ad05130d185550fb26603c1e31c27ab2e..ff1a6e49b0133b4e7cef0b8fb1aa1ffe8cb896cd 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 5d52b52ac7f2f2558bb5d5e74b13f3ea3d4aa3df..7316526aa28044640e4d26466bde9f8f6167e8d3 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index d27637874af8ef58cb7ff2c8c13dfcf35ecfdd5e..b6d761f077ce53d15f2bf831399b8165aac5c3f5 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index ccd0eb6cc9f89f4d5bff68e6fa432f57d0c13c60..3f7710acb3c16499d70de95a7023fad8681a46d5 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozfile diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 8569d9287ac827f5f73067b8b0b480d55d2db03c..491069cd87fb9539fbebf3db4983191592131b01 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , moznetwork diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 7bd14f2d10cab9ebe0e7b907b4a6f41c34f26773..34350dd4821f827ef8f0bbdb6c6fd622de6d5b44 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 1d1be733f998587de34155faa7fa92e024ff8e38..6862967e420f3da7f5b656e7d6bd1ee1cd2f383c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , moznetwork diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index dfe91309ea40072d68e2fee1a2327cc2ee42a7c0..bc4b9e914653f5bb6ba1e6fc353f74eb7d37446b 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index a6561d3e07ace2496d8f0fe8cbc7af6ee7cbe466..3901f7c310d06bf58c7febfe79eda925d5eb3519 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index c1e5344326077fbe40de6b113d7f1700c63990ce..e8130e8038fdf1b9694efe64b019719e4971b6e0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozinfo diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index c94acdd3ba5a8640b5066a305a1c7298f180950c..3620248904cefc693156ef53dc2d22bcee3be8e0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index e9f6177cfa1bb0089c547e075da1a3e59e1f07b7..324c7c6c2d24e2ba5e1092eaa6c6ac3fcb49897e 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozdevice diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index d1c799c95dee5fdfee3cac334c43e7823184dee7..2ff50e1fa92eae1b63ecab84f94cad0c87955e99 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozinfo diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index c9eb12bd52b461170778dd07be413c31c45c7a1a..dbe3cb4bc2d8b6557ae2ddbae7e82f6b47a0e7eb 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index e4b2bdefad206808d033d7932bf1610f71960c4a..cfb70724210ef86a80bd1ad4c0ec313449683e92 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask +{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 3f974872b9594aef29f30345772deb10f486bc5a..6dbfa1fae60357efd82e0da1b329f55bfad3d7f2 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six -, fetchPypi, lib +, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index f689bc2ff49d8ecc01d9ff5c3ac8aeb7caed5934..a3a9096a335c66debabc26d6549e11e7c5edbcb1 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , cython -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index dfa87c843ff25ff834b3917f09f0f9baafafe5a8..b167b7f427c1ff08604d9aa32b34d6ec362ad669 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -13,7 +13,6 @@ , testpath , jupyter_core , nbformat -, nbconvert , ipykernel , pandocfilters , tornado diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 4cc5769d8d836ca0ae1dd72bce92cdc81520310b..27fc7d11e7519d1844d3b54ca2806888bac60560 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -5,7 +5,6 @@ , lxml , libxml2 , libxslt -, pytest , nose , rednose }: diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index af7e4dde59e3b52359a4c11923d65e4233a06591..e60233c3590e4a738d2623b3c412798947e00b1f 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9645e54f7ec1d84eb16297e271681405e0359210..56edc44bce71fde7b895c991d21e47625f457c0b 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: +{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { version = "3.2.5"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d6531eda2ef12497d4d5fc0b0b257ec1842e47ae..d9e884dabbe0f23fc1949cc8824994596f9d32db 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }: +{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }: buildPythonPackage rec { pname = "numpy"; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 3f37940ed8aebac99216fc5ef56ddf4f63f9b00e..474609220cfae0ad0040b66ba4a521ebcf04abb1 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, requests -, nose -, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 2c0a2c44f6eb2a09f5595cb2893c4927740f0861..c481aa0dfea701bcba8a954f304cacbf40251e4f 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -1,8 +1,6 @@ { buildPythonPackage , fetchPypi -, python , stdenv -, fetchurl , pytest , glibcLocales , cython @@ -23,7 +21,7 @@ }: let - inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv.lib) optional optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 08fdddb73467e1119fbbf1c55acfe4d408e99ef5..ef07f2a36e32ab35aea9ed60e4e3eb5801a96d83 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -2,7 +2,6 @@ , fetchPypi , python , stdenv -, fetchurl , pytest , glibcLocales , cython @@ -24,7 +23,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString concatStringsSep; + inherit (stdenv.lib) optional optionals optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index ac150af4b7824b20f169d55f648687bbb89fe909..34573626bacac86442bf43b12276ab7ddd5dfc11 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch +{ stdenv, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 18cc23338bf69b00bcb601551f71822c11766ba8..4092f5e1c4f35dd5afc27540a8921dc6fe3e37b6 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch +{ stdenv, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 165de7bd2baf42f136c21c6a83be71f4160334f0..24539c7bbcef53f967662051f79184c7c3cac475 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , nose , bcrypt diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 2d1f707a8ebd8196eda382d17216b72989df140f..1ee93c753d80d0904a2819044c73ce887ec47dc3 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, glibcLocales, pandoc, git +, glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe }: diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index b861797c4a8f285e6df719622508cbac6b1d677f..4f2e7f3ca845591b4ef5adcd25200f1507c26fc2 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , fetchPypi , zope_interface -, pkgs }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 3f90e6b2da7d4b048dbd806179f2edcca9499e3a..5675be32397398b2ea0416b44ce7f3175c956640 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi , plaster, PasteDeploy , pytest, pytestcov }: diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 8c3de8bd0351b0893486eaaa3e6482e6a1f7d92e..82aaebb10039366ed82adc995d7017b8b8dd271d 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi , pytest, pytestcov }: diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 0fbfa5108c1b503c91671802064ac4bfae8348e7..2a6996c628e6bf2dec5bd4b5c10a7018a91c5371 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 5269ecd5d8b400c423c2ba410b69ffd0a0505148..2c6eb7e5fbf7feb45e3f3f8afdb5511fc8c738c0 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest }: diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 0ae689034a3ad47c9d2ad93ca5bc64eb30a95676..2b00a007f90b3096e7f76a184c58b192be2324e4 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch -, python, substituteAll +, substituteAll }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index f51c6989c011bf512dc55b8eefb48c1ce8d4279f..841e003bc897c5ad25faede8f57a8afc7f3ecd5f 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -1,9 +1,6 @@ { lib , fetchurl , buildPythonPackage -, git -, mercurial -, bazaar , psutil , pygit2 }: diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 212c06cc9421f146cf0dbcd6924452778416cf32..18fb14c3aa9a5a56be09cbdd9c3b1a105e00f1cf 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -2,7 +2,6 @@ , python , buildPythonPackage , fetchFromGitHub -, isPy3k , pytest , python-utils , sphinx diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index eaf353af08231c8d86ebfccd7735b9a187a06580..f6b2bfa939c6278f8addaf3e9a724a3e572f5064 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "prometheus_client"; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 7fbdfb7c33eb3625234c80ec6aef65b8b01bc0fc..84fe2f69554585d632629ec460553bff01ed5983 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , darwin -, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 6adc1e7ec04ca0c220c38ab2722574094127da51..be409e348ea3bf8eae1d83bf5a324b2387081ff1 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub -, cacert , buildPythonPackage, python-jose, pyjwt }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 5fd1be7c15cc20593ebba78727255d4d644dd8f8..fd1866d22f434f0c718efa0266cc72a8925c6a5f 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pyyaml , unidecode -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 845630e514fac2493cb64afbaa51985ccb96e576..d4ed6088409b0b375b08a833feeb5c20c4c9d8b1 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch -, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, lxml, cssutils, future, enum34, six }: diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index b074f9f4934eae446639850a30ec39d1cc20b195..23ed4917cc58b8aeb731673643da2a17d071bef9 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }: +{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index af975e333f0f2ffedef15bbe5e743c20c1fdd59a..e7858888d36106cd661d715b9f926c608e16f88a 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pycryptodome }: +{ buildPythonPackage, pycryptodome }: # This is a dummy package providing the drop-in replacement pycryptodome. # https://github.com/NixOS/nixpkgs/issues/21671 diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index b4ef42cb22abb814ce2780bbbc0c65937e23d1c7..35041f8447ba9075584dd842f5418c8a1b7c7213 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, gmp }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { version = "3.6.2"; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 5a4a81f13accc1e4cb11826790ac3c7c6faf7f92..b6c9ae5e8ba6191d96ce84050174cc644a303335 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11 +{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 08c266da6963afc510cf1f26a5bc80ed8e8986a6..916bf7f692d2199af8e061bfc60249f11df2d426 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch +{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 5271677dc1eab7cf622dfe20fdf6f418ec3512cd..d4c46d6b835977ac444594f87608d447c8d410a2 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,5 +1,5 @@ { stdenv, castxml, fetchFromGitHub, buildPythonPackage, -llvmPackages, clang }: +llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; version = "1.9.1"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 524fb4af61c5903027f543fcceac77bd324b995a..c6264f08de8684e0f77accc3a1e3035bf37148b6 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: buildPythonPackage rec { major = "3.26"; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index a0dd6113b750c912d7fc0f5ddc7795f4b277cc63..5af6ef9922894f227ce8701cd190c488d06099e2 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -12,7 +12,6 @@ , pytest , nose , parameterized -, matplotlib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index 1263c498a46b36392b0afb6ab00583f918fb9ff6..3b7011fa748210a51c2c0d6263eca9f7f91b2f05 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "PyMVGLive"; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index bceb2b50cc5967892abd9441c2c873e6e8c9e44b..463cd8044e1daa3a4567548faf36d552ecce88b2 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}: buildPythonPackage rec { pname = "pynacl"; diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 08fc87127959eb2ed8c1a4bfc4b35d8e1a21e73d..09b7f38613030f1c22fe4dd805a7dafaa0ba6737 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, libvorbis, flac, libogg, libopus, opusfile }: +{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile }: buildPythonPackage rec { pname = "PyOgg"; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 8175ef2b1725bc348e57ae8ab9ecffdb35c597e3..55f96416efd47319fa3c5acbc9e8700e1314aa7f 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "pyowm"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ebad81f809b58de7537adb98c7ed4c7bd31c9102..6a3e3e66e2c9dcac491d544f95b6ca6b9135aef9 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper +{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig , qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 89799988fa1f1a11c7340088fbcc08e1882ce576..280981ab2c2463ab52517457d9c830a86f84b6b9 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -4,7 +4,6 @@ , absl-py , enum34 , future -, futures , mock , mpyq , numpy diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 6681b1b199add6aff79c2db814e44d9ef23c955a..1ffc546cfa1e28a5e96ab9571f7f3e41c456c18e 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }: +{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { pname = "PySDL2"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 288b141d32e82b5988df50b0021858cdeb851281..ab46c726f6c7096bc47b648aad958d87f77d9427 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 4555479af43eb67cfc5511413b8b6b823da5d9d1..3ca4f832c8cfc3bf6a29b265b28328c375a8a4dc 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: +{lib, buildPythonPackage, fetchPypi, pytest, cram, bash}: buildPythonPackage rec { version = "0.2.0"; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index c2d205f2833c31c65e2f8c7b20dd1b020a5ff2e4..101594750fd5ceb2a9cffcd3337613cb972bbc55 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: +{lib, buildPythonPackage, fetchPypi, pytest, flake8}: buildPythonPackage rec { pname = "pytest-flake8"; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c12d4b8add03d555e8a55b991ce554a30efcaf15..163063ae57fc0895b436251debfb08856aa267cb 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }: buildPythonPackage rec { pname = "pytest-mock"; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 38d34a958545f6783aa10f2fe962bf4f7bc63d8c..84f337e1b83aad052b477457aa337fd46a8cafad 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }: buildPythonPackage rec { pname = "pytest-xdist"; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index f4d87dc035c1a2a3eaa1067c3ad741e567a732ed..e8c71bff18b2d6836627ce7a4e50ed9c10232d67 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 18162d105acfae4124b7d5e479d362e9d1f47441..962ebbecbaaa4fe340d108e68bdf90d04b7397ac 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, pythonOlder, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, - fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake, - stdenv, linkFarm, symlinkJoin, + fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, + linkFarm, symlinkJoin, utillinux, which }: assert cudnn == null || cudatoolkit != null; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c072b661cc42ad1f6011da08b6d57ed12b7747e6 --- /dev/null +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, nose +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "PyWavelets"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9"; + }; + + checkInputs = [ nose pytest ]; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy ]; + + # Somehow nosetests doesn't run the tests, so let's use pytest instead + checkPhase = '' + py.test pywt/tests + ''; + + meta = { + description = "Wavelet transform module"; + homepage = https://github.com/PyWavelets/pywt; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d09a9bbd6d80d1613aa77f979d099f7e4aa9d759..159e0ce15fb424e55a7decf4799bf3db282818cb 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2 +{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2 , m2crypto, ply, pyyaml, six , httpretty, lxml, mock, pytest, requests }: diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 646308feece4ae71fba4c9e7a2b9bb3a5acbbdd3..5a55c1f47bb2e27769a47d699d405185d1d5829c 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -1,4 +1,4 @@ -{lib, fetchurl, python, buildPythonPackage, makeWrapper}: +{fetchurl, python, buildPythonPackage, makeWrapper}: buildPythonPackage rec { pname = "PyXML"; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 26107ea3c4af246385c1dedcf2d1c3551f65d4a4..4de7777fa8b913752215a8e67add34ff1d91ba3e 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest , tornado diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 174e0871ca2f0c750b609462fbebdb23ab95208c..5f7cded86fda9399435f37ac6ef93b2b69e8e21a 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "qasm2image"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nelimeee"; repo = "qasm2image"; - rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa"; - sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3"; + rev = "57a640621bbbc74244f07e2e068a26411b0d9b24"; + sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1eda590a864fecb11400d9fae3fbd4344d97dd5f..0f02560c81f8db8dbc79ef10b673c20b0d4b25a5 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -2,8 +2,6 @@ , isPy3k , buildPythonPackage , fetchPypi -, fetchurl -, python , numpy , scipy , sympy @@ -21,13 +19,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.5.4"; + version = "0.5.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf"; + sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17"; }; buildInputs = [ cmake ] @@ -50,13 +48,9 @@ buildPythonPackage rec { # Pypi's tarball doesn't contain tests doCheck = false; - patches = [ - ./setup.py.patch - ]; - meta = { description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; - homepage = https://github.com/QISKit/qiskit-sdk-py; + homepage = https://github.com/QISKit/qiskit-terra; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ pandaman diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch deleted file mode 100644 index 9c4224ce64c68c6b1597103798566cf65b689115..0000000000000000000000000000000000000000 --- a/pkgs/development/python-modules/qiskit/setup.py.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -18,13 +18,13 @@ from setuptools.dist import Distribution - - requirements = [ - "IBMQuantumExperience>=1.9.2", -- "matplotlib>=2.1,<2.2", -- "networkx>=2.0,<2.1", -- "numpy>=1.13,<1.15", -- "ply==3.10", -- "scipy>=0.19,<1.2", -- "sympy>=1.0,<1.2", -- "pillow>=4.2.1,<5.2" -+ "matplotlib>=2.1", -+ "networkx>=2.0", -+ "numpy>=1.13", -+ "ply>=3.10", -+ "scipy>=0.19", -+ "sympy>=1.0", -+ "pillow>=4.2.1" - ] diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index cdbba1806735fbcb19e8c7fd9ef9ecbfd36f49d2..badaf9b3787bfb3ba891aaae35930b817fd1111d 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , isodate , html5lib diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index de2683595e5f262afdb89d741cd0787f46f9f5cd..6ea233f695bb4a826b10c1dd83d47997c124d025 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "redis"; version = "2.10.6"; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index a356db74f07cf56342960a51df40c24208e75756..0b3e84c3512889877e68933570d5a6727b0eaf27 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,9 +1,7 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , freetype , pillow -, pip , glibcLocales , python , isPyPy diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 6bd294671dee997a8108d9159694f6192e61df0c..2286d9c2dc7fbe89497ab3e489b856c815e12e66 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi, python , mock, testrepository, testtools , requests, six }: diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 4cc74431fc8525ab142f5e9fd1ddd45c563b644d..662045a9ce1e4c4ade9475263b255a9624c291e2 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , cookies, mock, requests, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index d9c8791817655ee05da1c27d9c4d48cf2d3d440b..ed0bf42ae68722a1d59a749357435bdfd0592471 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: +{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: buildPythonPackage rec { pname = "rhpl"; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 7184795639c40720468481cf5eb446f20830a432..d8c43c1ea8661d066ed647f8846c80034fc484ef 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }: +{ stdenv, buildPythonPackage, fetchPypi, hypothesis }: buildPythonPackage rec { pname = "rubymarshal"; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index ed358213492e43176c75110f896e17b616ae27bd..c642039d4fea85ac226cd45895f7196939e9c739 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython +{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython , chardet, lmtpd, pythondaemon, six, jinja2, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1a07e001caec692b535dd7b041517f12fad2b1e6 --- /dev/null +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, numpy +, scipy +, matplotlib +, networkx +, six +, pillow +, pywavelets +, dask +, cloudpickle +, pytest +}: + +buildPythonPackage rec { + pname = "scikit-image"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ]; + + checkInputs = [ pytest ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "Image processing routines for SciPy"; + homepage = http://scikit-image.org; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index edaf7cd90cc5f41f5fd3465105707b790a777717..39af29da814578bb1315762dde4e50af5c642177 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi, python , nose, pillow , gfortran, glibcLocales , numpy, scipy diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5e57dd3f093da6773e726dc738202a1b9b2ffc22..41878b19d0859a775ab09e073b4da602e989ab61 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 1cef1510ccf5200cf02767da01b1d11ad7015a82..0e4b6cfa1e4757cb666e7e9f8cfa4355104db914 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , isPy27 , testfixtures diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 006f52f1d38b7bc3c37f64bd028cf65ce7a6a451..8c66df80dc587dae6204f4de9c0229ed4ca91403 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi , boto , boto3 diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 16c1841a3d625fdfeb6104f92b298ba2bcf0be2d..d2a306356b6d22298970ed3734ee66f1da5df6db 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,7 +1,5 @@ { lib -, pkgs , buildPythonPackage -, python , fetchPypi , pythonOlder , html5lib diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 211419f86b1bfbe417f5f997de3f45358760fe55..50d58877b7ea0bf967ddef290462fcf4019c2ef6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pytest , mock -, pytest_xdist , isPy3k , pysqlite }: diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 9ac04e18e4f6ce6bad98c824a237e36b4d58b122..a122a0c40ec8706fde44efb34384833846acd327 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , requests, six -, backports_unittest-mock, pluggy, pytest, pytestrunner }: +, backports_unittest-mock, pytest, pytestrunner }: buildPythonPackage rec { pname = "sseclient"; diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix index 3c650bd60ddac4310831699a6a067d7b411dba58..7a93d64a89f5c8642f9ec3be968f96e311aaf9ee 100644 --- a/pkgs/development/python-modules/syncserver/default.nix +++ b/pkgs/development/python-modules/syncserver/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , isPy27 , unittest2 diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index c56a5d7889f635b5964c5a31fbce40b072ec0e18..9f8087a305d91e8760723ad2e0796bb7a8e81575 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , setuptools_scm , six, pytz}: diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 21b21f174d0bedf84f995db9541b376ec1c5e3ff..4e3621157f939b08280ca37fb6060fdce0b6803d 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, isPy35, isPy36, pythonOlder +, isPy3k, isPy36, pythonOlder , astor , gast , numpy diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 628be2e946af6fe7ae490a02759060a5f74db4b7..1e35d95c5e1f8a90f7c51d79ac190fb9968d3f1e 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, mock, manuel, pytest, sybil, zope_component, django }: +, mock, manuel, pytest, sybil, zope_component }: buildPythonPackage rec { pname = "testfixtures"; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index d42430248216f64fb1b6800f079f6d5ed90dad31..9b22ad3e5456097c9410d66a5b2e5a1270a913b9 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -4,7 +4,6 @@ , fetchPypi , cachetools , cld2-cffi -, cython , cytoolz , ftfy , ijson diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 0ffaf315d54b4d22262dd20ec5a51b943227b40e..0ced52c7ba1059c8c5cd81b12a38df2d25240f89 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, lib }: +{ fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { version = "3.9.2"; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index b5812820023800c6c76f74f14bd34b3689516515..88e6c8d167429af68761b7549588220c2693db13 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, pkgs , buildPythonPackage , fetchPypi , pythonOlder @@ -11,7 +10,6 @@ , msgpack-python , preshed , numpy -, python , murmurhash , pathlib , hypothesis diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index b55c42cfa561e7700a6e5d4e7388d12102f59507..edc4bbdebb13383324a80ff7bc261ebca08f5e72 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ fetchPypi, buildPythonPackage , semantic-version, boto3, flask, docutils, requests }: diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 829d7bcfcb2b6af3d3bd284c432e1552140dcb62..6f3eae60c635f70febc8cc6b72da860169ef878b 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index c6efe5ba2397e79f41771614acb7b5c7ac8a91b3..44fcb9b46ff9b54ca8d103b811c162c120128c04 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , testfixtures , cornice diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 359f13e2a00bfdbe970621b5de29465e0f13bca0..4ceeb026634ce17de8c1e1a7855800359a8c8180 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , py , virtualenv diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 87fa393ce5e33f08877b6ececd436743984dbb28..0b77f7068012071b00cba5cd4f94bfcb1a12ffaa 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -5,8 +5,6 @@ , coverage , glibcLocales , flake8 -, matplotlib -, pandas }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0cfc8c3e14a93c6ba053bedd01722c0509c5d9d9..5bd0f5f81d2baab0ec2918ee2199690146378fdd 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; version = "1.1.0"; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 3bb75fb2ac291598cfbb793ae95f350db4c86fa9..8320500fc141d358d4b2e93deca0d9133e4074e6 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, tzlocal, pytz }: +, pytz }: buildPythonPackage rec { pname = "tzlocal"; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index 235f33da5994423b6db6f9e7e53d586dfc094aea..42588347c851727ad30ae378bc81a4b0dda322db 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "UkPostcodeParser"; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 276ed481601c1365aa5b044f1a42aff95433d938..eb2fa2bd042d5c3c4fce6d8a9a211c95179d79d5 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake +{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index ab4ce1be2b1a6b3de9bcdefa9d2a5505f32fdf45..805941cab60db5163211ea53bd26c26ff1be7bb9 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -7,7 +7,6 @@ , contextlib2 , wrapt , pytest -, httpbin , pytest-httpbin , yarl , pythonOlder diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index c152271af3359798c4d919e5d6b75adead7c7a0a..ef6089baa507f21229166472b05d21b2eb8f433d 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , mock , boto3, envs, python-jose, requests }: diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index b2ce75c43c3a51fbca7428166edfff3b710803a7..32145623e4da429e46bee50352f7404ff6152de9 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index e98fcf205fd595da3db569cef3bdb9d3d0c5879b..c3ac5b51cb0fa41f738fc4674085219ed4d16596 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34 }: +{ buildPythonPackage, fetchPypi, h11, enum34 }: buildPythonPackage rec { pname = "wsproto"; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 039a751a5e14d9c7bda3336394126be9558d7c7d..a9041f9a76f751c5dad24976b66d65e0c5bcda04 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,7 +5,6 @@ , numpy , pandas , python -, fetchurl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 9b53c180397dfb79cafc0e1688bc4dcc7e6f9265..d9b8fc892c16555ce1fccfdc845d77bca8471e0d 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -3,30 +3,28 @@ , nose , scipy , xgboost +, substituteAll }: buildPythonPackage rec { pname = "xgboost"; inherit (xgboost) version src meta; - propagatedBuildInputs = [ scipy ]; - checkInputs = [ nose ]; - - postPatch = let - libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ + (substituteAll { + src = ./lib-path-for-python.patch; + libpath = "${xgboost}/lib"; + }) + ]; - in '' - cd python-package + postPatch = "cd python-package"; - sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py - sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py - cat <xgboost/libpath.py - def find_lib_path(): - return ["${xgboost}/lib/${libname}"] - EOF - ''; + propagatedBuildInputs = [ scipy ]; + buildInputs = [ xgboost ]; + checkInputs = [ nose ]; - postInstall = '' - rm -rf $out/xgboost + checkPhase = '' + ln -sf ../demo . + nosetests ../tests/python ''; } diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch new file mode 100644 index 0000000000000000000000000000000000000000..68b39dee53e9856d8ef518444a58aaa31bd224ee --- /dev/null +++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch @@ -0,0 +1,59 @@ +diff --git a/python-package/setup.py b/python-package/setup.py +index e6c3386f..4ed0a8bd 100644 +--- a/python-package/setup.py ++++ b/python-package/setup.py +@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py') + libpath = {'__file__': libpath_py} + exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath) + +-LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()] +-print("Install libxgboost from: %s" % LIB_PATH) + # Please use setup_pip.py for generating and deploying pip installation + # detailed instruction in setup_pip.py + setup(name='xgboost', +@@ -35,7 +33,6 @@ setup(name='xgboost', + # this will use MANIFEST.in during install where we specify additional files, + # this is the golden line + include_package_data=True, +- data_files=[('xgboost', LIB_PATH)], + license='Apache-2.0', + classifiers=['License :: OSI Approved :: Apache Software License'], + url='https://github.com/dmlc/xgboost') +diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py +index d87922c0..859a30fb 100644 +--- a/python-package/xgboost/libpath.py ++++ b/python-package/xgboost/libpath.py +@@ -19,32 +19,4 @@ def find_lib_path(): + lib_path: list(string) + List of all found library path to xgboost + """ +- curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) +- # make pythonpack hack: copy this directory one level upper for setup.py +- dll_path = [curr_path, os.path.join(curr_path, '../../lib/'), +- os.path.join(curr_path, './lib/'), +- os.path.join(sys.prefix, 'xgboost')] +- if sys.platform == 'win32': +- if platform.architecture()[0] == '64bit': +- dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/')) +- # hack for pip installation when copy all parent source directory here +- dll_path.append(os.path.join(curr_path, './windows/x64/Release/')) +- else: +- dll_path.append(os.path.join(curr_path, '../../windows/Release/')) +- # hack for pip installation when copy all parent source directory here +- dll_path.append(os.path.join(curr_path, './windows/Release/')) +- dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path] +- elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): +- dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path] +- elif sys.platform == 'darwin': +- dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path] +- +- lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)] +- +- # From github issues, most of installation errors come from machines w/o compilers +- if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False): +- raise XGBoostLibraryNotFound( +- 'Cannot find XGBoost Library in the candidate path, ' + +- 'did you install compilers and run build.sh in root path?\n' +- 'List of candidates:\n' + ('\n'.join(dll_path))) +- return lib_path ++ return ["@libpath@/libxgboost.so"] diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index f8f933b96abb1ba46d224f6a8f02064454658a0d..79f6ddca5434f75282d2f7877c370ab88696a5fa 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; }; - patches = [ ./skip-broken-test.patch ]; + patches = [ ./skip-broken-test.patch ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch new file mode 100644 index 0000000000000000000000000000000000000000..6b3d3266b21b325a4cc0c140a033a453f77f0978 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch @@ -0,0 +1,24 @@ +From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Fri, 20 Jul 2018 10:07:22 -0500 +Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds) + +--- + ZConfig/tests/test_datatypes.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py +index 7c8d80c..addecd2 100644 +--- a/ZConfig/tests/test_datatypes.py ++++ b/ZConfig/tests/test_datatypes.py +@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase): + convert = self.types.get("locale") + # Python supports "C" even when the _locale module is not available + self.assertEqual(convert("C"), "C") +- self.assertRaises(ValueError, convert, "locale-does-not-exist") + + def test_datatype_port(self): + convert = self.types.get("port-number") +-- +2.18.0 + diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 418fcebaefd526fd8b391b6c0ed3563accb183d6..f283479c8de8dfd5864d1ba7f89a6ffa69a29f5d 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,6 @@ , pytest , pytestcov , requests-mock -, testtools , tornado }: diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 9aab2ba9e8441fbd27851d5bab35b6f1a41a6cf7..c23f332638d04fc3326dbd0100eec88bc161dc0f 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchPypi , buildPythonPackage -, isPy3k , zope_testrunner , transaction , six diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index e2bf3a569d0487980cb5caba42ce288b88cc9d6f..a4988332b226d58f7208e6c1e83fd3043b21021e 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, fetchpatch , zope_interface , zope_exceptions , zope_testing diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 68ab42a76dd7c810df29403d8a452dcd35e25c74..acaee897d9376794c29a2109dc977459d214390d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -47,11 +47,11 @@ let "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { - mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; }; deriveBiocExp = mkDerive { - mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; }; deriveCran = mkDerive { diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 16f1abe1a899ea7446477fa626acfe8d6c0d97aa..f902ca58c384589d28d0d73b68f21770470f528b 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -61,7 +61,7 @@ let else name; - copyIfBundledByPath = { bundledByPath ? false, ...}@main: + copyIfBundledByPath = { bundledByPath ? false, ...}: (if bundledByPath then assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ else "" diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index 85e93959e4b5f388398d19d231666bb31af6dd7d..b8e666a92f9a324395851e4a58710132570e36da 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -22,9 +22,9 @@ rec { else gemset; }; - filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; + filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; - platformMatches = {rubyEngine, version, ...}@ruby: attrs: ( + platformMatches = {rubyEngine, version, ...}: attrs: ( !(attrs ? "platforms") || builtins.length attrs.platforms == 0 || builtins.any (platform: diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix index ee3754595f394d86662d69ba5549050d86dec527..7c5932c4e761ef20c75697355442cff53055eab6 100644 --- a/pkgs/development/ruby-modules/bundled-common/test.nix +++ b/pkgs/development/ruby-modules/bundled-common/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs: +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }: let testConfigs = { inherit lib; diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix index 63da7044c0cfb05af0f326ecea69d455300acedf..e42f1bf2571147c2255d83ad114051349710d242 100644 --- a/pkgs/development/ruby-modules/bundler-env/test.nix +++ b/pkgs/development/ruby-modules/bundler-env/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs: +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}: let bundlerEnv = callPackage ./default.nix stubs // { basicEnv = callPackage ../bundled-common stubs; diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 2f9a822383256a4ccfe26afd6dee9fd4f8d1a802..b1d0b76f086c8f43ff5c25f7820cccd624952a7f 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, makeWrapper, ruby, coreutils }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index 83f1dddeeb60afe39ede977b6df8679492b31e1f..39520fdb0ba112f3f7cabc987bdfeb13c1012d57 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp }: bundlerApp rec { pname = "solargraph"; diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix index 3585681478c86eb1d64d1344c1ce90d606388294..7e6d1102f666916b9225777e836b419aaa7015ed 100644 --- a/pkgs/development/ruby-modules/testing/stubs.nix +++ b/pkgs/development/ruby-modules/testing/stubs.nix @@ -1,8 +1,5 @@ { stdenv, lib, ruby, callPackage, ... }: let - real = { - inherit (stdenv) mkDerivation; - }; mkDerivation = {name, ...}@argSet: derivation { inherit name; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 30d82aca83ae44c9c555d7d4ad839c29cdbc0f2b..fb0f7414841cfd1443bd0edfd31bd209b8042e5a 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }: +{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }: let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index b174d6c069b71a85bd64da79acbaa2ae03539049..b9b9b8abfb929570da4beb024bb9503d4658b4cb 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl, +{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl, gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 131533896ff94ebe942704a8aa30629455bd55dd..cbcfa981b6b5b646a7342d5b1960641b71c1ec2d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: +{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.13.0"; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 5bda2d945eb6c2be1ec67bf0ae04429d70b0b62e..19609e15c7651a2cf8649aabb3c466c434e77696 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub , arrow, futures, logfury, requests, six, tqdm }: diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 953a10ca47ab7f6c872c48baa03754dbd9f2fe97..5f2e9b5f440d8c3ce55b9924b3b39e088e67f26e 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils, cmake, zlib, fetchFromGitHub }: +{ stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2018-06-15"; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index a98c2b4e04bde162c44121582520684580f64375..52fec3f131b9ba3f6c9fce33fd003fe9720d29ca 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bazel-buildtools"; + name = "bazel-buildtools-unstable-${version}"; version = "2018-05-24"; goPackagePath = "github.com/bazelbuild/buildtools"; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 96e9d0f9a439fe283b60dba13f9dca0e6eaaa660..50b1d09ef93331f8b7e425b9038c0d614b27cc79 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.0.0-M11"; + version = "1.0.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,12 +16,12 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1"; + outputHash = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh"; }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; - nailgunCommit = "60c2d130"; + nailgunCommit = "0c8b937b"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 5d486f47844eb8ef14d607ab4e1f6089243e4bfc..2260f083b71b7297abb36a7bf1dc51c3f232ad72 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "buck-${version}"; - version = "v2017.10.01.01"; + name = "buck-unstable-${version}"; + version = "2017-10-01"; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 3729abfe247d6bbda68981009c41fede61b26d71..adb279cdea68f8d495a17d3f0a25a1f9f6f0b50e 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: +{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: let withPlugins = plugins: runCommand "wrapped-${package.name}" { diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index f6da92fe6219561c161911551c6a3592e9f0b130..c61bf3287db18888c78a460682a339150f08389d 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 +{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps , buildPlatform, hostPlatform }: diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9ff32f1b3484489b6737de3ebb9a4175b26e81a2..e77647b2fed44067c37648c47a3f1226ef93b348 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, python }: +{ lib, python }: let newPython = python.override { packageOverrides = self: super: { diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 52e29acc9d81bf8da47b8bbd2af8b42c8bdd3340..b9a8c97bd5eb5b3e033b55ec348f7eb6f2a932ea 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }: +{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: let diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f810f97ef4979a867d11b8fda8c61fb586693586..f5ca69e59c840a812001d2a37618c67aa04af948 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.8.1"; + name = "gradle-4.9"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg"; + sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; }; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index c0af0192978544a1d562dbc019424f89976ea158..2ccd6637d088a405bfcb2637030c716b5b032b0f 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let +{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix index 5da32f2334a78912401389297cbdb58876e6a030..c394d87e09ec3a1dacd2ce34d5892351797f1fc5 100644 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ b/pkgs/development/tools/build-managers/nant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper , targetVersion ? "4.5" }: let diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 38a197aa900b72b8bc4c45ba3e6ff895f0b3b350..1ad52f327e15b89046e2de0ccfbd8cccc297daea 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, runCommand, curl }: +{ stdenv, pythonPackages }: with stdenv.lib; with pythonPackages; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ff6dc07ea9e968fc003b38ea0e57dc3f4d2def54..d9e260a13de3eb7bd1183dfcba1c2d0114d91dbc 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,6 +1,6 @@ -{ stdenv, writeText, callPackage, fetchurl, +{ stdenv, fetchurl, fetchHex, erlang, hermeticRebar3 ? true, - tree, fetchFromGitHub, hexRegistrySnapshot }: + tree, hexRegistrySnapshot }: let version = "3.6.1"; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index d3842a39f18b6a210afdb965d094f8b0a8888cdd..4b0242a3956d2b08858faaec0fff9e0fe0e2d183 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, fetchpatch, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let name = "scons"; in python2Packages.buildPythonApplication { diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index f52d53526fa1dec0a20566c52dac24195c4987a0..3bd31523412aaf7bc648ee585bfc1e95db689cb4 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,4 +1,4 @@ -{ callPackage, stdenv }: +{ callPackage }: let mkScons = args: callPackage (import ./common.nix args) { }; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 000943f117f63db59fe3e22d0ceedcb43e92c6ca..e86d61cf6c9a10996e0b65550bbbf4c6abc5e531 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "waf-${version}"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 2dca2b6cd423ea8ffb0bfc63edd57c5870d0dc29..95ee4e93f2a8f139bed8187d6fc4c640514c54ce 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +{ stdenv, buildGoPackage, fetchFromGitHub , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f42adffc5f420ab3cf8eb8ea7098cef2ddc27c4e..603b155ee4f9a1989dff28418710089aa9e03f75 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub , pythonPackages -, pkgconfig , cmake , llvmPackages , withMan ? true diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index df06793eaec0b752335905bc2ba0d267e223cd6d..1d81d469eb29afe9df8a05492a79c4b6c4a2d43f 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }: +{ lib, bundlerEnv, ruby_2_4, perl, autoconf }: bundlerEnv { # Last updated via: diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index f96d3e810ca55c00f8dad4fc95a88fd249bbb905..3e3e239fbfb3fae0bb0e0a9550fdf1616e9913a2 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "compass-1.0.3"; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 8d43736d3a8a560233992a67c5c0e5654c3c66b3..b2b903b095c69bc49e2bb62ab13fabadea4aab96 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: with lib; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index e3c8d7ed014de31f603f32e781edd1f8cf8784f5..7e660f3fcd9095362e11b429c3f55330c1590ae9 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildCommand = '' install -Dm555 $src $out/bin/coursier + patchShebangs $out/bin/coursier wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 7f66317167a5f0efc3562036e40f5327045a7940..46104e78d1d7ba4078d315c4a20a99bdf171bcbc 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact +{ stdenv, fetchurl, jre, makeWrapper , mysqlSupport ? true, mysql_jdbc ? null }: assert mysqlSupport -> mysql_jdbc != null; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9a7a600d13436d0f50220b6f196b4afa6d14f021..b101e52aad9ccdc1f6afa1aeb256eecd64d3fc9e 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "delve-${version}"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 905314efe5a9b8aca62863ae7e48199857f24ab6..26d96a64126398e47e632a61ab8f031582b5f3dc 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , pythonPackages , glibcLocales , devpi-server diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 6823ae3372cb8a46e194d1cc294da30189f22802..f3ade82e52e8ad95b74f2259c878919d66f54458 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ - { stdenv, pythonPackages, glibcLocales, nginx }: + { stdenv, pythonPackages, nginx }: pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index f6920a83e09c9d76f8288eb2b397cd67ec104392..7e8a41590724f4db2b7479847b2a4f4dbe6da236 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool -, makeWrapper, python2Packages }: +{fetchurl, pkgconfig, libxml2Python, libxslt, intltool +, python2Packages }: python2Packages.buildPythonApplication { name = "gnome-doc-utils-0.20.10"; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 32025edb30641d69100fd53126592f717fd751b3..8ec6aec9918e0b05e0a6894b6e4b1eb6b038e324 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Make six available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. postInstall = '' - ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/ + ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/ ''; doCheck = false; # requires a lot of stuff diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 253f5b374d3c397b7eb9acc1841fd71ba6a98902..de9fb82f66f24b33d050f0796845b46504ef3f2d 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "easyjson-unstable-${version}"; diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.nix b/pkgs/development/tools/egg2nix/chicken-eggs.nix index 4ec9e0daa47af08facdce04e10b69a583c4e1d79..1f786f127c91a4589d93533cc2454dc8dea76912 100644 --- a/pkgs/development/tools/egg2nix/chicken-eggs.nix +++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 38432e58d0d9099427d7fcab6ca30d3605737504..695a532305a91ddf302353bf5f7c69aba361792c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: let version = "1.8.2"; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 3dc0d3fca88cbe5bc4c9f3d5290860fb6b62b39b..a89861faebbcf88057e3a5d22be956a81e33058d 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ]; + buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index 082edb37a4f3d0aeed2b652491cfe24104cb5939..e21749f90d0298f447f188ea8fe730424be893af 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildRebar3, buildHex, +{ fetchFromGitHub, buildRebar3, # Erlang dependencies: ibrowse_4_2_2, diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index df14c29c372830c5a981a4e93d2baa1d3ee529bf..9bbdc8c8334d2894d0a8991c0784a23c1344049d 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex +{ stdenv, buildHex , getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }: diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index d6cc527e6418a97aff2453341638cb9a68228b2e..18367d14f6e593f3eb7736124a069c6b035c4471 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }: +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { name = "fac-${version}"; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 3d4d542d2f926d0164eee51bdcfa1769bc4ac977..4c67a45d8c30da8ba7c8489d7d2cc243502bdb06 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, man }: +{ stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { name = "git-ftp-${version}"; version = "1.5.1"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 4b87e74a6308eb5e943d72149252a7faf870cdc3..9a783deecee6d5b79c65bc957676f5ea5672ac89 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-bindata-${version}"; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index fe159c85c3d64feefb4591a203ecea7002ce88df..5e1cd03e0af5d73e900f2a2052cd39718ce5df00 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "go-outline-${version}"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index e47b84354d62a834a809c3c3dad037c87a47c711..52cd37f98850140f556f2ca8e3757e21b198b166 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-repo-root-${version}"; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 9a8b592b038ded7855c121912d73ac37b0500d51..38ceea7d417beadc0e340579309d607eeeedaf9c 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-symbols-${version}"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 2501c36dd5cdd171c8017d3229f4c00f95a7fa98..a20e1658988c6f5aed25a98d45396271b91f4d08 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gocode-${version}"; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index e4ef9d26da2575c55ba9011dc84d2616cecad6f9..fcdb56460e19c92d5ab8d8a79583e04edefb3d49 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "goconvey-${version}"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 6644c8fcfc4f7c333a496e9b3dc93c1f2835fbe2..3227ed8eec2eae91bef9c3e03ea0bbc435e8da77 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "godef-${version}"; diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index 5c69f34e28b30be437a49920dedff8035913a15b..14c319320d0c6635caf32bf97732f970a9f85f42 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "goimports-${version}"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 99f049314ae801f64a8f27444baa4ac4ec6b713c..a617e582c980119b7e6a2c0ed5b348dac4f397b6 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "lint-${version}"; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index f1452bc121148a9d9f2f54f3200433b9d49465a3..86b7246b4113f5e8ce06140844b18e9d737d773f 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gomodifytags-${version}"; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 298657fe38c57c5995f791c96afbbd82851213b9..ea9c92c0d0a1258ddaf61f9fb094b85f7b52fc99 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gopkgs-${version}"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index ad22d4ea40796b4a9aeb73497a076b74a610769d..b8230561fb42d308a506c93b32078036748054ea 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gotags-${version}"; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index ccdab780e6cfac448129ccbca5b9ae35984e25e1..6c8270f85986f09ab7e4e039b54b24a7cba6d91c 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotests-${version}"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index e9a7e7ac89183cfcf375bfb215f10038106776e9..05e87d0846066c61d17b7c2b93c780fb5e741fd0 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, go, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gotools-${version}"; - version = "20170807-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "5d2fd3ccab986d52112bf301d47a819783339d0e"; + name = "gotools-unstable-${version}"; + version = "2018-07-20"; + rev = "be728107ea8275e6f58ba07e246b94181acaab24"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn"; + sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix index d4be771e8d6b9a7419184be61bb5d28312343d21..e85fb1201012c452c7376c5e4c7aabb680a42cd4 100644 --- a/pkgs/development/tools/gotools/deps.nix +++ b/pkgs/development/tools/gotools/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + rev = "0ed95abb35c445290478a5348a7b38bb154135fd"; + sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl"; }; } ] diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index a80f1569329c198d7e7cf06c52e621ba9e60f764..440b5e2eb0b7169599911a409c0f05fea79ed688 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "govers-${version}"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 65bc55c6d8d7ba30e4e40710dad916a8470d4e17..69b20dd3a179e496afd3f7e71e65983773d2968f 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gox-${version}"; diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 31697750a702e18c7b63cb26e7fd92b2a3432ee9..a2a049615b78ccc5c0d7cbec75d8345bd3c5ace7 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix index ff82127f0c4b8ea4128308f3a3310b545c408b12..47a9c550fa8bc4fbd3ecd3032df442e332b14245 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -3,7 +3,7 @@ let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); in stdenv.mkDerivation { - name = "hyper-haskell-server-with-packages"; + name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index edf967f7d1100b000d592381a8e9f51a62cf3dc3..5e372b4f3874d6a4b5bb75e194c1213d62362523 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix index fb91015e10c8fd4ac3fee620760a676fb1104e59..f1c754ddff96a945956cabe378cfd6ca040c83f1 100644 --- a/pkgs/development/tools/haskell/leksah/default.nix +++ b/pkgs/development/tools/haskell/leksah/default.nix @@ -3,7 +3,7 @@ let leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); in stdenv.mkDerivation { - name = "leksah"; + name = "leksah-${leksahEnv.version}"; buildInputs = [ gtk3 ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 88c4fc14a66618ec64c5a054a3658c60dd84e3fa..30dd7f217915debeed0a9344e56c76d8608b5722 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,6 +1,6 @@ { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty -, tasty-golden, transformers, fetchFromGitHub, fetchpatch +, tasty-golden, transformers, fetchFromGitHub }: mkDerivation { diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 6511bdd20102f9eb5cc64b961c890fd0b2630868..905580482d45f94f2c02823648dfd99e15c0e1c3 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }: +{ stdenv, fetchFromGitHub, python, pcsclite, pth }: stdenv.mkDerivation rec { pname = "hexio"; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index e71e296212cd5fd1c16fcb071fc588a90ee9fb3c..b2c764c5a8566fe62760b534f4bb4dcc3471a815 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: +{ stdenv, makeWrapper, requireFile, gcc, unzip }: with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index af738bc71a93dae77786344448aff5685e5b200d..34b9e1df1906465e0ebf5937e7b9cdf72d33cf74 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, patchelf, unzip }: +{ stdenv, requireFile, unzip }: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index e2aa27a96eb5a6d8c2f9e554678c18737cf50232..b6a78071bc87d4572fb76a781f8ba89c30a697ea 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, llvmPackages, irony }: +{ stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation rec { name = "irony-server-${version}"; diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index dd0379e83a7c2af58227d7e56b9758c5afa689f6..c53d6608efd337d223de0c76019a802db4848064 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "jmespath-${version}"; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index d46f7b3e88337f79115fb5cabefbfb0fae718daa..e8e8acd6a9a416ecee0ed3216f4cc27a39d0cec1 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "jp-${version}"; diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix index d53b39021339d1d02018e2e788269a0d1a209907..694428f55a6baab815d180216a678c797d51f81a 100644 --- a/pkgs/development/tools/json2hcl/default.nix +++ b/pkgs/development/tools/json2hcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "json2hcl"; diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 11f4a5c8bd0a85d979b4fc078a53c7279e2eede4..af5c0e9c2f9fea393aad7679eafa70eee5107c02 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: with lib; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 9e41ef3813180cf49e45203af1a11fce112d5343..afac17b52519878943e4b23ffb3079f661b7f943 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "leaps-${version}"; diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix index 8adea820ec7675596d79e4f981ca678431892bc7..58f50dd2f7e30f5bc52e6201e1f147403cb98439 100644 --- a/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "librarian-puppet-go-${version}"; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index c4df52da170131735c5949691e8f4d58a24963b3..a5dd0a882728171daef9bf778b8a524c1f505b19 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "manul-unstable-2016-09-30"; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 660917ee9f1ff9ec35cdc48bd860fc291698d269..265d425bbcfb5ef0771430d498eea30f683331c3 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { name = "autogen-${version}"; diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index affc400a9ed0f9d5d1c730fad7f5f7cd54080d08..6646b847252676f78a3591842f4b41551793e35e 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: +{ stdenv, fetchurl, perl, autoconf, doCheck ? false }: stdenv.mkDerivation rec { name = "automake-1.16.1"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0b71c6719dc4ae0bb5c9b00e64529676f7df04ce..2badd0ed26a9a6e2a739c4f2f960ae1a8a57148e 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages , fetchurl, zlib, autoreconfHook264 -, buildPlatform, hostPlatform, targetPlatform +, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: @@ -10,7 +10,7 @@ let # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 version = "2.30"; basename = "binutils-${version}"; - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index ab84cb37656eec6d6261f021aef0a14648f7c086..2d7225ee03edcfafad320fd20ef127c1a12a2493 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, bash, libftdi +, gcc-arm-embedded, libftdi , python, pythonPackages }: diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 51610349c45efd4c70a012238fb0393b7e60205a..6519f349bfc8a39b8d9e069e58e5dad10909c039 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cscope, tk, makeWrapper }: +{ fetchurl, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { name = "cbrowser-0.8"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 34d1d8a829b137dddf8469c19ddef10d1b4f66e9..c5cb277c256f6c3e13f4d002cf04bf63800be1c1 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: +{ stdenv, fetchurl, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index bf9797671269972a6c5366594b1fa058570b8f58..0b86deb52055ee64bbd8216d26c779d63dcdeee3 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ fetchFromGitHub, makeWrapper , cmake, llvmPackages, ncurses }: let diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 4df04f44f56ad59d368ca49aa6ffd624657a6140..75ae9f1ba8b24c33062da96c3cfa651145cf80de 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,4 +1,4 @@ -{ pkgs, ctags, writeScriptBin }: +{ pkgs, ctags }: with pkgs.stdenv.lib; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index b734eadae902bd63371c9cea4efb40bc3a6d020f..d9fab774b76ac122f8138d68e719db09744557e0 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.6"; + name = "dejagnu-1.6.1"; src = fetchurl { url = "mirror://gnu/dejagnu/${name}.tar.gz"; - sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0"; + sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz"; }; - patches = [ ./wrapped-runtest-program-name.patch ]; - buildInputs = [ expect makeWrapper ]; doCheck = true; diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch deleted file mode 100644 index d745bc65cbb27aa03dadb1d849cb394d935fda65..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch gives `runtest' a `$0' that contains `runtest' instead -of `.runtest-wrapped'. This is required because `runtest' checks -what `$0' looks like to determine the target. - ---- dejagnu-1.4.4/runtest 2003-08-17 03:27:59.000000000 +0200 -+++ dejagnu-1.4.4/runtest 2010-03-18 15:57:58.000000000 +0100 -@@ -10,6 +10,7 @@ - # Get the execution path to this script and the current directory. - # - mypath=${0-.} -+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`" - if expr ${mypath} : '.*/.*' > /dev/null - then - : - diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 82b224b37f42d7f0354e1f333f466f996c6ee12c..591254c73f578a0f94dde4271e9f90aab602a264 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, ncurses, gettext +{ stdenv, fetchurl, ncurses , withLibrary ? false, libtool , unicodeSupport ? true }: -let optional = stdenv.lib.optional; - optStr = stdenv.lib.optionalString; +let optStr = stdenv.lib.optionalString; buildShared = !stdenv.isDarwin; in diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 4d8a9b05847a15d4cfed2a0221ef5f6f9ba0a67e..a1f33fdfc9e7038cfbbf5a1c1e8e876d8704bb91 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, findutils # for xargs + # for xargs , gettext , libtool , makeWrapper diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 12d3f97dfc41fc01dea4765bed66a51f1112d7f2..29bf92d2b6e5f2618808fe735d3a813bb1b0bbfd 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -4,14 +4,14 @@ let in python27Packages.buildPythonApplication rec { pname = "gdbgui"; - version = "0.11.1.2"; + version = "0.13.0.0"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; + sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix index 13978645c29985c2a6cbf00a95fe03d4f3df7650..273f9db0c399a0c6b97d43fabe2bde23205e5e2b 100644 --- a/pkgs/development/tools/misc/gdbgui/requirements.nix +++ b/pkgs/development/tools/misc/gdbgui/requirements.nix @@ -11,7 +11,7 @@ let inherit (pkgs) makeWrapper; - inherit (pkgs.stdenv.lib) fix' extends inNixShell; + inherit (pkgs.stdenv.lib) fix' extends; pythonPackages = import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 296d9673d8f152cc3e71be768446835972ebe949..f0f21f8f4d5a864c80ea5f2522e979d2bff373b9 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, makeWrapper -, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig +, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags }: stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 4fdd017306acc644912d3fa6ef23df4704d5ec04..cf516b16f4b492192b03bf59dcd12de9d30580e9 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,9 +1,9 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, fetchpatch, pixz }: +, rpm, dpkg, cdrkit, pixz }: with stdenv; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 08729f6b41b2dd0d510d41e655dcb2df19d57851..d92b20a12b02005693e7e3f3a6b1e6ac4cc887d9 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, autoreconfHook, utilmacros, gnome2 }: +, procps, utilmacros, gnome2 }: stdenv.mkDerivation rec { name = "intel-gpu-tools-1.22"; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 71bc3b87a7ac66bf87e1b3c5f7e0005f837f1fa9..27f49ebcf38ca2a2b289c1c5f06ba5f1abeef526 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "linuxkit-${version}"; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 9205f6caf0dc6553e4a38d0e01af639657f3bb00..017c6ad804915effa2539eadf487707b2246a032 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitLab }: +{ stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { name = "loccount-${version}"; version = "1.2"; diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 208f0ebd411b2d9af035c757a8c919133de1737b..23b7119e7d744cd590d5f2d1874e9b65aab0a8f9 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix index e6f7ac3290b4a0928ad925248e387f2e6d7eb941..c45e7841d450e227710444012c0ce0f4408b988a 100644 --- a/pkgs/development/tools/misc/moby/default.nix +++ b/pkgs/development/tools/misc/moby/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "moby-${version}"; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 219281f4ec1718fa9643888853bc8d9f07b48e39..7235af49c2e6ca5f7f526bcd0cda789de2518231 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, libiconv, vanilla ? false }: +{stdenv, fetchurl, libiconv, vanilla ? false }: with stdenv.lib; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 3da98f38ebc76491e4e59b5bcf10ca8b40617c0e..553ded815ef836562448765301d248d81e96c78c 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "stm32flash-0.5"; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 9b4fd05dc0a0147bf8a429372a49408ac9c89df1..48a2e7bd2cb167b35bb4cf8b66d14875a2d8107a 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 4263b80789a204d90c09bccffaed581942267863..d6c5256ca84df33b57b9e29785c8d1ccb2f4a918 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb, fetchgit }: +{ stdenv, unzip, libusb, fetchgit }: let version = "2.1"; in diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index c8747e66e39b3d096ffd5b4104045d75089dfceb..11caf8e7b20e8bfad0d32c3ba21a452e97382a20 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, conduit, magic-mime, tzdata +, cohttp, conduit, magic-mime }: assert stdenv.lib.versionOlder "4.02" ocaml.version; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index dea1ab2a4459b2989264ba8cb9ddde863f54c5c6..6a34c1c130d981150f92fa9f37fb201d17c0a2ac 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }: +{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let version = "0.9.1"; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index f09dbfdb16538072c9f6497ba69fe54194b1e1e3..df7630e2d16f2b4851f08cd651ec3592b08e03ce 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index fc1513ecf34bc7c1973b72a3fe5d0a0ab2c3778d..6840bcac0dc58ea3a889045f3a31077cd31cb18f 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig +, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg, libxcb, libXScrnSaver, cups +, ffmpeg, libxcb, cups , sqlite, udev }: let diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 7cdf7dc939641c1c61d70551fa85a17cda364f31..7c7bf79acc7d609fae800b23c7da97c4ffa2b851 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }: +{ stdenv, fetchurl, ocaml, writeText }: let pname = "camlidl"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6d269552f62898f560a6e3c8edbf53416ad54505..79801304595597816230968cebdd8b1d5eb746c8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9"; + sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv"; }; buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 31a5c3ea17bb4662890fdabd5919512bbefd1d07..5ec8cca344d4fd1a2526872a3b27dcdc06c4746d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx , ocaml-migrate-parsetree, ppx_tools_versioned -, js_of_ocaml, ocaml_lwt +, js_of_ocaml, ocaml_lwt, lwt_log }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; buildPhase = "jbuilder build -p js_of_ocaml-lwt"; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index aa9feda985a3f23dc707923d1e530d07e093f55b..73b7da119abe5235e9868a07486864e9ef6527e4 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchurl, makeWrapper, +{ stdenv, lib, fetchurl, makeWrapper, ocaml, unzip, ncurses, curl, aspcud }: diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 340c57f2817668729386c2fcafa5184325323782..74f450a9e3ac01946d37e2d0e244d4cf3873f63c 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder , lambdaTerm, cppo, makeWrapper }: diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 287bb8beb52459cd9ff3668651a3c2eb08453585..469e64acff06dd650d0315e4ffa20ef4245f6a32 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }: +{ stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.5"; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 27596878f346e25824b9a3430308817a6f3eccae..86c1f82678aee7c3200bde680808141177f9af59 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, glib, pkgconfig, python, scons, pythonPackages }: +{ stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation rec { name = "hammer-${version}"; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 3c062dbe1ab4a8237749c50a82d2a34a0189ae5b..949d798f7e88f214aa00197586efcbf8cad39126 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -5,24 +5,6 @@ }: let - fakeXcrun = writeScriptBin "xcrun" '' - #!${stdenv.shell} - echo >&2 "Fake xcrun: ''$@" - args=() - while (("$#")); do - case "$1" in - -sdk*) shift;; - -find*) shift;; - *) args+=("$1");; - esac - shift - done - - if [ "''${#args[@]}" -gt "0" ]; then - echo >&2 "Fake xcrun: ''${args[@]}" - exec "''${args[@]}" - fi - ''; fakeClang = writeScriptBin "clang" '' #!${stdenv.shell} if [[ "$@" == *.c ]]; then diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 614ffe5e218d67c547a6e48cde9064a9d05479db..624866ea9e37857ba62a0596824a8a65c6ae18f9 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "quicktemplate-unstable-${version}"; diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 88c975b5735210e7b037ffc9b131107e920f0131..55797948a84a5e3f5eb1e4a5ae9c221e56aa3b5e 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }: +{ lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { name = "redis-dump-0.3.5"; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index a2c75a02aa28a20fbfebf2a959ed7bf3d7a89402..da3b27ebacc585380fc7e0ab42c9798d860ca0cf 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: stdenv.mkDerivation rec { name = "rtags-${version}"; diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 850fb5ad7f5800ffbe3c6afe48206bf502fd43e4..2b9792e4df255f86b554203943385514526d09b8 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, makeWrapper }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { pname = "rubocop"; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index 370318d1ff299149087fdf81b506c72f326c8c09..50c890e3c47e212adc2da984c7604570e215253d 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 3b1e8c2c8a75d08eeae8d59d638a97aac8856c54..48bfbdd689b88b382bf7c1a689291a3a191f82d7 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg +{ stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -6,9 +6,6 @@ with stdenv.lib; let minorVersion = "3.6"; patchVersion = "0"; - arch = if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else ""; in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 041aee7a1c5cc9b961e4309ac9a574dc64f2a30c..534c69200e026f40a830485aff97007ad4e89d0b 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}: +{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index f6687f4e4328b97b9f5b28c043c81757a065d425..a3499258a99958eff34a699013b881fa0df0e30d 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }: +{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { name = "textql-${version}"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 0db25f88d768882ad928e9fee38978a9ccadd4a7..ab90bb27bd5eb565b978052fb8809a8cdabd11a5 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, python3Packages, stdenv }: +{ fetchFromGitHub, lib, python3Packages }: with python3Packages; diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 2a4ddaf803985d04870ba2a8fab66e8b3b3bfafb..0fbcd7b71a6015ad2dfb5b029e0605938c449c2b 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "vndr-${version}"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index da2612415ba5de77ab64c5022988c48bb4f886ad..d6d5d6d3ea6624ba8fabfb2cd1a5dfc33ff39a15 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index b99780d41382d3bab76d9c9af167c10ec52811da..17c64f0548b3eefb63eef36942979dc40bd94d68 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "ws-${version}"; diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index f8b1c1bf31e9d80838de134f10920eafe5ac896b..77ef8565a34eda0844c7a1dd3a7d3d72eb95f599 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand +{ lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics , targetPlatform , xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX" @@ -7,8 +7,6 @@ let - inherit (lib) toLower; - toolchainName = "com.apple.dt.toolchain.XcodeDefault"; sdkName = "${xcodePlatform}${sdkVer}"; diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix index d585a35b0bc55b13fd36b019652fca14fe5b8b7b..4d62f5b8571419630e8021159fb83396106ae7f7 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/development/tools/xib2nib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }: +{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { name = "xib2nib-730e177"; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index 52231d0a831863dfa452dfb3de9e203040952980..a08e01a48b7f521fe485a617c37e50576834eba4 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: +{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: buildPythonApplication rec { pname = "yq"; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 0220fbd8df8245f474b4d356b3c3e6d71a2b84a6..e63f609fc2b6c90b81e6b2700784fee0f3fa67b4 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "minify-${version}"; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index c51e1595ee7234d04899ec8f3457ba39e2fdbb70..cbe7d3da8aa662bdf6c092b938728ccf79c06200 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }: +{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "postman-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildPhase = ":"; # nothing to build icon = fetchurl { - url = "https://www.getpostman.com/img-rebrand/logo.png"; - sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v"; + url = "https://www.getpostman.com/img/v2/media-kit/Logo/PNG/pm-logo-horiz.png"; + sha256 = "271b88317bd787f4a30ab374148e73314d60fb1b220ef791611774a061c49f30"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 0cf1b6f5e67109b10d01caba236d343328515d3e..d05f19d3171cb4433b4aef30d1b36c660d2a683d 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, perl, fetchurl, python2 +{ stdenv, lib, perl, fetchurl, python2 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2 diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 0ada8d64685dcfea8053c9fa18d5004922a73f02..f2be128fd99899a3ad9ce9555dd82fa32ede1cd9 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "90secondportraits"; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 70413f0f941b65237f1a8fe22c5425589dfa4890..45be0a3085e46c4d88a296a4211ceecabbcaa199 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig +{ stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 }: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; + sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj"; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index d9a5df73f17ccbe3f30282bd93640d401735ab8e..cb75b6802702e945875533044a9763eb1a244d96 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, stdenvNoCC, buildEnv, gccStdenv, lib, recurseIntoAttrs }: +{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs }: # To whomever it may concern: # @@ -60,9 +60,7 @@ let legends-browser = callPackage ./legends-browser {}; twbt = callPackage ./twbt {}; - themes = recurseIntoAttrs (callPackage ./themes { - stdenv = stdenvNoCC; - }); + themes = recurseIntoAttrs (callPackage ./themes { }); # aliases phoebus-theme = themes.phoebus; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index baad45298441f143076cb3a47fbca6e62d446b52..f781b0a71de35d68b572bee2ac1b0b55f736e48b 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, hostPlatform, lib, fetchurl, fetchFromGitHub, cmake, writeScriptBin, callPackage +{ stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin , perl, XMLLibXML, XMLLibXSLT, zlib , enableStoneSense ? false, allegro5, libGLU_combined , enableTWBT ? true, twbt diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 5e92bbb285b827532afe4e0cc98be28250870a6e..4236d6bab989ff4705cc8ae81895fc336bd5cd46 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase +{ stdenv, fetchFromGitHub, qtbase , qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 54f0f0405ac5d3b4dd2ca1ac03c61a7fd85d6229..322a21ec3ad979abb4fe8ec7f810399faf28e509 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }: +{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }: let platformSlug = if stdenv.targetPlatform.is32bit then diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 3aa9e573f61dfeb64e585b5073bf71fef226487d..3e0d3dcc6d73a866a1c28ee6857bdc08181598df 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, buildEnv, callPackage +{ stdenvNoCC, lib, buildEnv , dwarf-fortress, themes # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index 5caaa9e05ca515863f747af36d0565421cb2ac55..0b8eb23a7b9d1befce6231c582157449a1f535c6 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub}: +{lib, fetchFromGitHub}: with builtins; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 5eebbf77d2bafa8d56c0f42e324cc61779e3650c..6efe004fa9e856f83edca86771739fe418f5a3e4 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -22,8 +22,6 @@ let then builtins.getAttr theme themes else theme; - twbtOnlyWithDFHack = assert (enableDFHack || !enableTWBT); true; - unBool = b: if b then "YES" else "NO"; # These are in inverse order for first packages to override the next ones. diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 9dde1da868dd7b7128873794dc433e20e85665da..e48ac612b32d5c7962d96d022a5aed260f92cd4f 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; buildPhase = '' runHook preBuild diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index defee04e5c2494fae1425bc3393cd68f5af45d1c..b718a92143cb89d814b9176061fb634f4092aa5f 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, runCommand , jdk8, ant , jre8, makeWrapper -, findutils }: let diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index df1dd47905e4e34b65131a65e16662aab9a01394..ae1db1d8b4a360c4f750b7a2eef952a2441c681d 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper +{ stdenv, fetchFromGitHub, cmake, makeWrapper , openal, fluidsynth, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 8d49d38b415860815c309b36798c4619e9538fbb..21d2ad87dfb8a25a3f7996f55a54f3d776e4883c 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib, binutils }: +{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: stdenv.mkDerivation rec { name = "meritous-${version}"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index a5b349334923eebd5d7ae1a9b48890d95deb9da5..7c32d7faa3c5977148b3f168540e21cb60f4bb25 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, fetchurl +{ fetchurl , python }: diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index a693c79e8cec0ca5cf0aefcdcd3176183ee60655..aa4a06bc7d2bf36cf72cd87b5aa7ca60f06502f0 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "mrrescue"; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index db959177eb57808a582ee317085380bf7f94b0ae..d4ad1119b9f53584bdf5d2df3d297cb702028063 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less, makeWrapper , x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5 }: diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 7b848086794bcfe7ef74a45df5006efea1c08f00..0f045faf371eb02c5bcacbf2cf9b9df9311b9a00 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer, binutils }: +{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 8080c959638800569e305789b47af9e725732d0c..4d01feaccc0db2a2ed01ef6b4f834fecf740d2e9 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, giflib, libXt, pkgconfig }: +, libXt, pkgconfig }: let openscenegraph_ = openscenegraph.overrideDerivation (self: { diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 9e67c7847f83f9f2e4dea8020fab55954b9417fc..e5783ec5396f8d7d105d67a34328c82ef27301e3 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, +{ stdenv, fetchFromGitHub, SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng, libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 582cafcc4d462f59331d171574b5f76326e9439b..b475726555597a34dd8f9693c9ab73e36fa22798 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file +{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg }: diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index a936ca134122abf2e6a34ebfaed2e7add1d65f22..9a82c678f3701dfcc7e7a056860c799f7e145221 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2018.01.28"; in diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 122ce3f6e2fab6bad94aa8afa30ee14272156d16..aae49eedd7c989edf8f27fa51f7cc8e510b933b8 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }: +{ stdenv, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }: let boost = boost155; in stdenv.mkDerivation rec { diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 69b166664be4242751bcf708eaba5bc00e250d43..4ab53d677324f4ffb3be84466d0a56c62c7672c1 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index a038957f701edc0baa14d6a99034132b71baf2a7..e75698e72799cb09f09068a3f701d1a5894b30a7 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, +{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 2636bc9e79901c5d0eb338d2807ea96aaa88d19a..58ed85c79fdb7e0b6da34e72961e3db49e4f6fdf 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "sienna"; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index ada2520a097c5bf655c87844752bf4c3e1b9e18f..ccece066cdc2b0754c5076ed019098d18034d264 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -16,7 +16,6 @@ let ver3 = "2"; version = "${ver1}.${ver2}.${ver3}"; ver_dash = "${ver1}-${ver2}-${ver3}"; - ver2_dash = "${ver1}-${ver2}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 83a85415664d64afc75240503504030697d713b2..1dcf432ccd48495af1c6977381b421e86e1530f1 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 2000398b537d4d5c22aa10118c5f9aa86203a74c..632a047e96c7124b3dcc697065e8b2f147f99a17 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar -, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring +, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index d51d1bb154d693e8f4ea8ed409a194ba8889a29a..4f9406abd835543b119837ba0a91fed05f2324b4 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm +{ stdenv, lib, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index e0f9bae2e39b3ef3d289beff685b05c41fd0c34d..cfef1ed0db2b1dc8a1380f8e71fa8cb700c550f1 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 522a1a2857d5420fcf913fb29c7aa1147eee9feb..b941f3bd2e050075aa9fc646a09c686756a2cf37 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,6 +1,6 @@ { fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, -libpng, zlib, bash, makeWrapper }: +libpng, zlib, makeWrapper }: stdenv.mkDerivation rec { name = "torcs-1.3.7"; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index dd60c0efb599b6e8d99093d8fabbd8275002cd27..00592f7c39bb21de6a57dc8ab16e1297cbe88fb9 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, libGLU_combined -, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod +, SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null , haskellPackages ? null diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index ce20d1b3f1779d2af3071cd08ca86980e0198c2b..7e43fbf2c880cff6cdc11a3b0f7d69fd7053f9eb 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image -, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin +, libvorbis, bullet, curl, gettext, writeTextFile , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 45b4e5a5891ee244b5d1d811afa0b457e5bced5b..75afddf52c8e4098458139b68c91e692459519e0 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu +, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false }: diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 222275a2ba1ade50edc5212467f750fab04a31ee..1e2c17814d6feecc7d948b1c0f9b72989580c0f9 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, python, gettext , boost, libpng, zlib, glew, lua, doxygen, icu -, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, SDL2_gfx +, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf }: stdenv.mkDerivation rec { diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index af76e85346f7934ad0fbb73da0fc2e2243c4da92..9684f3b876a8667b5c98d898b8771535e5325aa7 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, requireFile, fetchurl +{ stdenv, requireFile , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined , demo ? false }: diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 6d9ae55e639c564845ca97e9f9d343f7dc34ace2..ac7bf7973d77e0983912339710b4e621cbeeeed3 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , # required for both - unzip, libjpeg, zlib, libvorbis, curl, patchelf + unzip, libjpeg, zlib, libvorbis, curl , # glx libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib , # sdl diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 35fcb4a0eec796418cb6efcd55a8a9104a0debdd..3d60dab6fe0061f3cd0fee1fcc01a6e05b2f66af 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "sqlite-zandronum-3.0"; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 0f5ee05349defab3ada0c1c6ee94d546f1a86678..1786a4996a3042cca258057304fa244839f9aac0 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }: +{ stdenv, fetchFromGitHub, cmake, zlib, cups }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 1c0b8e13ab0b50594474a334ec83c9942aa5c75a..9c5ef1d0283629c2efb27284fc6b0b2955ca8876 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -4,7 +4,6 @@ let i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; - i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {}; src_canon = fetchurl { url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 6f27985bdbfcf27e4f2883df4d31c5aeda1832ef..701d4b6a1002fe3e09aeb1368fc60d8164adb129 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}: +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "3.0.1-1"; diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index c5b63b07318d90637e65e09c168bfa267db8571d..f69c972c9996ec2811449dc7614c8bde1084fa7d 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, a2ps, coreutils, gnused, gawk, file, makeWrapper }: +{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: stdenv.mkDerivation rec { name = "mfcj470dw-cupswrapper-${version}"; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 40e65136f1b04181d2f0a16babe6f00a2998c04a..ff71df5dc1baec52c8aa8a983bb08712a0b5b239 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd , ghostscript, a2ps }: # Why: diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index e8da0541f6c56eeb547df67bd446e390482aba91..48636e1f76aaf1f342f231da27251623b23f2feb 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript }: +{ stdenv, fetchurl, cups, libusb, libxml2 }: let diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 2cdaca8d7832dabfc47c0897b463793baace608d..bde918a7c484a46c79530ca4d43ba492da6cc58e 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, fetchurl, cups, zlib }: +{ stdenv, fetchsvn, cups, zlib }: let rev = "315"; in stdenv.mkDerivation rec { name = "splix-svn-${rev}"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d15680b6363960560b8591ab4a8f6d71eea449fc..870d9f5c1607c635527af6bd42a4d735fb6e8ee5 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi +, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf }: @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.3"; + version = "1.20.4"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; + sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index 88b88f59afc84d5bfa030609aa4613c6a22b06ea..1dac6034fdab9c2924d142032e91833bcbd6729e 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_32bit, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: +{ stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: let version = "1.2-0"; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 37f2361b45e80413e61b106cc612691939a397b7..91dce834a4bda0aed6d4bdf0f98be0ca561882ce 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, makeWrapper -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, openssl, polkit, nettools +, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils +, net_snmp, openssl, nettools , bash, coreutils, utillinux , qtSupport ? true , withPlugin ? false diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 4b88d4a96fa0dd73d58031dfd97fe5837b9b5d9b..59a75dab883237d3e9988c2a7ef1cc08d832531d 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, makeWrapper , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends , dbus, file, ghostscript, usbutils -, net_snmp, openssl, perl, polkit, nettools +, net_snmp, openssl, perl, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index f4110458062650a73ddd0acc9e25f7ce6cf6abaa..a7d5710a2793c4dbbdfcfe39810c7415afc4613a 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, rpmextract }: +{ stdenv, fetchurl, rpmextract }: let version = "20160218"; in diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index e0fe451ce24d950e13e2d26010b948a9c22c28ed..64b485bea310308484a40c169eb2abbdb5db8987 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,4 +1,4 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }: +{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }: let pkg = import ./base.nix { version = "3.1.0"; pkgName = "image-analyzer"; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index d6c85c53b42121ab386f000e5563f91f08a651d1..9403a969e8f4e5330f4c212adc00e36fd70989c4 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,4 +1,4 @@ -{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.1.0"; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 081846f78e352544c3ccb4344a00454abc6d8905..73ef7bc6a180933b6703863daa8cb4dc4e5e5cab 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, libelf }: +{ stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { name = "vhba-${version}"; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index 86dfd25d175f83710a7fffca29f7e0339d52813a..aecfd7698f07da5ee612d7880b1cc8cd94915bbe 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: +{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: let revision = "4025"; revisionDate = "2017-07-02"; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index a0999e6caf520992a7f3a189bffa94e9379ef51d..5de8ac46b9051f9b38b628dc7146a7a95770bcab 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3, +{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3, libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }: with stdenv.lib; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 7de9b576ef3779254a30417e2287a5e3d8652505..9ff99110eccfafbce71074ca8699a23991a70c22 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: +{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: stdenv.mkDerivation rec { name = "mupen64plus-${version}"; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 8a366ba737f316fbd3d9b263ad7d05282d8f332e..9eb353ede5832a80b977422c72c194f85e9a6a9b 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3 -, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas +{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 +, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 2e47cead8ec20c2b143cac56deed0ffbb97af910..65cc0bd9c05a761c9a24f6c3122d99a87568cb88 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl, qmake, qttools, pkgconfig +, fetchurl, qttools, pkgconfig , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns , rsync, SDL2, xwininfo diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index ffc494dad4ca9b2235bb353f84f7032d518de712..40c1fcc6fdeffc69ffcf10ad55e599bba7d00e87 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, cmake, dos2unix, glib, gst_all_1, makeWrapper, pkgconfig +{ stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib }: diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 66ea5b12575719d5d2ec86e29e492c5653589a8d..ac078f622515dfdd49671a1a6c92c93ae87c1cd5 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -5,10 +5,6 @@ , ffmpeg , gettext , gtk2-x11 -, libpng -, libpthreadstubs -, libXdmcp -, libxshmfence , libGLU_combined , openal , pkgconfig diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 010c4721dc2db41512884ca31f6c992f88453efb..ae8fbe9e1f5e0d1745fe62499987e4ecaeec7dc2 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index ca67ca836ba01c85c316d3720d9721b0f93ef27e..a8eacbe234c60307240143f412b86602b283d131 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -6,7 +6,7 @@ # }; # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; -{ lib, pkgs, system, callPackage, +{ lib, system, callPackage, wineRelease ? "stable", wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 156db148435e93120200148aeca240453b3efda9..3ea60e62c6652235c9b8cdfe87a29a5a6e224d8f 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,4 +1,4 @@ -{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, +{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, wineRelease ? "stable", supportFlags }: diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 4a7fe0ff55b65f1c965a7e1603cc00a1fa5593ec..5264e66279f772523ab82f9756621edd12043ccf 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }: +{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }: with callPackage ./util.nix {}; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 182e176cacba33f6bc7e326c294a0e69b5578186..5839b076c0de5a39a8c400d164be5eb3be795320 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf +{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec , libiconv, ijs , x11Support ? false, xlibsWrapper ? null diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 52b0abc48a7a5584defdd492e489c6f8ca194b1c..391ac107ab710203bef259754148a936b74a0795 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -6,7 +6,6 @@ # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null , libopus ? null -, darwin # Extra options , prefix ? "" diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 046416cd9df204e7356be601167a20d6a44ce066..df83502aa88a01b99a876cc20df3e219484a8c3c 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }: +{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }: with stdenv.lib; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index d0b7458bf572f6e2fef0cd54550a4a71f781aa8b..fb8de9b6a71f805d2109b7bedb0ce6441c67d172 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -59,7 +59,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] - , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? "" + , propagatedBuildInputs ? [], gcc ? stdenv.cc, extraCmds ? "" , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix index 435cf2e0c9a784933516098b22f7f61b146d3476..367e4e53442e1f4f0a9fa47513df9aa4eaf6d028 100644 --- a/pkgs/misc/phabricator/default.nix +++ b/pkgs/misc/phabricator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgs, ... }: +{ stdenv, pkgs }: stdenv.mkDerivation rec { version = "2014-07-16"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 82ce4c20df8e7af636b0adf7db727859c82a788d..5e658abff47d26c5170986b94a00c4a3c9146b2a 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText +{ stdenv, fetchurl, writeText , xproto, libX11, libXext, libXrandr # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 86a6b4883acf6897749cc2b2254b9d072d6787a6..06d42da79362897aee5fbc4db0cf44bc4432f9d9 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2a628e0cdf4961108466328e95c291a8d051e6b7..2bf5274eeb465e64dcfc9ddf4283f17ac21a41fc 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig , armTrustedFirmwareAllwinner -, hostPlatform, buildPackages +, buildPackages }: let diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0085e9280a922f344c2bfef8fba07bfdb9cdb10b..b52e6324199030f16cf1b64f17e6d320a8ec8260 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,9 +1,9 @@ # TODO check that no license information gets lost -{ config, lib, fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby +{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby , which, fetchgit, llvmPackages, rustPlatform -, xkb_switch, rustracerd, fzf, skim +, xkb_switch, fzf, skim , python3, boost, icu, ncurses -, ycmd, makeWrapper, rake +, ycmd, rake , pythonPackages, python3Packages , substituteAll , languagetool @@ -14,13 +14,13 @@ let _skim = skim; - inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin - buildVimPluginFrom2Nix vimHelpTags; + inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; # TL;DR -# Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"` +# * Add your plugin to ./vim-plugin-names +# * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names +# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"` # Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, # update ./vim-plugin-names to contain only plugins which need generation # Copy the generated expression(s) into this file from the ./result file. @@ -170,11 +170,11 @@ let }; julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "julia-vim-2018-05-07"; + name = "julia-vim-2018-07-01"; src = fetchgit { url = "https://github.com/JuliaEditorSupport/julia-vim"; - rev = "3b8e8f9b03c4ffa415fb715406231efbbd1dfdd6"; - sha256 = "1dnhawb73c89x58nl0iqhn1rvyw0wrhmvfkxdsh40rnpdbjkyrcn"; + rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2"; + sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06"; }; dependencies = []; @@ -192,11 +192,11 @@ let }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-04-24"; + name = "vim-nix-2018-07-01"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d"; - sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78"; + rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0"; + sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457"; }; dependencies = []; @@ -412,11 +412,11 @@ let }; tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2018-03-23"; + name = "tsuquyomi-2018-07-04"; src = fetchgit { url = "https://github.com/Quramy/tsuquyomi"; - rev = "94f10d312134fc59b53b2e821d3315320f694cf0"; - sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay"; + rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65"; + sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l"; }; dependencies = []; @@ -444,22 +444,22 @@ let }; riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-vim-2018-01-21"; + name = "riv-vim-2018-06-21"; src = fetchgit { url = "https://github.com/Rykka/riv.vim"; - rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; - sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; + rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; + sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-06-17"; + name = "deoplete-nvim-2018-07-19"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "62078d04aea43aceb7cbdcfc4b22cf8f7767f614"; - sha256 = "1gc6hl3yi7h2mzw2sf1phnaphwmalyfqd6lfzmzq0lzf111mq9r3"; + rev = "0f1921799644cd662cb0a3393ba71096e5e56115"; + sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2"; }; dependencies = []; @@ -488,22 +488,22 @@ let }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-06-01"; + name = "vim-gitgutter-2018-07-06"; src = fetchgit { url = "https://github.com/airblade/vim-gitgutter"; - rev = "a986ab054788776dca269d6c289b470255d54e8c"; - sha256 = "0c0rjclqz8l1w1q6dfa2sxc67ns9vvg6q7yy2l0s5p7159d423iy"; + rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca"; + sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2018-04-07"; + name = "Spacegray-vim-2018-06-20"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "255a6086aa5af07e38e441964623029a39fa17c1"; - sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj"; + rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81"; + sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; }; dependencies = []; @@ -608,17 +608,6 @@ let }; - dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-06-04"; - src = fetchgit { - url = "https://github.com/vmchale/dhall-vim"; - rev = "290c2ec86b5c3d35dd3913cbb6ab9d2139074e38"; - sha256 = "03jhcaz6r2lbd4drc8acc9kv2k0287nzvw7lyl36jjkk3qy4c499"; - }; - dependencies = []; - - }; - clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2018-04-15"; src = fetchgit { @@ -634,11 +623,11 @@ let }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-06-02"; + name = "neomake-2018-07-16"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "ed2d2069ef7d2e919fc73c993a2c99a05d12d79e"; - sha256 = "1sf1ad8qzya8vkj8kdkkd204hs0fn7wh3ar9wv4nq1ks7v2y2855"; + rev = "f26a31a315f60150fd42682df911306b4d795dd8"; + sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w"; }; dependencies = []; @@ -678,22 +667,22 @@ let }; denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2018-06-02"; + name = "denite-extra-2018-07-19"; src = fetchgit { url = "https://github.com/chemzqm/denite-extra"; - rev = "54c2df37a2fa53e3caed4ad7391f85ff6dc7f0b1"; - sha256 = "0rsgd302h3rml98a9ddkaglp157av6yhbfbmc5i781k5pz003vvg"; + rev = "10836562703ebfe6552204e63b9b4293236d6d0f"; + sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6"; }; dependencies = []; }; denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2018-06-05"; + name = "denite-git-2018-07-19"; src = fetchgit { url = "https://github.com/chemzqm/denite-git"; - rev = "dfc8c8977133b2e00efa2d5add7ff05c36b2c1a3"; - sha256 = "1p4y22wwxvhxbgavandlld2rp2204g7vr162y0vsc0dm9lygvvm6"; + rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; + sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; }; dependencies = []; @@ -722,22 +711,22 @@ let }; CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2017-03-15"; + name = "CheckAttach-2018-07-18"; src = fetchgit { url = "https://github.com/chrisbra/CheckAttach"; - rev = "b583efd45e03902438a55299623390a0f9253513"; - sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + rev = "0f1f2e78071d7f805a0a679955cb4486f692b753"; + sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc"; }; dependencies = []; }; csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-vim-2018-06-12"; + name = "csv-vim-2018-06-24"; src = fetchgit { url = "https://github.com/chrisbra/csv.vim"; - rev = "eddfe4d553d2d25ffcf294e225717ddf9ae4c357"; - sha256 = "1074x0gycwaivadsa6g7mfhdf9rvyirhsfipby2pcvjrkbzvmz7j"; + rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a"; + sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy"; }; dependencies = []; @@ -754,23 +743,34 @@ let }; + base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "base16-vim-2018-05-24"; + src = fetchgit { + url = "https://github.com/chriskempson/base16-vim"; + rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; + sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2018-03-05"; + name = "vim-sort-motion-2018-07-15"; src = fetchgit { url = "https://github.com/christoomey/vim-sort-motion"; - rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4"; - sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik"; + rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; + sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; }; dependencies = []; }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2018-05-17"; + name = "vim-tmux-navigator-2018-07-13"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "d030f75e2932605cfc1417ca2ebb3fd5192c2a8e"; - sha256 = "1qfkzlg7g4ri54fhxnwwvh2xsm0hcnfxav7chdw10z3g984nzb1a"; + rev = "18b775fbccde5ff02e516c014290650bb40e257d"; + sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; }; dependencies = []; @@ -788,11 +788,11 @@ let }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-06-11"; + name = "ctrlp-vim-2018-06-28"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "306bc60a1bed48cee895623d03c87d84d00764b6"; - sha256 = "1ylzg9wjc1m4jgi6p3wk9nbip16cfhhgcbavly394j9w4zn3zdwy"; + rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; + sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; }; dependencies = []; @@ -876,11 +876,11 @@ let }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-05-31"; + name = "vim-2018-07-07"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "23e76f31abae2d3e090fcc25fbfcd8d8c9edd3bd"; - sha256 = "0zj749kc65dgqhsan65wagqlq45hg68m7qs07h1r12csfrr3r8x7"; + rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33"; + sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm"; }; dependencies = []; @@ -964,11 +964,11 @@ let }; elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2018-06-16"; + name = "elm-vim-2018-06-18"; src = fetchgit { url = "https://github.com/elmcast/elm-vim"; - rev = "e7c2f9ce36e69608c2f289f75e22d068255eac1f"; - sha256 = "022xan3ss4rrfhdsz9dd5n6avk4nf6lxqqbgpx9v4lrnqy01dhd8"; + rev = "e51e2e43ad617c26205a84453481d3ac152c8fec"; + sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b"; }; dependencies = []; @@ -1041,11 +1041,11 @@ let }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-06-16"; + name = "vim-go-2018-07-18"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "155836d47052ea9c9bac81ba3e937f6f22c8e384"; - sha256 = "1d16xninxwmqd6vgcjxzlqqynygb2h40lfmvwgp2cm60g2994fa3"; + rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b"; + sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk"; }; dependencies = []; @@ -1206,11 +1206,11 @@ let }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-06-11"; + name = "vim-snippets-2018-07-19"; src = fetchgit { url = "https://github.com/honza/vim-snippets"; - rev = "62f46770378ab899f40c334de264ccd64dc2db57"; - sha256 = "1g55qhy81dh9x5rkzij3k7ain561gz1amyvg69cq44n6d7pz798h"; + rev = "1143432afdb3a97b606b081700eead5b4f499d4d"; + sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf"; }; dependencies = []; @@ -1250,22 +1250,22 @@ let }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2018-03-12"; + name = "calendar-vim-2018-07-04"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e"; - sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs"; + rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b"; + sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-05-19"; + name = "lightline-vim-2018-07-05"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "555f202e33987863aaa31bf4df75ef989c3c49a7"; - sha256 = "0997k1wzlclwf4y70mv5zncv6vp9xdwgp5q7nickw6j9qf86gb84"; + rev = "0532dff598abca9975d3f80128eaadadbf1d91d4"; + sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc"; }; dependencies = []; @@ -1315,12 +1315,23 @@ let }; + tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tender-vim-2017-03-14"; + src = fetchgit { + url = "https://github.com/jacoborus/tender.vim"; + rev = "6b0497a59233b3e67fb528a498069eb1d24743f9"; + sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn"; + }; + dependencies = []; + + }; + vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-05-30"; + name = "vim-test-git-2018-07-10"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "062c489781c995f7e81103fec8a3c07bd2ff1f4b"; - sha256 = "0q4rnaqf5c979h10pacxxn7h3zv4zs9lf7f3z90avnlarh1sjvvx"; + rev = "e24477e81e91fe90c5d914849848027cb09a7c86"; + sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b"; }; dependencies = []; @@ -1437,11 +1448,11 @@ let }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-05-28"; + name = "fzf-vim-2018-07-11"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "ce82e10630830bc37a50f706cc3b7216d24e5009"; - sha256 = "081r1a4zqcr46rb4d39m8yj2dq1kiadh7n2iv7gxaqqldhx0p8pb"; + rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109"; + sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj"; }; dependencies = []; @@ -1568,6 +1579,17 @@ let }; + swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "swift-vim-2018-04-20"; + src = fetchgit { + url = "https://github.com/keith/swift.vim"; + rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996"; + sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3"; + }; + dependencies = []; + + }; + rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rainbow_parentheses-vim-2013-03-04"; src = fetchgit { @@ -1579,12 +1601,23 @@ let }; + fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fastfold-2018-06-02"; + src = fetchgit { + url = "https://github.com/konfekt/fastfold"; + rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; + sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; + }; + dependencies = []; + + }; + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2018-04-04"; + name = "vim-signature-2018-07-06"; src = fetchgit { url = "https://github.com/kshenoy/vim-signature"; - rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8"; - sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72"; + rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; + sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; }; dependencies = []; @@ -1623,6 +1656,17 @@ let }; + vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ledger-2017-12-12"; + src = fetchgit { + url = "https://github.com/ledger/vim-ledger"; + rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; + sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; + }; + dependencies = []; + + }; + vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jinja-2016-11-16"; src = fetchgit { @@ -1635,11 +1679,11 @@ let }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-06-17"; + name = "vimtex-2018-07-13"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "13474370fa0cc5e547abd6f40a9b6fddf2712ae4"; - sha256 = "1rwj8i5k8xaa466ld1p5nxsvfk3g20g42l2xqa60s6jmjicn7km5"; + rev = "e3dabe0a369dac556508ac5d1132979d654bc753"; + sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2"; }; dependencies = []; @@ -1679,11 +1723,11 @@ let }; rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2018-06-14"; + name = "rainbow-2018-06-19"; src = fetchgit { url = "https://github.com/luochen1990/rainbow"; - rev = "e7d115792f2a6bf6248d3f84a9025ae5e759868e"; - sha256 = "0zd7dcbrn7djx3nqnf8kkz8wzxcjla2b3bzqg2j7v9bjb3x3vdfl"; + rev = "549724c2123c5a06834676963be0d76d5c37abc1"; + sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf"; }; dependencies = []; @@ -1771,11 +1815,11 @@ let }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2017-10-26"; + name = "undotree-2018-07-02"; src = fetchgit { url = "https://github.com/mbbill/undotree"; - rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; - sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; + rev = "a80159c9f5c238575b63984b8bc610bc5de6b233"; + sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl"; }; dependencies = []; @@ -1826,22 +1870,22 @@ let }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-05-03"; + name = "vim-signify-2018-07-08"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "a1551dbae3b76035360b2ea2b38555194505d925"; - sha256 = "0wcfdcvbpl6hknsmzmpj86kbw1mfbfc55fza6kwad0lsw9ff5cix"; + rev = "9303070b022c4a642a8d35361e3680622c525144"; + sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-06-14"; + name = "vim-startify-2018-07-03"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "0b300f411f466f14f6832b3c97b7fb109f7b1ee3"; - sha256 = "0qjd2bnag4rr29yjkrxrzpkvfkb0912g2virj5rr26bbf8ya6s5q"; + rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde"; + sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s"; }; dependencies = []; @@ -1939,11 +1983,11 @@ let }; vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easygit-2018-05-15"; + name = "vim-easygit-2018-07-08"; src = fetchgit { url = "https://github.com/neoclide/vim-easygit"; - rev = "ada670f87f269e431b72cd7d63727683c46f3b4b"; - sha256 = "0shj52jzkhq89kw9wg4p89f1aidn9c0h6ishq56pdzzmqnjgzkdr"; + rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; + sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; }; dependencies = []; @@ -2028,11 +2072,11 @@ let }; vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-06-12"; + name = "vim-javascript-2018-07-14"; src = fetchgit { url = "https://github.com/pangloss/vim-javascript"; - rev = "935125e2c481a65d344b11ddfdb2e5f903e24e72"; - sha256 = "1n4cij2in9i4f6mcj7wn9zn9i4xmxcrf6yn00bacx4f51l6qhhkr"; + rev = "39e332a3c36c0115e1eab85c34cf121b7585869d"; + sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw"; }; dependencies = []; @@ -2071,12 +2115,23 @@ let }; + awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "awesome-vim-colorschemes-2018-01-20"; + src = fetchgit { + url = "https://github.com/rafi/awesome-vim-colorschemes"; + rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d"; + sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z"; + }; + dependencies = []; + + }; + purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2018-03-31"; + name = "purescript-vim-2018-07-05"; src = fetchgit { url = "https://github.com/raichoo/purescript-vim"; - rev = "8528d2a4a84f428aefad5882212c34db5c852699"; - sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf"; + rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; + sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; }; dependencies = []; @@ -2105,22 +2160,22 @@ let }; committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2018-04-11"; + name = "committia-vim-git-2018-07-14"; src = fetchgit { url = "https://github.com/rhysd/committia.vim.git"; - rev = "02a317cb49689b2424232d607d218511f921f2e4"; - sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5"; + rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279"; + sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1"; }; dependencies = []; }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-05-19"; + name = "vim-grammarous-2018-06-22"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "058db30bbd88e23fceb2f6364d9b22803d7c4c0d"; - sha256 = "1l2vhfsb0lhr5j77r8lgqnqgs9h9kdhw9bla1lj27xi0njbl4kql"; + rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8"; + sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -2180,44 +2235,44 @@ let }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2018-01-15"; + name = "rust-vim-2018-07-17"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6"; - sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq"; + rev = "2fa74427456a68e9e90f542567f851df50d48a8c"; + sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46"; }; dependencies = []; }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-05-19"; + name = "vim-devicons-2018-06-21"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "8ee4c8cdef4f6ea0f27b341ac077c303d0e57a90"; - sha256 = "1mfkg9miqg42qmzamlkhjc3mlqcri69d1pj6cs4kz3bdl7326ww6"; + rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; + sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-06-01"; + name = "neoformat-2018-07-16"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "ebe9ed941aea254e5fc6c3e2a0219054ff873e4b"; - sha256 = "0la3nvyi8kmp8pq6pkbhjc35wg6g28f903y7bz4igsajl37nijm1"; + rev = "f20e73193f2260d4437d160759d6b623a74a5a35"; + sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp"; }; dependencies = []; }; nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdcommenter-2018-03-03"; + name = "nerdcommenter-2018-06-21"; src = fetchgit { url = "https://github.com/scrooloose/nerdcommenter"; - rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; - sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78"; + sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx"; }; dependencies = []; @@ -2235,11 +2290,11 @@ let }; syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "syntastic-2018-06-15"; + name = "syntastic-2018-07-16"; src = fetchgit { url = "https://github.com/scrooloose/syntastic"; - rev = "9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a"; - sha256 = "1765ish9vdm7abm7c45z4h4v1xdhfis7igm5yc3m5h7im33gl7j2"; + rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9"; + sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q"; }; dependencies = []; @@ -2257,11 +2312,11 @@ let }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-06-05"; + name = "vim-polyglot-2018-07-08"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "33f610feb73ce782cf41a7d9a377541991c692b5"; - sha256 = "0sqsarrvy8flxlp0nj5782gzqvk3v6c7r6234pbpjwqga967h0fd"; + rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; + sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p"; }; dependencies = []; @@ -2279,11 +2334,11 @@ let }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-06-11"; + name = "denite-nvim-2018-07-19"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "ef3ffe7ffff25b0260be1e336dcd55014a6787a7"; - sha256 = "1zvin44fb9b11dciv1i14pwr3wc6yigsr4xmcg3gzaibr4mpng6b"; + rev = "0cab5543d755be4a6c9d331672b07235f8473f1f"; + sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0"; }; dependencies = []; @@ -2367,11 +2422,11 @@ let }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2018-06-17"; + name = "neosnippet-vim-2018-07-19"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "978ef36165e83ba1f8ee0a2047b6c923f7842d33"; - sha256 = "083jfdwadjdv2pwbxmwz8m384m023zvzdszjnn6qkbgwimx5ga7m"; + rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb"; + sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4"; }; dependencies = []; @@ -2440,12 +2495,23 @@ let }; + last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "last256-2017-06-11"; + src = fetchgit { + url = "https://github.com/sk1418/last256"; + rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; + sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; + }; + dependencies = []; + + }; + alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-04-23"; + name = "alchemist-vim-2018-06-25"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "d15033ce1b94aa1e6ba11c1bf1249d9680b24a45"; - sha256 = "0b0r236ah56zax7s095wq18j6bvfp267a3nfrndnszihwh7h2v1j"; + rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648"; + sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma"; }; dependencies = []; @@ -2485,11 +2551,11 @@ let }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-04-17"; + name = "vim-multiple-cursors-2018-07-16"; src = fetchgit { url = "https://github.com/terryma/vim-multiple-cursors"; - rev = "b781b1461bd4b346958309e1733a9d6ad1a66b6c"; - sha256 = "0hadbp2yj0kzcwj5rp18diq3b24xgxn46n7c29dgrjg91w4vagfd"; + rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d"; + sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw"; }; dependencies = []; @@ -2529,11 +2595,11 @@ let }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-05-07"; + name = "vim-quickrun-2018-06-19"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "4b493faaeb5322f11cadab52e39a53164baf9db7"; - sha256 = "0081m3v8dg4ihxsd0rzhmrra3i6vrnpz0svgjmm689rk55dkrv5i"; + rev = "825f9f195521646f7001f10cad8627c48017311f"; + sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa"; }; dependencies = []; @@ -2595,44 +2661,44 @@ let }; vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-commentary-2018-05-30"; + name = "vim-commentary-2018-07-11"; src = fetchgit { url = "https://github.com/tpope/vim-commentary"; - rev = "7f2127b1dfc57811112785985b46ff2289d72334"; - sha256 = "0ck221cj0zwn19p0vlzv0vl26rjlsnfpllslrqjh5g57m5cxb8aq"; + rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a"; + sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6"; }; dependencies = []; }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-06-02"; + name = "vim-dispatch-2018-07-18"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "47729b7831421f20fa40a7d5b3e9b928faf18e75"; - sha256 = "0wmvfqzw785c9bda0p4vlsavm0d59dmmnhs87jvqfijzyi2prj1l"; + rev = "43760f9d8469d59fd629a97e19dce4491192cca6"; + sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-05-28"; + name = "vim-eunuch-2018-07-13"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "e57666aa8d3a87b42c5ec429490bbf4a54f4c31d"; - sha256 = "01sz7mhckhnwlp48rkl34cz4nkjwrkdc1rq4mbknd3yscg1w259d"; + rev = "e5f4f955d53e07192fb330ff272604c1b8290532"; + sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za"; }; dependencies = []; }; vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-06-15"; + name = "vim-fugitive-2018-07-18"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "d39d5ca4299569a5d1a37a511d1a5eccef71b037"; - sha256 = "1657x01ihw96hnbnflyzxc88qpyj2lm6dnl84xs1ckzw3iqsw6ki"; + rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056"; + sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz"; }; dependencies = []; @@ -2650,33 +2716,33 @@ let }; vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-repeat-2018-01-30"; + name = "vim-repeat-2018-07-02"; src = fetchgit { url = "https://github.com/tpope/vim-repeat"; - rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357"; - sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc"; + rev = "43d2678fa59d068c815d8298331c195e850ff5a7"; + sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0"; }; dependencies = []; }; vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2017-06-28"; + name = "vim-rhubarb-2018-07-19"; src = fetchgit { url = "https://github.com/tpope/vim-rhubarb"; - rev = "6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a"; - sha256 = "1bmc5j9056bgdhyhvylbd93jkp1k9067mv3af6skzh0r77rx1a0g"; + rev = "186bf27e05ab8713193b1d1210cd3c79f392445a"; + sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv"; }; dependencies = []; }; vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sensible-2018-01-22"; + name = "vim-sensible-2018-07-16"; src = fetchgit { url = "https://github.com/tpope/vim-sensible"; - rev = "2d60332fa5b2b1ea346864245569df426052865a"; - sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; + rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; + sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; }; dependencies = []; @@ -2716,11 +2782,11 @@ let }; vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-vinegar-2018-06-06"; + name = "vim-vinegar-2018-06-20"; src = fetchgit { url = "https://github.com/tpope/vim-vinegar"; - rev = "bc2d57e2f57551171370b4458c6198041b11750c"; - sha256 = "0f0pasz9r9qqdnlcc6zj94kh4dnslydb7zfdjhdj2salqm3hnpd7"; + rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63"; + sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8"; }; dependencies = []; @@ -2782,11 +2848,11 @@ let }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-06-10"; + name = "youcompleteme-2018-06-20"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "e49f817bfe7a7400efcc0b6527188ff6395f996f"; - sha256 = "19cnixx08aqirb9yw2k3glklmyna075x1d9szzpg8ml557v9qgnn"; + rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b"; + sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f"; }; dependencies = []; buildPhase = '' @@ -2808,11 +2874,11 @@ let }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-06-13"; + name = "vim-airline-2018-07-13"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "45c9621157b5bc851804bfed57b8a504d55757b0"; - sha256 = "0g4g5fa0qy6hagic590sksa8z6xlmigdan64bya06jr9m7fd8a1a"; + rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2"; + sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw"; }; dependencies = []; @@ -2863,11 +2929,11 @@ let }; vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-06-02"; + name = "vim-ruby-2018-07-08"; src = fetchgit { url = "https://github.com/vim-ruby/vim-ruby"; - rev = "1e4c6fdf4450a01208911c079538e1a2ed128ec6"; - sha256 = "0xnnk0sd3z8v5hvdxy7rljvzfvdl63dqvd3kiksw4kzj7j8gcbkg"; + rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf"; + sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs"; }; dependencies = []; @@ -3050,11 +3116,11 @@ let }; vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimoutliner-2018-04-09"; + name = "vimoutliner-2018-07-04"; src = fetchgit { url = "https://github.com/vimoutliner/vimoutliner"; - rev = "4f12628247940d98eedd594961695dc504261058"; - sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78"; + rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; + sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; }; dependencies = []; @@ -3071,23 +3137,34 @@ let }; + dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "dhall-vim-2018-07-15"; + src = fetchgit { + url = "https://github.com/vmchale/dhall-vim"; + rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae"; + sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw"; + }; + dependencies = []; + + }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-06-17"; + name = "ale-2018-07-17"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "24fe1953110455f7f3305db2a8e5abc2aa6821af"; - sha256 = "0m47h33w73k6p0p4i8rhqpnp8jn5siyjzwyhgv5nk3ydci5y1mmy"; + rev = "5453e0e1a43302226da1d1d753e162af0231f9d3"; + sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-05-25"; + name = "vim-wakatime-2018-07-14"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "3d88d49551c15f6abd9fecd2480ef75f0d8cbe40"; - sha256 = "1lm4j5c67q4al1ymqnr0zlbdgql0381rl65v78vyai8vzaj98m14"; + rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; + sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; }; dependencies = []; buildInputs = [ python ]; @@ -3175,14 +3252,14 @@ let }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2018-05-20"; + name = "deoplete-go-2018-07-03"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "977fb75b38b82528d179f1029d1852900332dedc"; - sha256 = "114ypdawgj5k2gx1ff48z7yzk14b7gc68s4ijnb1yww2qxa2g9wm"; + rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd"; + sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -3192,22 +3269,22 @@ let }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-05-13"; + name = "deoplete-jedi-2018-07-10"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "45f1ac2cf44e6a0c10298e07b4d308b84e94a80d"; - sha256 = "03590rabdycbwjp0h36crb0jsavw5mln77hl107mb737rq2dgmah"; + rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8"; + sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6"; }; dependencies = []; }; zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-06-10"; + name = "zig-vim-2018-07-18"; src = fetchgit { url = "https://github.com/zig-lang/zig.vim"; - rev = "e35f63823edcf1dd35fa3deb262e6eed0cac4f8c"; - sha256 = "0vr6hh4vnpi6gbr3d54xip2n6s4j5xaiiqvzpa4pl6vfnqixazq5"; + rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe"; + sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck"; }; dependencies = []; @@ -3263,6 +3340,7 @@ let Hoogle = vim-hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; + maktaba = vim-maktaba; mayansmoke = mayansmoke-git; multiple-cursors = vim-multiple-cursors; necoGhc = neco-ghc; # backwards compat, added 2014-10-18 diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0137c2e6b4712f6001e6509fa557fc188041a98d..9e7f70925a20aa858bf19759c3ae2b3bfe4f7b2f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -23,6 +23,7 @@ "github:chrisbra/CheckAttach" "github:chrisbra/csv.vim" "github:chrisgeo/sparkup" +"github:chriskempson/base16-vim" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" @@ -75,6 +76,7 @@ "github:itchyny/vim-cursorword" "github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" +"github:jacoborus/tender.vim" "github:janko-m/vim-test.git" "github:JazzCore/ctrlp-cmatcher" "github:jceb/vim-hier" @@ -101,11 +103,14 @@ "github:kana/vim-operator-user" "github:kana/vim-tabpagecd" "github:kchmck/vim-coffee-script" +"github:keith/swift.vim" "github:kien/rainbow_parentheses.vim" +"github:konfekt/fastfold" "github:kshenoy/vim-signature" "github:lambdalisue/vim-gista" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" +"github:ledger/vim-ledger" "github:lepture/vim-jinja" "github:lervag/vimtex" "github:lfilho/cosco.vim" @@ -166,6 +171,7 @@ "github:python-mode/python-mode" "github:Quramy/tsuquyomi" "github:racer-rust/vim-racer" +"github:rafi/awesome-vim-colorschemes" "github:raichoo/purescript-vim" "github:reedes/vim-pencil" "github:reedes/vim-wordy" @@ -203,6 +209,7 @@ "github:shougo/vimproc.vim" "github:SirVer/ultisnips" "github:sjl/gundo.vim" +"github:sk1418/last256" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" "github:takac/vim-hardtime" diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 6cec206b73a40094121c52ed3d624ca59987dcb4..5bc1dddeab8ee33144e4a2d374fe988ffe5a74fa 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 16ddb8fd40527cbfbe9163b2761ff0c7784fcfd3..219fe341d0b669dff95daeed16f287faec29821e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,8 +1,7 @@ -{ stdenv, lib, fetchurl, callPackage, vscode-utils }: +{ stdenv, callPackage, vscode-utils }: let - inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension - extensionFromVscodeMarketplace; + inherit (vscode-utils) buildVscodeMarketplaceExtension; in # # Unless there is a good reason not to, we attemp to use the same name as the diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 41db2c1fcea3256c646a8c84652764c09a2b8f49..c33359ccbfc88e47f7b0e788ffb4477cc9f833b4 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, vscode-utils +{ lib, vscode-utils , pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 4c095278f9185882f3a940ed8a88631f9853fc5d..d7ec669204cdd41a47adcb9e7bb9eba28b573594 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, vscode, unzip }: +{ stdenv, lib, fetchurl, vscode, unzip }: let extendedPkgVersion = lib.getVersion vscode; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 6cf7ee07b70bbb7652dcc068afc6efe7ebcf4b57..89ff68266a295428df656e118546b8bb8b2b7c91 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cctools, appleDerivation }: +{ cctools, appleDerivation }: appleDerivation { nativeBuildInputs = [ cctools ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix index 302a657992aaf7cc4233a8a466b63c8c00edd9a1..29aa3d64cb08b910f5f83dfc71e6c80a13ffdb41 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef }: +{ appleDerivation, ed, unifdef }: appleDerivation { nativeBuildInputs = [ ed unifdef ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index d73dc8f3ec24717be717c68ed8f70110cfefb0f3..542ea20de11ec765518c1eae8748b38337238934 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: +{ appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { nativeBuildInputs = [ ed unifdef ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index d3ffa1fa2834670befce67dcad4eb8b5ffaa181f..add51a61d3d3ca687739b4909f57640f99f5fd3a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index 1a01d03219187378a55042ff7637b61158e58200..df5f6b7b8fd6412955feadfa2a040b887ef02546 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix index de691a056f3ea33115108b8db10106bdee39fa95..2ee80d70264635781360ab2690c88c091cb96d80 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { 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 386480d629024a3b377558e351fbe88167b8c950..1e27ead69f1bd7cae27a6155038bef0128f38b21 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,6 +1,6 @@ -{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo, +{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile, - removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: + removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil }: appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index f09842630fdb2ff1a279ae76c2bbb072be29ef21..e04142b8b11e36346dc2d45dadb5a77499cfa303 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 35608587c56901264487a8290c42d662a5b6d044..318e2728fc2e2fafd948682b4a2d634dccff4b21 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin +{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index fda7cd85e4f7afb6e433871fcb1090d6a1de6ebf..7b1492799ddb6160b8134b840d758142049a573b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: +{ stdenv, appleDerivation, xcbuild, ncurses, libutil-new }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 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 596ca25d70a46880eca8a8e6b37358f3200937c0..5d9781f3aa4ad4b45b604ce6fdb179264a172928 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,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index baa3b11225d09b8695e0443c81416c1bfaf8f4e2..043c7b0bc70d34168d4c269a274d96649d405189 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: +{ stdenv, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index 37dffaa9b20e2564257e1340894e428d5522eb97..7e1dc5309b1d02b99e33eb56462d63461e7d740e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; 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 a572d46ceab56c27bafa9af38a7e64fb9f5fa179..4220c50d61cb1639312c44ab12cb4e2eef6b540e 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,4 +1,4 @@ -{ stdenv, fetchurl, appleDerivation, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index b947267ab14dc518e0a264f19040576319a3fe27..f27b5ae13022042e5ee80deb82d9da79be57744c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,5 +1,5 @@ { stdenv, appleDerivation, xcbuildHook -, lib, hostPlatform, Libc, xnu, libutil-new }: +, Libc, xnu, libutil-new }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 5fcd04266d5ab620859147e7909adcb235c26fcf..fd2c95563b48a346817543d3c33048c34b5cb125 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, cctools, zlib }: +{ appleDerivation, cctools, zlib }: appleDerivation { buildInputs = [ cctools zlib ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index 80d629dfa3e607f55372b0d789c0d106458f93d9..b24d94b9d70d8639fe8951f5d485d3ad36f9c56e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index 86bc6e598f7d3feed4dd3fb05ace5c813b39294c..eed7982e9d8cc21a8b525d8e1c8f4aabef41bb80 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { # No clue why the same file has two different names. Ask Apple! diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index 826dbed1dfe05b35eff44abe8b4f2835ff80769b..ac33a24a8b4e6e51d38fb1c5f8ec033d2ff8b519 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index a43c00f7691b3cdb75df85b626dd00796891f9c1..46e9e592ddc690b1b399784d6b72a8d135a8c022 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontConfigure = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index d325e38b272e772bb631c2d35adf170fa48e724a..3d62c3961221294ec4128801c5f7e305179d5b9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform +{ stdenv, appleDerivation, lib, targetPlatform , enableStatic ? targetPlatform.isiOS , enableShared ? !targetPlatform.isiOS }: diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 41b1bf74af9eebeae12f18c293cea3c816217ce5..4fd0ab8a7fb2269bd0a4c872e7ddfa516153a28b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index 5a2cd33d8a0347701c3580ed472669dc3344075f..f3c7558cfc626e49fffe460bace34b3fd081e38d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, Libinfo, configd, mDNSResponder }: +{ appleDerivation, Libinfo, configd, mDNSResponder }: appleDerivation { buildInputs = [ Libinfo configd mDNSResponder ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix index aa73c281cab25c01b5da0c0dbc7521af4e8c09aa..e5637d6db410b661d16d9f4cf596547c7223a271 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix @@ -1,4 +1,4 @@ -{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix index 053dea134c725e45bc7f7193711f06c73c28d3c4..cf9fe411533f64236dccd39c8b24904d1255efca 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_codesigning, libsecurity_utilities, perl }: +{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, perl }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix index 07a3186caeec9546614559d26839b6561cdd07a3..609d07fda1009ddc729a4686cf00043dd3f09345 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix @@ -1,4 +1,4 @@ -{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: +{ CF, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index e811c4c11a82e5be22ff2241c963dd91bc0220d2..1ab950a9233c5bc688edc84711cbe7aa3661023a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -1,4 +1,4 @@ -{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }: +{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, sqlite, stdenv, osx_private_sdk }: appleDerivation { buildInputs = [ libauto diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 63674808d93b10cdb53f231122c1f8abda276bfa..f17ed785360d95625d0918d7f00f6482c1b0a996 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index cea5fc9a4e2cddb1b2ada5c3e7bbcb3320055de3..5c78182085b5ae19632b8ff7d449eeaadf01e2ab 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix index 17c24bebfda7d0581983da8ff816272932f5a3d0..5668c376130e7167639bee8a028a643449451b58 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 8baf62dba01bdddf66dd4fb40ca7141379917aab..2b45fbdb45e283b53a70b1bae24e418c32f05c39 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' 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 1bbda6ab7add90843d1ec825bd85da896a88ff06..39c903a2e7b99cd47111db4d07afcca33bfcb035 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,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuild, lib, hostPlatform +{ stdenv, appleDerivation, lib , Librpcsvc, apple_sdk, pam, CF, openbsm }: appleDerivation rec { diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 08df235ed8c2f9e4e427e5b635b685c242f39c4e..91abb3ca07a83a1474bacdb0306f0fdbc1fa1056 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 2c7da5be6e4c1c3367c9e4e669030a7fa42c2258..74c9f2543481e55b80b5c600d45e076e30e925d2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: +{ appleDerivation, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: appleDerivation { phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 21d64979d7eafb53fd145536896bc71ef063482b..bd10dde5572c7ee38b80d46f667f7b37488841c6 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,5 +1,4 @@ { stdenv, binutils-unwrapped, cctools -, hostPlatform, targetPlatform }: # Make sure both underlying packages claim to have prepended their binaries diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0c908197acb8c1d46739c44f5d22446ab58a9092..995e9af38cb8c0bec80ff1d12b69e4ae0a9e8017 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook -, libcxx, libcxxabi, libuuid +{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook +, libcxxabi, libuuid , libobjc ? null, maloader ? null , hostPlatform, targetPlatform , enableDumpNormalizedLibArgs ? false diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index c1e29843147c01ae06377adb0d354cada537dd63..6ed3b28eccc3cba669e5c21967a6d1d3db1133d9 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchzip, cmake, bison, flex}: +{stdenv, lib, fetchzip}: stdenv.mkDerivation rec { pname = "darling"; diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 4566d82835f7e6deff9e590f4cf7b028a11bc2ef..f161a7a88e175a20a611785de7ba65f22fb8c612 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -1,4 +1,4 @@ -{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, +{ Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix index fdc97304528df2f4584fd0cf5ea7101f5f80c374..dd652dc56273bab1a9731ce4e7be8678d8012542 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/default.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -1,4 +1,4 @@ -{callPackage, stdenv, darwin, xcbuild}: +{callPackage, darwin}: rec { corefoundation = callPackage ./corefoundation.nix {}; diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index d5ed21cd9e242f99030d3e40a63c114b76bdda8d..b848265736e63fc6d565b8482161c2baa47c08e7 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ lib, hostPlatform, targetPlatform +{ targetPlatform , clang-unwrapped , binutils-unwrapped , runCommand diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index df0ef80ff4d4518cabaa3b6ab718af5f6a6c7e06..97658c831eb091fdd9b28ab936ea811ef092190b 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, udev , libxcb, libxshmfence, epoxy, perl, zlib -, fetchFromGitHub, ncurses +, ncurses , libsOnly ? false, kernel ? null }: diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 859593e4b9aa5697c2e91dfa456a5a5565a67e5d..60ccad04eea4789e7093bfced0d0d5ab5ee01ed1 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs +{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 3104004b3d674588d56a805cc9b9c3a7aa4089ac..2796fed17dc618a3abe2428c991075126ea505c7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap }: diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 275600d42785a89a6adee0ebcb80fde575a52098..626e978f1f168e59749d462f8768161c177c0f91 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, kernel, perl, makeWrapper }: +{ stdenv, fetchurl, kernel, perl, makeWrapper }: # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9423e7a33f4eb0db855fa9210332a37646ddf268..9848882f3b867a66388445a4d986225424124b96 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel }: +{ stdenv, fetchurl, kernel }: let version = "6.30.223.271"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 06a2d4301596c6a68f998bdb67950636465c298b..bfd79cb42dc5660a4123c9c8f407e0116759162f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,9 +1,8 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchpatch +{ stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false , useMusl ? stdenv.hostPlatform.libc == "musl", musl , extraConfig ? "" -, buildPlatform, hostPlatform }: assert stdenv.hostPlatform.libc == "musl" -> useMusl; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 9b7f69d4ab89947c9df13df55702e174a0d8972f..a8ffb133a90592afce2ca3b2adc3434819709dee 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }: +{ stdenv, fetchurl, file, findutils, binutils, glibc, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index e4c45a9440ab5929501ffc54d9dcb0efa2299241..eb4e6a16e38a250b2a077bbe36f45d08c2bc4982 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake +{ stdenv, fetchFromGitHub, pkgconfig, cmake # dependencies , glib, libXinerama diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index d10b789f3e476c4f6ac314a91808a58f663b75f8..2b8efe7e7449a693e1f6821e41674978dff6f2ad 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }: +{ stdenv, buildPackages, kernel, pciutils, gettext }: stdenv.mkDerivation { name = "cpupower-${kernel.version}"; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index ad9b27f83fa9738e7172f1be9c1148cce3e39dcb..832167b6f26a2bad2d1d9eb8f77d796274f4b375 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc -, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig , python }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index d25692b6cdf697e31cdad70682d397b2f7dd35a6..45a7fe177f2bc0343da76a876b111886c6603ec5 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, kernel, onlyHeaders ? false }: +{ fetchurl, stdenv, kernel ? false }: stdenv.mkDerivation rec { pname = "cryptodev-linux-1.9"; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c57650e0806fb78451e07c1b965692191cb93631..794ebd126fa47b77500a3c1807b90cae5faf6e7b 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig , dbus, glib, linuxHeaders, systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 55be85d33f05bcf785a5bcd1c7314f9dad9df794..ad42590ad19c4d958ec0d5a3d4c437df1a79ee6b 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, utillinux, +{ stdenv, lib, unzip, utillinux, libusb1, evdi, systemd, makeWrapper, requireFile }: let diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index e3f382ababc386f5fde99bd1851e412402edc14e..180957ac2adff7dee70c6e8054bde55800f39924 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod }: +{ stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { version = "1.5.2"; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 6f6418edc3e561d2c647e337d270f88ff307034b..fb1a3e563884cf02ce3aa793b05d56867a86fd66 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python3, which }: +{ stdenv, fetchurl, python3, which }: stdenv.mkDerivation rec { name = "fatrace-${version}"; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 724498b960c03ef70e2f18d5718aaba2ce9fd931..47d56cbf7967fad9ba73bab00dcc2378c6d46e46 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, runCommand, git, cacert, gnupg }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index d813258f95a9e01e088c87b44d6d29de69adbaa1..7cc58c19c07d6acfbfadb7bbece5d6ba39911cc8 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -2,7 +2,6 @@ { stdenv, fetchFromGitHub, fetchpatch , fusePackages, utillinux, gettext -, autoconf, automake, libtool , meson, ninja, pkgconfig , autoreconfHook }: diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index cdbcca55d2ff243316f3f87ea3d7ef3addc65a37..594f966c2f4233c0e8a8975299e2f8d33185bf22 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, utillinux }: +{ callPackage, utillinux }: let mkFuse = args: callPackage (import ./common.nix args) { diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 581d0f841b964124be49cc18f9856656fc1edcb5..c8146c39cf5905ee7ab43f750a1825e664314bc4 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, gettext, pkgconfig -, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl +{ stdenv, fetchurl, intltool, pkgconfig +, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl , pulseaudioSupport ? true, libpulseaudio ? null }: assert pulseaudioSupport -> libpulseaudio != null; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 3f5ed788bb233532cc39529b6376b758e85a5cc3..4204105bb6058d68171d12c5fae4830e600caa47 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }: +{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { name = "iproute2-${version}"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index d0a8950a508736182fa199fde9b3ae8d1934f086..4caa0acb4b6a72709cd3ffd51c363eb05b5d6a84 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, sysfsutils, gnutls, openssl +, sysfsutils, openssl , libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 01cab57f71961edaae80e7d85f1879372bea60c8..677bb076b0c8eab8e740eebb32daa2dcaea3160e 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,5 +1,5 @@ { stdenvNoCC, lib, buildPackages -, buildPlatform, hostPlatform +, hostPlatform , fetchurl, perl }: diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 684955b9067defbedf7bdf5bfedc4e63668a04f9..25078b7d753cff3f615f66ad509924cc278dd1fc 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -47,7 +47,7 @@ , mkValueOverride ? null , ... -} @ args: +}: assert stdenv.isLinux; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index b1a2c0982f79fe0b12e32e84c6bc61337163e1e5..dc7c63574066cc80054622644a0dd6a08058ce94 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.141"; + version = "4.4.142"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08nbz4xg43v57h0x5zw69vnjkvddl9ppi0vwzwf6yxd3ism4p3ci"; + sha256 = "0zyxlqjnxrr1a1wlg3hzk8sx77ysmy66wb34kp77iv04xr9p9kai"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fe46b9eab40349123a806e91651abc82533e0fc4..b2171067307f01f47be6859a7c8db54bca1428da 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,7 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl -, ncurses ? null , libelf , utillinux -, writeTextFile, ubootTools +, writeTextFile }: let diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e0826aaa9d48f30c421d6df0ff990e4b156a0e38..1a365046f5f3512205142bcb5a1d484d8b72c31c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgs }: +{ fetchpatch }: rec { bridge_stp_helper = diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 201f170c258097013eca18749ac519c03a4fd4e8..6932afdf478dcd02aebb9a7c2e12f40ed5fde259 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnumake, file }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "keyutils-${version}"; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index ee58d8b9c057a073beaee39b771f88628f570691..266c94fd8c848878ec21aa937b0d2bf86494407c 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://packages.ubuntu.com/source/zesty/kmod; + homepage = https://packages.ubuntu.com/source/zesty/kmod; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 0f542b9e38244023f27ce641cd6a53cd37a5a45b..a24024112c959f4126fcbfe3eee8a137e8c10a54 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid , thin-provisioning-tools, enable_dmeventd ? false }: let diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 491f89f3cb44fafe3fa9b1432d68070e9c31e24a..3c158e228f370ca0630eddbe789c8c91ba899bf6 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x , docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index a825314683eaa167ee144c2bfffe0e734789db0b..77b0d915edb63097794b868e1eba4428965bf0fd 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, gnugrep, kmod }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { name = "mbpfan-${version}"; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 76a3405299105dec2c06354b34d5800fa424d114..bd4b3d9377f7586324d9ffffeafbbda24fbbdb82 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, firmwareLinuxNonfree, libarchive }: +{ stdenv, firmwareLinuxNonfree, libarchive }: stdenv.mkDerivation rec { name = "amd-ucode-${firmwareLinuxNonfree.version}"; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index f4e7ad1f23445945c6b344fc235035f98a363ac6..1b5925a55816aee787ff45d6ec64ae9c937b23dd 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mkinitcpio-nfs-utils-0.3"; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 6bcd2ea692d3b4c45a0769eb3957634aca93168f..d6936ccd650e584fec6cbe1db42e815f542ac442 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchurl -, buildPackages , linuxHeaders ? null , useBSDCompatHeaders ? true }: diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8eeaf502020dd1778aeb1cf73a6dd3a8f0662204..6fcb28a985c8931f5bd069ab1d315a7106709fdf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchpatch }: +{ lib, callPackage, fetchurl }: let generic = args: callPackage (import ./generic.nix args) { }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index b5435f23e71b4e49f37c98e6528fc417b03dc86b..0ededc08050d76d36f2fb8005f2a12a2e12c6653 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -12,7 +12,7 @@ , patches ? [] }: -{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch +{ stdenv, callPackage, pkgsi686Linux, fetchurl , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 21e6cb5d500b45018cdc607384319631eade4b87..474d3a69119c5b345cd02a0e8b49e4e6654fc042 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, m4 }: +{ stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { name = "nvidia-persistenced-${nvidia_x11.version}"; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 044479c5629597003de8a561c965c979d053149f..b40b6125bd91e296e0f25f97cea6ee4d9a18e822 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "1nl5hl5am8djwmrw1xxnd9ahp7kyzyj0yh1nxgmx43pn3d61n0vz"; + sha256 = "0pp00yzj9c398bzd7jrjhzr7q1pk7d069dnbzyq1qqssszgcj599"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index ac8a1c7de4a818303ce109cf8c624dcded3a6ee6..a2a272f1b3a588c27c1d6786df570dad5fdcfbac 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which -, procps, libcap_ng, openssl, python27, iproute , perl +, procps, libcap_ng, openssl, python27 , perl , kernel ? null }: with stdenv.lib; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 8ae731892768f66c260fc8be326c7b1be78a2a29..43f184f384ddd88bd19a396d4f201279d60b644d 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }: +{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }: assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 63d159e1884298f181baf6197edf1f8a6b1682f1..1a7a31d978af9969caa5a1ddcbb9b6f1a2517f0c 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux +{ stdenv, fetchurl, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 000d11af87d1c5beece28f8dda607c985a13aee0..be93ff6f2eb9087bdd0ad76694a9398db992212b 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,8 +1,7 @@ -{ stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip +{ stdenv, lib, makeWrapper, p7zip , gawk, utillinux, xorg, glib, dbus-glib, zlib , kernel ? null, libsOnly ? false , undmg, fetchurl -, libelf }: assert (!libsOnly) -> kernel != null; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 96306a9d5c6a3f425a77116e9da95a6a951aa8bd..879c427b04946532ff7ac95111e30b9f2389cf5a 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }: +{ stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 99b42fc7400757e7cf0365c2e4bbbad8bb69cf74..c54d45773428c4c363f2d867389e52d40e6687e4 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, kernel }: +{ stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "rtl8814au-${kernel.version}-${version}"; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index 07a9b06ae76df0c41bf849c8daa3ba051b743d53..64e38b41a5fadb867988da0a3f7e797e8d0c3ccf 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }: +{ lib, runCommand, substituteAll, coreutils }: let name = "service-wrapper-${version}"; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 4491bb7bf9367a008d47bef0bfba3843c6bd201a..42b5317d55620064fd8e437bad6e60d1719b6c0d 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, xdotool, unzip }: +{ stdenv, fetchurl, libX11, xproto, unzip }: stdenv.mkDerivation { name = "seturgent-2012-08-17"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index af3df245fe67cf565624ca0fc173675aa5c98a2d..880da81c42e0c752abf8ec9cab61fddeae419274 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -12,7 +12,7 @@ let , rev ? "spl-${version}" , broken ? false , patches ? [] - } @ args : stdenv.mkDerivation rec { + }: stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 99e4b09f46d8b2d024e88dfdf67f98b1c7770be6..0a55608af9682113722f95bd17e0a6c952f4f157 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl, +{ stdenv, fetchurl, pkgs, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, - libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper, - nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson + libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, + nss_wrapper, ncurses, Po4a, http-parser, jansson , withSudo ? false }: let diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 6223c967619d62f6f48d388b089d3f49aefad28e..cdb1910d9c0e08ff92d4359e23bc2547f38d93e8 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}: +{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 307ba9f43fa113039e3b3bb55e9b02a9397e3632..abb6efa29bfb5510dc9ce04998da93088ceeeda4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod -, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi +, xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders , iptables, gnu-efi -, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 +, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , ninja, meson, python3Packages, glibcLocales , patchelf , getent diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index 291666c0b4502e0e02d7e7ba3cf318b9de00ad72..fec70e8c485eb03ceec963f6aa651e20ca2963d9 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }: +{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: let media = fetchFromGitHub rec { diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index 9d919aaaa938a918ec85d9f869fe595f668e26b7..ac687de8c9ab5e3c772eebb9178b9c71bb1c0216 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , pkgconfig , txt2tags -, udev }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 4c3a92cd87e64fea3d7b3e3eb5196f47ea3f6f08..46b09dce43797933137d0852594340f965120677 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "trinity-${version}"; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 9f65d0a0316cb6d6564c3a2f2e26e2307ad98643..65c995558a4f323b88564b459f323c8e12022d8f 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -2,7 +2,7 @@ , gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted , gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43 -, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, udftools, ntfs3g +, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g }: let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 1e9101b68afefdcb61db7372020c04e826e87883..c4af0bec9a231a6fc0e74dc2427a9385eb100e56 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus-glib +{ stdenv, fetchurl, pkgconfig, dbus-glib , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 , useSystemd ? true, systemd, gobjectIntrospection }: diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9ec6c22d32a57993138dfef5d9cb6eac8903cb3e..35f32b0afdd86e96c7031937c932752aec1010fa 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow +{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow , ncurses ? null, perl ? null, pam, systemd, minimal ? false }: let diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index 72d7690d2f8a7d6632d38eee492859192a46b36d..9e2dee099cec85ef1ea92ff4386472a1a303fbf8 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, virtualbox, kernel, strace }: +{ stdenv, virtualbox, kernel }: stdenv.mkDerivation { name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 42982d49ce873a78579f2e87cc1d69d9d0364531..8f9a565ecc772c7d4b52e64b8e5ac9e2140a3f60 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, wireguard-tools }: +{ stdenv, kernel, wireguard-tools }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 7b421aaff3d7c043d57242194f35d01b93238034..add7c6488562ff9769fb9254469032a7fb3cbdca 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl +{ stdenv, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 06a38b291661df837a0bdd3b4be1a1949349dc04..f4ef1b1498f89ff7ba0cab940e945b95c317d16b 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: stdenv.mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index b5937dff375252fe811c1bebac2a1fadce07bf30..e0e211642af7f3b362275c4dd847b8afb4ccab4e 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender +, inputproto, libX11, libXext, libXi, libXrandr, libXrender , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6eac54ddf6510b7748aa3c01cd753ca7e3282e86..45edf8945c0e5ee37e1992ad684e501414384af9 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -24,7 +24,7 @@ let , rev ? "zfs-${version}" , isUnstable ? false , isLegacyCrypto ? false - , incompatibleKernelVersion ? null } @ args: + , incompatibleKernelVersion ? null }: if buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion then diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index ef42dadc2973a422770adf6cd65f4eb683badc85..7cd414a97b08621c3d103b70bab0b23e3a4d4ade 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }: +{ fetchurl, stdenv, hostPlatform, buildPlatform }: # This file is tweaked for cross-compilation only. assert hostPlatform != buildPlatform; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 4cc187846d0d04f1ee55e7ff79f9aa3a213498dd..22a9aef8edab1bd61738ad3f28f4460b76166e86 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand +{ stdenv, fetchurl , erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b1d60d8c14567814cd227d7bff4c49d76f682809..b2b681bcc8bd910495f5ca93187890dc88438bd5 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, +{ stdenv, lib, fetchurl, fetchsvn, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 548d01c249d2005f6964292710eca4284b3700b1..ee403ab49f0987f4536de58bb315111df481aae9 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "caddy-${version}"; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 90c87f8019d09a9eebcd24e2c780ee840ab52427..8335e40de98f53998e5bb3d5c24d17e8e3dc896d 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, zip, unzip, makeWrapper +{ stdenv, lib, fetchurl, zip, unzip , jzmq, jdk, python -, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: +, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: stdenv.mkDerivation rec { name = "apache-storm-" + version; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d2ad5d0bd8e830aba80f2f982d44cdc9beeff809..5cf192791000c1fff4657b02715d6823df1d0301 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }: +{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }: buildGoPackage rec { name = "consul-${version}"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index f83ef4cef38816d1897c2a556bf74af9cacc9502..0891b72cd1e9a3ec879d901fd12241df00a9c249 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchFromGitHub, openssl, libevent }: -let inherit (stdenv.lib) optional; in - stdenv.mkDerivation rec { name = "coturn-${version}"; version = "4.5.0.7"; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 13a78d61098b6688a46ba848a696a0eba9ae9068..8a1bb6313ad2d21d480a62afd3287ad1cec9ae32 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, python, wordnet, writeScript}: +{stdenv, python, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index ef99772a082dd66452fe4f200054a5c1eb82014c..2bdd758b980269a7e9db51d6b87192f2e2b9a14a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn +{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnutls liburcu libidn + gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl # without sphinx &al. for developer documentation diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bfa610b57d8ab79ac2ad411f0eac929ad1b45e03..1d7e5722ea786ce05d13d2d7d1f09a8db8da2bb5 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -2,13 +2,13 @@ , knot-dns, luajit, libuv, lmdb, gnutls, nettle , cmocka, systemd, dns-root-data, makeWrapper , extraFeatures ? false /* catch-all if defaults aren't enough */ -, hiredis, libmemcached, luajitPackages +, luajitPackages }: let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional optionals optionalString concatStringsSep; +inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 2c82b0bf33a8c69f464cdcbe34ad17cc4270c5f4..1ac1d3948942e57dec629c28c437acb2f124f153 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl , bind8Stats ? false , checking ? false , ipv6 ? true diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 29cb8c2223c06142339784924d29a2dd91d1fac0..d6b71f8160839dffb6e2a8413f06498af73baac5 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: +{ lib, libpcap, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index c1234606291daa261afb3c470a03289d90ce3f50..5e2381ada1d10ed2b9a5c7457ee97cec5575c633 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }: +{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: stdenv.mkDerivation rec { name = "exhibitor-${version}"; version = "1.5.6"; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 24ed1dffd4d8719a66f1a6a6715d59596789dc64..caf7d8360f076ddaaa2818432e7181d034c4405e 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool +{stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index ecefc1d8fabdc6e073656200ba823516724e9a85..461b90bc978c899c6e7233e4bdb4544646f4c91e 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -53,7 +53,9 @@ let patches = [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags (if lib.versionAtLeast version "5.2" - then ./ldflags.patch + then (if lib.versionAtLeast version "6.0" + then ./ldflags-6.0.patch + else ./ldflags-5.2.patch) else ./ldflags-5.1.patch) ] ++ # for 6.0+, we do NOT need to apply this version fix, since we can specify @@ -77,10 +79,20 @@ let --replace 'exit 1' '#exit 1' patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "6.0") '' + substituteInPlace ./Makefile \ + --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \ + --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; enableParallelBuilding = true; - makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; + + makeFlags = [ "all" "fdb_java" ] + # Don't compile FDBLibTLS if we don't need it in 6.0 or later; + # it gets statically linked in + ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] + # Needed environment overrides + ++ [ "KVRELEASE=1" ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' @@ -93,7 +105,9 @@ let mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb cp -v ./lib/libfdb_c.so $lib/lib + '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + '' + '' cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb @@ -131,15 +145,16 @@ in with builtins; { }; foundationdb52 = makeFdb rec { - version = "5.2.5"; + version = "5.2.6"; branch = "release-5.2"; - sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7"; + rev = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly + sha256 = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk"; }; foundationdb60 = makeFdb rec { - version = "6.0.0pre2227_${substring 0 8 rev}"; - branch = "master"; - rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523"; - sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll"; + version = "6.0.2pre2430_${substring 0 8 rev}"; + branch = "release-6.0"; + rev = "7938d247a5eaf886a176575de6592b76374df58c"; + sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; }; } diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags-5.2.patch similarity index 100% rename from pkgs/servers/foundationdb/ldflags.patch rename to pkgs/servers/foundationdb/ldflags-5.2.patch diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/ldflags-6.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..1fa17a9615aa9936543c309c7a38cf0b4920bd34 --- /dev/null +++ b/pkgs/servers/foundationdb/ldflags-6.0.patch @@ -0,0 +1,78 @@ +diff --git a/bindings/c/local.mk b/bindings/c/local.mk +index c861a29c..ff886e93 100644 +--- a/bindings/c/local.mk ++++ b/bindings/c/local.mk +@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c + CLEAN_TARGETS += fdb_c_tests_clean + + ifeq ($(PLATFORM),linux) +- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl +- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete ++ fdb_c_LIBS += lib/libstdc++.a ++ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl + fdb_c_tests_LIBS += -lpthread + endif + +diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk +index 2ef4fcb7..6e59625c 100644 +--- a/bindings/flow/tester/local.mk ++++ b/bindings/flow/tester/local.mk +@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: + @rm -rf bindings/flow/bin + + ifeq ($(PLATFORM),linux) +- fdb_flow_tester_LIBS += -ldl -lpthread -lrt +- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + else ifeq ($(PLATFORM),osx) + fdb_flow_tester_LDFLAGS += -lc++ + endif +diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk +index ca5dbab6..012f0130 100644 +--- a/fdbbackup/local.mk ++++ b/fdbbackup/local.mk +@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB + fdbbackup_STATIC_LIBS := $(TLS_LIBS) + + ifeq ($(PLATFORM),linux) +- fdbbackup_LIBS += -ldl -lpthread -lrt +- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 +diff --git a/fdbcli/local.mk b/fdbcli/local.mk +index fd738876..3af026b9 100644 +--- a/fdbcli/local.mk ++++ b/fdbcli/local.mk +@@ -22,14 +22,13 @@ + + fdbcli_CFLAGS := $(fdbclient_CFLAGS) + fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) +-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB) ++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB) + fdbcli_STATIC_LIBS := $(TLS_LIBS) + + fdbcli_GENERATED_SOURCES += versions.h + + ifeq ($(PLATFORM),linux) +- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc +- fdbcli_LIBS += -lpthread -lrt ++ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl + else ifeq ($(PLATFORM),osx) + fdbcli_LDFLAGS += -lc++ + endif +diff --git a/fdbserver/local.mk b/fdbserver/local.mk +index 690916d0..475abbaf 100644 +--- a/fdbserver/local.mk ++++ b/fdbserver/local.mk +@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB + fdbserver_STATIC_LIBS := $(TLS_LIBS) + + ifeq ($(PLATFORM),linux) +- fdbserver_LIBS += -ldl -lpthread -lrt +- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 89f1821981fcb97e171c0cbb1fd5b645300c991b..ebade244bdf7e4ce6fb135278ab397c868d8e9c2 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotty-${version}"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index fc9d4c0508edb5d8f165d2f6e89e3e1c12799768..c4be1f3c3b34a90c801c70db7bd5cb7a6cd399e0 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre, makeWrapper, unzip }: +{ stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { name = "h2-${version}"; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index dcd81fa44b0558e33a650570c62eabe8dcdbe319..6a33ac638d215f3d4e9ee04d8a0514d48f488171 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { name = "hbase-${version}"; version = "0.98.24"; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 493131795034e2054cdcbcef28f4f80840f795b1..d921eee49cfcc9adfe148d03957024c853d2fd2a 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: let python = python3.override { diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 43334819dc5643a0d07a0742da04222a28e6e66e..5a873c7e84b1c289087376fc67c1585576887bf1 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index dbc5c73414cd5297883e959323f46c36a74d2caf..fd2dec44c7f396518dc902488b904b5279242cf6 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jboss, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "jboss-mysql-jdbc"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 448695930039716f9ca7425c648a1b3328377337..643e7ed719a478c9410dc777e4e5d8fa1c4ebf59 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat +{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt , gd, geoip , withDebug ? false , withStream ? true , withMail ? false , modules ? [] -, hardening ? true , version, sha256, ... }: diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1f6fcc319435b9e4a54e00b241c37de6be215499..0910a6d0584495ef4aa241c804dfcd0e77da21f6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchurl, lib, pkgs }: +{ fetchFromGitHub, lib, pkgs }: { brotli = { diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 33801c8cd326402180233fcae6d4d8e8966e38f7..479c9e41aa91de20474fc6a7b1378ee2a6c48e41 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , lighttpd, iproute }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 1155bac75703507668cc4987a5af4f8f999f84d4..1fe48e84fac75581c7745901c5e7fe30ec3ed13d 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt, +{ stdenv, fetchurl, openssl, zlib, pcre, postgresql, libxml2, libxslt, gd, geoip, perl }: with stdenv.lib; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 098825d59ce83ba28326f355b93e4a8fb7444345..8fe34cd6183d894d3dc90714dadf6b6bfff55d4c 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -2,7 +2,7 @@ let - common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec { + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { name = "apache-tomcat-${version}"; version = "${versionMajor}.${versionMinor}"; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 0df055f9690f9fa223d8f4f4897e162781612f7d..f57c94cd108492eb3d4ffd53645d233aea8e13dc 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +{ sudo, coreutils, systemd, cryptsetup , mount, umount , buildGoPackage, fetchFromGitHub }: diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 5aafe55512beb2dbf13f36959c5a8c806dd65fcc..9e8a9dc9ec60047c05086cb8d1b2daebf28291f0 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python2, fetchurl, fetchFromGitHub }: +{ stdenv, python2, fetchFromGitHub }: let python = python2.override { packageOverrides = self: super: { diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 6826df5f6e86933e3c8e15d968bcd10ea1d5b75a..4276a51715a6cd3dd0c6a2ae4c77fba77d0c58e2 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap +{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 105223f31a5bb034728f672396ac6ddd8d9dfc89..2e17001abc50ed3e04b8df3d1cdb215520703e10 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; - homepage = http://livepeer.org; + homepage = https://livepeer.org; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e676246a08ec24b5cea3d704c99a4ec9988c42b6..5a9d8e61b1fee172f29b257a47c9fdad6086717e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer # Auth modules diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index f11400c190af90ea8b916cc72f4b031f815dcf28..98b270ad7d41317565a1f0d666349103fcf3943b 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 302aa8d55932fc87b22009dbb3a87da1cf5372e8..8c86cc6577a7a1a30c941a71e46f5ef705d1102a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }: +{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 305ee174bf3c7185994bfdfd1e66faba8407642d..0654da927769ab1ea5ca464b31d6f4c7ded59cc0 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.0.0"; + version = "5.1.0"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark"; + sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b"; + sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z"; }; installPhase = '' diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 53c87745e67ac8b1afdefee5af4a3d5074d4c3ae..fe1f1c6760d8a430f901d1e840961d715574a6e3 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos-dns-${version}"; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 98ac1534cf8a87d4480f7cf91cf0e95e3f9e5352..10c8811c548faf9072b2dbd021d3c84789fc3855 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch , pkgconfig, zlib, geoip }: buildGoPackage rec { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 0480d056c592a6e582e70c156972e427e5208680..0e256d907dc269ac2da30b21dc5a54c8377e74a0 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "cadvisor-${version}"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 646a7856788b0504f08b5b0860bf487802b493a7..a888549bb6aa99918fc3f229fa95ce816651f9ab 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-alerts-${version}"; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 34b4e87bf65c6dc8f2f0faa2d41f400e4e95ab49..96eaa5ef0cc428e98dc16dc8fbc0a420a6511c16 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 409801e8b7dc1e03912788480b4f26d4e7703398..0e21069bbb0ea6ece74a6fec5ed6b200c4227b3f 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "kapacitor-${version}"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 859849f7b2c71b4aeeae38c139c1dbe5ac76200d..af5f2880a0f89784ad5c7e84cd2019657bfe186c 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { name = "lcdproc-${version}"; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 957aee43691aac2a4c18e8e4d86a55ac3d35ec34..5d93f4c53496322a2e6a1237cab00f0f7d03116f 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper +{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper , perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }: let diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 798f31c3458e12665e3d7365ab59aee23a662026..1f342adebaa07edfb29f1a75802c52ad03c765ba 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "blackbox_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 2bd9b6af0748502c03c05a2a73fafb78a495e910..0d6fbac60e5d88c3cb0f4147109961818cfff087 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "collectd-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 2e7a4932de6250607d3beb4b2acbb9bee275f25d..1271b3d40e141d872c72190afefcabc6b81da77f 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "fritzbox-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index ea17c0b18b23dccdc085f4177be5023ff9e2a8c4..ffba472bdc335959993cd70b2533c86e551315dc 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { name = "prometheus-json-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 42ff2496df1209d334ee9d4989a7055783cb377e..ade9bb87d993399b26f007fc91c964f2e696d4d2 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 59314f1f282acc733637b2a80e1ff2bdcc4af7c5..8b6c54d41f91b56dd6662b1b9fb6ec8882c77547 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "minio-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 788fe8633967cc5826841b5e06f0d173e961a294..5e4ebb581400b9a559b279b8d8d1b9cfc83f03c5 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prom2json-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 9692354ad8a8b36c906bb7f53f032c13342f5bfe..29454dd44d2b4dfb56519b3dfa7d68c72e9eef81 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: +{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index f4d9f5a85037b9a6e0f7ac348a5c18d83c89f82c..e5480e020372171214a0561b61e9dd9b687b29b5 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "statsd_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 13e17d0b0192bbb129878c936b5ed4a11abe1d3e..0c5cc62676594893964d2a9c54ad818d27babca5 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "surfboard_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 44a670b95ab4cb6d07155b82aadf1f33eaac5711..18fa3f98db234ba610232993fb8d1acfbe23028e 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "unifi-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d83aa5b46658b5780ab176e252947c05861c63a3..b23270cd8c1e1c88ae6f85c64750ea94ee122f69 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: buildGoPackage rec { name = "prometheus_varnish_exporter-${version}"; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index d3816cf1ecdb28c838ae17e0d988aca20efb6dc7..9f1a2baeb9ac8873cb571faa7e80e15f22deaec6 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , enableJabber ? false, minmay ? null }: assert enableJabber -> minmay != null; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index bc5556d4bc00c04fe43360b4c098444616d2c54d..bf3849e6524b0ba93d3c2939ea9ffe21794ef530 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , net_snmp , libssh2, openldap , enableJabber ? false, minmay ? null , enableSnmp ? false diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 69b3577720f5cba3b5b6e5c81fd6a96c2255b238..047ce0a5130e955edc73d517406dc93edf1644c6 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }: +{ stdenv, fetchurl, pcre, libiconv }: let diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 35637e7f73aca12868dca46ad7b76fed3ad8273d..f8523e8607d3570c152d307871c36fb4f152b98b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0121d748129ba07a3a989c9bbe15d5861f0ad767..3d6a1aa9c6fa4269209b2cdd9552fb188e048b1e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name= "nextcloud-${version}"; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 9b21deecf4b300cdf40c72b8af89c30b90a5fb0d..f3d3fed23a4175c91d60b3469bfaefff23783395 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, openssl, zlib, python2Packages, readline, cmake, python }: +, openssl, zlib, readline, cmake, python }: let in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f97a3a5c1842dfcb7a5437789c79a3799b7ecf31..1d3240fae716d23a416b64ac45f4a5e34fabf3c1 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index b9e850e8dfd4df3833d207c001355384db10f1d0..c62ade1a20bbc3976c6adc1d06ae19b3d32b6622 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy -, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security +, zlib, libyamlcpp, sasl, openssl, libpcap, Security }: # Note: diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index e935b5d098797828605cb3f9c1b4d61d4e63f300..d6ee407e3418c5d228bb4157923c3203be319d5f 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, m4, python +{ stdenv, fetchurl, which, m4 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 9075756c16214a1d28666a54ef639c79069e9d0d..cf807e70596dcef92352e3f4bcebae707a7044f1 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index a064049072c964b2c3187319e507eb8e40eb6fde..1524ca207009cfdb051aee2dcad499c25a14f778 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index e4c9b90ab1455932bd2ae229121eeb305712c89d..b041aa9f35fc7f78fcf27ab37bacfeaa2f7aa8e3 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam }: let solrName = "solr-4.10.4-yz-2.tgz"; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index fa78c876c1ec319393534b183e33d0838d483cd7..d48587c924e78f086833184450fa66e6545c41f6 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "nsq-${version}"; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 3f92299c2a0a2a904eb0ac0c191a5a75ef228d80..22f09994ebf0d97fd82a056f0122b33bd65ed67b 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , ncurses # Extra ncurses utilities. Only needed for debugging. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 59c15839b39375cdc8fb8e2d532ad646bc91f16d..fc6b1bc2426b98ef8beae41928a5ab49fbf59601 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , libtool_2, removeReferencesTo , ncurses # Extra ncurses utilities. Only needed for debugging. diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index f02e67740b62fb7503fb45d4e5d979da5433b733..14a4a2868f0e60439bc232a24a33cf765d7ab59d 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: let - common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec { + common = { versiona, sha256 }: stdenv.mkDerivation (rec { name= "owncloud-${version}"; version= versiona; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ed4a8889c67dca47284e19f293f449da248aeb5c..73af65ef2561495b87a8d5a160ca707df317e2b9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -5,9 +5,6 @@ , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null -# Database selection -, tdb ? null, gdbm ? null - , x11Support ? false , useSystemd ? true diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 230e0aee2181df8d37983eac28fd42f668c1b4cf..04d520b412c142278fc3a9b9f68e4cb847538896 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, fetchurl, nodePackages }: +{ lib, fetchgit, nodePackages }: with lib; diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix index 6f5bb1d3a71fe21d8741b704da4bd865ddea1e32..87f4326c48c34ea3c1dccb8478c16890a7c1e7e0 100644 --- a/pkgs/servers/rippled/package.nix +++ b/pkgs/servers/rippled/package.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, fetchgit ? null, lib }: +{ self, fetchurl ? null }: { by-spec."abbrev"."1" = diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0ff7f88911f2695813ddc9b8463c69e570d0f100..eec80cb66bcc27162d311ea3ecad8bc609de53be 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , fetchpatch -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, docbook_xml_dtd_42, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, libgcrypt, libgpgerror +, gnutls , ncurses, libunwind, libibverbs, librdmacm, systemd , enableInfiniband ? false diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix index df1f9feb4de5b44a8e078d4e03f35ffed984d68c..21038a0f2183e096f327e1a0288ef74f77bf5da1 100644 --- a/pkgs/servers/samba/master.nix +++ b/pkgs/servers/samba/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ fetchFromGitHub , samba4 , nettle } : diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ade2ea94453456231165ae5d9399d7b38bd365eb..b93d8c2203d7cbe078f653d70387ba0ca70c52a2 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }: +{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: with pkgs.lib; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index ccb174371e0ce962d823405f765a0a8e534d068a..7bfea23c78b5af7f7540e3d3de682c79fa6a7f03 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 126a8cf0690e619b917cc7d3c884ce17de27ae2d..121e42f7a978cdd7def308c67264d973527baa6c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2 -, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl +, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons }: diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5d348c129437ea93495c9a82d3f97f91ff94f77d..a727b60dd9d4ebf0603e23e398731e91fe3ec0e8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -2,7 +2,7 @@ let - common = { version, sha256, psqlSchema } @ args: + common = { version, sha256, psqlSchema }: let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { name = "postgresql-${version}"; @@ -95,33 +95,33 @@ let in { postgresql93 = common { - version = "9.3.22"; + version = "9.3.23"; psqlSchema = "9.3"; - sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v"; + sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x"; }; postgresql94 = common { - version = "9.4.17"; + version = "9.4.18"; psqlSchema = "9.4"; - sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks"; + sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2"; }; postgresql95 = common { - version = "9.5.12"; + version = "9.5.13"; psqlSchema = "9.5"; - sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02"; + sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l"; }; postgresql96 = common { - version = "9.6.8"; + version = "9.6.9"; psqlSchema = "9.6"; - sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga"; + sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr"; }; postgresql100 = common { - version = "10.3"; + version = "10.4"; psqlSchema = "10.0"; - sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf"; + sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v"; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f45ee7500ed04cb9e46f5c075247c440c3bd3b5b..2438c49d9cb9b8c3e4b241216968ddade15b1f8a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -8,18 +8,6 @@ let malloc0ReturnsNullCrossFlag = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; - - gitRelease = { libName, version, rev, sha256 } : attrs : attrs // { - name = libName + "-" + version; - src = args.fetchgit { - url = git://anongit.freedesktop.org/xorg/lib/ + libName; - inherit rev sha256; - }; - buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; - preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh"; - }; - - compose = f: g: x: f (g x); in { bdftopcf = attrs: attrs // { diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 9c133f9d5d99278661fa604309361c58286be09f..3fc7aaea9c9352f1865b12581631e5066893b225 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel +{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" }: diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 72ce29bf3f2baa6626f82d6519609bde4d1fddf3..ab89dc28828b8d9567f39bd751fbedf6d87b3891 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -5,7 +5,6 @@ # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline70 ? null , withDocs ? false, texinfo ? null -, self }: with stdenv.lib; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 086fca480bb3eb49c589cb05aa8e8bf54d91f33f..dc7133e988facd5aaf92ccfd4993dbb21780006e 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,21 +1,22 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "elvish-${version}"; - version = "0.11"; + version = "0.12"; goPackagePath = "github.com/elves/elvish"; + excludedPackages = [ "website" ]; src = fetchFromGitHub { repo = "elvish"; owner = "elves"; rev = version; - sha256 = "1rzgy1ql381nwsdjgiwv4mdr1xwivnpmzgkdzms8ipn2lbwhff87"; + sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp"; }; meta = with stdenv.lib; { description = "A friendly and expressive Unix shell"; - homepage = https://github.com/elves/elvish; + homepage = https://elv.sh/; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index d6c107e995326782fa48900dcd58ba01b6b6a3f7..2ef0480942c4b77c08602aa40dc9d1a1d01a00bf 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, utillinux, - nettools, kbd, bc, which, gnused, gnugrep, + nettools, bc, which, gnused, gnugrep, groff, man-db, getent, libiconv, pcre2, gettext, ncurses, python3 diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index c118cea117290942dae2a6b926a71db57fb12466..2e200a74f7b489413cce0dc4c3a0538b9e724093 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "oh-${version}"; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index ab475a63499cb1215bd072614c0d25e240e9d0e4..8d3452b912bdfb029b78037536c56e7c068f09cd 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils }: +{ stdenv, lib, fetchurl }: let version = "0.3.0"; in diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a053884bb88547d24a508c85f25bd313e66d9a4d..93488d9e87f3368865a344316d16e74f9368e054 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, +{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, makeWrapper, less, openssl, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 665f403047f39c27e91c1a3a2b2bd09de899aba4..98ca9ce8f999b133c455dd5d463685a4f2d89f3b 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "antibody-${version}"; diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 2babf35f2b68d69c57c12216cb5e7f44f2a210e5..30c45ea3c9bff3b4100b37eda4015871332bbbc6 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zsh }: +{ stdenv, fetchFromGitHub }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 7bef904081e0608e8a7163fc891d95e33571cd1f..8acdd8bb5161059395addd431fc2070a1118425e 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchgit, fetchFromGitHub }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "zsh-prezto-2017-12-03"; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 78f7a82d2952eb4397ab20e8b431db6764a6f0aa..37795b11f6ddd45bd4ae321c704fb192c0eb3a95 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -5,7 +5,7 @@ assert crossSystem == null; let - inherit (localSystem) system platform; + inherit (localSystem) system; shell = if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 14fe769db6bed69b5d3005d4afab3c1af994feb0..0d764a4cbd108557c271673774f0bf8d7c64682e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,15 +18,14 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau -, nvidia_x11, virtualgl, libglvnd, primusLib +, libX11, xorgserver, kmod, xf86videonouveau +, nvidia_x11, virtualgl, libglvnd , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null , libglvnd_i686 ? null -, primusLib_i686 ? null , useDisplayDevice ? false , extraNvidiaDeviceOptions ? "" , extraNouveauDeviceOptions ? "" @@ -36,11 +35,6 @@ let version = "3.2.1"; - primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; - primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; - - primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686); - nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd ++ lib.optionals (nvidia_x11_i686 != null) diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index aeb4546ff4d3b73ff3f258766fb219c25c8af052..189dc56975f3f873accb08d33de5a9527b4c6f47 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, xorg, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-sct-${version}"; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index d130c9bac7cc9d3e4d87f4fb6b3773b958ed01b6..669cb4b4844ac4244fc840dd0ede558f1e2e9348 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -6,7 +6,6 @@ { stdenv , stdenv_i686 , lib -, bumblebee , primusLib , writeScriptBin , primusLib_i686 ? null diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 669da86621fd3458b60540426478222cd24cd211..45cb1966a4ff502fb9814d3108d64aa9f3fc8728 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libX11, imlib2 +{ stdenv, fetchFromGitHub, libX11, imlib2 , enableXinerama ? true, libXinerama ? null }: diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 21d7a50566db346d827517bd95f2041f534b3959..153ff45d2a7029d59eed78200cb394b9ee4de1e0 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }: +{ stdenv, fetchurl, pkgconfig, libvdpau }: stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index e3d9ecd5953e78a4df2c46ed5dafe29d11a5a1f6..987293878d82ad9416360b1f20f492e4e5b82aea 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, gtk, pkgconfig, procps, makeWrapper, ... }: +{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: stdenv.mkDerivation rec { name = "xbindkeys-config-${version}"; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 28839891aa5521bc2cb0e9da30929ef15acb309f..d8ae32c6ee4c75886ea2730e9574d07387a72f4c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto -, w3m, which, gnugrep, gnused, coreutils, xset +, w3m, gnugrep, gnused, coreutils, xset , mimiSupport ? false, gawk ? null }: assert mimiSupport -> gawk != null; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 8bff5a2e714aed1fc4291dfa79e97014d14d2bde..55ab34228261b0c2aa0d014a3cdf18e5649d68af 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf +, makeWrapper, xorgserver, getopt, xauth, utillinux, which , ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudio, gobjectIntrospection @@ -9,7 +9,7 @@ with lib; let - inherit (python2Packages) python cython buildPythonApplication; + inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; version = "2.3.2"; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index a0c2ee8f995f02c8b3bc261429b8e40fdf9d0695..16693b08e1104241ec7bf3596e7f9a115930b9ac 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf +, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama, pam }: diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 363214129b284274aa93a7678219c1af6e281545..d18fe4eafd344ca1295ad24b68f11ec91e48db5e 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,21 +1,8 @@ -{ stdenv, fetchurl, fetchFromGitHub, python2 +{ stdenv, fetchurl, python2 , windowsSupport ? false }: let - oldJinja = python2.override { - packageOverrides = self: super: { - jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { - version = "2.8.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; - }; - doCheck = false; - }); - }; - }; - generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec { pname = "ansible"; inherit version; diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 38b70d1b5d074b8971d546e487b9f76db4669379..c9c879becaa055213cf04d06acbd311fa13bf1c4 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: +{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; version = "0.6.2"; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 59a5ec8d4dad95bfc88eaf0fef00e22c1ce2061b..cd6cf90a5aa59fb863f72de92876fb6369c9ea50 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gobjectIntrospection -, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, gnutls, cairo, libtool, glib, pkgconfig , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32 +, libgcrypt, gtk3, vala_0_32 , libogg, libgpgerror, pythonPackages }: let diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 2b663cd3bceeb656812e471633930bdc7fb4f2f5..780eb4e9aa52f223668b35be100720d357f2f58d 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 759230c6a29323542449ed275c3c63d3a9428009..2a02873a8b5c427f2704fd5aa32c35a4bf6fa915 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index a4ac74e9f2da53eb0b7c45ad04d4f26d78fc9ff2..fef0e50cd5b1582ea2942f9ee7f165379dcdb7a9 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , openssl, zeromq, czmq, pkgconfig, cmake, zlib }: with rustPlatform; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index dfe4c099bebbdf4f761b5091e7824bf8558beda5..2fbfff287cb9c31999ecbde8cb41ed53ec12d7af 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables }: diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index 590f6ea55ca7f584c7e87a77b895411f4eb87bec..25b8bdb65856a786244bb29a6701e57acad6cf88 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ruby, git, bundlerApp }: +{ lib, ruby, bundlerApp }: bundlerApp rec { pname = "oxidized"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 47bf848578d9a8cb3c6ec248297898ce5eb6a015..ca0e16c1185a624ca918bb5c73e113c295c40be7 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }: +{ stdenv, pythonPackages, bash }: pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index 8d30307af2d3c7d7b586f164661c888dfd930c50..f8e893078157c472895342d51ca091972dd73df8 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , fetchFromGitHub , makeWrapper , openssl diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 14b128d15c7a3dba064a764ad59cd1843da77470..dc9796cc9e3a7b3c788fcb7f2672c95950e73473 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python +{ stdenv, fetchurl, cmake, makeWrapper, python , boost, lzma , withGog ? false, unar ? null }: diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index c9ce6ac4d10b865356c564179dcd0c10d0fe7d8e..8d4d5fd8dddd4ea1d9a913f245ab71a9cb07aab4 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, substituteAll }: +{ stdenv, rpm, cpio, substituteAll }: stdenv.mkDerivation rec { name = "rpmextract"; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 7583663ebf0ab94aa9eb41abd2be69ed18c9a104..79c8e2f20ecce223aa0c318aa379d32a87c50ea4 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: +{ stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }: stdenv.mkDerivation rec { name = "unp-${version}"; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 3004c7e2132cdbeb9c6e94121490af88ef12c98c..0d60e7962460572658f2838ed09a257b4fa92c6c 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index b8f39a03083ca68c2fced15305e3a0e3abf76519..d2a7358ff8fd6bf989a208e2f318b0e89440a62c 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp"; + sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 691568673df391c271a32ce3b8d2460a12c3ef0e..e93b02e062e291f5fb6c00dc3288fbe8e2065a57 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex +{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index eac589813f4738fc8b458649bcde2fe132b8b83e..ce65ef4eb80b39491ae42a8c67219ddf7c97ee11 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }: +{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }: buildPythonApplication rec { pname = "ddar"; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index c902802abce2d28c9b08e14fccc6ae726c57c79d..8781c2d2cada4abfb6ee8568d472f98beada4d3e 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,5 +1,4 @@ {stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang -, automake, autoconf, libtool, gettext }: stdenv.mkDerivation { name = "partimage-0.6.9"; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 77f5951d39e244dc9ef2a867d64b1820319562ce..6abd7002f8d740007a95bfbf1da041b948d2913d 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }: +{ fetchurl, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { name = "rsnapshot-1.4.2"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 00651806a10ab63f40bf4a2ef065f4eb78c14b28..8f93474f8f169eab7021b178e9398be59e7bd807 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, eggDerivation, fetchegg }: let - eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; + eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { pname = "ugarit-manifest-maker"; version = "0.1"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix index 0af5dd5bfff193154a85dc68c95ff0cec1bd6dd0..889d698188e29fb8ddc49f4f5b6357b58eccb004 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ eggDerivation, fetchegg }: rec { blob-utils = eggDerivation { name = "blob-utils-1.0.3"; diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index 56da9a8102087ba5a1db727ed724dfc657e3a3db..e8f0ea22df10b2d4bf9937287dfdc8aa25628dd5 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, eggDerivation, fetchegg }: let - eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; + eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { pname = "ugarit"; version = "2.0"; diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix index 9329618887fbb1d439c3741caadbe2d303b1465c..fe958cb55cc614a71c9d978a4e8599688b4b57d4 100644 --- a/pkgs/tools/backup/ugarit/eggs.nix +++ b/pkgs/tools/backup/ugarit/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, eggDerivation, fetchegg }: +{ eggDerivation, fetchegg }: rec { aes = eggDerivation { name = "aes-1.5"; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index f78c300afd0a7cff56cc7f430341cf8caad86791..bc57215c0c4b963ab826b4ca630b06ddcead335b 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 394f3fe5b9808d3089a2515e770d19c5aa51e28f..da562fde1603822974a33ea128bb3379981122f8 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 +{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 80add316094cb5370a4a79c57caf222b50a5c0af..674bb5b552b94bb2b32f33cabf3ca8d51ee78e4d 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gnu-efi }: +{ stdenv, fetchurl, gnu-efi }: let archids = { diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 8223ba2be4bb0fea45f02cb8053250129d476904..9587416a96af0409531faaf5afacafbd7018d1e6 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs , vcdimager, wrapGAppsHook, hicolor-icon-theme }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3a06a39dcad7dd8e6e7eb7c66bf4c58edb714f8e..0d2e63c7d59deb7d254b206ccf1b0e3f2389249f 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , linkStatic ? (stdenv.system == "i686-cygwin") }: diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index c39216f1e0ccd14b3bed82ef08fb804ac73c2a32..09065ede68277aa15d3f08d82ad86e2282651c0f 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, xz }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-${version}"; diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix index a38e0a67b28297792d26793f36028c5a716c049d..df7700d41cb8758b89d7718809131bec48c1d19f 100644 --- a/pkgs/tools/compression/lzbench/default.nix +++ b/pkgs/tools/compression/lzbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glibc }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "lzbench-20170208"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 213d98a1ec12ff84f778f4ea390851f53b0f24a4..ea363ae8cc2ae25120daa50f5407fb77a26172ad 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }: +{ stdenv, fetchurl, ucl, zlib, perl }: stdenv.mkDerivation rec { name = "upx-${version}"; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c2e13b75daa982d0c87f6e109d3a525317a977ea..1fafe7412d87bfd086cf1d441a39cdd12141d5e1 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium +{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium , keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 672b289b5bbda9a7d311cc391026077d8517913d..14fedd6610e144228c4fdbd8fec9f6bd4197d935 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -9,7 +9,7 @@ # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null +, curl ? null, fuse ? null , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null , libs3 ? null @@ -25,7 +25,7 @@ , zfs ? null # Version specific arguments -, version, src, patches ? [], buildInputs ? [] +, version, src ? [], buildInputs ? [] , ... }: @@ -44,8 +44,6 @@ let optExpat = shouldUsePkg expat; optCurl = shouldUsePkg curl; optFuse = shouldUsePkg fuse; - optLibibverbs = shouldUsePkg libibverbs; - optLibrdmacm = shouldUsePkg librdmacm; optLibedit = shouldUsePkg libedit; optLibatomic_ops = shouldUsePkg libatomic_ops; optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; @@ -62,9 +60,6 @@ let optLibxfs = shouldUsePkg libxfs; optZfs = shouldUsePkg zfs; - hasMon = true; - hasMds = true; - hasOsd = true; hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; @@ -97,7 +92,7 @@ let ps.prettytable ps.webob ps.cherrypy - ]); + ]); in stdenv.mkDerivation { @@ -106,7 +101,7 @@ stdenv.mkDerivation { inherit src; patches = [ - # ./ceph-patch-cmake-path.patch + # ./ceph-patch-cmake-path.patch ./0001-kv-RocksDBStore-API-break-additional.patch ] ++ optionals stdenv.isLinux [ ./0002-fix-absolute-include-path.patch diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index f929f354766c87d17d7dfcef0ab067fbb3c8123c..9af14b051261779a4a07b11daae1a006310e1567 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, parted, substituteAll, utillinux }: +{ stdenv, fetchurl, parted, utillinux }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 494fd7036e29076acd77bf6838aa4c2d602dd501..beb046cdbdb785e10993d9e6fe60ad65ba1f8b69 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, - liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages, + liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc }: diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 028aef6024b105a8f47dedea784b7b563762a1ea..0438b9c38e4b8c97cea8785500f147073bcaed4a 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-mtpfs-${version}"; diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index f4bb5592abdb8b614a029d829aa523b2ad2e7198..4f7c2248a8edb40a970f2f3701fb2353915b6dc1 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: stdenv.mkDerivation rec { version = "0.5.0"; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index c2066f95ef5ab24cf0bda8934f509454d5b5b998..24a88349bf43558dee51066a9fe6890f226d0ee8 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: with stdenv; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 217056117ea7304752e05238872a785637962852..758e130e4adf41190052bd619df9d75e90d310b0 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true -# No longer needed, but kept for backwards-compatibility with older NixOps. -, udevSoMajor ? null # Propagated dependencies , pkgs, urlgrabber }: diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 341b025b079152d0830b802f43530aa45fa04677..b3d8d70f0e2911884fc486eeb47f3bb328797526 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, automake, autoreconfHook, libtool, fuse, - pkgconfig, pcre, lz4, xz, zlib, lzo, zstd }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, + pkgconfig, lz4, xz, zlib, lzo, zstd }: with stdenv.lib; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index e9325e9b18d58dd2e8ccc662788b3849478f7d1d..6d95d5ee12b52d8601589f15771a67d9f8352849 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -2,9 +2,7 @@ , docutils }: -let - inherit (stdenv.lib) optional; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "3.4.0"; name = "sshfs-fuse-${version}"; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 2a85adb60b568267e061da02c46c781ac1a8de18..4c0c2343dd2a1eb240eaaf49f5330861fffe1767 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,5 +1,5 @@ { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python -, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }: +, lib, valgrind, makeWrapper, fetchFromGitHub }: stdenv.mkDerivation rec { src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 9dfb2deeaee32ea55534091526e04b9488dc6937..66e6690bc6a7f9d32645256b34feaa78b35b89ad 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }: +{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: stdenv.mkDerivation rec { name = "zkfuse-${version}"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 7a06d9f346b842af663686dc2db9bba0a64498a8..a3b259703517284c805eec483a51274dfd5cb113 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText -, libXdmcp, libXau, lib, openssl, zlib }: +, libXdmcp, libXau, lib, openssl }: let version = "2.0.0"; in diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 0a48e947a48ea4394ae0680544165bf31c719c1d..cc899ab104f90ce38c57154eca68ae1bd04c6e10 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, patchelf, imagemagick }: +{ stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation rec { name = "cuneiform-${version}"; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6c62e0528386ce6687c299608ee02ab19ca2fbef..c267695dd784e4e916f2b8c513a47c09e68b8c06 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +{ stdenv, fetchurl, cmake, ninja, pkgconfig , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng , withGimpPlugin ? true, gimp ? null}: diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0a4ebf495b248bfbaf586829634a23e44783f82d..d50adaa387facb6a2357b1d57db53308549d04cb 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -2,7 +2,6 @@ , cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua -, emacs ? null , libX11 ? null , libXt ? null , libXpm ? null diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 2fa4bb90a8ea7e83db3338f83394c33fe8b18948..68ff84c7495ae4f59f06fdf9a0caf497aa48ce92 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -7,7 +7,7 @@ assert stdenv.isDarwin -> ApplicationServices != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 0bb0bb00efa5fdc987a6bc82d8aca72b51c44754..393c18d385299f4f85ffc5ab4114f21f40c093ac 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { name = "jbig2enc-0.28"; diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index 95f7c547b5596c766fab79ba81b54eb3e4102f75..a83bc845eb9eb9f8f6200d39e33735cb6b23cab2 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }: +{ lib, python3Packages, imagemagick, feh }: python3Packages.buildPythonApplication rec { pname = "pywal"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index da63cb58a55fdeb9eb6473db2c8a6485ce463061..18699f412847bf9c50d646b8325b5565be94c407 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, - python27, libpng, matio ? null, cfitsio ? null, libwebp ? null + python27, libpng ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index a0de144d907e2cfa3f507104379b2dd37b2ccb09..7321128a6b5aa685fc027ad4acb5e3701d317529 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "yafaray-core-${version}"; - version = "v3.3.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; - rev = "${version}"; + rev = "v${version}"; sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 170ac4c6a26fc2d6f80b338d97123fbdc95e57c7..d74c7608bc90ef23f8b036cb03ed87a30f395b18 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, + python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, fcitx, gettext }: let japanese_usage_dictionary = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 50ab7d85c5ac0f609a8b98d5680eec9c2c0880ed..166fd16811abe34bbab2b854e713483d56d71529 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules +{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules , fetchpatch }: diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index c7d0eecb763c9e1a94c640eca4548de148ce53dc..ab8a7bdb34de523ff2a2feb629d29749caa99676 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,7 +2,7 @@ , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules -, xkeyboard_config, pcre, libuuid, curl, cacert +, xkeyboard_config, pcre, libuuid , withPinyin ? true , fetchFromGitHub }: diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 1dfe6b24506106a08774f38b8fa9b9caa02a1743..28a08e39b225d79cd119a89fdfe6ec7f1f683f22 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }: +{ symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }: symlinkJoin { name = "fcitx-with-plugins-${fcitx.version}"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index f70c7d02e9f06b0afa8a07916c780814a8355a43..cb2076cd21c7aa4a8597c0a4edefcab249d094a9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, librsvg, python3 +, gtk3, ibus, libhangul, python3 }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index fd924cdd2a2b1550ce3c6b8b6cde3cb8321e84bb..01b092ef2a613ee49b615cca2d69ba05a6a860e9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf -, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: +, ibus, gtk2, zinnia, qt5, libxcb }: let japanese_usage_dictionary = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d3507b57cbd020eeba0176b1bf691a49a34632c6..540779477e35cf2ed0c7be1f029214a1fa79e9aa 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig -, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 +, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 33c66fb7ff201975278f3597149240ef52dd1380..a6aed47d964cee955e2bbb24a4e1f89f7e623311 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, +{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, libevdev, udev }: let diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index ff146e6092322df4ff4b81837c1b2a513a662126..1044c0acc0a8ac282c282d095fa0fee32ec275fc 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.3"; diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index fcdd9a81d7204cc86e59100a9326f3a28c2c07c8..5ead0e1020cbf0e6e3241c256121d5ae501693a6 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "azure-vhd-utils-${version}"; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 41a50eecd84b646016adf0418bb528a380c1be91..d0434ebe28b43b246388113c5e143fbb1794f9b3 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "bibutils-${version}"; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index c5ebe7cf32eec53c6f661b795ed35a5299ef3224..026c626ff77ec3ca9876158dbf7096737ecfc166 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: +{ stdenv, fetchurl, python, perl, textual-window-manager }: stdenv.mkDerivation rec { version = "5.125"; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 4461834cb74de38a646e9703dc42643e821e2be7..a5d71a9487cc6a4fcf22e2966fd6b7b0d929ecc0 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40 -, libgudev, sane-backends, udev, gnome3, makeWrapper }: +, libgudev, sane-backends, gnome3, makeWrapper }: stdenv.mkDerivation rec { name = "colord-1.4.2"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 673e5c4c321f8854bec35fa81c1d35f927e64c32..a8a878b1998d8f687ea40dd40609188194b129cc 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "dashing-unstable-${version}"; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 054822e60699c8e7a10a27fc4374acf7ca700b7c..b3a654be04e4a68f8ab7f7a5416ab1689b2f02ca 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: +{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e22bce7c69893ac496d0df12aab2a0e0b99c176d..508fc77a9a03b7b08424b9d560bc79b58ed346fe 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}: +{ stdenv, fetchFromGitHub, buildGoPackage, bash}: buildGoPackage rec { name = "direnv-${version}"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index f34d05758cf42d6bf64954627dc353394b163af3..aa23b51f4b894f15a6c56d2b0a70b73734b77546 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "dust-${version}"; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index c1678f3907fbd14028be3f66d0b903062a2580e4..9d3b796c87969a4064edd982bd6908eceaa7d18a 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "esptool-ck-${version}"; - version = "0.4.11"; + version = "0.4.13"; src = fetchFromGitHub { owner = "igrr"; repo = "esptool-ck"; - rev = "0.4.11"; - sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f"; + rev = "0.4.13"; + sha256 = "1cb81b30a71r7i0gmkh2qagfx9lhq0myq5i37fk881bq6g7i5n2k"; }; makeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index f79720289bf5db080ca2a8d59076d900f10f65b5..66b7ef4c291958208c5d5292e21b8040b327c094 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -3,8 +3,6 @@ , buildPlatform, hostPlatform }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "findutils-4.6.0"; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 8219d110f2ef38fd885affba1d6b2425a84a32fe..c9ee511ff8309c127a586bc9d7de6f880705b6f6 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, curl }: +{ lib, bundlerEnv, ruby }: bundlerEnv { inherit ruby; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 0f6fb38ef3bc4e629885c6b7b466bd084bcf70d5..04717974a8b37c4b14850cabc5e91c860a1bb080 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib +{ stdenv, fetchFromGitHub, lib , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withSpiro ? false, libspiro diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 77ec5bcb86bbf3aea3b8ca72d975bb88380de86e..be86f6496f00df169b164a23d8da60f3f48100cc 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41"; + sha256 = "16v5s9xwdsii7pcphrb0a7aib2zprrw6n4fyc8w8c11gbkg27r4d"; }; doCheck = true; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index ba85c5376db1f194ad35c9c7717482573be892a7..e8e2152f7110fcaa25aee76cb04932655b22ce1a 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: buildGoPackage rec { name = "fzf-${version}"; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 84d3239729f5ba88ac3c0061cde75ade94e0e375..990282b2d584a452acc82148c378939800596770 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}: +{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}: assert licenseFile != null; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 7c944ceaab3f271295438c80ca2290b9e75415a7..c187b09624ad2927113bc4fc2b317df2b48e9871 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: with builtins; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 24841a2bac792cf0ec737ec98dfa80eab0a5b2bb..a5871d2bc33e65a80d461820a5b8af66eb836958 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: let goPackagePath = "github.com/github/gh-ost"; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 1c1fb05050f18aa4e05811da3ed70350643a878c..d7c10220f4b7c7c7753d7b131d1f2a9e3ad0ec86 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gosu-${version}"; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 21a624c9d256881b9167312ae4e3b1d0d99249ea..3f476cfea9418441fa87ce68b0b07ed487974514 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, graylog }: +{ pkgs, stdenv, fetchurl, unzip, graylog }: with pkgs.lib; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 58c9f18ec5aa54e4a3593f6d7a08c8df43efee8e..63511782f00b673f1fbb1168499e5f2b0aece48b 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, flex, bison, python , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index 14c8ca234331de168b20d7c1ae5fee21fb37146c..17b48ad8741a68af596a62629961df5e3806dad7 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, gcc , removeReferencesTo , cpp ? false , gfortran ? null diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 494616d2b48557d6653ec2d258af6b916f87797d..31813c0b880a92bb4631ed78f36af6447a98d32d 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, gcc , removeReferencesTo , cpp ? false , gfortran ? null diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 03af224b4c0513a42dcd93b67c63ef7ee8db7b29..82801da322c6b8e142dc54db00b242c80054e1a3 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ant, javac, hdf_java }: +{ stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { name = "hdfview-${version}"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 52e7793d9744c3ccf868fe1e95047797282b3eef..7035f2ecedff1c3ad7547c6c3f15adab6fe7dd66 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "i3cat-${version}"; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index decc4afde0b97d2e4a94a7e2e434a9f2233bcd25..141fc968a2d4e0bdc5c6614d72d8a40ee1cdac70 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "ical2org-${version}"; - version="v.1.1.5"; + version="1.1.5"; goPackagePath = "github.com/rjhorniii/ical2org"; src = fetchFromGitHub { owner = "rjhorniii"; repo = "ical2org"; - rev = "${version}"; + rev = "v.${version}"; sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm"; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 7f44dab71f4f3af3f7c59200d48d25f79fa63454..6ec9729438c8b8a4800d6d3c40fbe77e0b757af8 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -28,6 +28,10 @@ buildGoPackage rec { runHook postBuild ''; + postInstall = '' + install -D --mode=444 lf.1 $out/share/man/man1/lf.1 + ''; + meta = with stdenv.lib; { description = "A terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 8d55b2cdc00ee70509fd7d8a0224ee2d8806d18f..eb3b6aa11e6ab5b1391c557366d7966f9c2e3cb4 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index e49614834ae3aea1e200423655a342563864bd03..d0395ecbd7f0ba64e8d2251758ae940720405439 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index c17c99980a88d7e0df49a20ea7a3098a0a9e8646..cb9e2cbf1e8421a2c44e84305db65f0596c63bce 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, zeromq }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index fbfcfc1007407510c616fbb32ec3fcd467f6872d..2c13927dfad8d293429e392e052f145dff3fbf4c 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index f8910f83ec5726c458865641ef5ae8a5b484e36d..18177c0a7e30538ad8af5be4f6f4c162320ded26 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , boost, secp256k1 }: let diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 085e6f41a0915a16c6fe0090731acc8ab15b456f..e2ff4868c9eac8e83c058091d51a2e7e9bce7f90 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "massren-${version}"; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index c6f9f4749b347954c9e1719e7ff8fa024bb22382..1d3a355dd95008c6a9a136d719325963cadaeb9f 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mmake-${version}"; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 7657b072aa89c7762a51957082e09a3cfc8292c1..26fcea669c223c8c2b7ed8135e4031825c33e004 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "2.17.4"; + version = "2.17.7"; name = "mrtg-${version}"; src = fetchurl { url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; - sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; + sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; }; buildInputs = [ diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 7dbfc90fa12574202a4897079685cc1c70ea7cf1..a076a405ce78741c00ac4b9658f1897b39ffb3fc 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "neofetch-${version}"; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 267b458cccc67a7f1c9f72567177da4f68b506f2..be96dd9d3d354a231be94601308886194d460efb 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }: +{stdenv, fetchurl, glib, gettext, readline, pkgconfig }: stdenv.mkDerivation rec { name = "pal-0.4.3"; diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 260d96a981f304894c04bdca36d34e5378bbbbe4..52e704eb52e14c159b7e4ed03a28bfc5b57b76c3 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive +{ lib, fetchFromGitHub, bashInteractive , python3, vim }: diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 38cab5cf8623b6a02fead65ccb0154548e3fdb7b..69b60ae0997edfdb13b10d535387f51991781d96 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchFromGitHub, fetchurl, lib, + mkDerivation, fetchFromGitHub, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework }: diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index f39ee734d81de3b1937f1981d41e97b70d5f6ab6..c320f8ef5f6aefba51d9780881d52ec8e34f04a0 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging }: let diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 670f7067765496d066655a28c1447d7c77bfbec7..c1b99b315677fd595a01fc33524d930a6754a72d 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rsync, glibc, gawk }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "5.53"; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index c6fdf0a5120e05656854743ab6361902c360eccc..a43335626acf759fe5b732052ba60f4bc073eb49 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ stdenv, fetchurl, qtbase, qttools, qmake }: let inherit (stdenv.lib) getDev; in diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index db68fab75ab1ce042fc8cee9f1ac28f0f904ec03..11ac0fc14199dc0c55d9155268b344cb3686c551 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rcm-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; - sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f"; + sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck"; }; patches = [ ./fix-rcmlib-path.patch ]; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index f1712a43c3be870386d838a073b431942268b46b..a1fa7dee08367408747b60f30334c1b72d9b8d40 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, emacs, curl, check, bc }: +{ fetchurl, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { name = "recutils-1.7"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 668a3fd5c9963dd4e747484b52820d4d81724cb0..082eb6879c41029e9bb267c9e58fb77e277ce21f 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, skalibs, gcc }: +{ stdenv, fetchurl, skalibs }: with stdenv.lib; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f0abb38706b02f20099c2675b1df0ebe3e1951b6..9ba61221684a752406eb162d5dbb15b695325237 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip -, rtmpdump, substituteAll }: +, rtmpdump }: let inherit (pythonPackages) python nose pycrypto requests mock; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 9d12fa254d4733b4df2d74d258548c61f99bc446..a58eb3156384770325dacdb42e7c3718b4044129 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook -, makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl +, docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify , gobjectIntrospection, libsecret , cups-filters , pythonPackages -, withGUI ? true }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index b9c93c6395493b5b35c9d938ccf23e0a3452ed44..0ad683bd652c37aa3e944d5fa67b7abf5f3756f4 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "t-3.1.0"; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 1f50eef0ed0004511bcb3dfeab5287cb9bc5b777..be6a5070d6117af083ef5a51be656bb03320027c 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildRubyGem, makeWrapper, ruby }: +{ lib, buildRubyGem, ruby }: # Cannot use bundleEnv because bundleEnv create stub with # BUNDLE_FROZEN='1' environment variable set, which broke everything diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 3932e06192ed6ddbfdd35a128cc74c663ccc979a..dd0fb4de702e36ef5ac92699c794136621d27723 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, python }: with python.pkgs; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 10e481b7664b1db71a13b7f4c7c499289cdd65ce..2729f6f885947d70c8b4ce1363b2d7f7e645202d 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libcaca, figlet }: +{ stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { name = "toilet-${version}"; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 113c7e127d4f98c65257e0e46fb094d814127451..7ae871afc783a7d8528fc64fdd7be625c82f6135 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, coreutils -, python3, python3Packages, substituteAll }: +, python3Packages, substituteAll }: python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index ff8e7873839bb3c28b27dfd074fb4d1ee57d5643..7751e03df1935480f524688e46441656faf6d026 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 25687a3dbe1e1780f7fe7a370eb8f8964c39a46f..48edb601a43f00480a4a5025c5de32f8867d99ab 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison +{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline , python3 , svfSupport ? false diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 2b801bb74a4200ef874a7b673787132ceb4824e5..b1704c3b46c615968bfcd2d23163ca25208f8abe 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub }: with rustPlatform; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 80a728747fefb757ad5aaf13161aa8fe6638a4a6..e03f84355cad244008319ce644b6fd3557e03d0e 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,6 +1,6 @@ { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool -, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su +, libuuid, libxfs, lvm2, openssl, perl, procps, quota , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 80135f4ab4474b9421fa266ad800d2f439e39537..c4cfc00308e91bf880853d271c166733e162ed03 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt +{ stdenv, fetchurl, makeWrapper, xorgserver, getopt , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 90489e126fa55964898887b3145c23af83e72494..be6bacd3b2142fbaf5b650da788d552a1814f6a2 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, targetPlatform, fetchurl, buildPythonPackage +{ lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index 528f9aecb54fa20787dce54538efdd46207e01b4..acc0bac04ff6e01438e904d7f7ca01ec54b5c977 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python27Packages +{ stdenv, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 492b72a176edba5d2041b271bfe9fe186f1abae0..589e6717c7dc6df6ab322b94e874e7021f929b37 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "zsh-autoenv-${version}"; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 93535e935dc8e907fff7f3126e63a8dc02dde5d0..6f6009c107bac53df3c9e39eb4fab2f084ce469c 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, python, utillinux +{ stdenv, fetchFromGitHub , pkgs, makeWrapper, buildEnv , nodejs }: diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index e5c2aace400607aa85ebd103155365ae841374a3..8b9d1e3b704c8a9ff1000c2d2d657ddd01e43d70 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, - pkgconfig, procps, which, wget, lsof, net_snmp, bash, perl }: + pkgconfig, procps, which, wget, lsof, net_snmp, perl }: stdenv.mkDerivation rec { pname = "argus"; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 7af7a8f551d1230e088bce73a59bd49d255a4e07..7904ffb0d04e4620c41e3b44d4064025c4862d05 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { name = "assh-${version}"; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 1d9e2e1677fddaa4df5c42ece4dea380e62e1a49..e20d62d1f077da0f4f64a1d49331a07ed11737b0 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, libX11 }: +{ stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { name = "cmst-${version}"; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index f6e0608ca7f8c85348573ec9b7d736de68fa6a38..e960f8c3a84854ffa65b20c6c1bbf3ebca1f9155 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk, +{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, wpa_supplicant, readline6, pptp, ppp }: diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 1038882573bcd4c9124d2e7761e8188fe12a0232..ff4a24fb781075f491d5f30c874db200664dc8b1 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages -, sysstat, unzip, makeWrapper }: +, unzip, makeWrapper }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index 91232b4ffa74c693ba27b3e6edf5bd33fdcea80e..af4b03ab700bfe464fa8945c4d797607a0582565 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump; + homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index be14db79880f83a4816fde9ba3e976d919d0a38d..9adb95d1d3fbd2aa37575ffc64cc6bf0c2149227 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, nettle -, libidn, libnetfilter_conntrack, fetchpatch }: +, libidn, libnetfilter_conntrack }: with stdenv.lib; let diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 732051d8ec78b3a436053af79bb26a604ac170dc..e440d35e82106f0408651ff02fbd0e8177ac2593 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c7d7b5ec6dfd2a8cd41c2f5114399516237888a0..12f68af7d0a6ea79b708f276864a10acea8ab6b1 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null , aesniSupport ? false diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 9d588f6fa5e11783a2eff7567006784ce9c4f8bb..2bd76188a638fa2961a5a3c4b19bf7dfcf385ab0 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index f28c75774db56dfb9c71398729ea10329990c878..c66218c48986c5bccb53d1864e29509dcc223b4b 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, getopt, ip2location-c, openssl, perl -, geoip ? null, geolite-legacy ? null -, ip2location-database ? null }: +, geoip ? null, geolite-legacy ? null }: stdenv.mkDerivation rec { name = "ipv6calc-${version}"; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 425e531419e4649b3be06f4aecff88d5eb6c291b..a7648fd59c35232b9a393d21e1af3f1b26b57e72 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc +{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc , bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 85c285fd3ece104f8221b1419632301b7e3ed05a..62c9e7b63d16f5b8b401e683a3aab7fae3af7c1d 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,7 +2,7 @@ , systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt +, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt , python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }: let diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix index 82810e714d52b4ee96a9dbcadef3e3da363232a5..93827eebb571897ae96c6cb4e2abe35955af94a9 100644 --- a/pkgs/tools/networking/network-manager/dmenu.nix +++ b/pkgs/tools/networking/network-manager/dmenu.nix @@ -1,5 +1,5 @@ { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages -, gobjectIntrospection, dmenu }: +, gobjectIntrospection }: let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index f7bb82e90dd9f62cd3ca1caaf49e2f333cb267e6..ab49514d720b916846c9a3b355fb3d54afd7523f 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig, -networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 2eef7f31ab555ae2f7b4fa85437e3c1d54807174..28b7c873d364acc967aa3f055ca3e2b630297f1a 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod }: +, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index e354ad223b8cd170c50b6c65614d926fc57dacb0..26bcc8f803f19e452fe63bcfbca468f308b4ce3b 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }: +{ buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "ngrok-${version}"; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 46c0ee0f27684072eaaca2c422c2b3550068d210..04a77176682d71685b92bd7a812b90f7cadd7047 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook +{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? true diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index c3d60d8e87b9c29719f3737c22aff877c187c9bf..e74a3554dc293597c16ec8b6e6e157b533a4002d 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl"; + sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; }; propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index a13d6599ffb01ec4f30007d65332079c2bf73fad..3814af60112e09e3c5f7ffbf4cccc6888362ca8f 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "s3gof3r-${version}"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index d2e8a9a30519754a076e9c48d59beb997defa3b8..09fa69dd37c4e50f8a3ebe252f670fe685ce255b 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, cmake +{ stdenv, fetchgit, cmake , libsodium, mbedtls, libev, c-ares, pcre , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix index ce2a8cf6a7f358c01411ae63a88dd848b6122b7d..e721479374454aa24046b59185a7d0ef233124e2 100644 --- a/pkgs/tools/networking/skydive/default.nix +++ b/pkgs/tools/networking/skydive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +{ lib, buildGoPackage, fetchFromGitHub, perl , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: buildGoPackage rec { diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 675777e4faa670d95c925a0f49661b84e090bd78..acda30dbfef82cfcf3829f59b7983b543db6efb3 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: -let inherit (stdenv.lib) optional optionalString; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index a3f08cb5a0771223ae144745abb922a2577a758f..7d3f773b1930bfecadc4eab6d3112b514b3b005c 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "srelay-0.4.8"; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 59cc89ac57274dcd7c3f1944ce41d1c055a1145b..8b4850a6347cbb089f91499e0b5ab1022176e149 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpcap }: +{ stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { name = "tcpdump-${version}"; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 9e13cfc59c1caa096e8b0baff7b4059d0c2f65e7..cfb627e8b3b9dcf4b034b36ee7494567c395546d 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv , pkgs , fetchurl, libpcap, libnet +{ stdenv , fetchurl, libpcap, libnet }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index b9abba2cd0da34330e52b76fd3ff3d8883f20750..bc97d5d8d6e411ca773726ceb96be06d0ea3acf0 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcp_wrappers }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tftp-hpa-${version}"; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index db4b6a2281d4843cfbf56c3f72ca1a13d4b9a9d7..09c737c048ae29100236de157c5da1d6e34236af 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { name = "tinc-${version}"; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 5fe69ede1a7df5e11e00b379a9721ac09d110c19..ea40a541a22411c4e403803c081df0cd91da871c 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn +{ stdenv, buildGoPackage, fetchgit , pkgconfig , glib, libxml2 }: diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index fe315666a2ea2df4c633b889539017a2b0eecf1a..9f67dd4e2c30290540afc289d5d6f969cf267226 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute, iputils -, locale ? "C" }: +, nettools, openresolv, iproute, iputils }: let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 263a44615305d6a38ffcc3574fa17f0600675bbb..7dc0e07f9451985cf05391095d2a11c9680d5e4c 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, ant }: +{ stdenv, fetchFromGitHub, jdk, ant }: stdenv.mkDerivation rec { name = "zap-${version}"; diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix index 042c999be0dfa63881f28a53e7538c7d85b23168..67aa52f478949516530a2e5f6a3a8cf405027baa 100644 --- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix +++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix @@ -3,13 +3,6 @@ with pkgs; let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index a2ff38ab3004e3fde47b5dd87aaa94e8f09a6cdf..69e978d3439de06955d2aba9437d55a4270d2499 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, buildEnv, - git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix + git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix }: let mkPrefetchScript = tool: src: deps: diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index facf47ebca675f44de0296f5ec3924d78c195c93..9fe6ec6e291b7ca5a5fb23360dd4a4f7f6fbb1a5 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: +{ lib, stdenv, fetchFromGitHub, nix, readline }: let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index d03e6f614e5750fc8f8b7316117859267ba2dab6..660dce347a5b0a0bbf62e666c0776cbe7d27b0cf 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, +{ stdenv, fetchFromGitHub, bzip2, nix, perl, perlPackages, }: diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index da62eba63fd373b8f0966010b2b1c46fbb929754..105cb6d7ab0fc9ca255932db9520fd0f38227dbf 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh # version args , src, version }: diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index 27edfa890fcf019d991474a88b1904e23f6e2f58..ce31de9f65d3b9d22a4e49aacb10a19ffa4bb66f 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoPackage , fetchFromGitHub }: diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 2d1e1fb326ae640563e97a3564a12e6f5059cc62..6f46b39e65b17f8d34da074ff450429d1207e0ac 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem +{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem , writeScript }: let version = "0.2.1"; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index c38ef25f3548c9753992a1648acf92a0e0dd1569..f0f05a4c858e8a8e7269dad2ffeecae55c8c4cdf 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qttools, packagekit }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, qttools, packagekit }: stdenv.mkDerivation rec { name = "packagekit-qt-${version}"; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 1ff0ad6f6b686b325dd04c2ba8f2d2223d33878c..c61cbeb32682d131c6ac58d8b3a8d3e3c60e0165 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, callPackage, makeWrapper +{ stdenv, fetchurl, callPackage, makeWrapper , clang, llvm, which, libcgroup }: diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index d21500960fecacb0fd0928b99802633d8366040a..7637dcf246af068319c8273c48d7c5ebef5de418 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy , libaio, libcap_ng, gnutls, pixman, autoconf , writeText }: diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 91a5fa4bdd24a1e923c7f86dc553ae3f6400d59f..b3c256ae59bf1c9d09c241acce205a7caf15ff45 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "cfssl-${version}"; diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index 859c1fdf49a07edea3c726e841dd10160cdf2532..a4afa772d10e1ef1120bda28731cc3b2e0e4ccb1 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }: +{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }: stdenv.mkDerivation rec { name = "cipherscan-${version}"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 79644d3577459edf3dc4b21810e9b5db42d4e305..825993937246ebb664eb5113d022c16c05061938 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchurl, pkgconfig , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 , libmspack, systemd }: diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index 07061aa0d11729eef98dc5b2d4b2e33d7900692a..32819b603f90b92cec7c6cda34003c0ee23c5766 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -1,6 +1,5 @@ { lib , pythonPackages -, fetchpatch }: with pythonPackages; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index f27f9af59c68f77e01dff03c8d8f63f931dcdd35..b99087e475d2cf8d811e1aef263c8cfdf1084fc1 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,7 +1,7 @@ {stdenv, system, fetchurl, dpkg, openssl, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig -, makeWrapper , makeDesktopItem, python, pythonPackages, lib +, makeWrapper , python, pythonPackages, lib , libredirect, lsof}: let diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 3a9c81df2343a87549c0cba2a2dc75a3fb8b0397..9398b38cb34c96de26b79f921e5ff520caa68a50 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs -, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg +, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE - wrapGAppsHook ]; + wrapGAppsHook gobjectIntrospection ]; patches = [ ./makefile-mkdir.patch ]; @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.spacefrogg ]; - broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index b0381b32bcfec432123ee1a668aab7535f763b95..fd773da4adea47d3cb508ad452831341215b1a6f 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba , libiconv, npth, gettext, texinfo, pcsclite, sqlite # Each of the dependencies below are optional. diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 25102fd0730331c94efe81d8a76c3df115f18252..88b15ebf43f5ffb63416ec5551553e747488638f 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { - version = "1.8.1"; + version = "1.8.2"; name = "gopass-${version}"; goPackagePath = "github.com/gopasspw/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w"; + sha256 = "0a2nnm3liilp2jcsvgyp87cjw92gspcc3azaszfvx125l63r4c9f"; }; wrapperPath = with stdenv.lib; makeBinPath ([ @@ -26,9 +26,6 @@ buildGoPackage rec { $bin/share/bash-completion/completions \ $bin/share/zsh/site-functions \ $bin/share/fish/vendor_completions.d - # by default, gopass tries to write configuration to /homeless-shelter - # during startup, which lands in stdout - export GOPASS_CONFIG=/dev/null $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index cbd260455d8ec09fafd3be33878ddceea3f5876e..df9d42211f6c87bc7c2ceca47020baa9c520bd1e 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: +{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { name = "gorilla-bin-${version}"; diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index fd78d9b2efbf39fe8cf84a00b999029af4a56857..385a201d88b0174bb220a56e403908412f131d9b 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssh, gnupg, unbound, libreswan }: +{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: let inherit (pythonPackages) python; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5d873885b1fdfc8011889f73486a4c7f84218442..e6c375599a92c9a0652f5147c1a835189a6cdc37 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index d9617e3eb2bafe5a6313a4ce7b89f2571978675b..62b92b7d0bddb34bc12d57c61bfa28c18416db66 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }: let version = "1.4.0"; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index e55e97656f637944e98fb362ec70caf8e13c954b..862b4a0df6e2a8d4e51b582b86e3c1031145bb04 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper +, gcc, pythonPackages, perl, perlPackages, makeWrapper }: with stdenv.lib; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 1a7cf30b9528dc09f5a5973b4c92837730c53bd6..549794b7831345a413ba976f94ca85b7e7efb151 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups +{ stdenv, fetchurl, alsaLib, atk, cairo, cups , dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3 -, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: +, libnotify, nspr, nss, pango, systemd, xorg }: let libPath = stdenv.lib.makeLibraryPath [ diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index c7e9267dde71f7a101b4487a3a12558514ea9fa1..007414d68a5e62577d872fbc15182cb986c85095 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv +{ stdenv, lib, pkgs, fetchurl, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index b198d7446a924b9266a8a7877c25e6bf65d58f02..4acdd6cb897e4e7a1bd01eed6093fe8e618f2f04 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: +{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 0c6d15e7d776f1c5361a0c1f7c2105790f688fa7..016017205ab43de051ad59afeedef487b7e688c8 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , cmake, ccid, qttools, qttranslations , pkgconfig, pcsclite, hicolor-icon-theme }: diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index bf5f9116f08cb2c33e3d7ae04a901746f7282c86..047706cd8a68dbbe4d7244cdbfc4f1fb6c926cf2 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "saml2aws-${version}"; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 26faf2c730c64689187645e99cc124e02633397d..bbcfc4c78907f0743f8618e027bb5b1e74dabd73 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "sops-${version}"; diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 0a9804a743bc30112cb47d3168599f3d3f8121a6..50b16ad58399e4afdc1a47d703bfb69b8d95143f 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ssdeep-${version}"; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index f1bac7adba1087bd704519bb0c9c51b78419c32c..0c0cf29f977fe500c9a51750894671434fa7e720 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }: +{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "theHarvester"; diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix index 6a7682a8f5786feee544f12b454fe6cfe75b9e9c..c944883d41783c6ee855ac5c1ff5fa047b7c7099 100644 --- a/pkgs/tools/security/tor/update.nix +++ b/pkgs/tools/security/tor/update.nix @@ -1,6 +1,5 @@ { lib , writeScript -, runCommand , common-updater-scripts , bash , coreutils diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 70640563aa31b595a6bb3bbd1b75997800812d6d..4f2671aeacbf561a4f3e6caffc7cc69fb42ead17 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,17 +1,22 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }: +{ stdenv, pythonPackages, nix, ronn }: pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.6.3"; + version = "1.7"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi"; + sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj"; }; buildInputs = [ ronn ]; - checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ]; + checkInputs = with pythonPackages; [ + freezegun + pytest + pytestcov + pytest-flake8 + ]; propagatedBuildInputs = [ nix @@ -27,9 +32,7 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; - postBuild = '' - make -C doc - ''; + postBuild = "make -C doc"; checkPhase = "py.test src/vulnix"; @@ -45,7 +48,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; homepage = https://github.com/flyingcircusio/vulnix; - license = licenses.bsd2; + license = licenses.bsd3; maintainers = with maintainers; [ ckauhaus plumps ]; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 3f618301a864bdba02a5b7f17fe7e0c30d081e20..fd7f93d1546ca3e51ab4f463b53de2836539e5f0 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g"; + sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn"; }; # Disable fstype test, tries to read /etc/mtab diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index f99d22becdb831458fe4c8065fae618ae504dd55..9cba7df21b7dca360f9b472a270c916425a58a5a 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }: +{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }: stdenv.mkDerivation rec { version = "0.14.7"; diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index ebe654d946e3b944b8d7b89dee588c961f5d29ef..3dc2a5caeb91dcea6e1bea09caae7fc9ff77f912 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "confd-${version}"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index e664c0ef8e2cecda287cd3512f75d2248fb0bc1a..35c57dd8ea916a3e50ed8388422810d1384410d3 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-template-${version}"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index fc42c3b856f61ef01fec5662df76114df08a0406..6c852efe96e5464993e35c1432d4a6bcab5c4d55 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,10 +1,7 @@ { stdenv , fetchurl, lzip -, hostPlatform, buildPlatform }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "ddrescue-1.23"; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index b6f1af7b23fe6e1651d332235e7139b0ae4f7bf6..5a902914b37bc489977f8b0458e17c66b868d0fc 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages -, libevdev, linuxHeaders +, libevdev }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 77f65de9a8d0ade51a65ff76c2ad1425a17b2adc..9eef3b064a0c7d7bb2c6bf0c4e21359998ae88d8 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gohai-${version}"; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 316b94befde3b1b4a6205057876043bf331e1bac..473d245618fafd6edf2aff31c3fce33e1c07f87a 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }: +{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 7bbf42b11321cf2b63ed4c58e0a88dbe1e1fb08c..5b2be75e452f88d123b8bbf519db56bd8e20ba8e 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson }: let diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index cd3c815934f3f6507115e75b5746606a5f69324b..b673c0f929a6a74b5c0e0057ae9b0e123ab7dcca 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "pcstat-unstable-${version}"; diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 3a5cb1b4965dabd1533092d2076cee58ad804cb0..5414d670423201dd6dda1b6735ab11aeaa3f0b5f 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby, stdenv }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { name = "procodile-${version}"; diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 62be30319cf85f70e3d3aa2b4dda8a070469fb1b..56a8133bd3a82fef8468412029f4acba6467559e 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "codesearch-${version}"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 27581134ca3417f903a81fdf4c4a1af90fe4c672..ab0f8893bfde43dcd0642a9e14ff392e1fbf09dc 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff +{ stdenv, fetchurl, perl , ghostscript #for postscript and html output , psutils, netpbm #for html output , buildPackages diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index c76ba8ea88d5a1224e2294059266c4a55977042c..829d734a8f75745d58557a4e42b46a12e760b018 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "the_platinum_searcher-${version}"; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 11355bb6df1d5f32c8620eabf69be27bd5f45823..aa41e7b7f60a6471f666c811c6ac4e2312986dae 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt }: rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index e87a8bc0275091bac5cb3af4c1b37035b767ec95..b7f8bd6df3814b96621c478606642ab82bb52b5f 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, gnum4 }: +{ stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { name = "jade-${version}-${debpatch}"; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 7328cd3878a20ace8d71028049a612df9a46c537..fe699b35590026292ebaec6f7398e6d5519ce722 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "shfmt-${version}"; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index efa5e539bd148863f38472b2466231b38c1facdc..421715f7c33ca781cc498e044d2b13116bb19d73 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "sift-${version}"; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 81b90e4925dec9c2db2d7ce6b230a2e9bc33d4a2..c3db482d271a7443f3c84b8e37c1d76b43d10ada 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, bash, coreutils }: +{ stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { version = "2.28"; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index f9debaaf061525e07f6dedc90d96728b8c592aa8..4271bf095a1454e73b52b146690ff9397c758870 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool -, zlib, openssl, zip, zimlib, cxxtools, tntnet +, zimlib, cxxtools, tntnet }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index b1fe301775c8b05afaaa56e968a461fb73df060f..1f6a7054b9e39a7d1775ffb751d3bdc68073aae7 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerApp, ruby, curl +{ stdenv, lib, bundlerApp, ruby # Dependencies of the 'mathematical' package , cmake, bison, flex, glib, pkgconfig, cairo , pango, gdk_pixbuf, libxml2, python3, patchelf diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 8ce2a6b0aa3c9a8ff27f0a195641fd8ba23b16f5..fa8af0089556a3971aceef50db50cb814c0c6f64 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper +{ stdenv, fetchFromGitHub, rustPlatform , darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 0566e5118705f9be8356b1437d9ad2db2d7d4349..4ee45bf4bc8f51caa724a63a222c0874a3afa037 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -207,7 +207,6 @@ rec { simpleTeXToPNG = { preamble ? null , body - , name ? baseNameOf (toString body) , packages ? [] }: @@ -227,7 +226,6 @@ rec { simpleTeXToPDF = { preamble ? null , body - , name ? baseNameOf (toString body) , packages ? [] }: diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 32894748ac46547563508863999478c7e801e04b..9bc5a9b273b9966bfd3991381a723ec811d1a439 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl +{ stdenv, fetchurl , texlive -, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto -, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext -, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig -, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr -, xpdf, cairo, pixman, xorg, clisp, biber +, zlib, libiconv, libpng, libX11 +, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext +, perl, pkgconfig +, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr +, cairo, pixman, xorg, clisp, biber , makeWrapper }: diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index ed3dad64f16d1f2752f5a6423bd411978a1e765e..939615f5797cf878c667336a0634dfd066254fe1 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, libxml2, libxslt +{ fetchurl, stdenv, libxml2, libxslt , docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index dab4bf44a6f9deb785a367ede068bbaa6e32d200..975e13b65da7adeb77a4b61079d8d6bccd6fe292 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, lib, ruby }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index bb72fd2911f77e604e35300ef909b727dd1bd1bd..32cf2771b51da63f531d6019a5aca7d150d41ee9 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 549c830e887155f384e6d0d74ab4b46a9439cbb6..ff9a13c500b36006de429dc5b19734cb4fd3811d 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "awless-${version}"; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 60ccc0f4724a696dbf530b8e80189cb9b97108b9..5e2f84dee1d2b729147390a3f11de4c884bf4c91 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }: +{ lib, pythonPackages, fetchurl, cloud-utils }: let version = "0.7.9"; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 83a340348c8edad6010b2dba287b3a6b217a9796..2286faf4d1b8ca60e009487418ddbd6a302d4265 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub +{ stdenv, pkgconfig, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index dce806cf6e34ee34291680f64bc21b2cb5f07053..ce628ff84b5e1ee05a106e3ee2981dee11cb1bd3 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, python2Packages }: +{ stdenv, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 3645de88bf8a0aae4b41d59682f83df74fe7c0a9..e987bc7986b11f595ad92b6ec032c8814ffbefb2 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildPythonApplication , bash -, shadow , systemd , utillinux , boto diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb793ab0b472819cf6402c606d834f3748a3190f..8980ccf4c245954d4687f70352cd1937823b43b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -700,9 +700,7 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { - pkgs_i686 = pkgsi686Linux; - }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -860,6 +858,8 @@ with pkgs; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + libtensorflow = callPackage ../development/libraries/libtensorflow { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; bliss = callPackage ../applications/science/math/bliss { }; @@ -5168,7 +5168,7 @@ with pkgs; sourceHighlight = callPackage ../tools/text/source-highlight { }; - spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; + spaceFM = callPackage ../applications/misc/spacefm { }; squashfsTools = callPackage ../tools/filesystems/squashfs { }; @@ -6757,9 +6757,8 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk10distro = packageType: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); + oraclejdk10distro = packageType: _: + (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); jikes = callPackage ../development/compilers/jikes { }; @@ -8640,7 +8639,6 @@ with pkgs; xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - stdenv = buildPackages.clangStdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { @@ -11418,7 +11416,6 @@ with pkgs; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; - inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -11439,7 +11436,7 @@ with pkgs; qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11453,7 +11450,7 @@ with pkgs; qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11468,7 +11465,7 @@ with pkgs; qt511 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.11) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -12168,13 +12165,9 @@ with pkgs; wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { - graphviz = graphviz-nox; - }; + wayland = callPackage ../development/libraries/wayland { }; - wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { - graphviz = graphviz-nox; - }; + wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { }; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; @@ -12561,7 +12554,7 @@ with pkgs; openblas = openblasCompat; withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; - inherit (darwin) cf-private libobjc; + inherit (darwin) libobjc; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -12678,7 +12671,6 @@ with pkgs; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; - python = python27; sphinx = python27Packages.sphinx; erlang = erlangR19; }; @@ -15749,7 +15741,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { @@ -15767,7 +15759,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { @@ -16367,9 +16359,7 @@ with pkgs; python = python27; }; - git-review = callPackage ../applications/version-management/git-review { - python = python27; - }; + git-review = callPackage ../applications/version-management/git-review { }; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -16412,7 +16402,6 @@ with pkgs; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; - androidsdk = androidsdk_extras; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; }); @@ -16867,9 +16856,7 @@ with pkgs; let mkApplications = import ../applications/kde; attrs = { - inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; - inherit plasma5; - inherit attica phonon; + inherit lib libsForQt5 fetchurl; inherit okteta; }; in @@ -17181,7 +17168,6 @@ with pkgs; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; - inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI }; @@ -17500,7 +17486,6 @@ with pkgs; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -17702,7 +17687,7 @@ with pkgs; pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + paraview = libsForQt59.callPackage ../applications/graphics/paraview { }; packet = callPackage ../development/tools/packet { }; @@ -18449,8 +18434,9 @@ with pkgs; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - # linux only by now - synergy = callPackage ../applications/misc/synergy { }; + synergy = callPackage ../applications/misc/synergy { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; + }; tabbed = callPackage ../applications/window-managers/tabbed { # if you prefer a custom config, write the config.h in tabbed.config.h @@ -18814,9 +18800,6 @@ with pkgs; nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - primusLib_i686 = if system == "x86_64-linux" - then pkgsi686Linux.primusLib - else null; libglvnd_i686 = if system == "x86_64-linux" then pkgsi686Linux.libglvnd else null; @@ -19232,7 +19215,7 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; #TODO: 'pil' is not available for python3, yet xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; @@ -19266,7 +19249,6 @@ with pkgs; finalterm = callPackage ../applications/misc/finalterm { }; roxterm = callPackage ../applications/misc/roxterm { - inherit (pythonPackages) lockfile; inherit (gnome3) gsettings-desktop-schemas vte; }; @@ -20174,7 +20156,7 @@ with pkgs; lumina = libsForQt5.callPackage ../desktops/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5 fetchFromGitHub; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); @@ -21244,7 +21226,7 @@ with pkgs; kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; }; + lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; @@ -21683,7 +21665,6 @@ with pkgs; }; vice = callPackage ../misc/emulators/vice { - libX11 = xorg.libX11; giflib = giflib_4_1; }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8f8caf755edf69d9c32d29228c3cac0cfa1262bb..3440bfafb110c4da1410c15e4d000d0d1c296ba5 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, callPackage, wxGTK30, darwin }: +{ callPackage, wxGTK30 }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 4527451d71a44c7a8498e81ddb73225d7b4de2f0..3782fc33d6a6ed97021ac90ffdb8e34707bca5ad 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,6 @@ , fetchNuGet , pkgconfig , mono -, monodevelop , fsharp , unzip , overrides ? {} diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f6c992d5bd5fe1e608cf61e8c8906525cb1d75c7..5d042c3385e1466fff4937842a6d0e73f300434b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -39,7 +39,7 @@ , melpaBuild , external -}@args: +}: with lib.licenses; @@ -50,16 +50,14 @@ let }; melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { - inherit external lib; + inherit external; }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { inherit external lib; }; - orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { - inherit fetchurl lib stdenv texinfo; - }; + orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { inherit lib lndir makeWrapper stdenv runCommand; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5fef4872db210949f23095790526ae60eb6ddf7b..bef3c2d0a219d4c4ce29b2f283c512ce552e9259 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,5 +1,5 @@ { buildPackages, pkgs -, newScope, stdenv +, newScope , buildPlatform, targetPlatform }: diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 5a85dc3433badddfbb2e3170d0b04572bcc9a657..35b0b42da3fe18d6d678478834fc38f8b7916f59 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }: +{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: let self = haxePackages; - callPackage = newScope self; haxePackages = with self; { withCommas = stdenv.lib.replaceChars ["."] [","]; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 77cd5b0eba53ecddba339e2d8a4cbb584c2f2bcf..73ed6bf9162cdfd2c72888ef40432d85c5f5a8e1 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, maven }: +{ pkgs }: with pkgs; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 017b9fca3f93f50b438240a141e039ee87977975..cb9df43824636436e0e3673ce65abda828dec0fa 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,15 +5,14 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which, fetchpatch, writeText }: let - isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a49d638dc47eef96085bf636fd224b2db6bb970d..eb76c323dde4cc6a2426c786df9c5c372e074e96 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -748,14 +748,14 @@ let # Jane Street janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; - + janeStreet = import ../development/ocaml-modules/janestreet { - inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit; + inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re zarith ppxlib; inherit (pkgs) stdenv openssl; }; - + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; }; inherit lib ocaml ocamlbuild ctypes cryptokit; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3465fbda44add717f1b18cc6beb5634bc094875..da5c9f68a09567b74120a4706ab822d80287391e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}: +{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: let self = _self // overrides; _self = with self; { @@ -5038,7 +5038,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { - homepage = http://www.matijs.net/software/msgconv/; + homepage = https://www.matijs.net/software/msgconv/; description = "A .MSG to mbox converter"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; @@ -15990,7 +15990,7 @@ let self = _self // overrides; _self = with self; { install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.3/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dddfa74f43ee7fbe8699e1b7eee8e0797cd8c340..fa3da8c99fd3c0a5940e2dfcea228974012e23d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3105,6 +3105,8 @@ in { }; + image-match = callPackage ../development/python-modules/image-match { }; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; immutables = callPackage ../development/python-modules/immutables {}; @@ -4542,6 +4544,8 @@ in { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; + zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-4.1.2"; @@ -9620,7 +9624,7 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales pandoc git; + inherit (pkgs) glibcLocales git; }; pep8 = buildPythonPackage rec { @@ -12411,28 +12415,7 @@ in { scipy = callPackage ../development/python-modules/scipy { }; - scikitimage = buildPythonPackage rec { - name = "scikit-image-${version}"; - version = "0.12.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scikit-image/${name}.tar.gz"; - sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2"; - }; - - buildInputs = with self; [ cython dask nose numpy scipy six ]; - - propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ]; - - # the test fails because the loader cannot create test objects! - doCheck = false; - - meta = { - description = "Image processing routines for SciPy"; - homepage = http://scikit-image.org; - license = licenses.bsd3; - }; - }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = callPackage ../development/python-modules/scikitlearn { inherit (pkgs) gfortran glibcLocales; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 3bc252e440f7234b002cbe2b0ae445256adec6ac..8b7240e21a336208a7ba34e58ddb664fee39a5e1 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,9 +3,7 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } -, officialRelease ? false -, # The platforms for which we build Nixpkgs. +{ # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] }: